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

src/option/aftersales/vueTvemp.js

@@ -263,8 +263,8 @@ export const columnList = [
     head: false,
   },
   {
-    prop: 'problemDescription',
+    prop: 'investigationProcess',
-    label: '异常问题描述',
+    label: '调查经过',
     type: 1,
     values: '',
     width: '150',

src/option/distribution/TripartiteTransfer.js

@@ -401,7 +401,7 @@ export const detailsColumnList = [
   {
     prop: 'unloadTrayName',
     label: '卸车托盘名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -411,7 +411,7 @@ export const detailsColumnList = [
   {
     prop: 'unloadTrayCode',
     label: '卸车托盘码',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],

src/option/distribution/VehicleArrivalManagement.js

@@ -58,7 +58,7 @@ export const columnList = [
     isshowSummary: true,
   },
   {
-    prop: 'NumberOfPiecesInTheCar',
+    prop: 'stockCarsNum',
     label: '在车件数',
     type: 1,
     values: '',

src/option/distribution/VehicleStowage.js

@@ -58,7 +58,7 @@ export const columnList = [
     isshowSummary: true,
   },
   {
-    prop: 'NumberOfPiecesInTheCar',
+    prop: 'stockCarsNum',
     label: '在车件数',
     type: 1,
     values: '',

src/views/aftersales/aftersalesWorkOrder.vue

@@ -4221,12 +4221,14 @@ const exportReport = () => {
     type: 'warning',
   })
     .then(() => {
+  
       let dataID = {
         workOrderStatus: details.query.workOrderStatus,
       };
       if (details.selectionList.length) {
         dataID.ids = details.selectionList.map(item => item.id).join(',');
       }
+      pageLoad.value=true
       $_exportAftersalesWorkOrder(dataID).then(res => {
         const currentDate = new Date();
         const formattedDate = `${currentDate.getFullYear()}${(currentDate.getMonth() + 1)
@@ -4240,7 +4242,13 @@ const exportReport = () => {
           .padStart(2, '0')}`;
         console.log(res, '导出');
         downloadXls(res.data, `导出工单数据${formattedDate}.xlsx`);
-      });
+      }).catch((e)=>{
+        console.log(e,'error');
+        
+      }).finally(()=>{
+        pageLoad.value=false
+      })
+      ;
     })
     .catch(() => {});
 };

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -883,17 +883,6 @@ const onLoad = debounce(async (params = {}) => {
 
     // 映射下拉框值
     handleTranslationDataSeclect(details.data, details.columnList);
-
-    // 计算在车件数
-    for (let i = 0; i < details.data.length; i++) {
-      const value = details.data[i];
-
-      value.NumberOfPiecesInTheCar = computeNumber(
-        value.realLoadingNumber || 0,
-        '-',
-        value.unloadNumber || 0
-      ).result;
-    }
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);

src/views/distribution/artery/VehicleStowage.vue

@@ -847,17 +847,6 @@ const onLoad = debounce(async (params = {}) => {
     // 映射下拉框值
     handleTranslationDataSeclect(details.data, details.columnList);
 
-    // 计算在车件数
-    for (let i = 0; i < details.data.length; i++) {
-      const value = details.data[i];
-
-      value.NumberOfPiecesInTheCar = computeNumber(
-        value.realLoadingNumber || 0,
-        '-',
-        value.unloadNumber || 0
-      ).result;
-    }
-
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);

src/views/distribution/inventory/CreateOrder.vue

@@ -3148,9 +3148,11 @@ const handlePickUpPrice = (pickup, template) => {
     let _total = 0;
 
     for (let i = 0; i < details.goodsList.length; i++) {
-      _total += computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result;
+      _total = computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result;
     }
 
+    console.log('_total :>> ', _total);
+
     // 是否存在最低计费
     if (
       (pickup || template) &&
@@ -3236,30 +3238,30 @@ const handleTrunkLinePrice = (trunkLine, template) => {
       switch (Number(template.trunklineMinCostType)) {
         // 价格
         case 1:
-          details.query.totalFreight = template.minCost > _total ? template.minCost : _total;
+          details.query.totalFreight = trunkLine.minCost > _total ? trunkLine.minCost : _total;
           break;
 
         // 件
         case 2:
           details.query.totalFreight =
-            template.minCost > details.totalObj.totalCount
+            trunkLine.minCost > details.totalObj.totalCount
-              ? _total + (template.additionalCost || 0)
+              ? _total + (trunkLine.minCost || 0)
               : _total;
           break;
 
         // 方
         case 3:
           details.query.totalFreight =
-            template.minCost > details.totalObj.totalVolume
+            trunkLine.minCost > details.totalObj.totalVolume
-              ? _total + (template.additionalCost || 0)
+              ? _total + (trunkLine.minCost || 0)
               : _total;
           break;
 
         // 重量
         case 4:
           details.query.totalFreight =
-            template.minCost > details.totalObj.totalWeghit
+            trunkLine.minCost > details.totalObj.totalWeghit
-              ? _total + (template.additionalCost || 0)
+              ? _total + (trunkLine.minCost || 0)
               : _total;
           break;
 

src/views/financialsector/Financialse/FinancialTrunkLine.vue

@@ -49,7 +49,11 @@
         prop="trunklineIsByCategory"
         :rules="[{ required: true, message: '请选择是否区分品类', trigger: ['blur', 'change'] }]"
       >
-        <el-radio-group v-model="details.form.trunklineIsByCategory" class="ml-4">
+        <el-radio-group
+          v-model="details.form.trunklineIsByCategory"
+          class="ml-4"
+          @change="trunklineIsByCategorychange"
+        >
           <el-radio
             v-for="item in details.isType"
             :key="item.value"
@@ -379,6 +383,24 @@ const goriesloading = ref(false);
 /** 计价方式改变时 */
 const handleChangePrcieMethod = value => {
   console.log('value :>> ', value);
+  // 遍历 dataTa 数组
+  details.form.billTemplateDetail.forEach(item => {
+    // 检查 item.code 是否不在 data 数组中
+    if (!value.includes(item.code)) {
+      // 不在则将 categories 重置为空数组
+      item.categories = [
+        {
+          reduce: false,
+          plus: true,
+          goodsName: '',
+          goodsId: '',
+          goods: '',
+          goodsArr: [],
+          loading: false,
+        },
+      ];
+    }
+  });
 
   let activeItem: any = {};
   for (let i = 0; i < details.lowestType.length; i++) {
@@ -387,7 +409,7 @@ const handleChangePrcieMethod = value => {
     activeItem = item;
     break;
   }
-
+  console.log(details.form.billTemplateDetail, 'details.form.billTemplateDetail');
   if (!activeItem.MappingOrNot) return;
   if (!details.form.trunklinePricingType.includes(activeItem.mapValue))
     details.form.trunklineMinCostType = '0';
@@ -590,7 +612,22 @@ const handleReduce = (value: any, index: number) => {
   if (index === 0) return;
   value.categories.splice(index, 1);
 };
-
+// 是否区分品类重置
+const trunklineIsByCategorychange = () => {
+  details.form.billTemplateDetail.forEach(item => {
+    item.categories = [
+      {
+        reduce: false,
+        plus: true,
+        goodsName: '',
+        goodsId: '',
+        goods: '',
+        goodsArr: [],
+        loading: false,
+      },
+    ];
+  });
+};
 /** 货物变化时 */
 const handleChangeCategory = item => {
   if (!item.goods) {

src/views/waybill/CreateZeroOrder.vue

@@ -2316,7 +2316,7 @@ const handlePickUpPrice = (pickup, template) => {
     let _total = 0;
 
     for (let i = 0; i < details.goodsList.length; i++) {
-      _total += computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result;
+      _total = computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result;
     }
 
     // 是否存在最低计费
@@ -2452,7 +2452,7 @@ const handleDispatchPrice = (dispatch, template) => {
   for (let i = 0; i < details.goodsList.length; i++) {
     const value = details.goodsList[i];
     if (value.subtotalDispatch)
-      _total += computeNumber(_total, '+', value.subtotalDispatch || 0).result;
+      _total = computeNumber(_total, '+', value.subtotalDispatch || 0).result;
   }
 
   // 是否存在最低计费