55

src/api/materialReturn/index.js

@@ -10,4 +10,17 @@ export async function returnPage(params) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+
+// 可以退还列表
+
+export async function refundable(data) {
+  const res = await request.post('/mes/returnmaterials/refundable', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+

src/views/materialReturn/components/pickList.vue

@@ -9,8 +9,13 @@
     width="76%"
   >
     <div>
-      <pickList :isReturn="true"> </pickList>
+      <pickList :isReturn="true" @selectionChange="selectionChange"> </pickList>
     </div>
+
+    <template slot="footer">
+      <el-button size="mini" @click="handleClose">取 消</el-button>
+      <el-button size="mini" type="primary" @click="save()">确 定</el-button>
+    </template>
   </el-dialog>
 </template>
 
@@ -23,14 +28,24 @@
 
     data() {
       return {
-        visible: true
+        visible: true,
+
+        pickIds: []
       };
     },
 
     methods: {
       handleClose() {
         this.$emit('closeDialog', false);
-      }
+      },
+
+      selectionChange(ids) {
+        this.pickIds = ids;
+      },
+
+      save() {
+        this.$emit('emitSave', this.pickIds);
+      },
     }
   };
 </script>

src/views/materialReturn/components/returnPop.vue

@@ -8,7 +8,7 @@
     append-to-body
     width="80%"
   >
-    <div>
+   <div>
       <el-form :model="returnForm" ref="returnForm">
         <el-row :gutter="24">
           <el-col :span="6">
@@ -38,12 +38,17 @@
       </el-form>
     </div>
 
-    <pickList v-if="pickListShow" @closeDialog="closeDialog"></pickList>
+    <pickList
+      v-if="pickListShow"
+      @closeDialog="closeDialog"
+      @emitSave="emitSave"
+    ></pickList>
   </el-dialog>
 </template>
 
 <script>
   import { getCode } from '@/api/produce/workOrder';
+  import { refundable } from '@/api/materialReturn/index.js';
   import pickList from './pickList.vue';
   export default {
     components: { pickList },
@@ -57,7 +62,9 @@
           scene: ''
         },
 
-        pickListShow: false
+        pickListShow: false,
+
+       returnList: []
       };
     },
 
@@ -80,6 +87,13 @@
 
       handleClose() {
         this.$emit('close');
+      },
+
+      emitSave(pickIds) {
+        refundable(pickIds).then((res) => {
+            this.returnList = res
+          console.log(res, 22);
+        });
       }
     }
   };

src/views/pick/pickApply/index.vue

@@ -14,6 +14,7 @@
         :selection.sync="selection"
         autoAmendPage
         :parse-data="parseData"
+         @update:selection="handleSelectionChange"
       >
         <template v-slot:toolbar>
           <el-button
@@ -260,6 +261,12 @@
         this.selfDetailedShow = false;
       },
 
+
+      handleSelectionChange(data) {
+        let ids = []
+        ids = data.map(item => item.id)
+        this.$emit('selectionChange', ids)
+      },
       /* 刷新表格 */
       reload(where = {}) {
         this.$refs.table.reload({ page: 1, where });