diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
index 8b763061..00a15510 100644
--- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js
+++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js
@@ -97,30 +97,6 @@ export function getTable00(PageCurrent, PageSize, num) {
     }
   })
 }
-// 保存
-export function save(num1, num2, num3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_工艺任务分配_保存数据',
-      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
-    }
-  })
-}
-// // 模糊查询
-// export function fuzzyQuery(num) {
-//   return request({
-//     url: '',
-//     method: 'post',
-//     data: {
-//       type: '1',
-//       name: '车间生产管理工艺_传递后_机床名称_查询数据_模糊查询',
-//       param: '机床图号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1'
-//     }
-//   })
-// }
 // 工艺定额人员查询
 export function initPerson() {
   return request({
@@ -133,3 +109,27 @@ export function initPerson() {
     }
   })
 }
+// 保存
+export function save(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_工艺任务分配_保存数据',
+      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
+    }
+  })
+}
+// 保存
+export function save2(num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_工艺任务分配_保存数据',
+      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
+    }
+  })
+}
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index ef2d26f0..26bacdb0 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -37,14 +37,14 @@ export function payTime(num, time) {
   })
 }
 // 修改扣款数据、扣款说明
-export function WithdrawingEdit(num, quality, plan, Other, Explain) {
+export function WithdrawingEdit(num, quality, Explain) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款_计划=' + plan + '&扣款_其他=' + Other + '&扣款说明=' + Explain
+      name: '车间生产管理_外协扣款_编辑数据',
+      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 8d31b698..31d5b1d0 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -3,16 +3,16 @@
     <el-card>
       <div slot="header">
         <el-row style="margin-bottom:-10px!important;">
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>
-          <el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">
-            <el-option
-              v-for="item in inventoryName"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
+          <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 150px;" @keyup.enter.native="pageCurrent=1;pageSize=20;searchMaterial()"/>
+          <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
+          <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
+          <!--<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">-->
+          <!--<el-option-->
+          <!--v-for="item in inventoryName"-->
+          <!--:key="item.value"-->
+          <!--:label="item.label"-->
+          <!--:value="item.value"/>-->
+          <!--</el-select>-->
           <el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
             <el-option
               v-for="item in locateName"
@@ -85,18 +85,18 @@
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
       <el-row>
-        <el-col style="width: 240px">
-          <span>物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
-        </el-col>
-        <el-col style="width: 240px">
-          <span>物料规格:</span>
-          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
-        </el-col>
-        <el-col style="width: 240px">
-          <span>物料型号:</span>
-          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
+        <el-col style="width: 280px">
+          <span>名称规格型号:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;" @keyup.enter.native="pageCurrent01=1;pageSize01=20;searchMaterial01()"/>
         </el-col>
+        <!--<el-col style="width: 240px">-->
+        <!--<span>物料规格:</span>-->
+        <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
+        <!--</el-col>-->
+        <!--<el-col style="width: 240px">-->
+        <!--<span>物料型号:</span>-->
+        <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
+        <!--</el-col>-->
         <el-col style="width: 80px">
           <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>
         </el-col>
@@ -134,7 +134,7 @@
           @current-change="handleCurrentChange01"/>
       </div><hr>
       <el-row>
-        <el-col style="width: 210px">
+        <el-col v-show="false" style="width: 210px">
           <span>仓库:</span>
           <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
             <el-option
@@ -206,6 +206,7 @@ export default {
   mounted() {
     this.initData()
     this.searchMaterial()
+    this.getLocate()
   },
   methods: {
     // 初始化数据
@@ -236,8 +237,7 @@ export default {
         method: 'post',
         data: {
           type: '1',
-          name: '库存管理_货位主文件_查询数据',
-          param: `仓库流水号=${this.inventoryNameValue}`
+          name: '库存管理_货位主文件_查询数据_2019-11-28'
         }
       }
       request(param).then(res => {
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index d42569b9..020fa906 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -436,9 +436,9 @@ export default {
     },
     // 领料确认
     inputPassword() {
-      this.form3.outTypeValue = ''
+      this.form3.outTypeValue = 21
       this.form3.password = ''
-      this.form3.department = ''
+      this.form3.department = '装配'
       this.dialogFormVisible3 = true
     },
     selectable(row, index) { // 控制某行是否可选
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 0e94e373..903b4535 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row style="margin-bottom: 10px">
-        <span>物料名称：</span>
-        <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
-        <span>物料规格：</span>
-        <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+      <el-row style="margin: 5px">
+        <span>名称规格型号：</span>
+        <el-input v-model="materialName" placeholder="名称规格型号" clearable size="small" @keyup.enter.native="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()"/>
+        <!--<span>物料规格：</span>-->
+        <!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
+        <!--<span>物料型号：</span>-->
+        <!--<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>-->
+        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
       </el-row>
-      <span>物料型号：</span>
-      <el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord">
+      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
           <template slot-scope="scope">
@@ -30,11 +30,11 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.仓库名称 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column label="货位名称" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
@@ -65,7 +65,7 @@
       </div>
     </el-card>
 
-    <el-card>
+    <el-card v-show="false">
       <el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" align="center" min-width="80">
@@ -169,7 +169,7 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <el-form-item label="领料部门" prop="DirectNumber" label-width="100px" size="small">
+        <el-form-item label="领料部门" prop="department" label-width="100px" size="small">
           <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="领料人" prop="DirectNote" label-width="100px">
@@ -220,7 +220,8 @@ export default {
           { required: true, message: '请输入数量', trigger: 'blur' },
           { validator: checkNum, trigger: 'blur' }
         ],
-        DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }]
+        DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }],
+        department: [{ required: true, message: '请输入领料部门', trigger: 'blur' }]
       },
       locateNumber: '',
       materialNumber: '',
@@ -346,12 +347,13 @@ export default {
     },
     // 打开表单
     parOut(row) {
-      this.dialogFormVisible = true
+      this.form.department = '装配车间'
       this.locateNumber = row.货位流水号
       this.materialNumber = row.物料流水号
       this.partnumber = row.货位存量
       this.离线合同明细流水号 = row.离线合同明细流水号
       this.组件零件基本件流水号 = row.组件零件基本件流水号
+      this.dialogFormVisible = true
     },
     // 重置表单
     callOff() {
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index 383c9e53..fb22417f 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -19,11 +19,12 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/>
-        <el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />
-        <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />
+        <el-input v-model="name" placeholder="名称图号规格" style="width:150px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
+        <!--<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />-->
+        <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
       </el-row>
-      <el-row style="margin-bottom:10px">
+      <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
           v-model="inTime"
           type="daterange"
@@ -34,7 +35,6 @@
           style="width:250px;margin-left: 0px"
           start-placeholder="开始时间"
           end-placeholder="结束时间"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
       </el-row>
     </el-card>
     <el-card style="width: 900px">
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 80995f00..1ae4bcc2 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -19,11 +19,12 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" />
-        <el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />
-        <el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />
+        <el-input v-model="name" placeholder="名称图号规格" clearable size="small" style="width:150px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
+        <!--<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />-->
+        <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
       </el-row>
-      <el-row style="margin-bottom:10px">
+      <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
           v-model="outTime"
           type="daterange"
@@ -34,7 +35,6 @@
           style="width:250px;margin-left: 0px"
           start-placeholder="开始时间"
           end-placeholder="结束时间"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
       </el-row>
     </el-card>
     <el-card style="width: 900px">
diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
index 3ca27de2..aa250568 100644
--- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
+++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
@@ -37,11 +37,11 @@
       </el-row>
       <el-row>
         <span>操作者:</span>
-        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
+        <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:120px; margin-top: 10px;margin-bottom: 10px"/>
         <span>零件图号:</span>
-        <el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
+        <el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>
         <span>工艺名称:</span>
-        <el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/>
+        <el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:150px"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
           <el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
@@ -507,7 +507,6 @@ export default {
       this.partNumber ? check4 = 1 : check4 = 0
       this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0
       searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => {
-        console.log(res.data.rows, 898989)
         this.tableData = res.data.rows
         this.total = res.data.total
         this.tableData.map(v => {
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index b53986dd..e0d450cc 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -633,7 +633,8 @@ export default {
     },
     opclickshowPanel($event) {
       if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') {
-        var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101'
+        // var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101'
+        var aaa = 'http://192.168.1.232:8007/#/login?OPNAME=' + $event.path[2].id
         window.open(aaa)
       }
     },
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index fdef9f3a..7a7fd68d 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -3,7 +3,6 @@
     <el-card>
       <div>
         <el-row>
-          <!--          <span style="margin-left: 10px">机床号：</span>-->
           <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
             <el-option
               v-for="item in machineNumber"
@@ -14,17 +13,14 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
             </el-option>
           </el-select>
-          <!--          <span style="margin-left: 10px">组号：</span>-->
-          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:150px" size="small" clearable>
+          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:100px" size="small" clearable>
             <el-option
               v-for="item in groupNumber"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <!--          <span style="margin-left: 10px">零件号：</span>-->
-          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px;width:150px"/>
-          <!--          <span style="margin-left: 10px">工艺员：</span>-->
+          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
           <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
             <el-option
               v-for="item in person"
@@ -33,6 +29,9 @@
               :value="item.value"/>
           </el-select>
           <el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
+          <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
+            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
+          </el-tooltip>
         </el-row>
       </div>
     </el-card>
@@ -64,22 +63,22 @@
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="130px">
+            <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="90px">
+            <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="投产数量" align="center" width="90px">
+            <el-table-column label="数量" align="center" width="50px">
               <template slot-scope="scope">
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
+            <el-table-column label="工艺员" prop="工艺员" align="center" width="75px">
               <template slot-scope="scope">
                 {{ scope.row.工艺员 }}
               </template>
@@ -90,21 +89,13 @@
               :current-page="pageCurrent"
               :page-sizes="[5, 10, 20, 300]"
               :page-size="pageSize"
+              :pager-count="5"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
         </el-card>
-        <el-card>
-          <div>
-            <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
-              <div style="display: inline-block">
-                <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
-              </div>
-            </el-tooltip>
-          </div>
-        </el-card>
       </el-col>
       <el-col style="width: 1000px">
         <el-card v-if="tableData2.length">
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 74463e8e..182b9ded 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -24,6 +24,7 @@
       </el-select>
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
+      <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="currency">保存</el-button>
     </el-card>
     <el-card>
       <el-table
@@ -159,7 +160,10 @@ export default {
       PageCurrent: 1,
       PageSize: 50,
       total: 0,
-      Craftsmens: [] // 工艺员
+      Craftsmens: [], // 工艺员
+      通用件图号: [],
+      通用件规格: [],
+      工艺员: []
     }
   },
   created() {
@@ -292,6 +296,7 @@ export default {
                 工艺结束时间: response.data.rows[i].工艺计划结束时间,
                 数量: response.data.rows[i].批次数量,
                 投产时间: response.data.rows[i].操作时间,
+                规格: response.data.rows[i].规格,
                 工艺员: '',
                 人员编号: '',
                 工艺计划流水号: response.data.rows[i].工艺计划流水号
@@ -356,7 +361,6 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
-      console.log(val)
     },
     save() {
       for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -376,6 +380,22 @@ export default {
           })
         }
       }
+    },
+    // 直接保存工艺
+    currency() {
+      this.通用件图号 = []
+      this.通用件规格 = []
+      this.工艺员 = []
+      this.multipleSelection.map(v => {
+        if (!v.工艺员) {
+          return false
+        }
+        console.log(111)
+        this.通用件图号.push(v.零件号)
+        this.通用件规格.push(v.规格)
+        this.工艺员.push(v.工艺员)
+      })
+      console.log(this.通用件图号, this.通用件规格, this.工艺员)
     }
   }
 }
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index bd86ff96..ce57deab 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
         <span>组号:</span>
