Merge branch 'dev' into pre-production

src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue

@@ -213,6 +213,13 @@ const printTemplate = (type: 'haveTem' | 'notHaveTem') => {
     element.style.borderColor = type === 'haveTem' ? '#000' : '#fff';
   }
 
+  const lineArr = document.querySelectorAll('.printCode .line');
+
+  for (let index = 0; index < lineArr.length; index++) {
+    const element = lineArr[index];
+    element.style.borderColor = type === 'haveTem' ? '#000' : '#fff';
+  }
+
   print(printNode);
 };
 

src/views/waybill/TemporaryStorageList.vue

@@ -1177,7 +1177,6 @@ const handleCreateOrder = () => {
     });
   }
 
-  
   let _htMallName = '';
   let _dealerName = '';
   let _brand = '';
@@ -1186,20 +1185,24 @@ const handleCreateOrder = () => {
     const value = details.selectionList[i];
 
     if (i === 0) {
-       _htMallName = value.htMallName;
-       _dealerName = value.dealerName;
-       _brand = value.brand;
+      _htMallName = value.htMallName;
+      _dealerName = value.dealerName;
+      _brand = value.brand;
     }
-    
+
     if (!_htMallName) {
-      if (_htMallName !== value.htMallName || _dealerName !== value.dealerName || _brand !== value.brand) {
+      if (
+        _htMallName !== value.htMallName ||
+        _dealerName !== value.dealerName ||
+        _brand !== value.brand
+      ) {
         return ElMessage({
           type: 'warning',
           message: '请选择统一商场和品牌开单',
         });
       }
     } else {
-       if (_htMallName !== value.htMallName || _brand !== value.brand) {
+      if (_htMallName !== value.htMallName || _brand !== value.brand) {
         return ElMessage({
           type: 'warning',
           message: '请选择统一商场和品牌开单',
@@ -1509,8 +1512,8 @@ onActivated(() => {
   console.log('this.$store :>> ', $store);
   if ($store.state.isRefresh.refreshObj.TemporaryStorageList) {
     // 重新请求数据
-    details.query = {};
-    handleClearTableQuery(details.columnList);
+    // details.query = {};
+    // handleClearTableQuery(details.columnList);
     details.page.pageNum = 1;
     onLoad({}, true);
 

src/views/waybill/WaybillOrderList.vue

@@ -705,6 +705,7 @@ const editOrder = () => {
         id: _item.id,
         type: 'edit',
         backPath: '/waybill/WaybillOrderList',
+        orderStatus: Number(_item.waybillType) === 1 ? 'haveData' : 'notHaveData',
       },
     });
   } else if (Number(_item.waybillType) === 2) {