From 8affba812c4a525d634951c52922dc33f89e8d25 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 14 Apr 2020 11:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Outsourcing/OutsourcingTaskExecution.js   | 14 ++++++-------
 .../OutsourcingTaskExecution/index.vue        | 21 ++++++++++++++-----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index 8892255c..47dc8899 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -115,7 +115,7 @@ export function editData1(Number, manufacturers, freight, Explain) {
   })
 }
 // 新建外协加工任务单
-export function addTable(contractNumber, personNum, manufacturers, time, freight) {
+export function addTable(contractNumber, personNum, manufacturers, time, time2, freight) {
   return request({
     url: '',
     method: 'post',
@@ -124,12 +124,12 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理_外协加工任务单_增加数据',
-      param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int'
+      param: '表单号=' + contractNumber + '&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '&任务下达日期=' + time + '&到货日期=' + time2 + '&运费=' + freight
     }
   })
 }
 // 外协加工任务单修改
-export function editData(Number, manufacturers, freight, Explain) {
+export function editData(Number, manufacturers, freight, Explain, time2) {
   return request({
     url: '',
     method: 'post',
@@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理_外协加工任务单_修改数据',
-      param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain
+      param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain + '&到货日期=' + time2
     }
   })
 }
@@ -152,7 +152,7 @@ export function deleteData(Number) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理_外协加工任务单_删除数据',
-      param: '外协加工任务单流水号=' + Number + '=int'
+      param: '外协加工任务单流水号=' + Number
     }
   })
 }
@@ -166,7 +166,7 @@ export function deleteData1(Number) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间生产管理_外协加工任务单明细_删除数据',
-      param: '外协加工任务单明细流水号=' + Number + '=int'
+      param: '外协加工任务单明细流水号=' + Number
     }
   })
 }
@@ -181,7 +181,7 @@ export function getNumber(time) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理_外协加工任务单_查询数据_单据编号',
-      param: '任务下达日期=' + time + '=string&表单号=1=string=output'
+      param: '任务下达日期=' + time + '&表单号=1=string=output'
     }
   })
 }
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index f39141ba..b1312375 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -109,9 +109,9 @@
               <el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small" @change="saveAct(scope.row)" @blur="filterNuber(scope.row.加工价格_成交, scope.$index, '加工价格_成交')"/>
             </template>
           </el-table-column>
-          <el-table-column label="机加工开始时间" align="center" width="150px">
+          <el-table-column label="到货日期" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.机加工开始时间 }}
+              {{ scope.row.到货日期 }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
@@ -139,6 +139,16 @@
             placeholder="下达任务日期"
             value-format="yyyy-MM-dd"/>
         </el-form-item>
+        <el-form-item label="到货日期" prop="到货日期" style="margin-left: 70px">
+          <el-date-picker
+            v-model="form.到货日期"
+            type="date"
+            size="small"
+            style="width:200px"
+            default-value
+            placeholder="到货日期"
+            value-format="yyyy-MM-dd"/>
+        </el-form-item>
         <el-form-item label="外协厂家" prop="外协厂家" style="margin-left: 70px">
           <el-select v-model="form.外协厂家" placeholder="选择外协厂家" filterable clearable size="small" style="width:200px">
             <el-option
@@ -230,6 +240,7 @@ export default {
       form: {
         表单号: '',
         下达任务日期: '',
+        到货日期: '',
         外协厂家: '',
         运费: null
       },
@@ -372,7 +383,7 @@ export default {
             this.List3.push({
               外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
               加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
-              机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
+              到货日期: response.data[i].到货日期,
               零件图号: response.data[i].零件图号,
               零件名称: response.data[i].零件名称,
               批次数量: response.data[i].批次数量,
@@ -455,7 +466,7 @@ export default {
         this.$message.error('请输入数字')
       } else {
         this.handleAdd_disable = true
-        addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.运费).then(response => {
+        addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.到货日期, this.form.运费).then(response => {
           if (response.data[0].result === '1') {
             this.$notify({
               title: '成功',
@@ -476,7 +487,7 @@ export default {
     // 提交编辑
     submitEdit() {
       this.handleAdd_disable = true
-      editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
+      editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain, this.form.到货日期).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('编辑成功')
           this.dialogFormVisible = false