-        <el-select v-model="Group" size="small" clearable placeholder="组号">
+        <el-select v-model="Group" size="small" style="width: 100px" clearable placeholder="组号">
           <el-option
             v-for="item in Groups"
             :key="item.value"
@@ -23,8 +23,9 @@
         </el-select>
         <span>零件号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
+        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
       </el-row>
-      <el-row>
+      <el-row v-if="false">
         <span class="demonstration">计划下达时间:</span>
         <el-date-picker
           v-model="startTime"
@@ -41,7 +42,6 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index 80af3cc6..f2a4a0ce 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -22,7 +22,7 @@
     <!--      </el-tooltip>-->
     </el-card>
     <el-row>
-      <el-col style="width: 400px">
+      <el-col style="width: 350px">
         <el-card>
           <el-table
             v-loading="loading"
@@ -35,22 +35,22 @@
             border
             element-loading-text="拼命加载中"
             @row-click="searchTable2">
-            <el-table-column label="操作者" align="center" width="110px" show-overflow-tooltip>
+            <el-table-column label="操作者" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划工时" align="center">
+            <el-table-column label="计划工时" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.理论加工时间段 }}
               </template>
             </el-table-column>
-            <el-table-column label="加工工时" align="center">
+            <el-table-column label="加工工时" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.实际加工时间段 }}
               </template>
             </el-table-column>
