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

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

@@ -107,6 +107,7 @@ export default {
       cdOutBillType:
         oldData.cdOutBillType === 0 ? undefined : oldData.cdOutBillType,
     };
+    this.$set(this.cDocObj,'cdOutBillType',String(this.$attrs.shipmentObj.ladingBillInfo?.issueType)||undefined)
   },
   methods: {
     /** 提交 */

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

@@ -40,8 +40,8 @@
         </el-select> -->
         <el-input v-model="subMaterialObj.packageUnit" :placeholder="$t('请输入包装单位')"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('毛重(KGS)')">
-        <el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入毛重') + '(KGS)'"></el-input>
+      <el-form-item :label="$t('货物毛重(KGS)')">
+        <el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入货物毛重') + '(KGS)'"></el-input>
       </el-form-item>
       <el-form-item :label="$t('立方数(CBM)')">
         <el-input v-model="subMaterialObj.cbm" :placeholder="$t('请输入立方数') + '(CBM)'"></el-input>
@@ -129,17 +129,19 @@ 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")
     this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookSeaInfo?.bigPortId||undefined)
     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: {

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -496,7 +496,7 @@ export default {
       return ''
     },
     warehouseId(){
-      return this.order?.logisticsInfoDto?.startWarehouseId
+      return this.order.adjustToDestWarehouseId || this.order?.logisticsInfoDto?.startWarehouseId
     }
   },
 

src/views/ecw/supplier/edit.vue

@@ -17,10 +17,18 @@
         </el-form-item>
       </div>
       <div>
-        <el-form-item :label="$t('合作开始时间')" prop="cooperationDateStart">
+        <el-form-item :label="$t('合作开始时间')" prop="cooperationDateStart" label-width="120px" :rules="[{
+          required: formData.areaType==1,
+          message: this.$t('请填写合作开始时间'),
+          trigger: 'change'
+        }]">
           <el-date-picker v-model="formData.cooperationDateStart" value-format="timestamp" clearable></el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('合作结束时间')" prop="cooperationDateEnd">
+        <el-form-item :label="$t('合作结束时间')" prop="cooperationDateEnd" label-width="120px" :rules="[{
+          required: formData.areaType==1,
+          message: this.$t('请填写合作结束时间'),
+          trigger: 'change'
+        }]">
           <el-date-picker v-model="formData.cooperationDateEnd" value-format="timestamp" clearable></el-date-picker>
         </el-form-item>
       </div>
@@ -856,7 +864,7 @@ export default {
     selectFile(row) {
       this.$set(this.formData.externalVO,'clearanceFileId',row.id)
       this.$set(this.formData.externalVO,'baNo',row.baNo)
-      this.$set(this.formData.externalVO,'baNo',row.baNo)
+      this.$set(this.formData.externalVO,'fromNo',row.fromNo)
       this.showFileNoDialog = false
     },
     updateFileNo(row) {