55

src/api/pick/pickApply.js

@@ -10,4 +10,17 @@ export async function getPage(params) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+
+// 退料(过滤不要的数据的领料接口)
+export async function returnPage(params) {
+  const res = await request.get('/mes/pickorder/returnPage',  { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+

src/views/materialReturn/components/pickList.vue

@@ -0,0 +1,36 @@
+<template>
+  <el-dialog
+    title="领料单"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    append-to-body
+    width="76%"
+  >
+    <div>
+      <pickList :isReturn="true"> </pickList>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import pickList from '../../pick/pickApply/index.vue';
+
+  export default {
+    name: 'PickList',
+    components: { pickList },
+
+    data() {
+      return {
+        visible: true
+      };
+    },
+
+    methods: {
+      handleClose() {
+        this.$emit('closeDialog', false);
+      }
+    }
+  };
+</script>

src/views/materialReturn/components/returnPop.vue

@@ -37,12 +37,16 @@
         </el-row>
       </el-form>
     </div>
+
+    <pickList v-if="pickListShow" @closeDialog="closeDialog"></pickList>
   </el-dialog>
 </template>
 
 <script>
   import { getCode } from '@/api/produce/workOrder';
+  import pickList from './pickList.vue';
   export default {
+    components: { pickList },
     data() {
       return {
         visible: true,
@@ -51,7 +55,9 @@
           code: '',
           name: '',
           scene: ''
-        }
+        },
+
+        pickListShow: false
       };
     },
 
@@ -64,7 +70,13 @@
         this.returnForm.code = await getCode('return_materials_code');
       },
 
-      selectOrder() {},
+      selectOrder() {
+        this.pickListShow = true;
+      },
+
+      closeDialog() {
+        this.pickListShow = false;
+      },
 
       handleClose() {
         this.$emit('close');

src/views/materialReturn/index.vue

@@ -72,12 +72,22 @@
     computed: {
       columns() {
         return [
+
+        {
+          width: 45,
+          type: 'selection',
+          columnKey: 'selection',
+          align: 'center',
+          reserveSelection: true,
+        },
+
           {
             prop: 'code',
             label: '退料单编号',
             align: 'center'
           },
 
+
           {
             prop: 'name',
             label: '退料单名称',
@@ -145,6 +155,9 @@
       this.returnShow = false;
     },
 
+
+    handDetailed(row)  {},
+
       /* 刷新表格 */
       reload(where = {}) {
         this.$refs.table.reload({ page: 1, where });

src/views/pick/pickApply/components/pick-search.vue

@@ -29,7 +29,7 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-if="!isReturn" v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
           <el-select size="mini" v-model="where.status" style="width: 100%">
             <el-option
@@ -68,7 +68,14 @@
 
 <script>
   export default {
-    props: [],
+    props: {
+      isReturn: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      }
+    },
     data() {
       // 默认表单数据
       const defaultWhere = {

src/views/pick/pickApply/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
-      <pick-search @search="reload" ref="searchRef"> </pick-search>
+      <pick-search @search="reload" ref="searchRef" :isReturn="isReturn"> </pick-search>
 
       <!-- 数据表格 -->
       <ele-pro-table
@@ -15,10 +15,18 @@
         :parse-data="parseData"
       >
         <template v-slot:toolbar>
-          <el-button type="primary" size="mini" @click="handPick"
+          <el-button
+            type="primary"
+            v-if="!isReturn"
+            size="mini"
+            @click="handPick"
             >工单领料</el-button
           >
-          <el-button type="primary" size="mini" @click="handSelfPick"
+          <el-button
+            type="primary"
+            v-if="!isReturn"
+            size="mini"
+            @click="handSelfPick"
             >自建领料单</el-button
           >
         </template>
@@ -72,7 +80,7 @@
 </template>
 
 <script>
-  import { getPage } from '@/api/pick/pickApply';
+  import { getPage, returnPage } from '@/api/pick/pickApply';
 
   import pickSearch from './components/pick-search.vue';
 
@@ -90,6 +98,15 @@
       detailed,
       selfDetailed
     },
+
+    props: {
+      isReturn: {
+        type: Boolean,
+        default() {
+          return false;
+        }
+      }
+    },
     data() {
       return {
         // 加载状态
@@ -108,6 +125,14 @@
     computed: {
       columns() {
         return [
+          {
+            width: 45,
+            type: 'selection',
+            columnKey: 'selection',
+            align: 'center',
+            reserveSelection: true,
+            show: this.isReturn
+          },
           {
             prop: 'code',
             label: '领料单编号',
@@ -167,7 +192,8 @@
     methods: {
       /* 表格数据源 */
       async datasource({ page, limit, where }) {
-        let res = await getPage({
+        let URL = this.isReturn ? returnPage : getPage;
+        let res = await URL({
           ...where,
 
           pageNum: page,