-            <el-table-column label="完成数量" align="center">
+            <el-table-column label="完成数量" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.完成数量 }}
               </template>
@@ -66,15 +66,15 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="margin-left: 0px;width: 810px">
+      <el-col style="margin-left: 0px;width: 860px">
         <el-card>
           <el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
-            <el-table-column label="零件图号" align="center" width="170px" show-overflow-tooltip>
+            <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件名称" align="center" width="90px" show-overflow-tooltip>
+            <el-table-column label="零件名称" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
@@ -84,7 +84,7 @@
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="完成数量" align="center" width="70px">
+            <el-table-column label="完成数" align="center" width="60px">
               <template slot-scope="scope">
                 {{ scope.row.完成数量 }}
               </template>
@@ -94,11 +94,11 @@
                 {{ scope.row.质检结果 }}
               </template>
             </el-table-column>
-            <el-table-column label="不合格数" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.不合格数量 }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column label="不合格数" align="center" width="70px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.不合格数量 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column label="计划工时" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.理论加工时间段 }}
@@ -109,7 +109,12 @@
                 {{ scope.row.实际加工时间段 }}
               </template>
             </el-table-column>
-            <el-table-column label="完成时间" align="center" width="100px">
+            <el-table-column label="加工开始" align="center" width="135px">
+              <template slot-scope="scope">
+                {{ scope.row.加工开始时间 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="加工完成" align="center" width="135px">
               <template slot-scope="scope">
                 {{ scope.row.加工完成时间 }}
               </template>
@@ -145,10 +150,10 @@ export default {
       loading2: '',
       pageCurrent: 1,
       pageSize: 10000,
-      total: '',
+      total: 0,
       pageCurrent2: 1,
       pageSize2: 10000,
-      total2: '',
+      total2: 0,
       timeCheck: '',
       operater: ''
     }
@@ -166,8 +171,6 @@ export default {
       if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
         this.timeCheck = 1
       } else {
-        // this.startTime = ''
-        // this.endTime = ''
         this.timeCheck = 0
       }
       searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
@@ -197,7 +200,8 @@ export default {
               不合格数量: response.data.rows[i].不合格数量,
               理论加工时间段: response.data.rows[i].理论加工时间段,
               实际加工时间段: response.data.rows[i].实际加工时间段,
-              加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : ''
+              加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '',
+              加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : ''
             })
           }
         }
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 7d221ad8..50014045 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -13,7 +13,7 @@
                 :value="item.value"/>
             </el-select>
           </el-row>
