修复出货的一些bug

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.prStatus>21" command="edit" v-hasPermi="['shipment:box:update']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item  command="sea" v-hasPermi="['shipment:box:action:sea']">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error" v-hasPermi="['shipment:box:action:error']">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost" v-hasPermi="['shipment:box:action:cost']">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -419,6 +419,7 @@ export default {
         case "modifyCabinet":
           this.$set(this.dialogConfig, "fullscreen", false);
           this.modifyCabinetObj = {};
+          this.$set(this.modifyCabinetObj,'cabinetId',this.shipmentObj.cabinetId)
           break;
         case "splitOrder":
           this.$set(this.dialogConfig, "fullscreen", true);

src/views/ecw/box/shippingSea/nodePage/common/supplierSelect.vue

 <template>
-  <el-select filterable :value="value === 0 ? undefined : value" @change="change" v-bind="$attrs" clearable>
-    <el-option v-for="supplier in getSuppliers" :key="supplier.id" :label="$l(supplier, 'company')" :value="supplier.id"></el-option>
+  <el-select
+    filterable
+    :value="value === 0 ? undefined : value"
+    @change="change"
+    v-bind="$attrs"
+    clearable
+  >
+    <el-option
+      v-for="supplier in getSuppliers"
+      :key="supplier.id"
+      :label="$l(supplier, 'company')"
+      :value="supplier.id"
+    ></el-option>
   </el-select>
 </template>
 
@@ -14,6 +25,10 @@ export default {
     companyType: String,
     value: Number,
     allSupplier: Array,
+    areaType: {
+      type: Number,
+      default: 0
+    },
   },
   model: {
     prop: "value",
@@ -24,9 +39,12 @@ export default {
   },
   computed: {
     getSuppliers() {
-      if (!this.companyType) return this.allSupplier;
-      return this.allSupplier.filter((item) =>
-        item.areaType == 1
+      let allSupplier = this.allSupplier.filter(
+        (item) => item.areaType == this.areaType
+      );
+      if(this.areaType == 1 || !this.companyType) return allSupplier;
+      return allSupplier.filter((item) =>
+        item.companyTypes.includes(this.companyType)
       );
     },
   },

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

@@ -23,11 +23,11 @@
         <ladingSelect v-model="subMaterialObj.shipperId" :placeholder="$t('请选择托运人')" :allUsers="this.$attrs.allLading" />
       </el-form-item>
       <el-form-item :label="$t('收货人')">
-        <el-input v-model="subMaterialObj.consigneeName" readonly></el-input>
+        <el-input v-model="subMaterialObj.consigneeName" disabled></el-input>
         <!-- <userSelect v-model="subMaterialObj.consigneeId" :placeholder="$t('请选择收货人')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item :label="$t('通知方')">
-        <el-input v-model="subMaterialObj.notifyingName" readonly></el-input>
+        <el-input v-model="subMaterialObj.notifyingName" disabled></el-input>
         <!-- <userSelect v-model="subMaterialObj.notifyingId" :placeholder="$t('请选择通知方')" :allUsers="this.$attrs.allUsers" /> -->
       </el-form-item>
       <el-form-item label="Mark & No.">
@@ -133,20 +133,23 @@ export default {
       ...oldData,
       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)
       this.$set(this.subMaterialObj,'markNo',"N/M")
       this.$set(this.subMaterialObj,'startPortId',this.shipmentObj.bookSeaInfo?.bigPortId||undefined)
+      this.$set(this.subMaterialObj,'shipCompanyId',Number(this.shipmentObj.bookSeaInfo?.shipCompanyType)||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||'/'))
-    
+    }
     
     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/box/shippingSea/nodePage/trailer.vue

@@ -7,7 +7,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('拖车公司')">
-        <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" :placeholder="$t('请选择拖车公司')" :allSupplier="this.$attrs.allSupplier" />
+        <supplierSelect v-model="trailerObj.tlCompanyId" :companyType="'4'" :areaType="0" :placeholder="$t('请选择拖车公司')" :allSupplier="this.$attrs.allSupplier" />
       </el-form-item>
       <el-form-item :label="$t('拖车时间')" prop="tlTime">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" value-format="yyyy-MM-dd HH:mm:ss" v-model="trailerObj.tlTime"></el-date-picker>