Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/query.vue

@@ -191,7 +191,7 @@
         <costForm v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :costDetail="costDetail" />
       </template>
       <template v-if="dialogConfig.type === 'error'">
-        <regError v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" />
+        <regError v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :allUsers="allUsers" />
       </template>
       <template v-if="dialogConfig.type === 'updateError'">
         <updateError v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :errorInfo="errorInfo" />
@@ -225,6 +225,7 @@ import costForm from "./costForm.vue";
 import regError from "./regError.vue";
 import editForm from "./editForm.vue";
 import updateError from "./updateError.vue";
+import { listUser } from "@/api/system/user";
 
 export default {
   name: "boxDetail",
@@ -243,6 +244,11 @@ export default {
     ).filter((item) => item.value == "1" || item.value == "2");
     this.initData();
     this.queryAllData();
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
   },
   data() {
     return {
@@ -256,6 +262,7 @@ export default {
       warehouseList: [],
       // 供应商
       allSupplier: [],
+      allUsers: [],
       // 部分list
       sectionList: [],
       // 单证数组
@@ -312,6 +319,8 @@ export default {
       // 修改异常
       errorInfo: {
         orderList: [],
+        errorType: "",
+        operate: "",
       },
     };
   },
@@ -347,6 +356,7 @@ export default {
       }
       this.getErrorType();
       this.$set(this.errorInfo, "orderList", orders);
+      this.$set(this.errorInfo, "operate", type);
       // 判断异常类型
       this.handleCommand("updateError");
     },

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

@@ -542,6 +542,7 @@ export default {
     "cusDeclarationObj.dcCustomsStatus"(val) {
       if (val !== "3") {
         this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
+        this.$set(this.cusDeclarationObj, "dcPassTime", "");
       } else {
         const { customsInfo = {} } = this.shipmentObj;
         this.$set(
@@ -574,7 +575,8 @@ export default {
     },
     // 查验状态
     "cusDeclarationObj.dcCheckStatus"(val) {
-      if (val !== this.cusDeclarationObj.dcCheckStatus) {
+      const { customsInfo = {} } = this.shipmentObj;
+      if (val != customsInfo.dcCheckStatus) {
         this.$set(this.cusDeclarationObj, "dcPassTime", "");
       }
     },

src/views/ecw/box/updateError.vue

@@ -83,11 +83,27 @@ export default {
   watch: {
     errorInfo: {
       handler: function (val) {
-        const { errorType, orderList } = val;
-        this.headerTitle = this.$t("确定给{selfNo}下的{orderNos}更新状态吗？", {
+        const { errorType, orderList, operate } = val;
+
+        if (operate === "single") {
+          this.headerTitle = this.$t(
+            "确定给{selfNo}下的{orderNos}更新状态吗？",
+            {
               selfNo: this.shipmentObj.selfNo,
               orderNos: orderList.map((item) => item.orderNo).join(",") ?? "",
-        });
+            }
+          );
+        } else {
+          this.headerTitle = this.$t(
+            `确定给{selfNo}下的${
+              operate === "all" ? "所有订单" : "所选订单"
+            }更新状态吗？`,
+            {
+              selfNo: this.shipmentObj.selfNo,
+            }
+          );
+        }
+
         switch (errorType) {
           // 报关异常
           case "customs":