修改海运缺陷单

src/views/ecw/box/indexSea.vue

@@ -156,7 +156,7 @@
         <costForm v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
       </template>
       <template v-if="dialogCfg.dialogType === 'error'">
-        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" />
+        <regError v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :allUsers="allUsers"/>
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
         <ladingBill v-if="dialogCfg.open" @closeDialog="closeDialog" :shipmentObj="currRow" :getCabinetName="getCabinetName" />
@@ -212,6 +212,7 @@ import costForm from "./costForm.vue";
 import regError from "./regError.vue";
 import editForm from "./editForm.vue";
 import ladingBill from "./ladingBill/index.vue";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "EcwBoxIndexsea",
@@ -266,6 +267,7 @@ export default {
       countryList: [],
       // 通知列表
       noticeList: [],
+      allUsers: [],
     };
   },
   computed: {
@@ -301,6 +303,11 @@ export default {
     this.getList();
     this.getCountryList();
     this.queryNotice();
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
   },
   methods: {
     formatDate,

src/views/ecw/box/indexSeaAir.vue

@@ -290,6 +290,7 @@
           v-if="dialogCfg.open"
           @closeDialog="closeDialog"
           :shipmentObj="currRow"
+          :allUsers="allUsers"
         />
       </template>
       <template v-if="dialogCfg.dialogType === 'editLadingBill'">
@@ -318,6 +319,7 @@ import costForm from './costForm.vue'
 import regError from './regError.vue'
 import editForm from './editSeaAirForm.vue'
 import ladingBill from "./ladingBill/index.vue";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: 'EcwBoxIndexseaair',
@@ -379,6 +381,7 @@ export default {
       cabinetList: [],
       channelList: [],
       warehouseList: [],
+      allUsers: []
     }
   },
   computed: {
@@ -418,6 +421,11 @@ export default {
     }
   },
   created() {
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
     this.transportTypes = this.getDictDatas(
       this.DICT_TYPE.ECW_TRANSPORT_TYPE
     ).filter((item) => item.value == '4')

src/views/ecw/box/ladingBill/index.vue

@@ -26,7 +26,7 @@
         </el-table-column>
         <el-table-column :label="$t('控货')" align="center" prop="">
           <template slot-scope="scope">
-            {{scope.row.isCargoControl}}
+            {{scope.row.isCargoControl ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column :label="$t('计划箱数')" align="center" prop="loadNum">
@@ -50,7 +50,7 @@
             {{ scope.row.loadWeight }}kg
           </template>
         </el-table-column>
-          <el-table-column :label="$t(' 跟进客服')" align="center" prop="" />
+        <el-table-column :label="$t(' 跟进客服')" align="center" prop="" />
         <el-table-column :label="$t('制作')" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <!-- 0 （未制作提货单）  1（审核中） 2（审核通过） 3（审核拒绝） -->
@@ -158,7 +158,7 @@ export default {
       if (type === "query") {
         this.getBillList();
       }
-      if(type === 'close'){
+      if (type === "close") {
         this.$emit("closeDialog");
       }
     },

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

@@ -77,7 +77,7 @@
       <!-- <el-form-item :label="$t('装箱单')">
         <el-button type="primary">{{$t('下载装箱单')}}</el-button>
       </el-form-item> -->
-      <el-form-item :label="$t('报关单')">
+      <el-form-item :label="$t('报关单')" v-show="isDownload">
         <el-button type="primary" @click="downloadCusFile">{{$t('下载所有报关单')}}</el-button>
       </el-form-item>
 
@@ -228,6 +228,7 @@ export default {
       inspectionTimecustoms: this.getDictDatas(
         this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
       )[0].value,
+      isDownload: false,
     };
   },
   created() {
@@ -533,6 +534,12 @@ export default {
     },
   },
   watch: {
+    "cusDeclarationObj.documentInfo"(val) {
+      this.isDownload = false;
+      if (val.includes("2")) {
+        this.isDownload = true;
+      }
+    },
     "cusDeclarationObj.dcBoxWgt"(dcBoxWgt) {
       this.calcVGM(dcBoxWgt, this.cusDeclarationObj.dcGoodsWgt);
     },

src/views/ecw/box/shippingSea/nodePage/unloading/index.vue

@@ -2,7 +2,9 @@
   <div>
     <el-form ref="unloadingForm" :model="unloadingObj" label-width="100px">
       <el-form-item :label="$t('网点')">
-        <dockSelect v-model="unloadingObj.ulOutletsId" :placeholder="$t('请选择网点')" :allDocks="this.$attrs.allDocks" />
+        <el-select filterable v-model="unloadingObj.ulOutletsId" clearable>
+          <el-option v-for="node in nodes" :key="node.id" :label="$l(node, 'title')" :value="node.id"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('到仓时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -30,7 +32,7 @@
 import startUnloading from "./startUnloading.vue";
 import { unloadCreate } from "@/api/ecw/boxSea";
 import { formatDateStr, serviceMsg } from "../../utils";
-import dockSelect from "../common/dockSelect.vue";
+import { getNodePage } from "@/api/ecw/node";
 
 /**
  * 卸柜
@@ -38,13 +40,14 @@ import dockSelect from "../common/dockSelect.vue";
 export default {
   name: "unloading",
   inheritAttrs: false,
-  components: { startUnloading, dockSelect },
+  components: { startUnloading },
   data() {
     return {
       // 清关对象
       unloadingObj: {},
       // 弹窗状态
       dialogVisible: false,
+      nodes: [],
     };
   },
   created() {
@@ -52,6 +55,10 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["ulWarehouseTime", "ulBoxTime"]);
     this.unloadingObj = oldData;
+    getNodePage({ pageNo: 1, pageSize: 1000, status: 0 }).then((res) => {
+      const { data } = res;
+      this.nodes = data?.list ?? [];
+    });
   },
   methods: {
     /** 提交 */