Merge branch 'dev' into pre-production

src/components/tablecmt/tablecmt.vue

@@ -171,7 +171,7 @@
       </el-table-column>
     </el-table>
     <!-- 勾选合计行 -->
-    <div class="selection-total-row" v-if="shownm && isHaveSelection">
+    <div class="selection-total-row" v-show="shownm && isHaveSelection">
       <span>勾选合计:</span>
       <span v-for="item in selectCount">
         <span style="margin: 0 5px">{{ item.label + ':' }}</span>
@@ -502,7 +502,7 @@ function timeclear(value, column: TableColumnType) {
 }
 function handleDelete(index: number, row: TableDataType) {}
 const getSummaries = (param: any) => {
-  selectCount.value = [];
+  const _arr = [];
   const { columns, data } = param;
   let newarr = [];
   let tji = 0;
@@ -518,7 +518,7 @@ const getSummaries = (param: any) => {
         tji = computeNumber(tji, '+', Number(ite[props.columnList[index]?.prop] || 0)).result;
       }
       newarr[index] = tji;
-      selectCount.value.push({
+      _arr.push({
         label: props.columnList[index]?.label,
         value: 0,
         prop: props.columnList[index]?.prop,
@@ -528,6 +528,7 @@ const getSummaries = (param: any) => {
       newarr[index] = null;
     }
   });
+  selectCount.value = _arr;
   // console.log(columns)
   return newarr;
 };

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1561,11 +1561,11 @@ const IndexTable = val => {
       res.data.data.records.forEach(item => {
         console.log(item, 'item');
         // 对为null的数据进行处理
-        for (const property in item) {
-          if (item[property] == null) {
-            item[property] = '/';
-          }
-        }
+        // for (const property in item) {
+        //   if (item[property] == null) {
+        //     item[property] = '/';
+        //   }
+        // }
         // 对状态进行处理
         if (item.workOrderType == 1) {
           item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1102,6 +1102,10 @@ const Statistics = () => {
 
 // 查询包件信息自动回显
 const ChangePackageInfo = (val, index) => {
+  if(!val){
+    return
+    // 如果输入框里面没有值就不请求
+  }
   PackageInfo.value[index].orderCode = ''; //订单自编码
   PackageInfo.value[index].waybillNumber = ''; //运单号
   PackageInfo.value[index].orderId = ''; //运单号

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -1460,17 +1460,17 @@ const ConfirmForm = () => {
       DataSubmit['processorEntityList'].push({
         businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
         businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
-        workOrderId: $route.query.id, //异常工单ID
+        workOrderId: $route.query.id=='/'?'':$route.query.id, //异常工单ID
         conditions: 1, //状态  1正常  2新增  3取消
         typesOf: 2, //1 责任方 2 处理方
         warehouseId: $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, //仓库ID
-        processingStatus: $route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理
+        processingStatus: $route.query.ProcessType=='/'?'':$route.query.ProcessType, //处理状态 类型 1 待处理 2 已处理
       });
     });
     // 新增处理方要携带调查经过
     DataSubmit.surveyRecordDTO = {
       content: Indexform.value.investigationProcess, //内容'
-      workOrderId: $route.query.id, //工单ID
+      workOrderId: $route.query.id =='/'?'':$route.query.id, //工单ID
       // pictureUrl: KFfeel.value.join(','), //附件路径
     };
   }
@@ -1549,7 +1549,7 @@ const ConfirmForm = () => {
           money: Number(item.num), // 金额
           reasonArbitration: item.reason, // 说明
           workOrderId: $route.query.id, // 异常工单
-          warehouseId: $route.query.warehouseId, // 仓库ID
+          warehouseId:  $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID
         });
       } else {
         DataSubmit['completionRecipientEntities'].push({
@@ -1565,7 +1565,7 @@ const ConfirmForm = () => {
                 .join(',')
             )
             .join(','),
-          warehouseId: $route.query.warehouseId, // 仓库ID
+          warehouseId:  $route.query.warehouseId == '/' ? '' : $route.query.warehouseId, // 仓库ID
           workOrderId: $route.query.id, //异常工单
         });
       }

src/views/distribution/reservation/reservationAddFrom.vue

@@ -715,6 +715,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -726,6 +727,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -737,6 +739,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -935,6 +938,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -945,6 +949,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         /* {
@@ -975,6 +980,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
 
@@ -1017,6 +1023,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -1037,6 +1044,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -1077,7 +1085,7 @@ export default {
           label: '序号',
           type: 0,
           values: '',
-          width: '50',
+          width: '55',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -1235,6 +1243,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -1246,6 +1255,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {
@@ -1497,6 +1507,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -1507,6 +1518,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         /* {
@@ -1537,6 +1549,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -1548,6 +1561,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
 
@@ -1599,6 +1613,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -1808,6 +1823,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
           head: false,
         },
         {

vite.config.js

@@ -12,7 +12,7 @@ export default ({ mode, command }) => {
       port: 2888,
       proxy: {
         '/api': {
-           target: 'http://test.api.huitongys.com',
+          target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },