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

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

@@ -197,7 +197,7 @@ export function customerCreditLogPage(params){
 //客户详情订单分页
 export function infoListOrderPage(params){
   return request({
-    url:'/customer/detail/infoList/orderPage',
+    url:'/ecw/order/customer-order-page',
     method:'get',
     params
   })
@@ -259,3 +259,46 @@ export function getCustomerLines(customerId){
   })
 }
 
+// 获取客户延期调入公海池的审批详情
+export function getDelayInfo(query) {
+  return request({
+    url: '/ecw/customer/delay/approval/info',
+    method: 'get',
+    params: query
+  })
+}
+
+//客户延期调入公海池的审批申请
+export function creatDelayApproval(data){
+  return request({
+    url:'/ecw/customer/delay/approval',
+    method:'post',
+    data
+  })
+}
+
+// 取消客户延期调入公海池的审批申请
+export function cancelDelayApproval(query) {
+  return request({
+    url: '/ecw/customer/cancel/delay/approval',
+    method: 'put',
+     params:query,
+    })
+}
+
+// 获取客户审批详情
+export function getApproval(id) {
+  return request({
+    url: '/ecw/customer-approval/get',
+    method: 'get',
+    params: {id}
+  })
+}
+//调入公海池
+export function testEnterToOpenSea(customerId) {
+  return request({
+    url: '/ecw/customer/test-enter-to-open-sea',
+    method: 'get',
+    params: {customerId}
+  })
+}

src/api/ecw/customerFollow.js