-          <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
+          <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="600" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
             <el-table-column
               label="序号"
               type="index"
@@ -51,7 +51,7 @@
               :page-sizes="[50, 100, 200, 500, 1000]"
               :page-size="pageSize"
               :total="total"
-              :pager-count="5"
+              :pager-count="4"
               layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index c53c5673..b8aa40d0 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -563,7 +563,7 @@ export default {
     },
     // 扣款编辑
     WithdrawingEdit() {
-      WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.计划, this.form2.其他, this.form2.扣款说明).then(response => {
+      WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.扣款说明).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('修改成功')
           this.searchTable()
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 3d59ff66..9d46b708 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -70,17 +70,12 @@
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.备注 || '—' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="技术下达数量" width="100px">
+          <el-table-column align="center" label="计划数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同采购数量" width="100px">
+          <el-table-column align="center" label="采购数量" width="100px">
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
             </template>
@@ -105,6 +100,11 @@
               {{ scope.row.姓名 || '—' }}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
         </el-table>
         <div class="block">
           <el-pagination
@@ -158,17 +158,12 @@
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.备注 || '—' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="技术下达数量" width="100px">
+          <el-table-column align="center" label="计划数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同采购数量" width="100px">
+          <el-table-column align="center" label="采购数量" width="100px">
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
             </template>
@@ -193,6 +188,11 @@
               {{ scope.row.姓名 || '—' }}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
         </el-table>
         <div class="block">
           <el-pagination
@@ -251,12 +251,7 @@
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.备注 || '—' }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="技术下达数量" width="100px">
+          <el-table-column align="center" label="计划数量" width="100px">
             <template slot-scope="scope">
               {{ scope.row.零件数量 || '—' }}
             </template>
