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

src/api/ecw/box.js

@@ -318,3 +318,12 @@ export function downloadLadingCopy(params) {
     params,
   });
 }
+
+// 更新异常订单状态
+export function updateAbnormalOrder(data) {
+  return request({
+    url: "/shipment/box/updateAbnormalOrder",
+    method: "post",
+    data,
+  });
+}

src/api/ecw/customer.js

@@ -285,3 +285,12 @@ export function cancelDelayApproval(data) {
     data: data,
     })
 }
+
+// 获取客户审批详情
+export function getApproval(id) {
+  return request({
+    url: '/ecw/customer-approval/get',
+    method: 'get',
+    params: {id}
+  })
+}
\ No newline at end of file

src/utils/dict.js

@@ -203,7 +203,14 @@ export const DICT_TYPE = {
   BOX_SEA_AIR: 'shipping_process_sea_air', // 海空联运流程流程
   BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
   BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型
-  BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state'
+  BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state',
+  BOX_INSPECTION_TIME_CUSTOMS: 'inspection_time_customs', // 校验时间-报关
+  BOX_INSPECTION_TIME_SHIPPING: 'inspection_time_shipping', // 校验时间-起运
+  BOX_INSPECTION_TIME_ARRIVAL: 'inspection_time_arrival', // 校验时间-到港
+  BOX_SHIPPING_UPDATE_TYPE: "shipping_update_type",// 更新类型
+  BOX_CUSTOMS_ERROR_TYPE: "customs_error_type",// 报关异常状态
+  BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
+  BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
 }
 
 /**

src/views/bpm/processInstance/detail.vue

@@ -331,6 +331,12 @@ export default {
           id: this.processInstance.businessKey,
           path: this.processInstance.processDefinition?.formCustomViewPath
         },
+        // 客户延期
+        customer_delay:{
+          component: () => import('@/views/ecw/customer/components/Delay'),
+          id: this.processInstance.businessKey,
+          path: this.processInstance.processDefinition?.formCustomViewPath
+        },
       }
       console.log(this.processInstance.processDefinition.formCustomViewPath.trim())
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]

src/views/ecw/box/indexSea.vue

@@ -178,7 +178,7 @@
             </el-table-column>
             <el-table-column :label="$t('操作')" align="center" width="80">
               <template slot-scope="scope">
-                <el-button type="text" @click="handleCommand(scope.row, 'sea')">{{$t('处理')}}</el-button>
+                <el-button type="text" @click="handleCommand(scope.row, 'handle')">{{$t('处理')}}</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -372,7 +372,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm(this.$t('是否确认删除出货编号为 {no} 的数据项?', {no: row.selfNo}))
+        .confirm(
+          this.$t("是否确认删除出货编号为 {no} 的数据项?", { no: row.selfNo })
+        )
         .then(function () {
           return deletebox(row.id);
         })
@@ -432,11 +434,14 @@ export default {
 
         case "editLadingBill":
           const cabinetLabel = this.getCabinetName(row.cabinetId);
-          const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}', {
+          const title = this.$t(
+            "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+            {
               selfNo: row.selfNo,
               cubNo: row.cubNo,
-            cabinetLabel: cabinetLabel
-          })
+              cabinetLabel: cabinetLabel,
+            }
+          );
           this.$set(this.dialogCfg, "title", title);
           this.$set(this.dialogCfg, "fullscreen", true);
           break;
@@ -453,7 +458,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('预装单')+`(${row.selfNo}).xlsx`,
+            this.$t("预装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -461,7 +466,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('已装单') + `(${row.selfNo}).xlsx`,
+            this.$t("已装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -469,7 +474,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('应收汇总表') + `(${row.selfNo}).xlsx`,
+            this.$t("应收汇总表") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -486,6 +491,16 @@ export default {
         case "downloadLadingCopy":
           downloadFileByUrl(command, { shipmentId: row.id });
           break;
+        case "handle":
+          const { noticeType } = row;
+          if ([1, 2, 3, 4, 8].includes(noticeType)) {
+            this.$router.push("/boxSea/shippingSea/" + row.id);
+          }
+          if ([5, 6, 7].includes(noticeType)) {
+            this.$router.push("/boxSea/query/" + row.id);
+          }
+          this.closeDialog();
+          break;
       }
 
       if (["editLadingBill", "cost", "error"].includes(command)) {

src/views/ecw/box/regError.vue

@@ -17,12 +17,17 @@
       <el-form-item :label="$t('异常情况')">
         <el-input v-model="errorObj.abnDetail" type="textarea" rows="2" :placeholder="$t('请输入异常情况')"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('异常时间')" prop="arrivalTime" class="two-element">
+      <el-form-item :label="$t('异常时间')" prop="arrivalTime" class="three-element">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnStartTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="errorObj.abnEndTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <div class="delayTime">延迟时间：{{delayDay}}天</div>
       </el-form-item>
 
-      <el-form-item :label="$t('是否更新订单状态')">
+      <el-form-item :label="$t('通知人')">
+        <userSelect v-model="errorObj.notifyUsers" :placeholder="$t('请选择通知人')" :allUsers="this.$attrs.allUsers" multiple />
+      </el-form-item>
+
+      <!-- <el-form-item :label="$t('是否更新订单状态')">
         <el-radio-group v-model="errorObj.orderStatus">
           <el-radio v-for="item in status" :key="item.value" :label="item.value">{{item.label}}</el-radio>
         </el-radio-group>
@@ -32,7 +37,7 @@
       </el-form-item>
       <el-form-item :label="$t('英文内容')">
         <el-input v-model="errorObj.contentEn" type="textarea" rows="2" :placeholder="$t('请输入英文内容')"></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row class="operate-button">
@@ -45,12 +50,16 @@
 <script>
 import { abnormalCreate } from "@/api/ecw/boxSea";
 import { serviceMsg } from "./shippingSea/utils";
+import userSelect from "./shippingSea/nodePage/common/userSelect.vue";
+import dayjs from "dayjs";
+
 /**
  * 异常登记
  */
 export default {
   name: "regError",
   inheritAttrs: false,
+  components: { userSelect },
   data() {
     return {
       // 异常对象
@@ -66,23 +75,47 @@ export default {
           label: this.$t("否"),
         },
       ],
-      flag: 'sea'
+      flag: "sea",
+      delayDay: 0,
     };
   },
   created() {
     const { currNode } = this.$attrs;
     this.errorObj = { opStep: currNode?.dataKey ?? undefined };
-    if(this.$attrs.shipmentObj.bosType == 'seaAir'){
-      this.flag = 'seaAir';
+    if (this.$attrs.shipmentObj.bosType == "seaAir") {
+      this.flag = "seaAir";
     }
   },
+  watch: {
+    // 异常开始时间
+    "errorObj.abnStartTime"(val) {
+      this.compareDate(val, this.errorObj.abnEndTime);
+    },
+    // 异常结束时间
+    "errorObj.abnEndTime"(val) {
+      this.compareDate(this.errorObj.abnStartTime, val);
+    },
+  },
   methods: {
+    // 时间比较
+    compareDate(abnStartTime, abnEndTime) {
+      this.delayDay = 0;
+      let date1 = null,
+        date2 = null;
+      if (abnStartTime) date1 = dayjs(abnStartTime);
+      if (abnEndTime) date2 = dayjs(abnEndTime);
+      if (date1 && date2) {
+        this.delayDay = date2.diff(date1, "day");
+      }
+    },
     /** 提交 */
     onSubmit() {
       this.$refs["errorForm"].validate((valid) => {
         if (valid) {
           abnormalCreate({
             ...this.errorObj,
+            delayDays: this.delayDay,
+            notifyUsers: this.errorObj.notifyUsers?.join(",") ?? "",
             shipmentId: this.$attrs.shipmentObj.id,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
@@ -108,18 +141,14 @@ export default {
   .operate-button {
     text-align: center;
   }
-  .two-element-formItem {
-    display: flex;
-    > :last-child {
-      width: 100%;
-      margin-left: 10px;
-    }
-  }
-  .two-element {
+  .three-element {
     .el-form-item__content {
       display: flex;
-      > :last-child {
-        margin-left: 10px;
+      > .el-date-editor {
+        margin-right: 10px;
+      }
+      > .delayTime {
+        width: 300px;
       }
     }
   }

src/views/ecw/box/shippingDetail.vue

@@ -93,7 +93,6 @@
 import { approvalDetail } from "@/api/ecw/box";
 import {
   getSeaStatus,
-  getStatusName,
   getTotlContent,
 } from "./shippingSea/utils";
 import { getCabinetPage } from "@/api/ecw/cabinet";
@@ -196,12 +195,6 @@ export default {
         }
       };
     },
-    /* 货柜状态 */
-    getCabinetStatus() {
-      return (shippingVO) => {
-        return getStatusName(getSeaStatus(shippingVO));
-      };
-    },
     /* 体积重量 */
     getVolumeWeight() {
       return (total) => {

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

@@ -24,7 +24,7 @@
 
     <!-- 对话框 -->
     <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
-      <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
+      <regError @closeDialog="regCloseDialog" v-bind="$attrs" />
     </el-dialog>
   </div>
 </template>
@@ -50,12 +50,17 @@ export default {
       arrivalObj: {},
       // 校验
       rules: {
-        apRealTime: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        apRealTime: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
       },
       // 弹窗配置
       dialogVisible: false,
       // 提示消息
       showMsg: false,
+      inspectionTimeArrival: this.getDictDatas(
+        this.DICT_TYPE.BOX_INSPECTION_TIME_ARRIVAL
+      )[0].value,
     };
   },
   created() {
@@ -76,11 +81,19 @@ export default {
     },
   },
   methods: {
+    regCloseDialog(type) {
+      this.dialogVisible = false;
+      if (type === "error") {
+        this.$emit("getBoxInfo");
+      }
+    },
     // 获取预计到港时间
     getExpectedTime() {
       const { shippingInfo } = this.$attrs.shipmentObj;
       if (shippingInfo) {
-        return dayjs(shippingInfo.dtEstArrivalTime).format("YYYY-MM-DD HH:mm:ss");
+        return dayjs(shippingInfo.dtEstArrivalTime).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
       }
       return null;
     },
@@ -93,7 +106,7 @@ export default {
       if (apConfirmTime) date2 = dayjs(apConfirmTime);
       if (date1 && date2) {
         const days = date2.diff(date1, "day");
-        if (days > 5) {
+        if (days > this.inspectionTimeArrival) {
           this.showMsg = true;
         }
       }

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

@@ -35,6 +35,9 @@
       <el-form-item :label="$t('截关时间')">
         <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcCutOffTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
+      <el-form-item :label="$t('报关时间')" prop="dcDecTime">
+        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cusDeclarationObj.dcDecTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
       <el-form-item :label="$t('状态')" prop="dcCustomsStatus">
         <el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || isCheckDeal('status')">
           <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{item.label}}</el-radio>
@@ -88,6 +91,7 @@
       <el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
       <el-button type="primary" @click="extraCost" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'">{{$t('额外费用')}}</el-button>
+      <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button>
     </el-row>
 
     <!-- 对话框 -->
@@ -141,6 +145,11 @@
         </el-row>
       </el-row>
     </el-dialog>
+
+    <!-- 对话框 -->
+    <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="regDialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
+      <regError @closeDialog="regCloseDialog" v-bind="$attrs" :shipmentObj="shipmentObj" />
+    </el-dialog>
   </div>
 </template>
 
@@ -165,6 +174,8 @@ import {
 } from "../utils";
 import ImageUpload from "@/components/ImageUpload";
 import Decimal from "decimal.js";
+import regError from "../../regError";
+import dayjs from "dayjs";
 
 /**
  * 报关
@@ -172,7 +183,7 @@ import Decimal from "decimal.js";
 export default {
   name: "cusDeclaration",
   inheritAttrs: false,
-  components: { supplierSelect, ImageUpload },
+  components: { supplierSelect, ImageUpload, regError },
   props: {
     shipmentObj: Object,
   },
@@ -194,6 +205,9 @@ export default {
         dcCustomsStatus: [
           { required: true, message: this.$t("必填"), trigger: "change" },
         ],
+        dcDecTime: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
       },
       // 弹窗配置
       dialogConfig: {
@@ -208,6 +222,12 @@ export default {
       costList: [],
       // 是否审核中
       inReview: false,
+      // 异常登记
+      regDialogVisible: false,
+      isShowError: false,
+      inspectionTimecustoms: this.getDictDatas(
+        this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
+      )[0].value,
     };
   },
   created() {
@@ -228,15 +248,39 @@ export default {
       "dcCutOffTime",
       "dcCheckTime",
       "dcPassTime",
+      "dcDecTime",
     ]);
     oldData = formatNumberString(oldData, [
       "dcCustomsType",
       "dcCustomsStatus",
       "dcCheckStatus",
     ]);
+
     this.cusDeclarationObj = oldData;
   },
   methods: {
+    regCloseDialog(type) {
+      this.regDialogVisible = false;
+      if (type === "error") {
+        this.$emit("getBoxInfo");
+      }
+    },
+    // 时间比较
+    compareDate(dcDecTime, dcPassTime) {
+      this.isShowError = false;
+      let date1 = null,
+        date2 = null;
+      if (dcDecTime) date1 = dayjs(dcDecTime);
+      if (dcPassTime) date2 = dayjs(dcPassTime);
+      if (date1 && date2) {
+        const delayDay = date2.diff(date1, "day");
+        if (delayDay >= this.inspectionTimecustoms) this.isShowError = true;
+      }
+    },
+    // 异常登记
+    exceptionReg() {
+      this.regDialogVisible = true;
+    },
     /* 跳转订单详情 */
     jumpOrderDetail(row) {
       this.$router.push({
@@ -520,6 +564,20 @@ export default {
         }
       },
     },
+    // 报关时间
+    "cusDeclarationObj.dcDecTime"(val) {
+      this.compareDate(val, this.cusDeclarationObj.dcPassTime);
+    },
+    // 放行时间
+    "cusDeclarationObj.dcPassTime"(val) {
+      this.compareDate(this.cusDeclarationObj.dcDecTime, val);
+    },
+    // 查验状态
+    "cusDeclarationObj.dcCheckStatus"(val) {
+      if (val !== this.cusDeclarationObj.dcCheckStatus) {
+        this.$set(this.cusDeclarationObj, "dcPassTime", "");
+      }
+    },
   },
   computed: {
     /* 获取报关审核退场状态文字 */

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

@@ -19,12 +19,12 @@
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
       <el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
-      <el-button type="primary" @click="exceptionReg" :disabled="!showMsg">{{$t('异常登记')}}</el-button>
+      <el-button type="primary" @click="exceptionReg" :disabled="!isShowError">{{$t('异常登记')}}</el-button>
     </el-row>
 
     <!-- 对话框 -->
     <el-dialog custom-class="shipping-dialog" :title="$t('票异常')" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
-      <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
+      <regError @closeDialog="regCloseDialog" v-bind="$attrs" />
     </el-dialog>
   </div>
 </template>
@@ -56,6 +56,11 @@ export default {
       dialogVisible: false,
       // 提示消息
       showMsg: false,
+      // 异常登记
+      isShowError: false,
+      inspectionTimeShipping: this.getDictDatas(
+        this.DICT_TYPE.BOX_INSPECTION_TIME_SHIPPING
+      )[0].value,
     };
   },
   created() {
@@ -69,9 +74,16 @@ export default {
     // 实际开船时间
     "departureObj.dtRealShipTime"(val) {
       this.compareDate(val, this.getSailingTime());
+      this.compareDate1(val, this.getSailingTime());
     },
   },
   methods: {
+    regCloseDialog(type) {
+      this.dialogVisible = false;
+      if (type === "error") {
+        this.$emit("getBoxInfo");
+      }
+    },
     // 时间比较
     compareDate(dtRealShipTime, sailTime) {
       this.showMsg = false;
@@ -83,6 +95,17 @@ export default {
         this.showMsg = true;
       }
     },
+    compareDate1(dtRealShipTime, sailTime) {
+      this.isShowError = false;
+      let date1 = null,
+        date2 = null;
+      if (dtRealShipTime) date1 = dayjs(dtRealShipTime);
+      if (sailTime) date2 = dayjs(sailTime);
+      if (date1 && date2) {
+        const delayDay = date1.diff(date2, "day");
+        if (delayDay >= this.inspectionTimeShipping) this.isShowError = true;
+      }
+    },
     // 异常登记
     exceptionReg() {
       this.dialogVisible = true;

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -236,6 +236,10 @@ export default {
 
           if (end.includes(val[keyName])) {
             node.currStatus = "end";
+            // 判断是否存在异常未处理
+            if (val[voName].hasAbnormal) {
+              continue;
+            }
             // 报关
             if (type === "cusDeclaration") {
               const { dcCustomsStatus, dcCheckStatus } = val;

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

@@ -45,7 +45,7 @@ import { getDockPage } from "@/api/ecw/dock";
 import { listUser } from "@/api/system/user";
 
 // 这里引入的数据切换语言后要刷新才生效，优化办法是label同时配备labelEn字段，然后再页面上用$l函数调用
-import { getSeaStatus, getStatusName, seaBaseData } from "./utils";
+import { seaBaseData } from "./utils";
 /**
  * 海运操作主页面
  */
@@ -115,12 +115,6 @@ export default {
       });
     },
   },
-  watch: {
-    /* 监听发货对象 */
-    shipmentObj(val) {
-      // this.statusLabel = getStatusName(getSeaStatus(val));
-    },
-  },
 };
 </script>
 

src/views/ecw/box/shippingSea/utils.js

@@ -4,79 +4,6 @@ import FileSaver from "file-saver";
 import Decimal from "decimal.js";
 import i18n from "@/i18n";
 
-/**
- * 节点状态值
- *
- * @return {*}
- */
-function getStatusName(statu) {
-  const statusName = new Map();
-
-  statusName.set(11, i18n.$t("未订舱"));
-  statusName.set(12, i18n.$t("已订舱"));
-
-  statusName.set(21, i18n.$t("未预装"));
-  statusName.set(22, i18n.$t("预装中"));
-  statusName.set(23, i18n.$t("预装审核中"));
-  statusName.set(24, i18n.$t("预装审核失败"));
-  statusName.set(25, i18n.$t("预装审核成功"));
-
-  statusName.set(2111, i18n.$t("未理货"));
-  statusName.set(2112, i18n.$t("已理货"));
-
-  statusName.set(31, i18n.$t("未派车"));
-  statusName.set(32, i18n.$t("已派车"));
-
-  statusName.set(41, i18n.$t("未装柜"));
-  statusName.set(42, i18n.$t("装柜中"));
-  statusName.set(43, i18n.$t("已装柜、待封柜"));
-  statusName.set(44, i18n.$t("封柜审核中"));
-  statusName.set(45, i18n.$t("封柜审核失败"));
-  statusName.set(46, i18n.$t("封柜审核成功"));
-  statusName.set(47, i18n.$t("已封柜，待出仓"));
-
-  statusName.set(51, i18n.$t("未报关"));
-  statusName.set(52, i18n.$t("报关中"));
-  statusName.set(53, i18n.$t("已报关"));
-
-  statusName.set(61, i18n.$t("未配船"));
-  statusName.set(62, i18n.$t("已配船"));
-
-  statusName.set(71, i18n.$t("未提单补料"));
-  statusName.set(72, i18n.$t("已提单补料"));
-
-  statusName.set(81, i18n.$t("未驳船"));
-  statusName.set(82, i18n.$t("已驳船"));
-
-  statusName.set(91, i18n.$t("未起运"));
-  statusName.set(92, i18n.$t("已起运"));
-
-  statusName.set(101, i18n.$t("未上传"));
-  statusName.set(102, i18n.$t("已上传"));
-
-  statusName.set(111, i18n.$t("未清关文件"));
-  statusName.set(112, i18n.$t("已清关文件"));
-
-  statusName.set(121, i18n.$t("未到港"));
-  statusName.set(122, i18n.$t("已到港"));
-
-  statusName.set(131, i18n.$t("未清关"));
-  statusName.set(132, i18n.$t("已清关"));
-
-  statusName.set(181, i18n.$t("未卸柜"));
-  statusName.set(182, i18n.$t("卸柜中"));
-  statusName.set(183, i18n.$t("卸柜审核中"));
-  statusName.set(184, i18n.$t("卸柜审核失败"));
-  statusName.set(185, i18n.$t("卸柜审核成功"));
-  statusName.set(186, i18n.$t("已卸柜"));
-
-  statusName.set(191, i18n.$t("未结算"));
-  statusName.set(192, i18n.$t("结算中"));
-  statusName.set(193, i18n.$t("已结算"));
-
-  return statusName.get(statu);
-}
-
 /**
  * 海运流程
  *
@@ -1537,7 +1464,6 @@ function downloadFileByUrl(funName, params) {
 }
 
 export {
-  getStatusName,
   getColmnMapping,
   getSeaStatus,
   seaBaseData,

src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue

@@ -44,7 +44,7 @@ import { getSupplierPage } from "@/api/ecw/supplier";
 import { getChannelList } from '@/api/ecw/channel';
 import { getDockPage } from "@/api/ecw/dock";
 import { listUser } from "@/api/system/user";
-import { getSeaStatus, getStatusName, seaAirBaseData } from "../shippingSea/utils";
+import { seaAirBaseData } from "../shippingSea/utils";
 import {arrryToKeyedObjectBy} from '@/utils/index'
 
 /**
@@ -130,12 +130,6 @@ export default {
       });
     },
   },
-  watch: {
-    /* 监听发货对象 */
-    shipmentObj(val) {
-      this.statusLabel = getStatusName(getSeaStatus(val));
-    },
-  },
 };
 </script>
 

src/views/ecw/box/updateError.vue

+<template>
+  <div class="shipping-update-error">
+    <!-- 更新报关异常状态 -->
+    <div class="message-title">{{headerTitle}}</div>
+    <el-form ref="updateErrorForm" :rules="rules" :model="updateObj" label-width="140px">
+      <el-form-item :label="$t('更新类型')" prop="type">
+        <el-radio-group v-model="updateObj.type">
+          <el-radio v-for="item in this.getDictDatas(this.DICT_TYPE.BOX_SHIPPING_UPDATE_TYPE)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item :label="$t('更新订单状态')">
+        <el-radio-group v-model="updateObj.updateOrder">
+          <el-radio v-for="item in types" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="customize">
+        <el-input v-model="updateObj.customize" :placeholder="$t('请输入')" :disabled="!isEnter"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-row class="operate-button">
+      <el-button type="primary" @click="onSubmit">{{$t('提交')}}</el-button>
+      <el-button @click="cancel">{{$t('关闭')}}</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { updateAbnormalOrder } from "@/api/ecw/box";
+import { serviceMsg } from "./shippingSea/utils";
+
+export default {
+  name: "updateError",
+  inheritAttrs: false,
+  components: {},
+  props: {
+    shipmentObj: Object,
+    errorInfo: Object,
+  },
+  data() {
+    return {
+      updateObj: {},
+      rules: {
+        type: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+      },
+      types: [],
+      isEnter: false,
+      headerTitle: "",
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs["updateErrorForm"].validate((valid) => {
+        if (valid) {
+          let text = "";
+          // 自定义
+          if (this.updateObj.updateOrder === "0") {
+            text = this.updateObj.customize;
+          } else {
+            const dict = this.types.find(
+              (item) => item.value === this.updateObj.updateOrder
+            );
+            text = this.$l(dict, "label");
+          }
+
+          const { orderList } = this.errorInfo;
+          updateAbnormalOrder({
+            shipmentId: this.shipmentObj.id,
+            orderIdList: orderList.map((item) => item.orderId) ?? [],
+            type: this.updateObj.type,
+            text,
+          }).then((res) => {
+            serviceMsg(res, this).then(() => {
+              this.$emit("closeDialog", "detail");
+            });
+          });
+        }
+      });
+    },
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+  watch: {
+    errorInfo: {
+      handler: function (val) {
+        const { errorType, orderList } = val;
+        this.headerTitle = this.$t("确定给{selfNo}下的{orderNos}更新状态吗？", {
+          selfNo: this.shipmentObj.selfNo,
+          orderNos: orderList.map((item) => item.orderNo).join(",") ?? "",
+        });
+        switch (errorType) {
+          // 报关异常
+          case "customs":
+            this.types = this.getDictDatas(
+              this.DICT_TYPE.BOX_CUSTOMS_ERROR_TYPE
+            );
+            break;
+          case "shipping":
+            this.types = this.getDictDatas(
+              this.DICT_TYPE.BOX_SHIPPING_ERROR_TYPE
+            );
+            break;
+          case "arrival":
+            this.types = this.getDictDatas(
+              this.DICT_TYPE.BOX_ARRIVAL_ERROR_TYPE
+            );
+            break;
+        }
+      },
+      immediate: true,
+    },
+    "updateObj.updateOrder"(val) {
+      if (val === "0") {
+        this.isEnter = true;
+        this.rules.customize = [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ];
+      } else {
+        this.isEnter = false;
+        this.rules.customize = [];
+        this.$refs["updateErrorForm"].clearValidate("customize");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.shipping-update-error {
+  .message-title {
+    text-align: center;
+    font-size: 20px;
+    margin: 0 20px 10px;
+  }
+}
+</style>

src/views/ecw/customer/components/Delay.vue

+<template>
+    <div>
+        <el-descriptions :column="4">
+            <el-descriptions-item label="客户编号">{{detail.customerId}}</el-descriptions-item>
+            <el-descriptions-item label="客户名称">{{detail.customerName}}</el-descriptions-item>
+            <el-descriptions-item label="跟进客服">{{detail.followUpSalesmanName}}</el-descriptions-item>
+            <el-descriptions-item label="创建时间">{{detail.createTime|parseTime}}</el-descriptions-item>
+            <el-descriptions-item label="申请凭证" :span="4">
+                <el-image v-for="(item, index) in pictures" :key="index" :src="item" style="width:100px; height:100px" :preview-src-list="pictures"></el-image>
+            </el-descriptions-item>
+            <el-descriptions-item label="申请原因" :span="4">{{detail.reason}}</el-descriptions-item>
+        </el-descriptions>
+    </div>
+</template>
+<script>
+import { getApproval } from '@/api/ecw/customer';
+import {parseTime} from '@/utils/ruoyi'
+export default {
+    filters: {parseTime},
+    props:{
+        id: [String, Number]
+    },
+    data(){
+        return {
+            info: null
+        }
+    },
+    computed:{
+        detail(){
+            if(!this.info) return null
+            return JSON.parse(this.info.details)
+        },
+        pictures(){
+            if(!this.detail) return []
+            return this.detail.voucher.split(',').filter(item => !!item)
+        }
+    },
+    created(){
+        getApproval(this.id).then(res => {
+            this.info = res.data
+        })
+    }
+}
+</script>
\ No newline at end of file

src/views/ecw/customer/edit.vue

@@ -35,6 +35,11 @@
                 <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" form-type="checkbox" multiple v-model="form.type"></dict-selector>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('货运类型')" prop="transportType">
+                <dict-selector :type="DICT_TYPE.TRANSPORT_TYPE" form-type="checkbox" multiple v-model="form.transportType"></dict-selector>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('常用提货网点')" prop="pickupPoint">
                 <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
@@ -661,7 +666,7 @@ export default {
             return
           }
 
-          const form = {...this.form, type: this.form.type?.join(','), taxRate: Number(this.form.taxRate)}
+          const form = {...this.form, type: this.form.type?.join(','), transportType: this.form.transportType?.join(','), taxRate: Number(this.form.taxRate)}
 
           // 检查路线是否启用了但是没选择目的仓
           let errors = 0

src/views/system/internalHelpDoc/index.vue

@@ -9,8 +9,8 @@
       <el-form-item label="标题英文" prop="titleEn">
         <el-input v-model="queryParams.titleEn" placeholder="请输入标题英文" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="0-启用,1-停用" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择0-启用,1-停用" clearable size="small">
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
@@ -45,7 +45,7 @@
       <el-table-column label="标题英文" align="center" prop="titleEn" />
       <el-table-column label="内容中文" align="center" prop="contentZh" />
       <el-table-column label="内容英语" align="center" prop="contentEn" />
-      <el-table-column label="0-启用,1-停用" align="center" prop="status" />
+      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>