From 00352f0039a6c6aa8846dd4251d3480371b0cca4 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 1 Apr 2019 16:10:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/OutPartSelect.js            |  2 +-
 .../MaterialArrivalManagement.js              | 12 +++++++++++
 .../MaterialArrivalManagement/index.vue       | 21 ++++++++++++++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/api/Inventory/OutPartSelect.js b/src/api/Inventory/OutPartSelect.js
index 70438de1..9c927b49 100644
--- a/src/api/Inventory/OutPartSelect.js
+++ b/src/api/Inventory/OutPartSelect.js
@@ -31,7 +31,7 @@ export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSi
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_库存管理_基本件库存查询',
+      name: '车间生产管理工艺_库存管理_基本件出库记录查询',
       param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index 5c603b88..b7bb4a4f 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -74,3 +74,15 @@ export function change2(Number, code, num) {
     }
   })
 }
+export function handlechange2(Number, code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间',
+      param: '工序流水号=' + Number + '&实际完成时间=' + code
+    }
+  })
+}
+
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 3dc3162f..e82f8c4a 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -115,11 +115,12 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, change, handlechange, searchtable3, change2 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { searchtable, searchtable2, change, handlechange, searchtable3, change2, handlechange2 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
+      editTime: '',
       bianliang1: [],
       bianliang2: [],
       num: 0,
@@ -179,13 +180,21 @@ export default {
               备料到货: this.Data[i].备料到货,
               工艺要求: response.data[0].工艺要求,
               工序流水号: response.data[0].工序流水号,
-              重量: response.data[0].重量
+              重量: response.data[0].重量,
+              单价: 0
             })
           })
           this.loading = false
         }
       })
     },
+    zeroFill(i) {
+      if (i >= 0 && i <= 9) {
+        return '0' + i
+      } else {
+        return i
+      }
+    },
     // 自家备料出库
     handleChange1(row) {
       if (row.重量 === '' || row.重量 === null) {
@@ -193,8 +202,14 @@ export default {
       } else if (row.单价 === '' || row.单价 === null) {
         this.$message.error('请输入单价')
       } else {
+        var date = new Date()
+        var month = this.zeroFill(date.getMonth() + 1)
+        var day = this.zeroFill(date.getDate())
+        this.editTime = date.getFullYear() + '-' + month + '-' + day
         change(row.工艺计划流水号, row.重量, row.单价).then(() => {
-          handlechange(row.工序流水号, '0000')
+          handlechange(row.工序流水号, '0000').then(response => {
+            handlechange2(row.工序流水号, this.form.完成时间)
+          })
         }).then(response => {
           this.searchTable()
         })