Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/selectedCollectionOutbound/boxTabPage.vue

@@ -1,33 +1,38 @@
 <template>
   <div>
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+    <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane
         v-for="item in tabOption"
         :label="item.label"
         :name="item.name"
       >
       </el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
     <keep-alive>
-      <component
+      <!-- <component
         v-if="activeName && isValidComponent(activeName)"
         :is="activeName"
         :key="activeName"
         ref="componentRef"
         v-bind="activeNameProps"
-      />
+      /> -->
+      <outbound :activeNameProps="activeNameProps"></outbound>
     </keep-alive>
   </div>
 </template>
 
 <script>
-  import { deepClone } from '@/components/FormGenerator/utils/index';
-  import { getPickOrderById } from '@/api/pda';
+  // import { deepClone } from '@/components/FormGenerator/utils/index';
+  // import { getPickOrderById } from '@/api/pda';
+
+  import Outbound from '@/views/bpm/outgoingManagement/outbound.vue';
+
   export default {
     name: 'boxTabPage',
     components: {
-      tab1: () => import('./detailDialog.vue'),
-      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      Outbound
+      // tab1: () => import('./detailDialog.vue'),
+      // tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
     },
     props: {
       taskDefinitionKey: {
@@ -50,65 +55,38 @@
     data() {
       return {
         form: {},
-        activeName: 'tab1',
+        // activeName: 'tab1',
         cKey: 1,
         extractedList: [],
-        wwType: ''
-      };
-    },
-    computed: {
-      tabOption() {
-        let list = [
-          {
-            label: '领料单详情',
-            name: 'tab1',
-            isShow: true
-          },
-          {
-            label: '出库',
-            name: 'tab2',
-            isShow: true
-          }
-        ];
-        return list.filter((item) => item.isShow);
-      },
-      activeNameProps() {
-        switch (this.activeName) {
-          case 'tab1':
-            return {
-              businessId: this.businessId,
-              form: this.form
-            };
-          case 'tab2':
-            return {
-              form: this.form,
-              bizType: 11,
-              sourceBizNo: this.form.code,
-              detailList: this.form.detailList,
-              type: '自选领用出库',
-              wwType: this.wwType,
-              extractedList: this.extractedList
-            };
+        wwType: '',
+        activeNameProps: {
+          businessId: this.businessId,
+          // form: this.form,
+          bizType: 11,
+          // sourceBizNo: this.form.code,
+          // detailList: this.form.detailList,
+          type: '自选领用出库'
+          // wwType: this.wwType,
+          // extractedList: this.extractedList
         }
-      }
-    },
-    async created() {
-      this.getPickOrderDetail();
+      };
     },
+    computed: {},
+    async created() {},
     methods: {
-      isValidComponent(componentName) {
-        const validComponents = ['tab1', 'tab2'];
-        return validComponents.includes(componentName);
-      },
-      handleClick(val) {
-        this.activeName = val.name;
-        if (val.name == 'tab2') {
-          this.$emit('activeCompChange', 'inoutBound');
-        } else {
-          console.log('activeCompChange------------');
-          this.$emit('activeCompChange', 'inoutBoundView');
-        }
-      },
+      // isValidComponent(componentName) {
+      //   const validComponents = ['tab1', 'tab2'];
+      //   return validComponents.includes(componentName);
+      // },
+      // handleClick(val) {
+      //   this.activeName = val.name;
+      //   if (val.name == 'tab2') {
+      //     this.$emit('activeCompChange', 'inoutBound');
+      //   } else {
+      //     console.log('activeCompChange------------');
+      //     this.$emit('activeCompChange', 'inoutBoundView');
+      //   }
+      // },
       async getTableValue() {
         console.log(this.$refs.componentRef);
         return {
@@ -117,27 +95,6 @@
             ? await this.$refs.componentRef.getReturnStorage()
             : ''
         };
-      },
-      getPickOrderDetail() {
-        getPickOrderById(this.businessId).then((data) => {
-          data.detailList = data.detailList.map((item) => {
-            item.code = data.code;
-            return item;
-          });
-          this.wwType = data.type;
-          this.extractedList = data.detailList.map((item) => ({
-            taskId: item.taskId,
-            workOrderId: item.workOrderId
-          }));
-          let categoryLevelTopIds = data.detailList.map(
-            (item) => item.rootCategoryLevelId
-          );
-          let filterCategoryLevelTopIds = Array.from(
-            new Set(categoryLevelTopIds)
-          );
-          data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
-          this.form = deepClone(data);
-        });
       }
     }
   };

src/views/bpm/handleTask/components/selectedCollectionOutbound/boxTabPage2.vue

@@ -0,0 +1,145 @@
+<template>
+    <div>
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="item in tabOption"
+          :label="item.label"
+          :name="item.name"
+        >
+        </el-tab-pane>
+      </el-tabs>
+      <keep-alive>
+        <component
+          v-if="activeName && isValidComponent(activeName)"
+          :is="activeName"
+          :key="activeName"
+          ref="componentRef"
+          v-bind="activeNameProps"
+        />
+      </keep-alive>
+    </div>
+  </template>
+  
+  <script>
+    import { deepClone } from '@/components/FormGenerator/utils/index';
+    import { getPickOrderById } from '@/api/pda';
+    export default {
+      name: 'boxTabPage',
+      components: {
+        tab1: () => import('./detailDialog.vue'),
+        tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      },
+      props: {
+        taskDefinitionKey: {
+          type: String,
+          default: ''
+        },
+        activeComp: {
+          type: String,
+          default: ''
+        },
+        permissionType: {
+          type: String,
+          default: 'view'
+        },
+        businessId: {
+          type: String,
+          default: ''
+        }
+      },
+      data() {
+        return {
+          form: {},
+          activeName: 'tab1',
+          cKey: 1,
+          extractedList: [],
+          wwType: ''
+        };
+      },
+      computed: {
+        tabOption() {
+          let list = [
+            {
+              label: '领料单详情',
+              name: 'tab1',
+              isShow: true
+            },
+            {
+              label: '出库',
+              name: 'tab2',
+              isShow: true
+            }
+          ];
+          return list.filter((item) => item.isShow);
+        },
+        activeNameProps() {
+          switch (this.activeName) {
+            case 'tab1':
+              return {
+                businessId: this.businessId,
+                form: this.form
+              };
+            case 'tab2':
+              return {
+                form: this.form,
+                bizType: 11,
+                sourceBizNo: this.form.code,
+                detailList: this.form.detailList,
+                type: '自选领用出库',
+                wwType: this.wwType,
+                extractedList: this.extractedList
+              };
+          }
+        }
+      },
+      async created() {
+        this.getPickOrderDetail();
+      },
+      methods: {
+        isValidComponent(componentName) {
+          const validComponents = ['tab1', 'tab2'];
+          return validComponents.includes(componentName);
+        },
+        handleClick(val) {
+          this.activeName = val.name;
+          if (val.name == 'tab2') {
+            this.$emit('activeCompChange', 'inoutBound');
+          } else {
+            console.log('activeCompChange------------');
+            this.$emit('activeCompChange', 'inoutBoundView');
+          }
+        },
+        async getTableValue() {
+          console.log(this.$refs.componentRef);
+          return {
+            form: this.form,
+            returnStorageData: this.$refs.componentRef.getReturnStorage
+              ? await this.$refs.componentRef.getReturnStorage()
+              : ''
+          };
+        },
+        getPickOrderDetail() {
+          getPickOrderById(this.businessId).then((data) => {
+            data.detailList = data.detailList.map((item) => {
+              item.code = data.code;
+              return item;
+            });
+            this.wwType = data.type;
+            this.extractedList = data.detailList.map((item) => ({
+              taskId: item.taskId,
+              workOrderId: item.workOrderId
+            }));
+            let categoryLevelTopIds = data.detailList.map(
+              (item) => item.rootCategoryLevelId
+            );
+            let filterCategoryLevelTopIds = Array.from(
+              new Set(categoryLevelTopIds)
+            );
+            data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
+            this.form = deepClone(data);
+          });
+        }
+      }
+    };
+  </script>
+  <style scoped lang="scss"></style>

src/views/bpm/handleTask/components/selectedCollectionOutbound/boxTabPage3.vue

@@ -0,0 +1,103 @@
+<template>
+    <div>
+      <!-- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="item in tabOption"
+          :label="item.label"
+          :name="item.name"
+        >
+        </el-tab-pane>
+      </el-tabs> -->
+      <keep-alive>
+        <!-- <component
+          v-if="activeName && isValidComponent(activeName)"
+          :is="activeName"
+          :key="activeName"
+          ref="componentRef"
+          v-bind="activeNameProps"
+        /> -->
+        <outbound :activeNameProps="activeNameProps"></outbound>
+      </keep-alive>
+    </div>
+  </template>
+  
+  <script>
+    // import { deepClone } from '@/components/FormGenerator/utils/index';
+    // import { getPickOrderById } from '@/api/pda';
+  
+    import Outbound from '@/views/bpm/outgoingManagement/outbound.vue';
+  
+    export default {
+      name: 'boxTabPage',
+      components: {
+        Outbound
+        // tab1: () => import('./detailDialog.vue'),
+        // tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      },
+      props: {
+        taskDefinitionKey: {
+          type: String,
+          default: ''
+        },
+        activeComp: {
+          type: String,
+          default: ''
+        },
+        permissionType: {
+          type: String,
+          default: 'view'
+        },
+        businessId: {
+          type: String,
+          default: ''
+        }
+      },
+      data() {
+        return {
+          form: {},
+          // activeName: 'tab1',
+          cKey: 1,
+          extractedList: [],
+          wwType: '',
+          activeNameProps: {
+            businessId: this.businessId,
+            // form: this.form,
+            bizType: 11,
+            // sourceBizNo: this.form.code,
+            // detailList: this.form.detailList,
+            type: '自选领用出库'
+            // wwType: this.wwType,
+            // extractedList: this.extractedList
+          }
+        };
+      },
+      computed: {},
+      async created() {},
+      methods: {
+        // isValidComponent(componentName) {
+        //   const validComponents = ['tab1', 'tab2'];
+        //   return validComponents.includes(componentName);
+        // },
+        // handleClick(val) {
+        //   this.activeName = val.name;
+        //   if (val.name == 'tab2') {
+        //     this.$emit('activeCompChange', 'inoutBound');
+        //   } else {
+        //     console.log('activeCompChange------------');
+        //     this.$emit('activeCompChange', 'inoutBoundView');
+        //   }
+        // },
+        async getTableValue() {
+          console.log(this.$refs.componentRef);
+          return {
+            form: this.form,
+            returnStorageData: this.$refs.componentRef.getReturnStorage
+              ? await this.$refs.componentRef.getReturnStorage()
+              : ''
+          };
+        }
+      }
+    };
+  </script>
+  <style scoped lang="scss"></style>
+  

src/views/bpm/outgoingManagement/outbound.vue

@@ -149,6 +149,30 @@
           </el-col>
         </el-row>
       </el-form>
+      <div class="mt20">
+        <headerTitle title="领料单详情"></headerTitle>
+        <el-table :data="form.detailList" style="width: 100%">
+          <el-table-column prop="code" label="领料单号"> </el-table-column>
+          <el-table-column prop="workOrderCode" label="工单编号">
+          </el-table-column>
+          <el-table-column prop="workOrderId" label="工单编号">
+          </el-table-column>
+          <el-table-column prop="categoryCode" label="物品编码">
+          </el-table-column>
+          <el-table-column prop="categoryName" label="物品名称">
+          </el-table-column>
+          <el-table-column label="数量">
+            <template slot-scope="{ row }">
+              {{ row.demandQuantity }}/{{ row.unit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领料仓库">
+            <template slot-scope="{ row }">
+              {{ row.warehouseName }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <div>
         <el-button
           style="margin-bottom: 20px; float: right; margin-right: 20px"
@@ -540,20 +564,23 @@
   import { deepClone } from '@/components/FormGenerator/utils/index';
   import { mapGetters } from 'vuex';
 
+  import { getPickOrderById } from '@/api/pda';
+
   export default {
     components: {
       selectTree,
       AssetsDialog
     },
     props: {
-      form: { type: Object, default: {} },
+      // form: { type: Object, default: {} },
       bizType: { type: Number, default: 1 },
-      sourceBizNo: { type: String, default: '' },
+      // sourceBizNo: { type: String, default: '' },
       type: { type: String, default: '正常出库' },
-      detailList: { type: Array, default: () => [] },
+      // detailList: { type: Array, default: () => [] },
       saleProductList: { type: Array, default: () => [] },
-      extractedList: { type: Array, default: () => [] },
-      wwType: { type: Number, default: null }
+      // extractedList: { type: Array, default: () => [] },
+      // wwType: { type: Number, default: null },
+      activeNameProps: { type: Object, default: {} }
     },
     directives: {
       'el-table-infinite-scroll': elTableInfiniteScroll
@@ -619,7 +646,12 @@
             trigger: 'change'
           }
         },
-        llrLsit: []
+        llrLsit: [],
+        form: [],
+        sourceBizNo: '',
+        detailList: [],
+        wwType: '',
+        extractedList: []
       };
     },
     computed: {
@@ -628,10 +660,11 @@
         return this.$store.state.user.info.clientEnvironmentId;
       }
     },
-    created() {
-      this.getFieldModel();
-      this.getListItems();
-      this.initDeptData().then(() => {
+    async created() {
+      await this.getFieldModel();
+      await this.getListItems();
+      await this.getPickOrderDetail();
+      await this.initDeptData().then(() => {
         this.initFormData();
       });
     },
@@ -650,6 +683,27 @@
           this.newColumns = [...newRes];
         });
       },
+      getPickOrderDetail() {
+        getPickOrderById(this.activeNameProps.businessId).then((data) => {
+          data.detailList = data.detailList.map((item) => {
+            item.code = data.code;
+            return item;
+          });
+          this.wwType = data.type;
+          this.extractedList = data.detailList.map((item) => ({
+            taskId: item.taskId,
+            workOrderId: item.workOrderId
+          }));
+          let categoryLevelTopIds = data.detailList.map(
+            (item) => item.rootCategoryLevelId
+          );
+          let filterCategoryLevelTopIds = Array.from(
+            new Set(categoryLevelTopIds)
+          );
+          data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
+          this.form = deepClone(data);
+        });
+      },
       userSlected(data) {
         this.formData.fromId = data.id;
         this.formData.fromUser = data.name;
@@ -662,7 +716,6 @@
         console.log('清空');
       },
       pickingHandleScroll() {
-        console.log('---------pickingHandleScroll------------');
         if (this.showPackingList.length < this.packingList.length) {
           if (this.packingList.length > this.pageSize) {
             this.pickingPageNum += 1;
@@ -678,7 +731,6 @@
         );
       },
       materielHandleScroll() {
-        console.log('---------materielHandleScroll------------');
         if (this.showMaterialList.length < this.materialList.length) {
           if (this.materialList.length > this.pageSize) {
             this.materielPageNum += 1;
@@ -692,7 +744,6 @@
         this.showMaterialList = this.showMaterialList.concat(
           this.materialList.slice(start, end)
         );
-        console.log(this.showMaterialList);
       },
       // 获取物品列表
       async getListItems() {
@@ -769,9 +820,7 @@
       },
       async getReturnStorage() {
         return new Promise((resolve) => {
-          console.log(this.formData);
           this.$refs.formName.validate(async (valid) => {
-            console.log('valid', valid);
             if (valid) {
               if (!this.productList?.length) {
                 return this.$message.error('请添加出库明细！');
@@ -799,7 +848,6 @@
               });
               obj.warehouseIds = warehouseId;
               obj.warehouseNames = warehouseName;
-              console.log('2222', obj);
               let isPass = false;
               // 1按数量计费 2按重量计费
               if (this.form.pricingWay == 2) {
@@ -871,6 +919,9 @@
         });
       },
       // 初始化用户信息
+      /**
+       * 异步初始化表单数据
+       */
       async initFormData() {
         // const res = await warehouseDefinition.tree();
         // let obj = res.find(
@@ -886,12 +937,12 @@
 
         // 物品类型
         this.formData.extInfo.assetType = Array.from(
-          new Set(this.form.categoryLevelId?.split(','))
+          new Set(this.form.categoryLevelTopId?.split(','))
         );
         // 出库类型
-        this.formData.bizType = this.bizType;
+        this.formData.bizType = this.activeNameProps.bizType;
         // 添加单据来源
-        this.formData.sourceBizNo = this.sourceBizNo;
+        this.formData.sourceBizNo = this.form.code;
         // 将出库状态改成出库状态 2出库 1入库
         this.formData.type = 2;
         // 入库登记人
@@ -979,7 +1030,6 @@
         });
       },
       addStock() {
-        console.log(this.formData.extInfo.assetType);
         if (
           !(
             this.formData.extInfo.assetType &&
@@ -1002,8 +1052,6 @@
     watch: {
       packingList: {
         handler(newVal) {
-          console.log('包装列表', newVal);
-          console.log('当前包装列表加载页数', this.pickingPageNum);
           this.showPackingList = newVal.slice(
             0,
             this.pageSize * (this.pickingPageNum > 0 ? this.pickingPageNum : 1)
@@ -1013,8 +1061,6 @@
       },
       materialList: {
         handler(newVal) {
-          console.log('物料列表', newVal);
-          console.log('当前物料列表加载页数', this.materielPageNum);
           this.showMaterialList = newVal.slice(
             0,
             this.pageSize *

src/views/bpm/outgoingManagement/outbound3.vue

@@ -149,6 +149,30 @@
           </el-col>
         </el-row>
       </el-form>
+      <div class="mt20">
+        <headerTitle title="领料单详情"></headerTitle>
+        <el-table :data="form.detailList" style="width: 100%">
+          <el-table-column prop="code" label="领料单号"> </el-table-column>
+          <el-table-column prop="workOrderCode" label="工单编号">
+          </el-table-column>
+          <el-table-column prop="workOrderId" label="工单编号">
+          </el-table-column>
+          <el-table-column prop="categoryCode" label="物品编码">
+          </el-table-column>
+          <el-table-column prop="categoryName" label="物品名称">
+          </el-table-column>
+          <el-table-column label="数量">
+            <template slot-scope="{ row }">
+              {{ row.demandQuantity }}/{{ row.unit }}
+            </template>
+          </el-table-column>
+          <el-table-column label="领料仓库">
+            <template slot-scope="{ row }">
+              {{ row.warehouseName }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <div>
         <el-button
           style="margin-bottom: 20px; float: right; margin-right: 20px"
@@ -540,20 +564,23 @@
   import { deepClone } from '@/components/FormGenerator/utils/index';
   import { mapGetters } from 'vuex';
 
+  import { getPickOrderById } from '@/api/pda';
+
   export default {
     components: {
       selectTree,
       AssetsDialog
     },
     props: {
-      form: { type: Object, default: {} },
+      // form: { type: Object, default: {} },
       bizType: { type: Number, default: 1 },
-      sourceBizNo: { type: String, default: '' },
+      // sourceBizNo: { type: String, default: '' },
       type: { type: String, default: '正常出库' },
-      detailList: { type: Array, default: () => [] },
+      // detailList: { type: Array, default: () => [] },
       saleProductList: { type: Array, default: () => [] },
-      extractedList: { type: Array, default: () => [] },
-      wwType: { type: Number, default: null }
+      // extractedList: { type: Array, default: () => [] },
+      // wwType: { type: Number, default: null },
+      activeNameProps: { type: Object, default: {} }
     },
     directives: {
       'el-table-infinite-scroll': elTableInfiniteScroll
@@ -619,7 +646,12 @@
             trigger: 'change'
           }
         },
-        llrLsit: []
+        llrLsit: [],
+        form: [],
+        sourceBizNo: '',
+        detailList: [],
+        wwType: '',
+        extractedList: []
       };
     },
     computed: {
@@ -628,9 +660,10 @@
         return this.$store.state.user.info.clientEnvironmentId;
       }
     },
-    created() {
+    async created() {
       this.getFieldModel();
       this.getListItems();
+      await this.getPickOrderDetail();
       this.initDeptData().then(() => {
         this.initFormData();
       });
@@ -650,6 +683,27 @@
           this.newColumns = [...newRes];
         });
       },
+      getPickOrderDetail() {
+        getPickOrderById(this.activeNameProps.businessId).then((data) => {
+          data.detailList = data.detailList.map((item) => {
+            item.code = data.code;
+            return item;
+          });
+          this.wwType = data.type;
+          this.extractedList = data.detailList.map((item) => ({
+            taskId: item.taskId,
+            workOrderId: item.workOrderId
+          }));
+          let categoryLevelTopIds = data.detailList.map(
+            (item) => item.rootCategoryLevelId
+          );
+          let filterCategoryLevelTopIds = Array.from(
+            new Set(categoryLevelTopIds)
+          );
+          data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
+          this.form = deepClone(data);
+        });
+      },
       userSlected(data) {
         this.formData.fromId = data.id;
         this.formData.fromUser = data.name;
@@ -662,7 +716,6 @@
         console.log('清空');
       },
       pickingHandleScroll() {
-        console.log('---------pickingHandleScroll------------');
         if (this.showPackingList.length < this.packingList.length) {
           if (this.packingList.length > this.pageSize) {
             this.pickingPageNum += 1;
@@ -678,7 +731,6 @@
         );
       },
       materielHandleScroll() {
-        console.log('---------materielHandleScroll------------');
         if (this.showMaterialList.length < this.materialList.length) {
           if (this.materialList.length > this.pageSize) {
             this.materielPageNum += 1;
@@ -692,7 +744,6 @@
         this.showMaterialList = this.showMaterialList.concat(
           this.materialList.slice(start, end)
         );
-        console.log(this.showMaterialList);
       },
       // 获取物品列表
       async getListItems() {
@@ -769,9 +820,7 @@
       },
       async getReturnStorage() {
         return new Promise((resolve) => {
-          console.log(this.formData);
           this.$refs.formName.validate(async (valid) => {
-            console.log('valid', valid);
             if (valid) {
               if (!this.productList?.length) {
                 return this.$message.error('请添加出库明细！');
@@ -799,7 +848,6 @@
               });
               obj.warehouseIds = warehouseId;
               obj.warehouseNames = warehouseName;
-              console.log('2222', obj);
               let isPass = false;
               // 1按数量计费 2按重量计费
               if (this.form.pricingWay == 2) {
@@ -871,6 +919,9 @@
         });
       },
       // 初始化用户信息
+      /**
+       * 异步初始化表单数据
+       */
       async initFormData() {
         // const res = await warehouseDefinition.tree();
         // let obj = res.find(
@@ -886,12 +937,12 @@
 
         // 物品类型
         this.formData.extInfo.assetType = Array.from(
-          new Set(this.form.categoryLevelTopId.split(','))
+          new Set(this.form.categoryLevelTopId?.split(','))
         );
         // 出库类型
-        this.formData.bizType = this.bizType;
+        this.formData.bizType = this.activeNameProps.bizType;
         // 添加单据来源
-        this.formData.sourceBizNo = this.sourceBizNo;
+        this.formData.sourceBizNo = this.form.code;
         // 将出库状态改成出库状态 2出库 1入库
         this.formData.type = 2;
         // 入库登记人
@@ -979,7 +1030,6 @@
         });
       },
       addStock() {
-        console.log(this.formData.extInfo.assetType);
         if (
           !(
             this.formData.extInfo.assetType &&
@@ -1002,8 +1052,6 @@
     watch: {
       packingList: {
         handler(newVal) {
-          console.log('包装列表', newVal);
-          console.log('当前包装列表加载页数', this.pickingPageNum);
           this.showPackingList = newVal.slice(
             0,
             this.pageSize * (this.pickingPageNum > 0 ? this.pickingPageNum : 1)
@@ -1013,8 +1061,6 @@
       },
       materialList: {
         handler(newVal) {
-          console.log('物料列表', newVal);
-          console.log('当前物料列表加载页数', this.materielPageNum);
           this.showMaterialList = newVal.slice(
             0,
             this.pageSize *