Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2741,28 +2741,25 @@ const dialogSearchSubmit = () => {
 
   console.log(details.query, 'details.query');
 };
-const ProcessSearch = async () => {
-  if (TopQuery.value.CreateTiem?.length) {
-    details.query.startCreateTime = await dayjs(TopQuery.value.CreateTiem[0]).format(
-      'YYYY-MM-DD HH:mm:ss'
-    );
-    details.query.endCreateTime = await dayjs(TopQuery.value.CreateTiem[1]).format(
-      'YYYY-MM-DD HH:mm:ss'
-    );
+const ProcessSearch = () => {
+  const { CreateTiem, workOrderNumbers, orderCodes } = TopQuery.value;
+
+  const queryKeys = ['workOrderNumbers', 'orderCodes'];
+  queryKeys.forEach(key => {
+    if (TopQuery.value[key]) {
+      details.query[key] = TopQuery.value[key];
+    } else {
+      delete details.query[key];
+    }
+  });
+
+  if (CreateTiem?.length) {
+    details.query.startCreateTime = dayjs(CreateTiem[0]).format('YYYY-MM-DD HH:mm:ss');
+    details.query.endCreateTime = dayjs(CreateTiem[1]).format('YYYY-MM-DD HH:mm:ss');
     delete details.query.CreateTiem;
   }
-  if (TopQuery.value.workOrderNumbers) {
-    details.query.workOrderNumbers = TopQuery.value.workOrderNumbers;
-  } else {
-    delete details.query.workOrderNumbers;
-  }
-  if (TopQuery.value.orderCodes) {
-    details.query.orderCodes = TopQuery.value.orderCodes;
-  } else {
-    delete details.query.orderCodes;
-  }
-  console.log(TopQuery.value, 'TopQuery.value');
 
+  console.log(TopQuery.value, 'TopQuery.value');
   console.log(details.query, 'details.query');
 
   delete details.query.inputAll;

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1328,7 +1328,7 @@ const ChangePackageInfo = async item => {
 
   console.log(res, '查询包条');
   let packageData = {};
-  if (res.data.code == 200 && res.data && res.data.data.length) {
+  if (res.data.code == 200 && res.data && res.data.data?.length) {
     form.value.Pageloading = false; //关闭页面加载
     packageData = res.data.data[0]; //取第一个值,内容相同
     // 判断输入的是否为同一批货

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -3530,6 +3530,12 @@ export default {
         console.log('执行了二次操作');
         const data = res.data.data;
         this.dataList = data.records;
+        if(this.dataList?.length){
+          this.dataList.forEach(i => {
+          i.reservationNum = i.handQuantity;
+        })
+        }
+
         this.loading = false;
         this.selectionClear();
       });

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -59,7 +59,7 @@
         <!-- 列表模块 -->
         <tablecmt
           class="tableNode"
-          :columnList="columnList"
+          :columnList="details.columnList"
           :tableData="data"
           :loading="loadingObj.list"
           :initFn="getrain"