修改库存预约的过滤

src/page/index/index.vue

@@ -77,8 +77,6 @@ export default {
   },
   created() {
     getMyCurrentWarehouse().then(res => {
-      console.log(res, '初始化请求参数');
-      console.log(res.data.data.name, '仓库名称');
       if (res.data.data == null) {
         console.log('当前没有数据');
         localStorage.setItem('WarehouseName', undefined);

src/page/index/top/index.vue

@@ -120,10 +120,10 @@ export default {
     };
   },
   mounted() {
-    getMyWarehouseList().then(res => {
-      let arr = [{ name: this.dataName ? this.dataName : '', id: '0' }];
-      this.datalist = arr.concat(res.data.data);
-    });
+    // getMyWarehouseList().then(res => {
+    //   let arr = [{ name: this.dataName ? this.dataName : '', id: '0' }];
+    //   this.datalist = arr.concat(res.data.data);
+    // });
     this.checkwarehousevalue = Number(localStorage.getItem('checkwarehousevalue'));
   },
   filters: {},

src/views/distribution/reservation/reservation.vue

@@ -459,7 +459,7 @@ export default {
         },
         {
           prop: 'mallName',
-          label: '商城',
+          label: '收货单位',
           type: 2,
           values: '',
           width: '130',

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1925,9 +1925,7 @@ export default {
       let page = this.page;
       let params = {};
       this.query.serviceType = '2';
-      console.log('this.marketName :>> ', this.marketName);
       params.marketName = this.marketName;
-      console.log('params :>> ', params);
       getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
           const inventoryList = res.data.data;
@@ -1938,14 +1936,18 @@ export default {
           this.page.total = inventoryList.total;
           console.log('res :>> ', res);
 
-          this.inventoryInfo = inventoryList.records;
+
+          // 过滤掉已选择的数量
+
+          const _inventoryInfo = inventoryList.records;
+          this.inventoryInfo = _inventoryInfo
           if (this.inventoryData.length !== 0) {
             // 获取ids的映射数组
             const ids = this.inventoryData.map(val => val.id);
             // 赋值给回显勾选的数组
-            this.inventorySelectList = this.inventoryInfo.filter(val => {
+           this.inventoryInfo = _inventoryInfo.filter(val => {
               // 循环获取符合条件的库存品组成数组
-              return ids.includes(val.id);
+              return !ids.includes(val.id);
             });
           }
           this.loading = false;
@@ -2628,18 +2630,7 @@ export default {
       }
       this.marketName = _marketName;
       console.log('this.inventoryList :>> ', this.inventoryList);
-      this.inventoryData = this.inventoryList;
-
-      // if (this.orderData.length) {
-      //   this.inventoryList.some(i => {
-      //     let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
-      //     if (!a) {
-      //       this.inventoryData.push(i);
-      //     }
-      //   });
-      // } else {
-      //   this.inventoryData = this.selectionList;
-      // }
+      this.inventoryData = [...this.inventoryData,...this.inventoryList];
 
       this.stockListShow = false;
     },
@@ -2841,7 +2832,8 @@ export default {
       });
       if (this.orderData.length !== 0) {
         const ids = this.orderData.map(val => val.id);
-        this.orderSelectList = this.stockArticleInfo.filter(val => ids.includes(val.id));
+        const _orderData = this.stockArticleInfo.filter(val => !ids.includes(val.id))
+        // this.orderSelectList = this.stockArticleInfo.filter(val => ids.includes(val.id));
         console.log('orderSelectList :>> ', this.orderSelectList);
       }
       this.orderList = [];

src/views/reservation/lnventory_list.vue

@@ -53,7 +53,7 @@
         >
           <template #default="slotProps">
             <el-text type="primary" text icon="el-icon-view" @click="handleViewDetails(slotProps.scope)">查看</el-text>
-            <el-text type="primary" text icon="el-icon-view" @click="handleViewDismantle(slotProps.scope)">拆包</el-text>
+            <!-- <el-text type="primary" text icon="el-icon-view" @click="handleViewDismantle(slotProps.scope)">拆包</el-text> -->
           </template>
         </tablecmt>
       </el-row>