修复市配编辑load没有关闭

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -530,6 +530,8 @@ export default {
       },
       loginRules: {
         typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
+        cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
+        cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
       },
       /** loading */
       loadingObj: {

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -830,7 +830,7 @@ const SjCxChange = () => {
     console.log(sjInput.value, '查询的司机');
     console.log(StockInfo.value, '司机');
     StockInfo.value.DriverInformation[1].options = StockInfo.value.DriverInformation[1].options.filter(res => res.name.includes(sjInput.value));
-    console.log(sjSelect.value, 'sjSelect.value');
+
   } else {
     StockInfo.value.DriverInformation[1].options = DriverInformationCopy.value;
   }
@@ -2596,7 +2596,7 @@ const SJchangeSelect = val => {
   if (val.length) {
     let SJname = null; //用来少选第一选择的司机名称
     SJname = CurrentVehicle(val, StockInfo.value.DriverInformation[1].options);
-    console.log(SJname[0].name, '司机');
+    
     DataSubmit.value.masterDriverName = SJname[0].name;
     let data = []; //存储函数筛选后的司机车辆信息
     let dataInfo = []; //临时存储的司机车辆信息
@@ -2922,6 +2922,8 @@ StockInfoCopy.value = deepCopy(StockInfo.value);
 DataSubmit.value = DataSubmitCopy.value
 DataSubmitCopy.value= deepCopy(DataSubmit.value);
 dataInfo.value=[]
+clInput.value=''
+sjInput.value=''
     })
     .catch(() => {
       handleBack();

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -1848,6 +1848,7 @@ export default {
             this.deliveryDriver = b;
             this.driverList = b;
             this.driverInfo = driverInfo;
+            this.loadingObj.pageLoading=false
           } else {
             let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO;
             this.aaa = false;
@@ -1858,10 +1859,17 @@ export default {
             this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum;
             this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone;
             this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee;
+            this.loadingObj.pageLoading=false
           }
+        }).catch(()=>{
+          
+        }).finally(()=>{
+        
+          this.loading = false;
         });
       }
-      this.loading = false;
+ 
+   
     },
   },
 };

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -304,16 +304,16 @@ const selectionChange = list => {
 const searchChange = () => {
   // 日期处理
   if (TopQuery.value.warehouseEntryTime) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
-    queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
     delete queryCarn.value.warehouseEntryTimestartTaskTime;
     delete queryCarn.value.warehouseEntryTimeendTaskTime;
   }
 
   if (TopQuery.value.signinTime) {
-    queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.signinTime[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
-    queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
   } else {
     delete queryCarn.value.signinTimestartTaskTime;
     delete queryCarn.value.signinTimeendTaskTime;
@@ -423,6 +423,7 @@ const removeParentheses=(str)=>{
     }
 // 预约信息
 const informationClick=(val)=>{
+  return
   console.log(val,'预约信息');
  let data= removeParentheses(val.reservationInfo)
  console.log(data,'处理好的数据');