From 6f77a6601a366a80b1873342d3554f4eb30af376 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 29 Dec 2018 22:21:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?=
 =?UTF-8?q?=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialArrivalManagement.js               | 11 +++++++++++
 .../MaterialArrivalManagement/index.vue        | 18 +++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index f58bc510..622f59fc 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -49,3 +49,14 @@ export function handlechange(Number, code) {
     }
   })
 }
+export function change(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料到货更改',
+      param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index b8f4377f..2a147c6f 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -7,6 +7,7 @@
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
         <el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
         <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
+        <el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>
       </el-row>
     </el-card>
 
@@ -55,10 +56,12 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, edit, handlechange } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { searchtable, searchtable2, change } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 export default {
   data() {
     return {
+      bianliang1: [],
+      bianliang2: [],
       num: 0,
       arrest: [],
       all: false,
@@ -115,15 +118,12 @@ export default {
         this.$message.warning('请选择零件')
       } else {
         for (let i = 0; i < this.arrest.length; i++) {
-          edit(this.arrest[i].工艺计划流水号).then(() => {
-            handlechange(this.arrest[i].工序流水号, '0000').then(response => {
-              this.num = this.num + response.data[0].result
-            })
-          })
-          if (this.num === this.arrest.length) {
-            this.searchTable()
-          }
+          this.bianliang1.push(this.arrest[i].工艺计划流水号)
+          this.bianliang2.push(this.arrest[i].工序流水号)
         }
+        change(this.bianliang2, '0000', this.bianliang1).then(() => {
+          this.searchTable()
+        })
       }
     },
     // 分页

From 4274f483fa752e73a3ab7b8e9ec8c9376bb030be Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sat, 29 Dec 2018 22:22:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/WorkshopProcurement/ProcurementContractApproval.js    | 4 ++--
 .../WorkshopProcurement/ProcurementContractApproval/index.vue | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js
index 0116c33e..537d2474 100644
--- a/src/api/WorkshopProcurement/ProcurementContractApproval.js
+++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js
@@ -60,14 +60,14 @@ export function searchTable3(num) {
     }
   })
 }
-export function submitApproval(num, num1, num2) {
+export function submitApproval(num, num1, num2, num3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '采购管理_合同审批_修改数据',
-      param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
+      param: '采购合同流水号=' + num + '&请购单流水号=' + num3 + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
     }
   })
 }
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index f68ced98..001b77cf 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -303,6 +303,7 @@ export default {
       TotalAmount1: '',
       RMB1: '',
       total1: 0,
+      QGNUM: '',
       pageCurrent1: 1,
       pageSize1: 10,
       tableData1: [],
@@ -398,6 +399,7 @@ export default {
       console.log(row)
       this.dialogVisible3 = true
       this.ProcurementContractNum = row.采购合同流水号
+      this.QGNUM = row.请购单流水号
     },
     selectChange() {
       if (this.form2.审批是否通过 === 2) {
@@ -409,7 +411,7 @@ export default {
     submitApproval(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => {
+          submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('审批成功')
               this.dialogVisible3 = false