@@ -286,6 +281,11 @@
               {{ scope.row.姓名 || '—' }}
             </template>
           </el-table-column>
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.备注 || '—' }}
+            </template>
+          </el-table-column>
         </el-table>
         <div class="block">
           <el-pagination
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index c44c6c94..5c5ca59f 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -2,17 +2,24 @@
   <div class="app-container">
     <el-card class="searchContract">
       <el-row>
-        <el-select v-model="contractNumValue" placeholder="请购单号/合同编号" size="small" @change="searchData">
+        <el-select v-model="contractNumValue" placeholder="请购单号/合同编号" size="small" style="width: 160px" @change="searchData">
           <el-option
             v-for="item in contractNum"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="contractName" placeholder="合同名称" size="small"/>
-        <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>
-        <el-input v-model="AdvanceCharge" size="small" placeholder="预付款"/>
-        <el-select v-model="currencyValue" placeholder="币种" size="small" clearable>
+        <el-input v-model="contractName" placeholder="合同名称" style="width: 120px" size="small"/>
+        <!--        <el-input v-model="supplierName" size="small" placeholder="请双击选择供应商" readonly clearable @dblclick.native="dialogVisible1=true;submitDisable=true" @clear="emptySupplierDetail"/>-->
+        <el-select v-model="supplierValue" placeholder="选择供应商" filterable style="width: 220px" size="small" clearable>
+          <el-option
+            v-for="item in supplierValues"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="AdvanceCharge" size="small" style="width: 120px" placeholder="预付款"/>
+        <el-select v-model="currencyValue" placeholder="币种" style="width: 120px" size="small" clearable>
           <el-option
             v-for="item in currency"
             :key="item.value"
