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

.env.dev

@@ -5,7 +5,7 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
+VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

.env.development

@@ -5,7 +5,8 @@ ENV = 'development'
 VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
+#VUE_APP_BASE_API = 'https://jd.admtest.jdshangmen.com'
+VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

public/static/plugins/ueditor/ueditor.all.min.js

@@ -17972,8 +17972,9 @@ UE.plugins['video'] = function (){
             tmpCell.rowSpan = tmpCell.colSpan = 1;
         }
         //去掉宽高
+        /* @ 20221223 dragondean
         !keepPro && domUtils.removeAttributes(tmpCell,'width height');
-        !keepPro && domUtils.removeAttributes(tmpCell,'style');
+        !keepPro && domUtils.removeAttributes(tmpCell,'style'); */
 
         tmpCell.style.borderLeftStyle = "";
         tmpCell.style.borderTopStyle = "";
@@ -18232,12 +18233,13 @@ UE.plugins['video'] = function (){
                 };
             }
             //给第一行设置firstRow的样式名称,在排序图标的样式上使用到
+            /* @ 20221223 dragondean
             if(!domUtils.hasClass(this.table.rows[0], "firstRow")) {
-                domUtils.addClass(this.table.rows[0], "firstRow");
+                domUtils.addClass(this.table.rows[0], "firstRow11111");
                 for(var i = 1; i< this.table.rows.length; i++) {
-                    domUtils.removeClasses(this.table.rows[i], "firstRow");
+                    domUtils.removeClasses(this.table.rows[i], "firstRow22222");
                 }
-            }
+            } */
         },
         /**
          * 获取单元格的索引信息

src/api/ecw/box.js

@@ -215,8 +215,7 @@ export function getNoticeList(data) {
   return request({
     url: "/shipment/box/noticeList",
     method: "post",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    data: jsonToFormData(data),
+    data,
   });
 }
 
@@ -246,7 +245,7 @@ export function getBoxApproval(params) {
 }
 
 // 获得制作提货单（审核中调用）
-export function getBillOfLandingInProcessing(params){
+export function getBillOfLandingInProcessing(params) {
   return request({
     url: "/shipment/make-bill-of-lading/getInProcessing",
     method: "get",

src/api/ecw/order.js

@@ -181,6 +181,28 @@ export function orderWarehouseInUpdateLabel(data){
   })
 }
 
+// 根据订单id获取标签箱号列表
+export function getLabelByOrder(orderId){
+  return request({
+    url: '/order/order-warehouse-in/get-label-by-order',
+    method: 'get',
+    params: {
+      orderId
+    }
+  })
+}
+
+// 根据订单id获取待入仓标签箱号
+export function getLabelWaitInByOrder(orderId){
+  return request({
+    url: '/order/order-warehouse-in/get-label-wait-in-by-order',
+    method: 'get',
+    params: {
+      orderId
+    }
+  })
+}
+
 // 入仓修改储位
 export function saveOrUpdateOrderLocation(data){
   return request({

src/components/bpmnProcessDesigner/package/theme/process-designer.scss

@@ -140,7 +140,7 @@
     }
   }
 }
-pre {
+.my-process-designer pre {
   margin: 0;
   height: 100%;
   overflow: hidden;

src/views/ecw/box/indexSea.vue

@@ -16,19 +16,19 @@
         <el-input v-model="queryParams.cubNo" :placeholder="$t('请输入柜号')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('柜型')" prop="cabinetId">
-        <el-select v-model="queryParams.cabinetId" :placeholder="$t('请选择柜型')">
+        <el-select v-model="queryParams.cabinetId" :placeholder="$t('请选择柜型')" clearable>
           <el-option v-for="item in cabinetList" :label="$l(item, 'name')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('始发地')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')">
+        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')" clearable>
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('目的地')" prop="destWarehouseId">
-        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')">
+        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')" clearable>
           <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -40,7 +40,7 @@
       </el-form-item>
 
       <el-form-item label="" prop="dateRangeCreateTime">
-        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
+        <el-date-picker v-model="queryParams.dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" clearable />
       </el-form-item>
 
       <el-form-item :label="$t('状态')" prop="boxStatus">
@@ -312,7 +312,9 @@ export default {
   methods: {
     formatDate,
     queryNotice() {
-      getNoticeList({}).then((res) => {
+      getNoticeList({
+        transportTypeList: this.transportTypes.map((item) => item.value),
+      }).then((res) => {
         const { data } = res;
         this.noticeList = data ?? [];
         if (data.length) {

src/views/ecw/box/query.vue

@@ -362,18 +362,18 @@ export default {
     },
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
-        // 报关异常 customsInfo
-        if (key === "customsInfo" && value && value.hasAbnormal) {
+        // 报关异常 customsHasAbnormal
+        if (key === "customsHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "customs");
           this.$set(this.dialogConfig, "title", this.$t("更新报关异常状态"));
         }
-        // 起运异常 shippingInfo
-        if (key === "shippingInfo" && value && value.hasAbnormal) {
+        // 起运异常 shippingHasAbnormal
+        if (key === "shippingHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "shipping");
           this.$set(this.dialogConfig, "title", this.$t("更新起运异常状态"));
         }
-        // 到港异常 arrivalInfo
-        if (key === "arrivalInfo" && value && value.hasAbnormal) {
+        // 到港异常 arrivalHasAbnormal
+        if (key === "arrivalHasAbnormal" && value) {
           this.$set(this.errorInfo, "errorType", "arrival");
           this.$set(this.dialogConfig, "title", this.$t("更新到港异常状态"));
         }

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

@@ -240,8 +240,8 @@
                 <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
                 <el-table-column :label="$t('备案')" align="center" prop="feeType">
                   <template slot-scope="{row}">
-                    <template v-if="row.brandName">{{row.brandName}}</template>
-                    <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
+                    <template>{{row.brandName}}</template>
+                    （<dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />）
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('箱数')" align="center" prop="num" />
@@ -354,7 +354,7 @@ export default {
         { value: "2", label: this.$t("关联单") },
       ],
       // 备案
-      filingOps: this.getDictDatas(DICT_TYPE.COMMISSION_PRODUCT_APPROVAL),
+      filingOps: this.getDictDatas(DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL),
       // 报关方式
       declarationMethodOps: this.getDictDatas(DICT_TYPE.ECW_CUSTOMS_TYPE),
       // 查询标识

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

@@ -237,7 +237,11 @@ export default {
           if (end.includes(val[keyName])) {
             node.currStatus = "end";
             // 判断是否存在异常未处理
-            if (val[voName].hasAbnormal) {
+            if (
+              val.customsHasAbnormal ||
+              val.shippingHasAbnormal ||
+              val.arrivalHasAbnormal
+            ) {
               continue;
             }
             // 报关

src/views/ecw/customer/query.vue

@@ -25,6 +25,8 @@
               <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('信用等级')">{{ customer.creditLevelNameZh }}</el-descriptions-item>
+
             <el-descriptions-item :label="$t('国家')">{{ country }}</el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('业务员')">{{ customer }}</el-descriptions-item>-->
             <el-descriptions-item :label="$t('客户来源')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_SOURCE, customer.source) }}</el-descriptions-item>
@@ -414,7 +416,7 @@ import {
   orderStatistics,
   creditLogCreate,
   creditScoreStatistic,
-  infoListReceiptPage, userMemberUserList, memberUserList, deleteCustomer,
+  infoListReceiptPage, memberUserList, deleteCustomer,
 
 } from '@/api/ecw/customer'
 import { DICT_TYPE, getDictDataLabel, getDictDatas2 } from '@/utils/dict'
@@ -691,6 +693,7 @@ export default {
       if(r.code === 0){
         this.creditLogPage();
         this.creditFrom = {};
+        this.creditScoreStatisticFn()
         this.dialogVisible = false;
       }
       })
@@ -698,7 +701,6 @@ export default {
     //获得信用客户统计
     creditScoreStatisticFn(){
       creditScoreStatistic({customerId:this.id}).then(r => {
-        console.log(r)
         if(r.code === 0) this.creditScoreStatisticObj = r.data
       })
     },

src/views/ecw/order/components/LandingBillDetail.vue

@@ -22,8 +22,8 @@
         </el-descriptions>
         <el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
 
-        <el-dialog title="查看提单" :visible.sync="ShowLandingBill">
-            <div style="text-align:center; width: 600px; margin: auto" v-html="billContent" />
+        <el-dialog title="查看提单" :visible.sync="ShowLandingBill" width="1000px">
+            <div style="text-align:center; width: 960px; margin: auto" v-html="billContent" />
         </el-dialog>
     </div>
 </template>

src/views/ecw/order/components/UpdateDetail.vue

@@ -22,7 +22,22 @@
             <el-descriptions-item :label="$t('申请理由')" :span="4">
                 <div>
                     <div v-for="(item, index) in order.applyInfoList" :key="index">
-                    {{index+1}}、 {{item.name}} {{$t('从旧的【{orgValue}】改成新的【{newValue}】', {orgValue: item.orgValue, newValue: item.newValue })}}
+                    {{index+1}}、 {{item.name}} 
+                        <template v-if="item.type != 1">{{$t('从旧的【{orgValue}】改成新的【{newValue}】', {orgValue: item.orgValue, newValue: item.newValue })}}</template>
+                        <div v-else class="pl-30">
+                            <div>
+                                {{$t('旧值')}}：<div v-if="!item.orgExternalWarehouse" class="pl-30">{{$t('无')}}</div>
+                            </div>
+                            <div v-for="it in item.orgExternalWarehouse" class="pl-30">
+                                {{$t('时间')}}：{{it.estLoadingTime}}，{{$t('地址')}}：{{it.loadingAddress}}
+                            </div>
+                            <div>
+                                {{$t('新值')}}：<template v-if="!item.newExternalWarehouse">{{$t('无')}}</template>
+                            </div>
+                            <div v-for="it in item.newExternalWarehouse" class="pl-30">
+                                {{$t('时间')}}：{{it.estLoadingTime}}，{{$t('地址')}}：{{it.loadingAddress}}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </el-descriptions-item>

src/views/ecw/order/edit.vue

@@ -326,7 +326,7 @@
                                 <el-date-picker v-model="item.estLoadingTime" value-format="yyyy-MM-dd HH:mm:ss" class="w-200"></el-date-picker>
                             </el-form-item>
                         </div>
-                        <div class="w-300">
+                        <div class="w-500">
                             <el-form-item :label="$t('装货地址')"
                             :prop="'externalWarehouseDtoList.' + index + '.loadingAddress'"
                             :rules="{

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

@@ -194,6 +194,7 @@
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
 import {
+  getLabelByOrder, getLabelWaitInByOrder,
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
@@ -303,6 +304,23 @@ export default {
         }
       })
     },
+
+    // 箱号标签回显
+    getLabelByOrder(){
+      getLabelByOrder(this.orderId).then(r => {
+        if (r.code === 0 && !! r.data && r.data.length > 0) {
+          this.label.orderLabelDtoList = r.data
+        } else {
+          // 没有历史数据，查默认值
+          getLabelWaitInByOrder(this.orderId).then(r => {
+            console.log(r)
+            if (r.code === 0 && !! r.data) {
+              this.label.orderLabelDtoList = [r.data]
+            }
+          })
+        }
+      })
+    },
     handleLabelAdd(index){
       this.label.orderLabelDtoList.splice(index + 1, 0, {
         "end": '',
@@ -323,6 +341,8 @@ export default {
       return getOrder(this.orderId).then(r => {
         this.order = r.data
         this.getTowSum()
+      }).then(() => {
+        this.getLabelByOrder()
       })
     },
     specialHas0(){
@@ -353,6 +373,12 @@ export default {
         sumVolume: this.form.sumVolume,
         sumWeight: this.form.sumWeight
       }
+
+      // 标签箱号
+      if (this.order.parentOrderId) {
+        form.labelList = this.label.orderLabelDtoList || []
+      }
+
       if (this.escapeBol) {
         form.exceptionUrls = this.form.exceptionUrls.split(',');
         form.descZh = this.form.descZh;

src/views/ecw/warehouse/index.vue

@@ -367,7 +367,7 @@
         </el-form-item>
 
         <el-form-item v-if="showFlag">
-          <routers-selector v-model="ladingform.lineIds" />
+          <routers-selector-without-channel v-model="ladingform.lineIds" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -389,7 +389,7 @@ import { uploadFile } from "@/api/infra/file";
 import { listDept } from "@/api/system/dept";
 import Ueditor from '@/components/Ueditor'
 import {getDictData} from '@/utils/dict'
-import RoutersSelector from '@/components/RoutersSelector';
+import RoutersSelectorWithoutChannel from '@/components/RoutersSelectorWithoutChannel';
 import { has } from 'min-dash';
 import Template from "../../cms/template/index";
 
@@ -398,7 +398,7 @@ export default {
   components: {
       Template,
       Ueditor,
-      RoutersSelector
+    RoutersSelectorWithoutChannel
   },
   data() {
 
@@ -446,6 +446,7 @@ export default {
 
       serviceGroup: [
         {id: '1', text: this.$t('集运服务')},
+        {id: '6', text: this.$t('数量(个)是否必填')},
       ],
 
       endServiceGroup: [
@@ -1071,6 +1072,7 @@ export default {
             });
             this.ladingform.lineId=lineId.substr(0,lineId.length-1);
         }
+        console.log(this.ladingform.lineId);
         this.ladingform.account = JSON.stringify(this.arr);
           createTemplate(this.ladingform).then(response => {
               this.$modal.msgSuccess(this.$t("设置路线提单模板成功"));