Merge remote-tracking branch 'origin/predev' into predev

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -129,6 +129,10 @@ export default {
     });
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
+    oldData = formatNumberString(oldData, ["issueType"]);this.subMaterialObj = {
+      ...oldData,
+      packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
+    };
     this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
     this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
     this.$set(this.subMaterialObj,'markNo',"N/M")
@@ -136,16 +140,13 @@ export default {
     this.$set(this.subMaterialObj,'destPortId',this.shipmentObj.bookSeaInfo?.destPortId||undefined)
     this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)
     this.$set(this.subMaterialObj,'containerSealNo',(this.shipmentObj.trailerInfo?.tlContainerNo||'')+'/'+(this.shipmentObj.trailerInfo?.tlStripSeal||'/'))
-    oldData = formatNumberString(oldData, ["issueType"]);
-    this.subMaterialObj = {
-      ...oldData,
-      packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
-    };
+    
     
     this.getSup(this.subMaterialObj.agentId)
   },
   methods: {
     getSup(id) {
+      console.log(id,'idid')
       getSupplier(id).then(response => {
         if(response.data.externalBackVO){
           this.$set(this.subMaterialObj,'consigneeName',response.data.externalBackVO?.receiveCompanyName||'/')

src/views/ecw/deptTarget/allAchievement.vue

@@ -3,13 +3,13 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('关键字')" prop="transportType">
+      <el-form-item :label="$t('关键字')" prop="key">
         <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" clearable/>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
       </el-form-item>
-      <el-form-item :label="$t('唛头')" prop="transportType">
+      <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" clearable />
       </el-form-item>
       <el-form-item :label="$t('资源类型')" prop="customerType">
@@ -416,6 +416,9 @@
                   data.sumVolume += item.completeVolume
                   data.sumNum += item.sumNum
                 })
+                  data.developVolume = data.developVolume.toFixed(2);
+                  data.companyVolume = data.companyVolume.toFixed(2);
+                  data.sumVolume = data.sumVolume.toFixed(2);
                 this.$set(this,'totalData',data)
               }else{
                     this.totalData.sumWeight =this.myAchievementData.totalWeight

src/views/ecw/deptTarget/myDeptAchievement.vue

@@ -3,13 +3,13 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('关键字')" prop="transportType">
+      <el-form-item :label="$t('关键字')" prop="key">
         <el-input v-model="queryParams.key" :placeholder="$t('请输入关键字查找')" />
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
       </el-form-item>
-      <el-form-item :label="$t('唛头')" prop="transportType">
+      <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('请输入关键字查找')" />
       </el-form-item>
       <el-form-item :label="$t('资源类型')" prop="customerType">
@@ -410,6 +410,9 @@
                   data.sumVolume += item.completeVolume
                   data.sumNum += item.sumNum
                 })
+                  data.developVolume = data.developVolume.toFixed(2);
+                  data.companyVolume = data.companyVolume.toFixed(2);
+                  data.sumVolume = data.sumVolume.toFixed(2);
                 this.$set(this,'totalData',data)
               }else{
                     this.totalData.sumWeight =this.myAchievementData.totalWeight

src/views/ecw/order/exception/index.vue

@@ -290,6 +290,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.page = 1
       this.getList();
     },
     handEdit(id){

src/views/ecw/order/prepayDeal.vue

@@ -33,7 +33,7 @@
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
        <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
         <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
-        <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
+        <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception','not_customer_service_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
           <el-row>
               <el-form-item :label="$t('填单参数')+':'">
                 <template v-if="orderData && orderData.costVO">
@@ -56,9 +56,9 @@
         </template>
 
         <template v-else>
-          <el-row>
+          <el-row v-if="shopData">
             <el-form-item :label="$t('填单参数')+':'">
-              <template v-if="shopData">
+              <template >
                 {{$t('{num}箱 {volume}m³ {weight}kg {quantity}个', {
                   num: shopData.num || 0,
                   volume: shopData.volume || 0,