Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

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()
+        })
       }
     },
     // 分页

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