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

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

@@ -44,7 +44,7 @@
         <el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
       </el-form-item>
       <el-form-item :label="$t('货物描述')">
-        <el-input v-model="subMaterialObj.goodsDesc" :placeholder="$t('请输入货物描述')"></el-input>
+        <el-input v-model="subMaterialObj.goodsDesc" type="textarea" autosize :placeholder="$t('请输入货物描述')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('柜号') + '/' + $t('封条')">
         <el-input v-model="subMaterialObj.containerSealNo" :placeholder="$t('请输入柜号') + '/' + $t('封条')"></el-input>
@@ -131,7 +131,7 @@ export default {
       packageUnit: oldData.packageUnit === 0 ? undefined : oldData.packageUnit,
     };
     if(!this.shipmentObj.ladingBillInfo){
-      console.log(this.shipmentObj,'111')
+      
       this.$set(this.subMaterialObj,'agentId',this.shipmentObj.agentInfo?.agentId||undefined)
       this.$set(this.subMaterialObj,'soNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
       this.$set(this.subMaterialObj,'blMblNo',this.shipmentObj.bookSeaInfo?.sono||undefined)
@@ -142,9 +142,8 @@ export default {
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)
       this.$set(this.subMaterialObj,'containerSealNo',(this.shipmentObj.trailerInfo?.tlContainerNo||'')+'/'+(this.shipmentObj.trailerInfo?.tlStripSeal||'/'))
       this.subMaterialObj.containerSealNo = this.subMaterialObj.containerSealNo.replace('//','')
+      this.getSup(this.subMaterialObj.agentId)
     }
-    
-    this.getSup(this.subMaterialObj.agentId)
   },
   methods: {
     getSup(id) {
@@ -154,7 +153,12 @@ export default {
           this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
           this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
           this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
-          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||''+response.data.externalBackVO?.ctnNo||'')
+          var goodName = '',baNo = '',fromNo = '',ctnNo = ''
+          if(response.data.externalBackVO.goodName && response.data.externalBackVO.goodName != '') goodName = response.data.externalBackVO.goodName
+          if(response.data.externalBackVO.fromNo && response.data.externalBackVO.fromNo != '') fromNo = (goodName!=''?'\n':'')+'FROM M NO:'+response.data.externalBackVO.fromNo
+          if(response.data.externalBackVO.baNo && response.data.externalBackVO.baNo != '') baNo = '\nBA NO:'+response.data.externalBackVO.baNo
+          if(response.data.externalBackVO.ctnNo && response.data.externalBackVO.ctnNo != '') ctnNo = '\nCTN NO:'+response.data.externalBackVO.ctnNo
+          this.$set(this.subMaterialObj,'goodsDesc',goodName+fromNo+baNo+ctnNo)
           if(this.subMaterialObj.goodsDesc == null){
             this.$set(this.subMaterialObj,'goodsDesc','/')
           }

src/views/ecw/financial/receivable.vue

@@ -292,7 +292,7 @@ export default {
   },
   activated(){
     console.log(11)
-    this.handleQuery()
+    this.getList();
   },
   created() {
     let that = this;

src/views/ecw/financial/voucher.vue

@@ -353,7 +353,7 @@ export default {
     };
   },
   activated(){
-    this.handleQuery()
+    this.getList();
   },
   created() {
     let that = this;

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

@@ -236,7 +236,7 @@ export default {
     };
   },
   activated(){
-    this.handleQuery()
+    this.getList();
   },
   created() {
     this.getList();