修改预约商城限制

src/views/distribution/artery/zeroAdditionalRecording.vue

@@ -91,11 +91,11 @@
               background
               @size-change="sizeChange"
               @current-change="currentChange"
-              :current-page="zeroAdditionalRecordingInfo.oldPage.pageNum"
+              :current-page="oldPage.pageNum"
               :page-sizes="[30, 50, 80, 120]"
-              :page-size="zeroAdditionalRecordingInfo.oldPage.pageSize"
+              :page-size="oldPage.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
-              :total="zeroAdditionalRecordingInfo.oldPage.total"
+              :total="oldPage.total"
             >
             </el-pagination>
           </div>
@@ -278,6 +278,11 @@ const details = reactive<any>({
     pageSize: 30,
     total: 0,
   },
+  oldPage: {
+    pageSize: 30,
+    pageNum: 1,
+    total: 0,
+  },
   /** 装车明细分页参数 */
   trickleLoadingPage: {
     pageNum: 1,
@@ -294,14 +299,6 @@ const details = reactive<any>({
   /** 列表Dom节点 */
   listNode: '',
   form: {},
-  /** 零担补录信息 */
-  zeroAdditionalRecordingInfo: {
-    oldPage: {
-      pageSize: 30,
-      pageNum: 1,
-      total: 0,
-    },
-  },
   /** 被选中的零担订单 */
   orderCodeList: [],
 });
@@ -316,7 +313,7 @@ const {
   drawerShow,
   page,
   trickleLoadingPage,
-  zeroAdditionalRecordingInfo,
+  oldPage,
   popUpShow,
 } = toRefs(details);
 
@@ -335,7 +332,7 @@ onMounted(() => {
 });
 
 /** 请求页面数据 */
-const onLoad = async (page: any, params = {}) => {
+const onLoad = async (params = {}) => {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
@@ -365,7 +362,7 @@ onLoad();
 
 /** 搜索 */
 const searchChange = () => {
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 清空表单 */
@@ -373,7 +370,7 @@ const searchReset = () => {
   details.query = {};
   details.stockupDate = [];
   details.page.pageNum = 1;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 展开列表控件 */
@@ -416,7 +413,7 @@ const searchHide = () => {
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头时间选择 */
@@ -429,7 +426,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -443,7 +440,7 @@ const selectsc = (index, row) => {
     details.query['certificateType'] = index;
     if (!index) delete details.query['certificateType'];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头复选框选择 */
@@ -454,7 +451,7 @@ const selectionChange = (list: any) => {
 /** 表格表头输入框搜索 */
 const newInputsc = (index, row) => {
   details.newQuery[row.prop] = index;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头时间选择 */
@@ -467,7 +464,7 @@ const newTimesc = (index, row) => {
   if (!index) {
     delete details.newQuery[row.prop];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -481,7 +478,7 @@ const newSelectsc = (index, row) => {
     details.newQuery['certificateType'] = index;
     if (!index) delete details.newQuery['certificateType'];
   }
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 表格表头复选框选择 */
@@ -492,7 +489,7 @@ const newSelectionChange = (list: any) => {
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.page.pageSize = pageSize;
-  onLoad(details.page);
+  onLoad();
 };
 
 /** 页码改变执行的回调 */
@@ -520,8 +517,6 @@ const setnewcolum = (newarr, headarr, type) => {
 const handleAddWaybill = () => {
   if (details.oldSelectionList.length === 0) return ElMessage.error('最少选择一条数据');
 
-  // 新增
-  // if (Number(details.pageType) === 1) {
   for (let item of details.oldSelectionList) {
     item.planNum = item.stockNum;
     item.loadingNum = 0;
@@ -529,31 +524,25 @@ const handleAddWaybill = () => {
   }
 
   details.orderCodeList = [
-    ...new Set([
+    ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]),
-      ...details.orderCodeList,
-      ...details.oldSelectionList.map(val => val.orderCode + ',' + val.waybillNo),
-    ]),
   ];
-  console.log('details.orderCodeList :>> ', details.orderCodeList);
 
-  const orderCodes = details.selectionList.map(val => val.orderCode);
-  // clearSelectionList();
   details.page.pageNum = 1;
-  // initOriginWarehouseOrder();
+  onLoad();
-  // }
 };
 
 /** 移除运单 */
 const handleRemoveWaybill = () => {
-  //   if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('最少选择一条运单');
+  if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条运单');
+  for (const iterator of details.newSelectionList) {
+    console.log('111 :>> ', 111);
+  }
   //   this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
   //   this.addInfo.haveIds = this.addInfo.map(val => val.id);
 };
 
 /** 零担补录提交 */
-const handleEditZeroSubmit = () => {
+const handleEditZeroSubmit = () => {};
-  details.popUpShow.zeroAdditionalRecordingVisited = false;
-};
 </script>
 
 <style scoped lang="scss">

src/views/distribution/reservation/reservationAddFrom.vue

@@ -2776,26 +2776,36 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.inventoryList.forEach(item => {
+      // this.inventoryList.every(item => {
-        if (item.reservationNum > item.applyNum) {
+      //   if (item.reservationNum > item.applyNum) {
+      //     this.$message.warning('该库存品数量输入有误!!!');
+      //     return false;
+      //   }
+      //   return true;
+      // });
+      const stockArr = [...this.inventoryData, ...this.inventoryList];
+
+      // 检测商场是否选择统一商场
+      const _isUnifyMarketName = stockArr.every(value => {
+        // 设置同一商场
+        if (this.marketName === '') this.marketName = value.marketName;
+
+        if (this.marketName !== value.marketName) {
+          this.$message.warning('请选择统一商场!!!');
+          return false;
+        } else if (value.reservationNum > value.applyNum) {
           this.$message.warning('该库存品数量输入有误!!!');
-          return;
+          return false;
         }
-      });
+        return true;
-      console.log('this.inventoryList :>> ', this.inventoryList);
-      // 检测商场是否选择统一商场
-      let _marketName = '';
-      const _isUnifyMarketName = this.inventoryList.every(value => {
-        if (_marketName === '') _marketName = value.marketName;
-        return _marketName === value.marketName;
       });
       if (!_isUnifyMarketName) {
-        this.$message.warning('请选择统一商场!!!');
+        // this.$message.warning('请选择统一商场!!!');
         return;
       }
-      this.marketName = _marketName;
+
       console.log('this.inventoryList :>> ', this.inventoryList);
-      this.inventoryData = [...this.inventoryData, ...this.inventoryList];
+      this.inventoryData = stockArr;
 
       this.stockListShow = false;
     },
@@ -2805,15 +2815,18 @@ export default {
     onSubmitOrder() {
       console.log('orderList-------------》', this.orderList);
       if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
-      const list = [...this.orderList, ...this.orderData];
+      const list = [...this.orderData, ...this.orderList];
       let _name = list[0].customerName.trim();
       let _address = list[0].customerAddress.trim();
       let _phone = list[0].customerTelephone.trim();
-      let _marketName = list[0].mallName.trim();
+      if (this.marketName === '') this.marketName = list[0].mallName.trim();
+
+      // 设置商场名称
+      if (this.marketName === '') this.marketName = this.marketName;
 
       // 循环查看数据是否符合要求
       const isRturn = list.every(item => {
-        if (item.mallName.trim() !== _marketName) {
+        if (item.mallName.trim() !== this.marketName) {
           this.$message.warning('请选择统一商场!!!');
           return false;
         }
@@ -2832,8 +2845,6 @@ export default {
 
       if (!isRturn) return;
 
-      // 设置商场名称
-      if (this.marketName === '') this.marketName = _marketName;
       // this.marketName = list[0].marketName;
 
       this.form.consignee = _name;