Merge branch 'dev' into pre-production

src/views/basicdata/brand/basicdataCategory.vue

@@ -333,7 +333,7 @@ export default {
     onLoad(page, params = {}) {
       console.log(this.query,';this.query');
       
-      this.loading = false;
+      this.loading = true;
       const { name, type } = this.query;
       let values = {
         name_like: name,

src/views/distribution/artery/AddVehicleStowage.vue

@@ -1902,6 +1902,19 @@ const handleAddWaybill = async (index: number) => {
     item.totalNum = item.totalNum || 20;
     item.planNum = item.stockNum;
     item.loadingNum = 0;
+
+    let isContinue = false;
+
+    for (let i = 0; i < details.orderCodeList.length; i++) {
+      const val = details.orderCodeList[i];
+
+      if (item.orderCode + ',' + item.waybillNo !== val) continue;
+      isContinue = true;
+      break;
+    }
+
+    if (isContinue) continue;
+
     _orderMap.push(item.orderCode + ',' + item.waybillNo);
     _node.lineCarsOrderList.push(item);
   }

src/views/distribution/artery/addTripartiteTransfer.vue

@@ -1080,17 +1080,36 @@ const currentChange = pageNum => {
 
 /** 加入调度池 */
 const handleAddWaybill = () => {
-  details.selectionList.forEach(val => {
+  const _orderMap = [];
-    val.planNum = val.stockNum;
+
-    val.loadingNum = 0;
+  for (let i = 0; i < details.selectionList.length; i++) {
-    details.newData.push(val);
+    const item = details.selectionList[i];
-  });
+
-  details.orderCodeList = [
+    item.planNum = item.stockNum;
-    ...new Set([
+    item.loadingNum = 0;
-      ...details.orderCodeList,
+
-      ...details.selectionList.map(val => val.orderCode + ',' + val.waybillNo),
+    let isContinue = false;
-    ]),
+
-  ];
+    for (let i = 0; i < details.orderCodeList.length; i++) {
+      const val = details.orderCodeList[i];
+
+      if (item.orderCode + ',' + item.waybillNo !== val) continue;
+      isContinue = true;
+      break;
+    }
+
+    if (isContinue) continue;
+
+    _orderMap.push(item.orderCode + ',' + item.waybillNo);
+    details.newData.push(item);
+  }
+
+  // details.selectionList.forEach(val => {
+  //   val.planNum = val.stockNum;
+  //   val.loadingNum = 0;
+  //   details.newData.push(val);
+  // });
+  details.orderCodeList = [...new Set([...details.orderCodeList, ..._orderMap])];
   console.log('details.orderCodeList :>> ', details.orderCodeList);
 
   const orderCodes = details.selectionList.map(val => val.orderCode);