@@ -36,6 +36,13 @@ export function getCustomerFollow(id) {
 
 // 获得跟进分页
 export function getCustomerFollowPage(query) {
+  return request({
+    url: '/customer/detail/infoList/followPage',
+    method: 'get',
+    params: query
+  })
+}
+export function getCustomerFollowPage2(query) {
   return request({
     url: '/ecw/customer-follow/page',
     method: 'get',

src/api/ecw/indirectCustomer.js

+// 导出客户 Excel
+import request from '@/utils/request'
+import query from "@/views/ecw/customer/query";
+import * as url from "url";
+
+export function exportCustomerExcel(query) {
+  return request({
+    url: '/ecw/indirect-customer/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得客户
+export function getCustomer(id) {
+  return request({
+    url: '/ecw/indirect-customer/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得客户分页
+export function getCustomerPage(query) {
+  return request({
+    url: '/ecw/indirect-customer/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新客户
+export function updateCustomer(data) {
+  return request({
+    url: '/ecw/indirect-customer/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 根据客户ID获得联系人列表
+export function getCustomerContactsListByCustomer(query) {
+  return request({
+    url: '/ecw/indirect-customer-contacts/list-by-customer',
+    method: 'get',
+    params: query
+  })
+}

src/api/ecw/order.js

@@ -181,6 +181,15 @@ export function orderWarehouseInUpdateLabel(data){
   })
 }
 
+// 入仓修改储位
+export function saveOrUpdateOrderLocation(data){
+  return request({
+    url: '/order/order-warehouse-in/save-or-update-order-location',
+    method: 'post',
+    data
+  })
+}
+
 // 获取入仓修改审批单详情-审批使用
 export function getWarehouseUpdateApprovalInfo(id) {
   return request({

src/api/system/internalHelpDoc.js

+import request from '@/utils/request'
+
+// 创建对内帮助文档
+export function createInternalHelpDoc(data) {
+  return request({
+    url: '/system/internal-help-doc/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新对内帮助文档
+export function updateInternalHelpDoc(data) {
+  return request({
+    url: '/system/internal-help-doc/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除对内帮助文档
+export function deleteInternalHelpDoc(id) {
+  return request({
+    url: '/system/internal-help-doc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得对内帮助文档
+export function getInternalHelpDoc(id) {
+  return request({
+    url: '/system/internal-help-doc/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得对内帮助文档分页
+export function getInternalHelpDocPage(query) {
+  return request({
+    url: '/system/internal-help-doc/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出对内帮助文档 Excel
+export function exportInternalHelpDocExcel(query) {
+  return request({
+    url: '/system/internal-help-doc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/components/CustomerFollow/index.vue

@@ -47,13 +47,13 @@
       >
       </el-table-column>
       <el-table-column
-        prop="followUserId"
-        label="跟进业务"
-        :formatter="(row, column, cellValue) => serviceUserList.find(e => e.id === cellValue) ? serviceUserList.find(e => e.id === cellValue).nickname : ''"
+        prop="followUserName"
+        label="客户经理 "
       >
       </el-table-column>
     </el-table>
-
+    <pagination  :total="total" :page.sync="pageNo" :limit.sync="pageSize"
+                @pagination="getCustomerFollowList"/>
     <el-dialog
       append-to-body
       title="客户跟进"
@@ -65,7 +65,8 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="跟进类型" required>
-              <dict-selector ref="dictType" form-type="radio" v-model="customerFollow.form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector>
+              <!-- <dict-selector ref="dictType" form-type="radio" v-model="customerFollow.form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector> -->
+              <el-radio v-model="customerFollow.form.followType" label="3">{{$t('投诉回访')}}</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -86,7 +87,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="跟进业务" required>
+            <el-form-item label="客户经理" required>
               <el-select v-model="customerFollow.form.followUserId" placeholder="请选择">
                 <el-option
                   v-for="item in serviceUserList"
@@ -123,7 +124,7 @@
 </template>
 
 <script>
-import {createCustomerFollow, getCustomerFollowPage} from "@/api/ecw/customerFollow"
+import {createCustomerFollow, getCustomerFollowPage, getCustomerFollowPage2} from "@/api/ecw/customerFollow"
 import { DICT_TYPE, getDictDataLabel } from '@/utils/dict'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
 import {listServiceUser} from "@/api/system/user"
@@ -152,8 +153,13 @@ export default {
 
       customerFollow: {
         dialogVisible: false,
-        form: {}
+        form: {
+          followType:'3'
+        }
       },
+      pageNo:1,
+      pageSize:10,
+      total:10,
     }
   },
 
@@ -227,13 +233,21 @@ export default {
         "result": undefined,
         "customerId":this.customerId
       }
-      this.$refs.dictType.changeValue(this.customerFollow.form.followType);
+      // this.$refs.dictType.changeValue(this.customerFollow.form.followType);
        this.$refs.dictMethod.changeValue(this.customerFollow.form.followMethod);
     },
     getCustomerFollowList() {
-      getCustomerFollowPage({bizId: this.id}).then(r => {
-        this.customerFollowList = r.data.list
+    if(this.$route.name === 'customerQuery'){
+      getCustomerFollowPage({customerId: this.customerId,pageNo:this.pageNo,pageSize:this.pageSize}).then(r => {
+        this.customerFollowList = r.data.list;
+        this.total = r.data.total;
       })
+    }else {
+      getCustomerFollowPage2({bizId: this.id,followType:3,pageNo:this.pageNo,pageSize:this.pageSize}).then(r => {
+        this.customerFollowList = r.data.list;
+        this.total = r.data.total;
+      })
+    }
     }
 
   }

src/components/WarehouseAreaDialog/index.vue

@@ -64,7 +64,8 @@
 </template>
 
 <script>
-import { getByWarehouseId } from '@/api/ecw/warehouseArea'
+import {getByWarehouseId} from '@/api/ecw/warehouseArea'
+import {saveOrUpdateOrderLocation} from "@/api/ecw/order"
 
 export default {
   name: 'WarehouseAreaDialog',
@@ -82,6 +83,11 @@ export default {
     warehouseId: {
       type: Number,
       default: undefined
+    },
+    // 是否入仓修改
+    isEditing: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -102,26 +108,6 @@ export default {
     visible(val) {
       if (val) {
         this.opened = true
-
-        if (this.area.length === 0) getByWarehouseId({cityId: this.cityId,warehouseId: this.warehouseId }).then(r => {
-          const area = r.data
-          area.forEach(e => {
-            // 仓库
-            e.children?.forEach(f => {
-              // 区域
-              f.selected = false
-              if(f.positionList) f.positionList.forEach(g => {
-                // 位置
-                g.selected = false
-                g.children?.forEach(k => {
-                  // 子位置
-                  k.selected = false
-                })
-              })
-            })
-          })
-          this.area = area
-        })
       } else {
       }
     },
@@ -134,9 +120,45 @@ export default {
   },
 
   methods: {
+    updateArea(){
+      this.initArea()
+    },
+    initArea(){
+      return getByWarehouseId({ cityId: this.cityId, warehouseId: this.warehouseId }).then(r => {
+        const area = r.data
+        area.forEach(e => {
+          // 仓库
+          e.children?.forEach(f => {
+            // 区域
+            f.selected = this.isSelected(e.id, f.id)
+            if(f.positionList) f.positionList.forEach(g => {
+              // 位置
+              g.selected = this.isSelected(e.id, f.id, g.id)
+              g.children?.forEach(k => {
+                // 子位置
+                k.selected = this.isSelected(e.id, f.id, k.id)
+              })
+            })
+          })
+        })
+        this.area = area
+      })
+    },
+    // 用于储位回显选中
+    isSelected(warehouse, area, position = 0){
+      return !!this.value.find(e => warehouse === e.wareId && area === e.areaId && position === e.locationId)
+    },
     handleSubmit() {
       this.$emit('input', this.inputValue)
       this.opened = false
+      if (this.isEditing) {
+        this.$nextTick(() => {
+          saveOrUpdateOrderLocation({
+            "orderId": this.orderId,
+            "orderLocationCreateReqVOList": this.inputValue
+          })
+        })
+      }
     },
     handleClose() {},
     handleSelectWarehouse(warehouse) {
@@ -146,7 +168,6 @@ export default {
         return
       } else if(this.activeWarehouseId !== warehouse.id) {
         this.activeWarehouseId = warehouse.id
-        console.log(this.inputValue.find(e => e.areaId === warehouse.id), warehouse.id)
         if (this.inputValue.find(e => e.areaId === warehouse.id)){
           return
         }
@@ -202,7 +223,6 @@ export default {
   },
 
   mounted() {
-    console.log('area dialog mounted')
   },
 
   computed: {

src/components/WorkFlow/index.vue

@@ -12,7 +12,7 @@
         </div>
         <el-form label-position="left" label-width="100px">
           <el-form-item :label="$t('抄送')">
-            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%">
+            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%" filterable >
                 <el-option
                 v-for="item in users"
                 :key="item.id"

src/layout/components/Navbar.vue

@@ -7,10 +7,14 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+        <div class="right-menu-item">
+          <el-image style="width: 22px;height: 22px;cursor: pointer;" :src="helpIcon" @click="tohelp"></el-image>
+        </div>
         <el-badge :value="matterNum !== 0 ? matterNum : '' " class="right-menu-item badge">
          <div @click="$router.push('/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
         </el-badge>
-        
+
+
         <el-badge :value="notMessage !== 0 ? notMessage : '' " class="right-menu-item badge">
          <el-image style="width: 22px;height: 20px;cursor: pointer;" :src="unreadMessage" @click="notRead"></el-image>
         </el-badge>
@@ -40,7 +44,7 @@
       <dict-selector :type="DICT_TYPE.SYSTEM_LOCALE" v-model="lang" defaultable class="right-menu-item select-nav" />
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        
+
         <div class="avatar-wrapper flex-center">
           {{$store.getters.name}}
           <img :src="avatar" class="user-avatar ml-10">
@@ -74,11 +78,13 @@ import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 import {getLocale, saveLocale} from "@/utils/db";
 import unreadMessage from  "@/assets/images/unread-message.png"
+import helpIcon from  "@/assets/images/help.png"
 import i18n from '@/i18n'
 export default {
   data() {
     return {
       unreadMessage,
+      helpIcon,
       // locale: getLocale(),
       // 枚举
       // langDatas: LangEnum.LANG,
@@ -159,6 +165,9 @@ export default {
     },
     notRead(){
       this.$router.push({path:'/system/internalMessage/my-internal-message',query:{status:'0'}});
+    },
+    tohelp(){
+      this.$router.push({path:'/operation_manage/info'});
     }
   }
 }

src/utils/dict.js

@@ -115,7 +115,8 @@ export const DICT_TYPE = {
   ECW_COST_FEE_TYPE: 'cost_fee_type', // 清单费用类型
   ECW_PRICE_AUDIT_STATUS: 'price_audit_status', // 路线价格审核状态
   ECW_CANCEL_PICK_TYPE: 'cancel_pick_type', // 取消放货类型
-
+  ECW_CUSTOMER_RESOURCE_TYPE: 'customer_resource_type', // 客户资源类型
+  ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',
@@ -148,6 +149,7 @@ export const DICT_TYPE = {
   //customer
   CUSTOMER_CREDIT_RULE_TYPE: 'customer_credit_rule_type',
   CUSTOMER_LEVEL_RULE_TYPE: 'customer_level_rule_type',
+  CUSTOMER_ESOURCE_TYPE:'customer_resource_type',//客户资源类型
   // order
   ORDER_TYPE: 'order_type', // 订单类型
   PRODUCT_RECORD_ATTRIBUTE: 'product_record_attribute', //产品备案属性
@@ -202,7 +204,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

@@ -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" />
@@ -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>
@@ -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,
@@ -372,7 +379,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 +441,14 @@ export default {
 
         case "editLadingBill":
           const cabinetLabel = this.getCabinetName(row.cabinetId);
-          const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}', {
-            selfNo: row.selfNo,
-            cubNo: row.cubNo,
-            cabinetLabel: cabinetLabel
-          })
+          const title = this.$t(
+            "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+            {
+              selfNo: row.selfNo,
+              cubNo: row.cubNo,
+              cabinetLabel: cabinetLabel,
+            }
+          );
           this.$set(this.dialogCfg, "title", title);
           this.$set(this.dialogCfg, "fullscreen", true);
           break;
@@ -453,7 +465,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('预装单')+`(${row.selfNo}).xlsx`,
+            this.$t("预装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -461,7 +473,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('已装单') + `(${row.selfNo}).xlsx`,
+            this.$t("已装单") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -469,7 +481,7 @@ export default {
           downloadFile(
             command,
             { shipmentId: row.id },
-            this.$t('应收汇总表') + `(${row.selfNo}).xlsx`,
+            this.$t("应收汇总表") + `(${row.selfNo}).xlsx`,
             "xlsx"
           );
           break;
@@ -486,6 +498,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/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

@@ -16,7 +16,8 @@
               <div v-for="(item, index) in scope.row.orderItemList" :key="index" class="goodList-div">
                 <p>{{$t('品名')}}：{{item.prodTitleZh}}</p>
                 <p>{{$t('品牌')}}：【
-                  <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.productRecord" />
+                  <span v-if="item.feeType === 0">无品牌</span>
+                  <dict-tag v-else :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="item.feeType" />
                   】
                 </p>
                 <p>{{$t('其他')}}：{{getTotlContent(item)}}</p>
@@ -26,7 +27,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 +51,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 +159,7 @@ export default {
       if (type === "query") {
         this.getBillList();
       }
-      if(type === 'close'){
+      if (type === "close") {
         this.$emit("closeDialog");
       }
     },

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>
@@ -74,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>
 
@@ -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,13 @@ export default {
       costList: [],
       // 是否审核中
       inReview: false,
+      // 异常登记
+      regDialogVisible: false,
+      isShowError: false,
+      inspectionTimecustoms: this.getDictDatas(
+        this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
+      )[0].value,
+      isDownload: false,
     };
   },
   created() {
@@ -228,15 +249,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({
@@ -489,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);
     },
@@ -498,6 +549,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(
@@ -520,6 +572,21 @@ export default {
         }
       },
     },
+    // 报关时间
+    "cusDeclarationObj.dcDecTime"(val) {
+      this.compareDate(val, this.cusDeclarationObj.dcPassTime);
+    },
+    // 放行时间
+    "cusDeclarationObj.dcPassTime"(val) {
+      this.compareDate(this.cusDeclarationObj.dcDecTime, val);
+    },
+    // 查验状态
+    "cusDeclarationObj.dcCheckStatus"(val) {
+      const { customsInfo = {} } = this.shipmentObj;
+      if (val != customsInfo.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/nodePage/review.vue

@@ -8,13 +8,14 @@
     <el-row class="operate-button">
       <el-button type="success" @click="onSubmit" v-show="!isReview">{{$t('发起申请')}}</el-button>
       <el-button type="primary" @click="jumpReviewDetail" v-show="isReview">{{$t('审核中')}}</el-button>
+      <el-button plain type="primary" @click="canclAudit" v-show="isReview">{{$t('取消审核')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
     </el-row>
   </div>
 </template>
 
 <script>
-import { approvalCreate } from "@/api/ecw/boxSea";
+import { approvalCreate, approvalCancel } from "@/api/ecw/boxSea";
 import { serviceMsg, toReviewDetail } from "../utils";
 
 /**
@@ -29,41 +30,56 @@ export default {
       reviewObj: {},
       isReview: false,
       bpmProcessId: "",
+      voKey: "",
     };
   },
   created() {
     const { currNode, shipmentObj } = this.$attrs;
-    const {
-      preInstallBackInfo,
-      cabinetBackInfo,
-      cabinetUnloadBackApprovalInfo,
-    } = shipmentObj;
-    if (currNode.type === "preinstall") {
-      this.isReview = preInstallBackInfo ? true : false;
-      if (preInstallBackInfo && preInstallBackInfo.approvalStatus !== 1) {
-        this.isReview = false;
-      }
-      this.bpmProcessId = preInstallBackInfo?.bpmProcessId;
+
+    let voKey = "";
+    switch (currNode.type) {
+      case "preinstall":
+        voKey = "preInstallBackInfo";
+        break;
+      case "cabinet":
+        voKey = "cabinetBackInfo";
+        break;
+      case "unloading":
+        voKey = "cabinetUnloadBackApprovalInfo";
+        break;
     }
-    if (currNode.type === "cabinet") {
-      this.isReview = cabinetBackInfo ? true : false;
-      if (cabinetBackInfo && cabinetBackInfo.approvalStatus !== 1) {
+
+    if (voKey) {
+      this.isReview = shipmentObj[voKey] ? true : false;
+      if (shipmentObj[voKey] && shipmentObj[voKey].approvalStatus !== 1) {
         this.isReview = false;
       }
-      this.bpmProcessId = cabinetBackInfo?.bpmProcessId;
-    }
-    if (currNode.type === "unloading") {
-      this.isReview = cabinetUnloadBackApprovalInfo ? true : false;
-      if (
-        cabinetUnloadBackApprovalInfo &&
-        cabinetUnloadBackApprovalInfo.approvalStatus !== 1
-      ) {
-        this.isReview = false;
+      this.bpmProcessId = shipmentObj[voKey].bpmProcessId;
+      if (this.isReview) {
+        this.$set(
+          this.reviewObj,
+          "applyReason",
+          shipmentObj[voKey].applyReason
+        );
       }
-      this.bpmProcessId = cabinetUnloadBackApprovalInfo?.bpmProcessId;
     }
+    this.voKey = voKey;
   },
   methods: {
+    /* 取消审核 */
+    canclAudit() {
+      const { shipmentObj } = this.$attrs;
+
+      approvalCancel({
+        applyReason: this.$t("取消反审核"),
+        id: shipmentObj[this.voKey].id,
+        shipmentId: shipmentObj.id,
+      }).then((res) => {
+        serviceMsg(res, this).then(() => {
+          this.$emit("closeDialog", "submit");
+        });
+      });
+    },
     jumpReviewDetail() {
       toReviewDetail.apply(this, [this.bpmProcessId]);
       this.$emit("closeDialog");

src/views/ecw/box/shippingSea/nodePage/tally/batchTally.vue

@@ -54,6 +54,9 @@ export default {
       warehouseId: this.$attrs.shipmentObj.startWarehouseId,
     };
   },
+  mounted() {
+    this.$refs.area.updateArea()
+  },
   methods: {
     getTotlContent,
     // 打开储位

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,12 @@ export default {
     let oldData = { ...this.$attrs.shipmentObj[voName] };
     oldData = formatDateStr(oldData, ["ulWarehouseTime", "ulBoxTime"]);
     this.unloadingObj = oldData;
+    // 进入卸柜，仓库给了默认值为0，并且底下显示无匹配数据。应该默认为空，让手动去选择
+    if(this.unloadingObj.ulOutletsId === 0) this.unloadingObj.ulOutletsId = ''
+    getNodePage({ pageNo: 1, pageSize: 1000, status: 0 }).then((res) => {
+      const { data } = res;
+      this.nodes = data?.list ?? [];
+    });
   },
   methods: {
     /** 提交 */

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, 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":
+            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/delay.vue

+<template>
+  <div class="app-container">
+    <el-card>
+      <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true"  label-width="180px" class="card">
+
+        <el-row>
+          <el-form-item :label="$t('客户名称')+':'">
+              <span style="margin-left: 8px;">{{handlerParams.customerName}}</span>
+          </el-form-item>
+        </el-row>
+        <el-row >
+          <el-form-item :label="$t('原计划掉入公海池时间')+':'">
+            <span style="margin-left: 8px;">{{handlerParams.orgEstimateEnterOpenSeaTime}}</span>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item :label="$t('申请延期后掉入时间')+':'">
+              <el-date-picker
+                v-model="handlerParams.estimateEnterOpenSeaTime"
+                type="date"
+                :picker-options="pickerOptions"
+                value-format="timestamp"
+                :placeholder="$t('请输入申请延期后掉入时间')">
+              </el-date-picker>
+          </el-form-item>
+
+        </el-row>
+        <el-row :span="8">
+          <el-form-item :label="$t('凭证')+':'" size="medium" :require="true">
+            <upload v-model="handlerParams.voucher" :limit="1"></upload>
+          </el-form-item>
+        </el-row>
+        <el-row :span="8">
+          <el-form-item :label="$t('申请理由')+':'" size="medium">
+            <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.reason"  />
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-card>
+    <!-- 只有不需要预付才需要审核 -->
+    <template>
+      <div class="page-title">{{$t('审批流程')}}</div>
+      <work-flow xmlkey="quotation_customer_delay_public" v-model="ccIdArr" />
+    </template>
+    <div slot="footer" class="dialog-footer">
+      <!-- bpmStatus
+      异常流程状态，1处理中2通过3不通过4已取消
+      待审核可能没有bpmStatus字段
+      -->
+      <template v-if="handlerParams.status == 1">
+        <el-button type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+handlerParams.formId)">{{$t('审核中')}}</el-button>
+        <el-button plain type="primary" @click="cancelAudit">{{$t('取消审核')}}</el-button>
+        <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
+      </template>
+      <template v-else>
+        <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
+        <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+  import upload from '@/components/ImageUpload'
+  import {getDictData, getDictDatas} from  '@/utils/dict'
+  import {getCustomer,getDelayInfo,creatDelayApproval,cancelDelayApproval} from '@/api/ecw/customer'
+  import WorkFlow from '@/components/WorkFlow'
+  import {cancelProcessInstance} from '@/api/bpm/processInstance'
+  export default {
+    name: "Delay",
+    components: {
+      upload, WorkFlow
+    },
+    data() {
+      return {
+        // 遮罩层
+        loading: false,
+        handlerParams:{
+        },
+        customerData:{},
+        showWorkFlow: false, // 是否显示工作流
+        dateRangeCreateTime:[],
+        pickerOptions: {
+        },
+        ccIdArr:[]
+      };
+    },
+  watch:{
+    ccIdArr(){
+      this.$set(this.handlerParams, 'ccIds', this.ccIdArr.join(','))
+    }
+  },
+    created() {
+      if(this.$route.query.id){
+        this.getData(this.$route.query.id)
+      }
+    },
+    methods: {
+       getData(id){
+         getCustomer(id).then(response => {
+            this.customerData = response.data
+            this.getDely(id)
+         });
+      },
+      getDely(id){
+        console.log(this.customerData)
+        let that = this
+        getDelayInfo({customerId:id}).then(res=>{
+          if(res.data){
+              that.handlerParams = res.data
+              if(!that.handlerParams.orgEstimateEnterOpenSeaTime){
+                that.handlerParams.orgEstimateEnterOpenSeaTime = that.getNowDate(that.customerData.enterOpenSeaTime)
+              }
+              if(that.handlerParams.estimateEnterOpenSeaTime){
+                that.handlerParams.estimateEnterOpenSeaTime = that.getTime(that.handlerParams.estimateEnterOpenSeaTime)
+              }else{
+                that.$set(that.handlerParams,'estimateEnterOpenSeaTime',that.customerData.estimateEnterOpenSeaTime)
+              }
+              if(that.handlerParams.ccIds){
+                var ids = that.handlerParams.ccIds.split(',')
+                ids.map(v=>{
+                  that.ccIdArr.push(parseInt(v))
+                })
+
+              }
+              console.log(that.ccIdArr)
+            }else{
+              that.handlerParams = {
+                  customerId:that.customerData.id,
+                  customerName:that.customerData.name,
+                  orgEstimateEnterOpenSeaTime: that.getNowDate(that.customerData.enterOpenSeaTime)
+              }
+            }
+            that.pickerOptions = {
+              disabledDate: (time) => {
+                var date = new Date(that.handlerParams.orgEstimateEnterOpenSeaTime);
+                  return (
+                    time.getTime() < date.getTime()
+                  );
+                },
+              }
+        })
+      },
+      submitForm(){
+          // if(!this.handlerParams.orderExceptionHandlerResult){
+          //   this.$modal.msgError(this.$t('请选择处理结果'));
+          //   return
+          // }
+
+            // if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
+            //   this.$modal.msgError(this.$t('请上传报关资料'));
+            //   return
+            // }
+            this.$set(this.handlerParams,'createTime',this.formatDate())
+            var params = Object.assign({},this.handlerParams)
+            // var ccIds = Array.isArray(this.handlerParams.ccIds) ? this.handlerParams.ccIds.join(',') : this.handlerParams.ccIds
+            // params.ccIds = ccIds
+            params.voucher = Array.isArray(this.handlerParams.voucher) ? this.handlerParams.voucher.join(',') : this.handlerParams.voucher
+
+            params.estimateEnterOpenSeaTime = this.getNowDate(this.handlerParams.estimateEnterOpenSeaTime)
+          creatDelayApproval(params).then(res=>{
+              this.$modal.msgSuccess(this.$t('提交成功'));
+              this.$store.dispatch('tagsView/delCurrentView')
+          })
+      },
+      getTime(dateTime){
+        var date = new Date(dateTime);
+        return date.getTime()
+      },
+      getNowDate(time) {
+            if(time){
+              var date = new Date(time);
+            }else{
+              var date = new Date();
+            }
+
+             var year = date.getFullYear() // 年
+             var month = date.getMonth() + 1; // 月
+             var day = date.getDate(); // 日
+              // 给一位数的数据前面加 “0”
+             if (month >= 1 && month <= 9) {
+                  month = "0" + month;
+             }
+              if (day >= 0 && day <= 9) {
+                  day = "0" + day;
+              }
+        return year + "-" + month + "-" + day
+
+       },
+       formatDate() {
+         var date = new Date()
+         var year = date.getFullYear()
+         var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+         var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+         var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+         var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+         var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+         return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+       },
+      // 取消审核
+      cancelAudit(){
+        this.$prompt("请输入取消原因", {
+          inputPattern: /[\S]+/,
+          inputErrorMessage: '不能为空'
+        }).then(({value}) => {
+          console.log(this.handlerParams.approvalId)
+          return cancelDelayApproval({approveId:this.handlerParams.approvalId,reason:value})
+        })
+        .then(res => {
+          this.$store.dispatch('tagsView/delCurrentView')
+        })
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .card-title{
+      font-size: 18px;
+      font-weight: bold;
+       margin-top: 10px;
+  }
+  .header{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .card{
+    margin-top: 20px;
+  }
+  .dialog-footer{
+    padding: 40px;
+    width: 60%;
+    align-items: center;
+    display: flex;
+    /* justify-content: space-between; */
+  }
+</style>

src/views/ecw/customer/edit.vue

@@ -30,19 +30,23 @@
                 <el-input v-model="form.address" :placeholder="$t('请输入联系地址')" />
               </el-form-item>
             </el-col>
+            
+            <el-col :span="12">
+              <el-form-item :label="$t('出货渠道')" prop="transportType">
+                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_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="type">
                 <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="pickupPoint">
-                <el-select v-model="form.pickupPoint" :placeholder="$t('请输入常用提货网点')">
-                  <el-option v-for="node in nodeList"
-                             :key="node.id" :label="node.titleZh" :value="node.id" />
-                </el-select>
+              <el-form-item :label="$t('资源类型')" prop="remarks">
+                <dict-selector :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="form.resourceType" formatter="number"></dict-selector>
               </el-form-item>
             </el-col>
+            
             <el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">
               <el-form-item :label="$t('所属代理')" prop="agentId">
                 <el-select filterable clearable v-model="form.agentId" :placeholder="$t('请选择所属代理')">
@@ -167,6 +171,7 @@
               <el-switch  v-model="form.isShowTidanPrice"></el-switch>
               </el-form-item>
             </el-col>
+            
             <el-col :span="24">
               <el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
                 <el-switch v-model="form.arrivalConfirm" :active-value="1" :inactive-value="0" />
@@ -656,7 +661,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
@@ -715,6 +720,7 @@ export default {
         level: 1,
         country: undefined,
         type: undefined,
+        transportType:[],
         agentId: undefined,
         company: undefined,
         address: undefined,

src/views/ecw/customer/index.vue

@@ -84,7 +84,12 @@
         width="55">
       </el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" prop="number" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name">
+        <template slot-scope="{row}">
+          {{row.name}} <el-tag v-if="row.isInOpenSea" size="mini">公</el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />
@@ -107,11 +112,23 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
+      <el-table-column :label="$t('出货渠道')">
+        <template slot-scope="{row}">
+          <dict-tag v-if="row.transportType" v-for="item in row.transportType.split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+<!--          <el-button size="mini" type="text" v-show="'development' === env && scope.row.isInOpenSea"  @click="seasPond(scope.row)"-->
+<!--                     v-hasPermi="['ecw:customer:query']">{{$t('掉入公海池')}}</el-button>-->
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
                      v-hasPermi="['ecw:customer:query']">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -120,6 +137,7 @@
                      v-hasPermi="['ecw:customer:delete']">{{$t('删除')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-user" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
+          <el-button :disabled="scope.row.isInOpenSea" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -480,8 +498,10 @@
 </template>
 
 <script>
-import { createCustomer, updateCustomer, deleteCustomer, getCustomer,
-  getCustomerPage, exportCustomerExcel } from "@/api/ecw/customer";
+import {
+  createCustomer, updateCustomer, deleteCustomer, getCustomer,
+  getCustomerPage, exportCustomerExcel, testEnterToOpenSea
+} from "@/api/ecw/customer";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import {CommonStatusEnum} from '@/utils/constants'
 import { uploadFile } from "@/api/infra/file";
@@ -505,6 +525,7 @@ export default {
   },
   data() {
     return {
+      env:process.env.NODE_ENV,
       getDictDatas,
       DICT_TYPE,
       // 遮罩层
@@ -683,6 +704,15 @@ export default {
     handleView(row) {
       this.$router.push('/customer/query/' + row.id)
     },
+    /** 调入公海池测试用 */
+    seasPond(row) {
+      testEnterToOpenSea(row.id).then(r => {
+         if(r.code === 0){
+           this.$t('调入公海池成功！')
+           this.getList();
+         }
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.$router.push('/customer/edit/' + row.id)
@@ -753,6 +783,10 @@ export default {
        this.$refs.CustomerFollowList.customerFollow.dialogVisible = true;
      })
     },
+    delay(row){
+
+      this.$router.push({path:'/customer/delay',query:{id:row.id}})
+    },
     complaint(row){
       this.customerId = row.id;
      this.$nextTick(()=>{

src/views/ecw/customer/indirectCustomer.vue

+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item :label="$t('客户名称')" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item :label="$t('联系方式')">
+        <el-input :placeholder="$t('请输入联系方式')" v-model="queryParams.defaultContactPhone"></el-input>
+      </el-form-item>
+      <el-form-item :label="$t('客户经理')" prop="customerService">
+        <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
+          <el-option v-for="dict in customerServiceList"
+                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('客户来源')" prop="source">
+        <el-select clearable  v-model="queryParams.source" :placeholder="$t('请选择客户来源')" clearable size="small">
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('创建时间')">
+        <el-date-picker clearable  v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+      </el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 列表 -->
+    <el-table ref="multipleTable" v-loading="loading" :data="list"   @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55">
+      </el-table-column>
+      <el-table-column :label="$t('客户名称')" align="center" prop="name" >
+        <template v-slot="scope">
+        <router-link :to="{path: '/customer/indirectInfo',query: {id: scope.row.id}}" class="link-type">
+          <span>{{ scope.row.name }}</span>
+        </router-link>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('联系方式')" prop="defaultContactPhone">
+        <template v-slot="{row}">
+          +{{row.defaultContactPhone}}
+        </template>
+      </el-table-column>
+       <el-table-column :label="$t('客户来源')" align="center" prop="sourse">
+         <template v-slot="{row}">
+           <span>{{row.agentCustomerName}}</span>
+             <!-- <dict-tag :value="row.resourceType" :type="DICT_TYPE.CUSTOMER_SOURCE" /> -->
+           </template>
+         </el-table-column>
+       <el-table-column :label="$t('资源类型')" align="center" prop="resourceType">
+         <template v-slot="{row}">
+             <dict-tag :value="row.resourceType" :type="DICT_TYPE.CUSTOMER_ESOURCE_TYPE" />
+           </template>
+         </el-table-column>
+       <el-table-column :label="$t('客户类别')" align="center" prop="sourse">
+        <template v-slot="{row}">
+           <dict-tag :value="row.type" :type="DICT_TYPE.CUSTOMER_TYPE" />
+         </template>
+       </el-table-column>
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
+      </el-table-column>
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('完善')}}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import {updateCustomer, getCustomer,
+  getCustomerPage, exportCustomerExcel } from "@/api/ecw/indirectCustomer";
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+
+import {listServiceUser} from "@/api/system/user";
+
+export default {
+  name: "IndirectCustomer",
+  data() {
+    return {
+      getDictDatas,
+      DICT_TYPE,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        source: null,
+        customerService: null,
+      },
+      // 网点
+      nodeList: [],
+      customerId:undefined,
+      customerServiceList:[],
+    };
+  },
+  created() {
+    this.getList();
+    listServiceUser().then(r=>{
+      this.customerServiceList = r.data;
+    })
+  },
+  methods: {
+    customerServiceFn(val){
+      if(this.customerServiceList.length > 0){
+        let index =this.customerServiceList.findIndex(item => item.id === val.customerService);
+        return index !== -1  ? this.customerServiceList[index]?.nickname :''
+      }else {
+        return ''
+      }
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getCustomerPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        source: null,
+        customerService: null,
+      }
+      this.handleQuery();
+    },
+
+    delay(row){
+      this.$router.push({path:'/customer/editIndirect',query:{id:row.id}})
+    },
+    handleSelectionChange(val){
+
+    }
+  }
+};
+</script>

src/views/ecw/customer/query.vue

@@ -18,6 +18,12 @@
             <el-descriptions-item :label="$t('客户名称')">{{ customer.name }}</el-descriptions-item>
             <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户生日')">{{ parseTime(customer.birthday, '{y}-{m}-{d}') }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('出货渠道')">
+              <dict-tag v-if="customer.transportType" v-for="item in customer.transportType.split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('资源类型')">
+              <dict-tag :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" :value="customer.resourceType"></dict-tag>
+            </el-descriptions-item>
             <el-descriptions-item :label="$t('客户等级')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_LEVEL, customer.level) }}</el-descriptions-item>
             <el-descriptions-item :label="$t('国家')">{{ country }}</el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('业务员')">{{ customer }}</el-descriptions-item>-->
@@ -110,7 +116,7 @@
                   <el-form-item :label="$t('报关方式：')">
                     <dict-selector
                       :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
-                      v-model="queryParams.customerType"
+                      v-model="queryParams.customsType"
                     />
                   </el-form-item>
                   <el-form-item :label="$t('控货')">
@@ -201,6 +207,9 @@
                 prop="consignorName"
                 :label="$t('客户名称')"
               >
+                <template v-slot>
+                  {{customer.name}}
+                </template>
               </el-table-column>
               <el-table-column
                 prop="objectiveName"
@@ -483,7 +492,8 @@ export default {
         3:this.$t('跟进中'),
         4:this.$t('赢单'),
         5:this.$t('输单'),
-        6:this.$t('报价完成')
+        6:this.$t('报价完成'),
+        7:this.$t('跟进中')
       },
       dialogVisible:false,
       DICT_TYPE,
@@ -617,11 +627,11 @@ export default {
     },
     changeDate(val){
      if(val){
-        this.queryParams.houseStartDate =  val[0];
-       this.queryParams.houseEndDate =  val[1];
+        this.queryParams.beginRucangTime =  val[0];
+       this.queryParams. endRucangTime =  val[1];
      }else {
-       this.queryParams.houseStartDate = undefined;
-       this.queryParams.houseEndDate =  undefined;
+       this.queryParams.beginRucangTime = undefined;
+       this.queryParams.endRucangTime =  undefined;
      }
     },
     //品牌授权
@@ -649,7 +659,7 @@ export default {
    },
     //订单
     getorderList(){
-      infoListOrderPage({customerId:this.id,...this.queryParams}).then(r => {
+      infoListOrderPage({customerDetailld:this.id,...this.queryParams}).then(r => {
         console.log(r)
         if(r.code === 0){
           this.orderList = r.data.list

src/views/ecw/myCustomerService/index.vue

@@ -112,6 +112,7 @@
                      v-hasPermi="['ecw:customer:update']" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:customer:delete']">{{$t('删除')}}</el-button>
+         <el-button :disabled="scope.row.isInOpenSea" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -219,6 +220,9 @@ export default {
     handleSelectionChange(val){
       this.selectCustomerList = val.map(i => i.id);
     },
+    delay(row){
+      this.$router.push({path:'/customer/delay',query:{id:row.id}})
+    },
     countryFormatter(row, column, cellValue) {
       const country = this.countryList.find((e) => e.id === cellValue)
       return country?.nameZh

src/views/ecw/offer/createLog.vue

@@ -95,7 +95,7 @@
         if(this.$route.query.number){
           this.form.number = this.$route.query.number
         }
-        userList('documentary customer service').then(res =>this.creatorData = res.data)
+        userList('customer service').then(res =>this.creatorData = res.data)
     },
     methods: {
       getList() {

src/views/ecw/offer/detail.vue

@@ -6,7 +6,7 @@
           <div class="offer-header">
               <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
               <div class="btns">
-            <el-button size="mini" type="primary"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
+            <el-button size="mini" type="primary" v-if="list.status!=5"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
                 <el-button type="primary" v-if="[1,3,7].indexOf(list.status) > -1"  size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
                 <el-button type="primary"  v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
                 <el-button size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
@@ -245,7 +245,11 @@
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('预计费用')">
                     <template >
-                        <div v-for="item in estimatedCosts" :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                      <div style="display:flex;flex-direction:column">
+                        <div v-for="item in estimatedCosts" :key="item.currencyId">
+                          <span>{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</span>
+                          </div>
+                          </div>
                     </template>
                 </el-descriptions-item>
             </el-descriptions>
@@ -470,6 +474,18 @@
               }
               arr.push(it)
           })
+          this.freightFeeList.forEach(item => {
+              if(!arr.find(items=>items.currencyId==item.currencyId)){
+                  let its = {...item}
+                  // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
+                  // if(freights){
+                  //     its.amount += freights.amount
+                  // }
+                  arr.push(its)
+              }
+
+          })
+
           return arr
       },
       // 预计费用(原价 - 优惠金额)
@@ -495,8 +511,13 @@
               if(coupon){
                   it.amount = it.amount.minus(coupon.reduceAmount)
               }
-              if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
-                  it.amount = it.amount.plus(this.list.otherFee)
+              // if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
+              //     it.amount = it.amount.plus(this.list.otherFee)
+              //     withOtherFee = true
+              // }
+              let otherFee = this.otherFeeList.find(fee => fee.currencyId == item.currencyId)
+              if(otherFee){
+                  it.amount += otherFee.amount
                   withOtherFee = true
               }
               // 保价费（美元）
@@ -527,7 +548,17 @@
                     amount: Decimal(this.fee.insuranceFee)
                 })
             }
+            this.otherFeeList.forEach(item => {
+                if(!arr.find(items=>items.currencyId==item.currencyId)){
+                    let its = {...item}
+                    // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
+                    // if(freights){
+                    //     its.amount += freights.amount
+                    // }
+                    arr.push(its)
+                }
 
+            })
             return arr
       }
     },
@@ -562,7 +593,7 @@
         that.loading = true;
         // 执行查询
         getOrder(id).then(response => {
-          that.orderDat = response.data;
+          that.orderData = response.data;
         });
       },
       getSupplierData(id){
@@ -628,9 +659,9 @@
             that.getChannelData()
           }
           that.calculationPrice()
-          if(that.list.orderId){
-            that.getOrderData(that.list.orderId)
-          }
+          // if(that.list.orderId){
+          //   that.getOrderData(that.list.orderId)
+          // }
           getCustomerContactsSelect({ids: [that.list.consignorId, that.list.consigneeId].join(',')}).then((res) => {
                let consignor = res.data.list.find(item => item.customerContactsId == that.list.consignorId)
                if(consignor) that.consignorData=consignor

src/views/ecw/offer/edit.vue

@@ -221,8 +221,8 @@
                 </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
-                        :prop="`prodCreateReqVOList.${scope.$index}.worth`"
-                        :rules="{
+                        :prop2="`prodCreateReqVOList.${scope.$index}.worth`"
+                        :rules2="{
                             // required: true, message: $t('货值不能为空'), trigger: 'blur'
                         }"
                         class="mb-0 mr-0"

src/views/ecw/offer/logList.vue

@@ -34,8 +34,11 @@
             </el-table-column>
             <el-table-column :label="$t('客户反馈')" align="center" prop="customerFeedback" />
             <el-table-column :label="$t('处理结果')" align="center" prop="processingResults" />
-            <el-table-column :label="$t('客户经理')" align="center" prop="followUpSalesmanName" />
-
+            <el-table-column :label="$t('客户经理')" align="center" prop="followUpSalesmanName">
+              <template slot-scope="scope">
+                <span>{{getCustomerService(scope.row.followUpSalesmanId)}}</span>
+              </template>
+             </el-table-column>
           </el-table>
               <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
                           @pagination="getList"/>
@@ -47,6 +50,7 @@
 import {getOfferLogPage} from "@/api/ecw/offerLog";
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOffer} from '@/api/ecw/offer'
+  import { userList } from "@/api/system/user"
 export default {
   name: "OfferLog",
   components: {
@@ -67,6 +71,7 @@ export default {
       number:'',
       relationId:0,
       creatorName:'test',
+      creatorData:[]
     };
   },
   created() {
@@ -75,6 +80,7 @@ export default {
       this.getList();
       this.getRelationID()
     }
+    userList('customer service').then(res =>this.creatorData = res.data)
   },
   methods: {
     /** 查询列表 */
@@ -89,6 +95,11 @@ export default {
       });
 
     },
+    getCustomerService(id){
+       var user = this.creatorData.find(item=>item.id==id)
+       if(user) return user.nickname
+       return ''
+    },
     getRelationID(){
       getOffer(this.params.offerId).then(response => {
         this.relationId = response.data.consignorId;

src/views/ecw/order/batchSingleApplication.vue

@@ -79,13 +79,14 @@
       <el-row style="margin-top: 30px">
         <el-col :span="8">
           <div style="text-align: right;">
-            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] && list[0].startWarehouseName ? list[0].startWarehouseName : '' }}
+            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] ? [14,16,15].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
           </div>
         </el-col>
         <el-col :span="3"><div style="text-align:center">
           {{$t('调至')}}
         </div></el-col>
-        <el-col :span="8"><el-select clearable v-model="params.warehouseInId">
+        <el-col :span="8">
+          <el-select clearable v-model="params.warehouseInId">
           <el-option  v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1"  :value="item.id" :label="item.titleZh"
                      :key="index"></el-option>
         </el-select></el-col>
@@ -222,8 +223,7 @@ export default {
     getOrderListFn() {
       getOrderPage({orderIdList: this.orderList}).then(r => {
         this.list = r.data.list
-        console.log(this.list,'this.list[0].startWarehouseId');
-        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : this.list[0].startWarehouseId}).then(r => this.availableWarehouse = r.data)
+        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId :[14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
         adjustLastWithStatus({orderId:this.list[0].orderId,lang:0}).then(r =>{
           this.applyStatus = r.data
           if(r.data?.orderWarehouseAdjustBackVO?.status === 1){
@@ -235,7 +235,7 @@ export default {
     submit() {
       let p = this.list.map(e => e.orderId).join(',');
       this.params.orderIds = p;
-      this.params.warehouseOutId = this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : this.list[0].startWarehouseId;
+      this.params.warehouseOutId = this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : [14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId;
       this.params.orderNo = this.list[0].orderNo
       orderWarehouseInAdjustApply(this.params).then(r => {
         if (r.code === 0) {

src/views/ecw/order/detail.vue

@@ -3,7 +3,7 @@
     <el-card class="card">
       <div slot="header" class="card-title">
         {{$t('订单编号')}}：{{order.orderNo}}
-        <template v-if="order.tidanNo">- {{order.tidanNo}}</template>
+        <template v-if="order.containerNumber"> - {{order.containerNumber}}</template>
       </div>
       <el-row :gutter="20">
         <el-col :span="8" v-if="order.consignorVO">

src/views/ecw/order/edit.vue

@@ -783,10 +783,10 @@ export default {
 
         this.calculationPrice()
     },
-    'form.packageTypeArr'(val){
+    /* 'form.packageTypeArr'(val){
         console.log('packageType', val, val.length)
         this.$set(this.form, 'packageType', val ? val.join(',') : '')
-    },
+    }, */
     'form.isExternalWarehouse'(isExternalWarehouse){
         // 勾选外部仓则添加一个默认的，取消则删除默认的空的
         if(!isExternalWarehouse){
@@ -1067,6 +1067,7 @@ export default {
                 item.channelIds = Array.from(item.channelIdSet).join(',')
             }
         })
+        this.form.packageType = this.form.packageTypeArr.join(',')
         // 修改的提交
         if (this.form.orderNo != null) {
             let data = Object.assign({}, this.form, {

src/views/ecw/order/index.vue

@@ -172,7 +172,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
         <template slot-scope="scope">
           <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
           <template v-if="scope.row.status == 88">
@@ -180,7 +180,7 @@
           </template>
           <template v-else>
             <!--操作相关的-->
-            <el-dropdown>
+            <el-dropdown v-if="exclude(scope.row.inWarehouseState, [204,205,206])">
               <el-button type="text">{{$t('操作')}}</el-button>
               <el-dropdown-menu slot="dropdown">
                 <!-- 编辑 -->
@@ -251,77 +251,77 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-            <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
-
-            <!--仓库相关的-->
-            <el-dropdown v-if="scope.row.status != 0">
-              <el-button type="text">{{$t('仓库')}}</el-button>
-              <el-dropdown-menu slot="dropdown">
-                <!-- 入仓操作 -->
-                <template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
-                  <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓操作')}}</el-dropdown-item>
-                </template>
-                <!-- 入仓补充 -->
-                <template v-if="
-                  include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
-                  scope.row.abnormalState != 1 &&
-                  include(scope.row.status, [2,3,5,10,9,8])
-                  ">
-                  <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
-                </template>
-                <!-- 入仓修改 -->
-                <template v-if="
-                    include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
-                  ">
-                  <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
-                </template>
-
-                <!-- 退仓 -->
-                <template v-if="
-                    (
-                      include(scope.row.inWarehouseState, [202, 210, 211, 213, 214, 215, 216]) &&
-                      exclude(scope.row.abnormalState, [1])
-                    ) ||
-                    include(scope.row.status, [16])
-                  ">
-                  <el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
-                </template>
-
-
-                <!-- 调仓 -->
-                <template v-if="
-                    include(scope.row.inWarehouseState, [202, 207, 209, 210, 202, 211, 212, 215, 216, 218]) ||
-                    (include(scope.row.status, [16]) && exclude(scope.row.inWarehouseState, [213,214]))
-                  ">
-                  <el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
-                </template>
-
-                <!-- 取消调仓 -->
-                <!-- <template v-if="
-                    include(scope.row.inWarehouseState, [212,213,214])
-                  ">
-                  <el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item>
-                </template> -->
-
-                <!-- 调拨出仓 -->
-                <template v-if="
-                    include(scope.row.inWarehouseState, [213])
-                  ">
-                  <el-dropdown-item @click.native="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })"  >{{$t('调拨出仓')}}</el-dropdown-item>
-                </template>
-
-                <!-- 调拨到仓 -->
-                <template v-if="
-                    include(scope.row.inWarehouseState, [214])
-                  ">
-                  <el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-dropdown-item>
-                </template>
-
-              </el-dropdown-menu>
-            </el-dropdown>
-
-            <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
-
+            <template v-if="scope.row.status != 0 && [204,205,206].indexOf(scope.row.inWarehouseState) < 0">
+              <!-- <el-divider direction="vertical"></el-divider> -->
+              <!--仓库相关的-->
+              <el-dropdown>
+                <el-button type="text">{{$t('仓库')}}</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <!-- 入仓操作 -->
+                  <template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1]) || scope.row.inWarehouseState == 208">
+                    <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓操作')}}</el-dropdown-item>
+                  </template>
+                  <!-- 入仓补充 -->
+                  <template v-if="
+                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
+                    scope.row.abnormalState != 1 &&
+                    include(scope.row.status, [2,3,5,10,9,8])
+                    ">
+                    <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
+                  </template>
+                  <!-- 入仓修改 -->
+                  <template v-if="
+                      include(scope.row.inWarehouseState, [202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205])
+                    ">
+                    <el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
+                  </template>
+
+                  <!-- 退仓 -->
+                  <template v-if="
+                      (
+                        include(scope.row.inWarehouseState, [202, 210, 211, 213, 214, 215, 216]) &&
+                        exclude(scope.row.abnormalState, [1])
+                      ) ||
+                      include(scope.row.status, [16])
+                    ">
+                    <el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
+                  </template>
+
+
+                  <!-- 调仓 -->
+                  <template v-if="
+                      include(scope.row.inWarehouseState, [202, 207, 209, 210, 202, 211, 212, 215, 216, 218]) ||
+                      (include(scope.row.status, [16]) && exclude(scope.row.inWarehouseState, [213,214]))
+                    ">
+                    <el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
+                  </template>
+
+                  <!-- 取消调仓 -->
+                  <!-- <template v-if="
+                      include(scope.row.inWarehouseState, [212,213,214])
+                    ">
+                    <el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item>
+                  </template> -->
+
+                  <!-- 调拨出仓 -->
+                  <template v-if="
+                      include(scope.row.inWarehouseState, [213])
+                    ">
+                    <el-dropdown-item @click.native="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })"  >{{$t('调拨出仓')}}</el-dropdown-item>
+                  </template>
+
+                  <!-- 调拨到仓 -->
+                  <template v-if="
+                      include(scope.row.inWarehouseState, [214])
+                    ">
+                    <el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-dropdown-item>
+                  </template>
+
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+
+            <!-- <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider> -->
             <!--打印相关的-->
             <el-dropdown v-if="scope.row.status != 0">
               <el-button type="text">{{$t('打印')}}</el-button>
@@ -649,3 +649,13 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .actions{
+    .el-dropdown{
+      margin-right: 10px;
+      &::last-child{
+        margin-right: 0;
+      }
+    }
+}
+</style>
\ No newline at end of file

src/views/ecw/order/pending.vue

@@ -4,6 +4,9 @@
     <el-card>
         <div slot="header" class="card-title">{{$t('查看')}}</div>
         <el-descriptions :column="4">
+          <el-descriptions-item :label="$t('订单号')">
+              {{orderData.orderNo||''}}
+          </el-descriptions-item>
             <el-descriptions-item :label="$t('唛头')">
                 {{orderData.marks?orderData.marks:$t('无')}}
             </el-descriptions-item>

src/views/ecw/order/prepayDeal.vue

@@ -286,7 +286,7 @@
               </el-select>
           </el-form-item>
         </el-row>
-        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
+        <el-row :span="8">
           <el-form-item :label="$t('备注')+':'" size="medium">
             <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
           </el-form-item>

src/views/ecw/order/warehousing/index.vue

@@ -147,7 +147,7 @@
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
-                           :order-id="orderId" :warehouse-id="warehouseId"></warehouse-area-dialog>
+                           :order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog>
 
     <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
 
@@ -226,7 +226,12 @@ export default {
       this.getOrder()
       getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
       getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
-      listByOrderId({ orderId: this.orderId }).then(r => this.form.orderLocationCreateReqVOList = r.data)
+      listByOrderId({ orderId: this.orderId }).then(r => {
+        this.form.orderLocationCreateReqVOList = r.data
+        this.$nextTick(() => {
+          this.$refs.area.updateArea()
+        })
+      })
     }
     getCurrencyList().then(res => this.currencyList = res.data)
   },

src/views/ecw/order/weightDeal.vue

@@ -103,7 +103,7 @@
           <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
         </div>
       </div>
-      <el-form  v-if="type=='order_heavy_cargo_exception'" :model="handlerParams" ref="queryForms" size="small" label-width="50px" class="card">
+      <el-form  :model="handlerParams" ref="queryForms" size="small" label-width="50px" class="card">
         <el-form-item :label="$t('备注')+':'" size="medium">
           <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
         </el-form-item>

src/views/ecw/order/withdrawal.vue

@@ -21,7 +21,7 @@
       </div>
       <div>
         <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">{{$t('确定退仓')}}</el-button>
-        <el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
+        <el-button v-if="!isExamine" @click="goBpm" type="primary" style="margin-right: 20px;">{{$t('审核中')}}</el-button>
         <el-button  v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">{{$t('取消审核')}}</el-button>
         <el-button @click="$parent.show = false;">{{$t('不，再考虑考虑')}}</el-button>
       </div>
@@ -75,6 +75,10 @@ export default {
     })
   },
   methods:{
+    goBpm(){
+      this.$parent.show = false
+      this.$router.push({query:{id:this.details.formId},path:'/bpm/process-instance/detail'})
+    },
     submit(){
       this.params.orderId =  this.orderDetails.orderId;
       this.params.orderNo =this.orderDetails.orderNo;

src/views/ecw/productPrice/edit.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="readonly">
 
       <el-form-item :label="$t('商品类型')" prop="productType">
-        <el-select v-model="form.productType" :disabled="!!$route.query.ids">
+        <el-select v-model="form.productType" :disabled="!!$route.query.action">
           <el-option
             v-for="type in productTypeList"
             :key="type.id"
@@ -14,7 +14,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('商品名称')" prop="titleZh">
-        <product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.ids" />
+        <product-selector v-model="form.productId" :product-type="form.productType" @change="product = $event" :disabled="!!$route.query.action" />
       </el-form-item>
 
       <el-form-item :label="$t('英文名称')" prop="titleEn">

src/views/system/helpDoc/info.vue

+<template>
+  <div class="infoheader">
+    <el-collapse v-model="activeNames">
+      <div v-for="item in helpData" :key="item.id">
+        <el-collapse-item :title="item.titleZh" :name="item.id">
+          <span v-html="item.contentZh">{{ item.contentZh }}</span>
+        </el-collapse-item>
+      </div>
+    </el-collapse>
+  </div>
+</template>
+
+<script>
+import { getInternalHelpDocPage} from "@/api/system/internalHelpDoc";
+export default {
+  data() {
+    return {
+      activeNames: [],
+      helpData: []
+    }
+  },
+  created() {
+    getInternalHelpDocPage({ pageNo: 1, pageSize: 100 }).then((r) => {
+      this.helpData = r.data.list
+      this.activeNames = this.helpData.map(m => { return m.id })
+    })
+  }
+}
+</script>
+
+<style scoped>
+  .infoheader{
+    padding:20px
+  }
+</style>

src/views/system/user/index.vue

@@ -163,6 +163,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="hasCustomerServicePost">
+            <el-form-item  label="不掉公海">
+              <el-switch v-model="form.notAllowedToEnterOpenSea"></el-switch>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">