更新

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -506,7 +506,7 @@
               size="small"
               icon="el-icon-menu"
               style="margin-left: 10px"
-              @click="executeReturn2">分配</el-button>
+              @click="allocateTask2">分配</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1000" effect="dark" content="打回制造部重新分配" placement="top">
             <el-button
@@ -514,7 +514,7 @@
               size="small"
               icon="el-icon-back"
               style="margin-left: 50px"
-              @click="allocateTask2">打回</el-button>
+              @click="executeReturn2">打回</el-button>
           </el-tooltip>
           <!--<el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>-->
           <!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
@@ -761,6 +761,8 @@ export default {
       basic: [],
       groupAndPart: [],
       groupAndPartBasic: [],
+      partNumber: [],
+      partNumberBasic: [],
       pageCurrent0: 1,
       pageSize0: 50,
       total0: 0,
@@ -993,17 +995,21 @@ export default {
     handleSelectionChange1(val) { // 标准件和外购件多选
       this.standardAndPurchase = []
       this.groupAndPart = []
+      this.partNumber = []
       for (let i = 0; i < val.length; i++) {
         this.standardAndPurchase.push(val[i].标准件和外购件流水号)
         this.groupAndPart.push(val[i].组件零件流水号)
+        this.partNumber.push(val[i].零件数量)
       }
     },
     handleSelectionChange2(val) { // 基本件多选
       this.basic = []
       this.groupAndPartBasic = []
+      this.partNumberBasic = []
       for (let i = 0; i < val.length; i++) {
         this.basic.push(val[i].基本件流水号)
         this.groupAndPartBasic.push(val[i].组件零件基本件流水号)
+        this.partNumberBasic.push(val[i].零件数量)
       }
     },
     selectable(row) { // 多选禁用
@@ -1099,7 +1105,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
+          executeReturn1(this.standardAndPurchase, this.groupAndPart, this.partNumber).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('操作成功')
               this.searchTable0()
@@ -1123,7 +1129,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          executeReturn2(this.basic, this.groupAndPartBasic).then(response => {
+          executeReturn2(this.basic, this.groupAndPartBasic, this.partNumberBasic).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('操作成功')
               this.searchTable2()