@@ -26,25 +33,25 @@
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           placeholder="规定到货时间"/>
-        <el-input v-model="name" placeholder="采购员" size="small" readonly/>
-        <el-input v-model="taxRate" placeholder="税率" size="small"/>
+        <el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
+        <el-input v-model="taxRate" placeholder="税率" style="width: 120px" size="small"/>
         <el-button v-show="contractNumType===0" type="success" size="small" @click="linkGroup">成组采购</el-button>
         <el-button v-show="contractNumType===1" type="danger" size="small" @click="unLinkGroup">取消成组采购</el-button>
       </el-row>
     </el-card>
     <el-card>
-      <el-table v-show="contractNumType===1" :data="tableData5" border style="width: 100%" height="100px" size="mini">
-        <el-table-column label="组件名称" align="center" width="150">
+      <el-table v-show="contractNumType===1" :data="tableData5" border style="width: 1200px" height="100px" size="mini">
+        <el-table-column label="组件名称" align="center" width="180">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" width="100">
+        <el-table-column label="组号" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" width="120">
+        <el-table-column label="数量" align="center" width="90">
           <template slot-scope="scope">
             <el-input v-model="scope.row.数量" size="mini" style="width:100%" @change="update1(scope.row)"/>
           </template>
@@ -56,10 +63,10 @@
         </el-table-column>
         <el-table-column label="金额" align="center" width="150">
           <template slot-scope="scope">
