第一轮测试采购bug修改

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -1,45 +1,59 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>物料名称:</span>
-      <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-      <span>分配情况:</span>
-      <el-select v-model="allocateStateValue" placeholder="分配情况" size="small" style="width: 100px">
-        <el-option
-          v-for="item in allocateState"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left: 10px"
-        @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-      <span>采购员:</span>
-      <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-        <el-option
-          v-for="item in person"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button
-        type="primary"
-        size="small"
-        icon="el-icon-menu"
-        style="margin-left: 10px"
-        @click="allocateTask">分配</el-button>
-    </el-card>
+    <el-row :gutter="10">
+      <el-col :span="16">
+        <el-card>
+          <span style="margin:0">项目名称:</span>
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
+            <el-option
+              v-for="item in project"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" style="width:170px" size="small" clearable/>
+          <span>分配情况:</span>
+          <el-select v-model="allocateStateValue" placeholder="分配情况" size="small" style="width: 100px">
+            <el-option
+              v-for="item in allocateState"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px"
+            @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card>
+          <span>采购员:</span>
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-menu"
+            style="margin-left: 10px"
+            @click="allocateTask">分配</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-back"
+            style="margin-left: 10px"
+            @click="executeReturn">退回</el-button>
+        </el-card>
+      </el-col>
+    </el-row>
 
     <el-card>
       <el-table
@@ -109,7 +123,7 @@
 </template>
 
 <script>
-import { initProject, initBuyer, searchTable1, allocateTask } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
+import { initProject, initBuyer, searchTable1, allocateTask, executeReturn } from '@/api/PurchasingCenter/PurchaseTaskAllocate'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -140,6 +154,7 @@ export default {
       check2: 0,
       tableData1: [],
       standardAndPurchase: [],
+      groupAndPart: [],
       pageCurrent1: 1,
       pageSize1: 20,
       total1: 0
@@ -187,8 +202,10 @@ export default {
     },
     handleSelectionChange1(val) { // 多选
       this.standardAndPurchase = []
+      this.groupAndPart = []
       for (let i = 0; i < val.length; i++) {
         this.standardAndPurchase.push(val[i].标准件和外购件流水号)
+        this.groupAndPart.push(val[i].组件零件流水号)
       }
     },
     selectable(row) { // 多选禁用
@@ -231,6 +248,29 @@ export default {
     handleCurrentChange1(val) {
       this.pageCurrent1 = val
       this.searchTable1()
+    },
+    executeReturn() { // 退回
+      if (this.standardAndPurchase.length === 0) {
+        this.$message.error('请选择需退回的物料')
+      } else {
+        this.$confirm('此操作执行后不可修改，是否确定退回?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          executeReturn(this.standardAndPurchase, this.groupAndPart).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('操作成功')
+              this.searchTable1()
+            } else { this.$message.error('操作失败') }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      }
     }
   }
 }