-            {{ parseInt(scope.row.数量) * parseFloat(scope.row.单价) }}
+            {{ (parseInt(scope.row.数量) * parseFloat(scope.row.单价)).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="交货期" align="center" width="150">
+        <el-table-column label="交货期" align="center" width="160">
           <template slot-scope="scope">
             <el-date-picker
               v-model="scope.row.物料计划到货时间"
@@ -71,7 +78,7 @@
               @change="update1(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width="250">
+        <el-table-column label="备注" align="center" min-width="100">
           <template slot-scope="scope">
             <el-input v-model="scope.row.备注" size="mini" style="width:100%" @change="update1(scope.row)"/>
           </template>
@@ -79,35 +86,35 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-table v-show="contractNumType===0" :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
-        <el-table-column label="物料名称" align="center" min-width="100">
+      <el-table v-show="contractNumType===0" :data="tableData4" border style="width: 1200px;max-height: 420px;" height="320px" size="mini">
+        <el-table-column label="物料名称" align="center" min-width="180">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" min-width="140">
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料或规格" align="center" width="200">
+        <el-table-column label="材料或规格" align="center" width="140">
           <template slot-scope="scope">
             {{ scope.row.规格或材料 }}
           </template>
         </el-table-column>
-        <el-table-column label="订货数量" align="center" width="100">
+        <el-table-column label="订货数量" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" width="150">
+        <el-table-column label="单价" align="center" width="140">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
+            <el-input v-model="scope.row.单价" size="mini" style="width:100px" @change="calculateContractSum"/>
           </template>
         </el-table-column>
-        <el-table-column label="金额" align="center" width="100">
+        <el-table-column label="金额" align="center" width="140">
           <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ scope.row.金额.toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="交货期" align="center" width="150">
@@ -122,7 +129,7 @@
               @change="update(scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width="150">
+        <el-table-column label="备注" align="center" width="180">
           <template slot-scope="scope">
             <el-input v-model="scope.row.备注" size="mini" style="width: 120px" @change="update(scope.row)"/>
           </template>
@@ -337,6 +344,7 @@ export default {
       contractNumValue: '',
       contractNumType: 0,
       RequisitionNumber: '',
+      supplierNames: [],
       contract: [{
         label: '合同模板1',
         value: 1
@@ -356,6 +364,7 @@ export default {
       supplierName: '', // 供应商
       supplier: [],
       supplierValue: '', // 供应商流水号
+      supplierValues: [],
       enterpriseNature: '', // 企业性质
       createDate: '', // 创立日期
       registeredCapital: '', // 注册资本
@@ -439,6 +448,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchSupplier()
   },
   methods: {
     linkGroup() {
@@ -482,6 +492,8 @@ export default {
       })
     },
     searchData() {
+      this.contractSum = 0.00
+      this.contractSum2 = 0.00
       for (let i = 0; i < this.contractNum.length; i++) {
         if (this.contractNum[i].value === this.contractNumValue) {
           this.contractNumType = this.contractNum[i].id
@@ -496,6 +508,7 @@ export default {
         console.log(this.tableData5)
       })
       searchData2(this.contractNumValue).then(response => {
+        console.log(response, 2233)
         this.tableData4 = response.data
         this.machineValue = response.data[0].机床流水号
         this.form3.机床 = response.data[0].机床图号
@@ -523,24 +536,44 @@ export default {
       })
     },
     calculateContractSum() { // 计算合同总额
-      this.contractSum = 0
-      this.contractSum1 = 0
-      this.costAccount = 0
-      this.riseFallPoint = 0
-      this.tableData4 = []
-      for (let i = 0; i < this.groupNum2.length; i++) {
-        this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量)
-        this.contractSum1 += parseFloat(this.groupNum2[i].金额)
-        this.tableData4.push(this.groupNum2[i])
-      }
-      this.contractSum = (this.contractSum1).toFixed(2)
-      this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
-      this.costAccount = this.contractSum
-      if (parseInt(this.costAccount) === 0) {
-        this.$message.error('成本核算不可为0')
-      } else {
-        this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount
-        this.riseFallPoint = this.riseFallPoint.toFixed(2)
+      if (this.contractNumType === 0) {
+        this.contractSum = 0
+        this.contractSum1 = 0
+        this.costAccount = 0
+        this.riseFallPoint = 0
+        this.tableData4 = []
+        for (let i = 0; i < this.groupNum2.length; i++) {
+          this.groupNum2[i].金额 = parseFloat(this.groupNum2[i].单价) * parseFloat(this.groupNum2[i].零件数量)
+          this.contractSum1 += parseFloat(this.groupNum2[i].金额)
+          this.tableData4.push(this.groupNum2[i])
+        }
+        this.contractSum = (this.contractSum1).toFixed(2)
+        this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
+        this.costAccount = this.contractSum
+        if (parseInt(this.costAccount) === 0) {
+          this.$message.error('成本核算不可为0')
+        } else {
+          this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount
+          this.riseFallPoint = this.riseFallPoint.toFixed(2)
+        }
+      } else if (this.contractNumType === 1) {
+        this.contractSum = 0
+        this.contractSum1 = 0
+        this.costAccount = 0
+        this.riseFallPoint = 0
+        for (let i = 0; i < this.groupNum5.length; i++) {
+          this.contractSum1 += parseFloat((parseInt(this.groupNum5[i].数量) * parseFloat(this.groupNum5[i].单价)).toFixed(2))
+        }
+        console.log(this.contractSum1, this.groupNum5, 898989)
+        this.contractSum = (this.contractSum1).toFixed(2)
+        this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
+        this.costAccount = this.contractSum
+        if (parseInt(this.costAccount) === 0) {
+          this.$message.error('成本核算不可为0')
+        } else {
+          this.riseFallPoint = (this.contractSum - this.costAccount) / this.costAccount
+          this.riseFallPoint = this.riseFallPoint.toFixed(2)
+        }
       }
     },
     fetchData() {
@@ -581,6 +614,12 @@ export default {
             response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
           }
         }
+        for (let i = 0; i < response.data.length; i++) {
+          this.supplierValues.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
         this.tableData01 = response.data
       })
     },
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index 7770a619..55a5fe76 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -27,104 +27,107 @@
         size="small"
         icon="el-icon-search"
         style="margin-left: 10px"
-        @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+        @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
+      <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
     </el-card>
-
-    <el-card>
-      <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
-        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="250">
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" prop="请款时间" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" prop="姓名" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
-          <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款付款情况" align="center">
-          <el-table-column label="审批情况内容" width="100" align="center">
-            <template slot-scope="scope">
-              <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
-              <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
-              <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="未通过审批原因" width="110" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="付款情况" width="100" align="center">
-            <template slot-scope="scope">
-              <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
-              <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
-              <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="未付款原因" width="100" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="250">
-          <template slot-scope="scope">
-            <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini" show-summary>
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="采购合同编号">
-                  <template slot-scope="scope">
-                    {{ scope.row.采购合同编号 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="已付金额" prop="已付金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.已付金额 }}
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="100" align="center" label="请款金额" prop="请款金额">
-                  <template slot-scope="scope">
-                    {{ scope.row.请款金额 }}
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">查看详情</el-button>
-            </el-popover>
-            <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-        <span v-show="supplierValue">累计合同总额：</span>
-        <el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>
-        <span v-show="supplierValue">累计付款：</span>
-        <el-input v-show="supplierValue" v-model="totalPay" size="mini" style="width: 100px;" readonly/>
-        <span v-show="supplierValue">累计欠款：</span>
-        <el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>
-      </div>
-    </el-card>
-
+    <el-row>
+      <el-col style="width: 1200px">
+        <el-card>
+          <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe @row-click="searchTable02">
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="340">
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款时间" prop="请款时间" align="center" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.请款时间.substr(0,10) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款人" prop="姓名" align="center" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款金额" align="center" width="90" prop="请款金额">
+              <template slot-scope="scope">
+                {{ scope.row.请款金额 }}
+              </template>
+            </el-table-column>
+            <!--        <el-table-column label="请款付款情况" align="center">-->
+            <el-table-column label="审批情况内容" width="100" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
+                <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
+                <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="未通过审批原因" width="130" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="付款情况" width="100" align="center">
+              <template slot-scope="scope">
+                <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
+                <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
+                <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="未付款原因" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+              </template>
+            </el-table-column>
+            <!--        </el-table-column>-->
+            <el-table-column label="操作" align="center" width="120">
+              <template slot-scope="scope">
+                <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent1"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize1"
+              :total="total1"
+              style="display:inline-block;width:40%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange1"
+              @current-change="handleCurrentChange1"/>
+          <!--            <span v-show="supplierValue">累计合同总额：</span>-->
+          <!--            <el-input v-show="supplierValue" v-model="totalSum" size="mini" style="width: 100px;" readonly/>-->
+          <!--            <span v-show="supplierValue">累计付款：</span>-->
+          <!--            <el-input v-show="supplierValue" v-model="totalPay" size="mini" style="width: 100px;" readonly/>-->
+          <!--            <span v-show="supplierValue">累计欠款：</span>-->
+          <!--            <el-input v-show="supplierValue" v-model="totalDebt" size="mini" style="width: 100px;" readonly/>-->
+          </div>
+        </el-card>
+      </el-col>
+      <el-col style="width: 500px">
+        <el-card>
+          <el-table :data="gridData" highlight-current-row size="mini" show-summary>
+            <el-table-column width="50" align="center" type="index" label="序号"/>
+            <el-table-column min-width="150" align="center" label="采购合同编号">
+              <template slot-scope="scope">
+                {{ scope.row.采购合同编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column min-width="100" align="center" label="已付金额" prop="已付金额">
+              <template slot-scope="scope">
+                {{ scope.row.已付金额 }}
+              </template>
+            </el-table-column>
+            <el-table-column min-width="100" align="center" label="请款金额" prop="请款金额">
+              <template slot-scope="scope">
+                {{ scope.row.请款金额 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-col>
+    </el-row>
     <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
       <span>供应商：</span>
       <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small">
@@ -242,7 +245,7 @@ export default {
       tableData1: [],
       total1: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 30,
       returns: '',
       supplierValue: '',
       supplier: [],