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

src/components/RoutersSelector/index.vue

 <template>
     <div>
         <div class="filters mb-10" v-if="showFilter">
-            {{$t('运输方式')}}
-            <dict-selector :type='DICT_TYPE.ECW_TRANSPORT_TYPE' v-model="transportType" :placeholder="$t('请选择运输方式')" :filter="transportFilter" style="width:150px" />
-
+            <template v-if="!type">
+                {{$t('运输方式')}}
+                <dict-selector :type='DICT_TYPE.ECW_TRANSPORT_TYPE' v-model="transportType" :placeholder="$t('请选择运输方式')" :filter="transportFilter" style="width:150px" />
+            </template>
             {{$t('始发地')}}：
             <el-select :placeholder="$t('请选择始发地')" v-model="exportCity" clearable>
                 <el-option v-for="item in exportCityList" :key="item.id" :label="item.titleZh" :value="item.id" />
@@ -14,7 +15,7 @@
                 <el-option v-for="item in importCityList" :key="item.id" :label="item.titleZh" :value="item.id" />
             </el-select>
 
-            <template v-if="type == 'air'">
+            <template v-if="type != 'sea'">
               {{$t('出货渠道')}}:
               <el-select :placeholder="$t('请选择目渠道')" v-model="channelId" clearable>
                 <el-option v-for="item in channelList" :key="item.channelId" :label="item.nameZh" :value="item.channelId" />

src/router/index.js

@@ -278,13 +278,14 @@ export const constantRoutes = [
         name: 'allocatedCustomerEdit',
         meta: {title:'编辑客户',titleEn:'Edit Customer', icon: ''}
       },
+      // {
+      //   path: 'add-edit/:customerId(\\d+)',
+      //   component: (resolve) => import('@/views/ecw/customer/edit'),
+      //   props: true,
+      //   name: 'customerEdit',
+      //   meta: {title: '新建客户',titleEn:'New customer', icon: ''}
+      // },
       {
-        path: 'add-edit/:customerId(\\d+)',
-        component: (resolve) => import('@/views/ecw/customer/edit'),
-        props: true,
-        name: 'customerEdit',
-        meta: {title: '新建客户',titleEn:'New customer', icon: ''}
-      },{
         path: 'perfect/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/edit'),
         props: true,

src/styles/index.scss

@@ -129,7 +129,7 @@ input, textarea{
 }
 
 .el-scrollbar__view{
-  overflow-x: hidden;
+  /*overflow-x: hidden;*/
 }
 
 .el-rate{

src/views/ecw/box/cancelClear.vue

+<template>
+  <div class="shipping-update-error">
+    <div class="message-title">{{$t(`您确定撤销${cancelClearInfo.orderNo}已清关状态吗?`)}}</div>
+    <el-form ref="arrivalForm" :rules="rules" :model="cusClearanceObj" label-width="120px">
+      <el-form-item :label="$t('撤销理由')" prop="clEstTime">
+        <el-input v-model="cusClearanceObj.applyReason" type="textarea" :rows="4"></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 { approvalCreate } from "@/api/ecw/boxSea";
+
+export default {
+  name: "updateError",
+  inheritAttrs: false,
+  components: {},
+  props: {
+    shipmentObj: Object,
+    cancelClearInfo: Object,
+  },
+  data() {
+    return {
+      // 到港对象
+      cusClearanceObj: {},
+      // 校验
+      rules: {
+        applyReason: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ]
+      }
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs["arrivalForm"].validate((valid) => {
+        if (valid) {
+          approvalCreate({
+            shipmentId: this.shipmentObj.id,
+            approvalStatus: 0,
+            approvalType: 21,
+            orderId: this.cancelClearInfo.orderId,
+            applyReason: this.cusClearanceObj.applyReason
+          }).then(()=>{
+              this.$message.success("成功");
+              this.cancel()
+            })
+        }
+      });
+    },
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.shipping-update-error {
+  .message-title {
+    text-align: center;
+    font-size: 20px;
+    margin: 0 20px 10px;
+  }
+}
+</style>

src/views/ecw/box/queryAir.vue

@@ -108,6 +108,7 @@
               <el-table-column prop="" :label="$t('操作')" align="center" width="120px">
                 <template slot-scope="scope">
                   <el-button type="primary" size="small" :disabled="scope.row.abnormalDealStatus === 1" @click="()=>updateStatus('single', scope.row)">{{$t('更新状态')}}</el-button>
+                  <el-button type="primary" size="small" :disabled="shipmentObj.clStatus!=132&&shipmentObj.clearanceInfo&&(shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) !== -1)" @click="()=>cancleClear(scope.row)">{{$t('撤销清关申请')}}</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -213,6 +214,9 @@
       <template v-if="dialogConfig.type === 'updateClear'">
         <updateClear v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :clearInfo="clearInfo" />
       </template>
+      <template v-if="dialogConfig.type === 'cancelClear'">
+        <cancelClear v-if="dialogConfig.visible" @closeDialog="closeDialog" :shipmentObj="shipmentObj" :cancelClearInfo="cancelClearInfo" />
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -244,6 +248,7 @@ import editForm from "./editForm.vue";
 import updateError from "./updateError.vue";
 import updateArrival from "./updateArrival.vue";
 import updateClear from "./updateClear.vue";
+import cancelClear from "./cancelClear.vue";
 import { listUser } from "@/api/system/user";
 
 export default {
@@ -257,7 +262,8 @@ export default {
     editForm,
     updateError,
     updateArrival,
-    updateClear
+    updateClear,
+    cancelClear
   },
   created() {
     this.transportTypes = this.getDictDatas(
@@ -352,6 +358,7 @@ export default {
       clearInfo: {
         orderList: []
       },
+      cancelClearInfo: {}
     };
   },
   methods: {
@@ -419,6 +426,11 @@ export default {
       this.$set(this.clearInfo, "type", type);
       this.handleCommand("updateClear");
     },
+    /* 更新清关状态 */
+    cancleClear(val) {
+      this.cancelClearInfo = val
+      this.handleCommand("cancelClear");
+    },
     getErrorType() {
       for (const [key, value] of Object.entries(this.shipmentObj)) {
         // 报关异常 customsHasAbnormal
@@ -603,6 +615,10 @@ export default {
           this.$set(this.dialogConfig, "visible", true);
           this.$set(this.dialogConfig, "type", "updateClear");
           break;
+        case "cancelClear":
+          this.$set(this.dialogConfig, "visible", true);
+          this.$set(this.dialogConfig, "type", "cancelClear");
+          break;
       }
     },
     // 关闭弹框

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

@@ -16,6 +16,7 @@
           reserve-keyword
           :filter-method="filterOrder"
           :placeholder="$t('请输入订单号、提单号、唛头')"
+           @change="selectOrderId"
           >
             <el-option
             v-for="(item) in statusOrderList"
@@ -60,7 +61,7 @@ import regError from "../../regError";
 import dayjs from "dayjs";
 import { arrivalCreate } from "@/api/ecw/boxSeaAir";
 import { shipmentOrderList } from "@/api/ecw/boxAir";
-import { formatDateStr, serviceMsg } from "../utils";
+import { formatDateStr, serviceMsg, formatDate } from "../utils";
 
 /**
  * 到港
@@ -106,6 +107,7 @@ export default {
       dtRealHeadTimeFlag: false,
       orderList: [],
       orderListFilter: [],
+      arrivalOrderList: []
     };
   },
   created() {
@@ -121,7 +123,8 @@ export default {
       this.dtRealHeadTimeFlag = true
     }
     if(!this.airArrivalInfo.arriveType) this.$set(this.airArrivalInfo,'arriveType',0)
-    this.$set(this.airArrivalInfo,'arriveOrderIdList',this.airArrivalInfo.arrivalOrderList.map(item=>{return item.orderId}))
+    this.$set(this.airArrivalInfo,'arriveOrderIdList',[])
+    this.arrivalOrderList = this.$attrs.shipmentObj.airArrivalInfo?this.$attrs.shipmentObj.airArrivalInfo.arrivalOrderList:[]
     shipmentOrderList(this.$attrs.shipmentObj.id).then(r=>{
       this.orderList = r.data
       this.orderListFilter = r.data
@@ -137,7 +140,7 @@ export default {
             tidanNo: item.tidanNo,
             marks: item.marks,
           }
-        let index = this.airArrivalInfo.arrivalOrderList.findIndex(p=>p.orderId==item.orderId)
+        let index = this.arrivalOrderList?this.arrivalOrderList.findIndex(p=>p.orderId==item.orderId):-1
         if(index != -1){
           json.arrival = this.$t('已到港')
         }else{
@@ -162,21 +165,48 @@ export default {
       this.compareDate(this.airArrivalInfo.estTime, val);
     },
 
-    // 确认到港时间
-    "arrivalObj.apConfirmTime"(val) {
-      this.compareDate(this.getExpectedTime(), val);
-    },
+    "airArrivalInfo.arriveType"(val) {
+      if(val == 1){
+        this.$set(this.airArrivalInfo, 'actSecondTime', null)
+        this.$set(this.airArrivalInfo, 'estTime', null)
+        this.$set(this.airArrivalInfo, 'actTime', null)
+      }else{
+        let oldData = { ...this.$attrs.shipmentObj[this.$attrs.currNode.voName] };
+        oldData = formatDateStr(
+          oldData,
+          ["actSecondTime", "estTime", "actTime"],
+          "YYYY-MM-DD HH:mm:ss"
+        );
+        this.$set(this.airArrivalInfo, 'actSecondTime', oldData.actSecondTime)
+        this.$set(this.airArrivalInfo, 'estTime', oldData.estTime)
+        this.$set(this.airArrivalInfo, 'actTime', oldData.actTime)
+      }
+    }
   },
   methods: {
     filterOrder(val){
       if(val != ''){
         this.orderListFilter = this.orderList.filter(item=>{
-          return item.orderNo.indexOf(val) > -1 || item.tidanNo.indexOf(val) > -1 || item.marks.indexOf(val) > -1
+          return item.orderNo&&item.orderNo.indexOf(val) > -1 || item.tidanNo&&item.tidanNo.indexOf(val) > -1 || item.marks&&item.marks.indexOf(val) > -1
         })
       }else{
         this.orderListFilter = this.orderList
       }
     },
+    selectOrderId(val) {
+      if (val.length == 1) {
+        let arr = this.arrivalOrderList.find((item) => item.orderId == val[0])
+        if (arr) {
+          this.$set(this.airArrivalInfo, 'actSecondTime', formatDate(arr.actSecondTime))
+          this.$set(this.airArrivalInfo, 'estTime', formatDate(arr.estTime))
+          this.$set(this.airArrivalInfo, 'actTime', formatDate(arr.actTime))
+        }
+      } else {
+        this.$set(this.airArrivalInfo, 'actSecondTime', null)
+        this.$set(this.airArrivalInfo, 'estTime', null)
+        this.$set(this.airArrivalInfo, 'actTime', null)
+      }
+    },
     regCloseDialog(type) {
       this.dialogVisible = false;
       if (type === "error") {

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

@@ -254,7 +254,7 @@
                 </div>
                 <div class="table-button">
                   <el-button v-if="item.relateOrderList" type="primary" size="small" style="margin-right: 20px;" @click="getRelationOrder(item)">{{$t('关联订单')}}</el-button>
-                  <el-button v-if="preList.sectionGoodList" type="success" size="small" :disabled="isAudit" @click="handleGoods('all',item,preList.sectionGoodList[0])">{{$t('分拣')}}</el-button>
+                  <el-button v-if="preList.sectionGoodList&&item.airShipment==4" type="success" size="small" :disabled="isAudit" @click="handleGoods('all',item,preList.sectionGoodList[0])">{{$t('分拣')}}</el-button>
                 </div>
               </el-row>
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
@@ -284,7 +284,9 @@
                 </el-table-column>
                 <el-table-column :label="$t('包装类型')" align="center" prop="">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.unit" />
+                    <span v-for="(unit,index) in scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.units.split(',')" :key="index">
+                      <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="unit" />
+                    </span>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('材质')" align="center" prop="material">{{ $t('、') }}<template slot-scope="scope">

src/views/ecw/customer/edit.vue

@@ -579,7 +579,7 @@ import MemberSelector from '@/components/MemberSelector'
 import {getCurrencyList} from "@/api/ecw/currency";
 
 export default {
-  name: "edit",
+  name: "EcwCustomerEdit",
 
   components: {
     Template,

src/views/ecw/customer/indirectCustomer.vue

@@ -159,9 +159,9 @@ export default {
       // 执行导出
       this.$modal.confirm(this.$t('是否确认导出间接客户数据项?')).then(() => {
         this.exportLoading = true;
-        return indirectCustomerExportExcel(params);
+        return indirectCustomerExportExcel();
       }).then(response => {
-        this.$download.excel(response, '间接客户列表.xls');
+        this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
         this.exportLoading = false;
       }).catch(() => {});
     },

src/views/ecw/deptTarget/index.vue

@@ -73,7 +73,7 @@
           <span>{{ getShipChannelName(scope.row.shippingChannel) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已完成方数')" align="center" prop="completeCubeNum"/>
+      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum"/>
       <el-table-column :label="$t('完成比例')" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.row.completeCubeNum/scope.row.cubeNum*100).toFixed(2)+'%' }}</span>

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -73,7 +73,7 @@
           <span>{{ getShipChannelName(scope.row.shippingChannel) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('已完成方数')" align="center" prop="completeCubeNum"/>
+      <el-table-column :label="$t('已完成目标值')" align="center" prop="completeCubeNum"/>
       <el-table-column :label="$t('完成比例')" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.row.completeCubeNum/scope.row.cubeNum*100).toFixed(2)+'%' }}</span>

src/views/ecw/order/index.vue

@@ -480,7 +480,6 @@
                 <!-- 打印入仓单 -->
                 <template v-if="
                   exclude(scope.row.status, [0, 2]) &&
-                  exclude(scope.row.shipmentState, [320,322,323]) &&
                   exclude(scope.row.abnormalState, [5,6,7,8])
                 ">
                   <el-dropdown-item @click.native="printWarehouseReceiptOrderId=scope.row.orderId" v-hasPermi="['ecw:order:warehouse_receipt']">{{$t('打印入仓单')}}</el-dropdown-item>

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

@@ -602,7 +602,7 @@ export default {
     this.getChannel()
     getWarehouseList().then(res => {
       this.tradeCityList = res.data
-      this.importCityList = this.tradeCityList.filter(item => item.type == 1)
+      this.importCityList = this.tradeCityList.filter(item => item.tradeType == 1 || item.tradeType == 3)
     })
     if (this.$route.query.orderId) {
       this.queryParams.orderId = this.$route.query.orderId

src/views/ecw/productPrice/batchEdit.vue

@@ -22,7 +22,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item :label="$t('单价模式')" prop="priceType">
-              <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" />
+              <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter='number' />
             </el-form-item>
 
             <!--阶梯订单-->
@@ -210,6 +210,7 @@ export default {
         specialList: [],
         priceStepList: [],
         stepPrice: 0,
+        priceType: null
         // advanceStatus: 0,
         // needBook: 0,
         // dayLimit: 10000
@@ -234,7 +235,9 @@ export default {
   computed: {
     // 类型，默认海运sea,air表示空运
     type(){
-      return this.$route.path.split(/[-_]/).pop()
+      let type = this.$route.path.split(/[-_]/).pop()
+      if(type == 'air' || type == 'sea') return type
+      return null
     },
     // 默认运费的货币和体积单位
     currencyAndUnit(){

src/views/ecw/productPrice/batchIncrease.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <products-selector ref="productSelector" v-model="form.productIdList" show-all @setall="isAllProduct=$event" :default-ids="form.productIdList" class="mb-20" />
 
-      <routers-selector v-model="selectedRoutes" :type="type" :show-filter="false" />
+      <routers-selector v-model="selectedRoutes" :type="type" />
 
       <el-card style="margin-bottom: 10px">
         <div slot="header" style="font-size:20px;">

src/views/ecw/productPrice/index.vue

@@ -196,7 +196,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="advanceStatus" :label="$t('単询')" align="center" width="80">
+      <el-table-column prop="advanceStatus" :label="$t('单询')" align="center" width="80">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.NEED_ORDER_INQUIRY" :value="scope.row.needOrderInquiry"></dict-tag>
         </template>
@@ -406,7 +406,8 @@ export default {
       AuditStatusEnum: AuditStatusEnum,
       locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
       // 查看更多阶梯价
-      showMoreStepPriceItem: null
+      showMoreStepPriceItem: null,
+      entryPath: null
     };
   },
 
@@ -545,6 +546,10 @@ export default {
       // if(!this.$route.query.product_id){
       //   return this.product = null
       // }
+      // 价格列表 跟 商品的价格列表，有时候商品价格列表的路由变动会导致价格列表也执行此处代码，所以做一个判断排除
+      // https://zentao.test.jdshangmen.com/bug-view-4928.html
+      if(this.$route.path != this.entryPath) return 
+
       let productId = this.product?.id
       if(this.$route.name === 'ProductPrice'){
         if(this.$route.query.product_id != productId){
@@ -562,6 +567,7 @@ export default {
     }
   },
   created() {
+    this.entryPath = this.$route.path
     if(this.$route.query.product_type){
       this.$set(this.queryParams, 'typeId', +this.$route.query.product_type);
     }

src/views/system/download/index.vue

@@ -19,13 +19,13 @@
 
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('下载编号')" align="center" prop="id" width="100" />
-      <el-table-column :label="$t('分类')" align="center" prop="type" width="100" >
+      <el-table-column :label="$t('分类')" align="left" prop="type" width="120" >
           <template v-slot:default="{row}">
               <dict-tag :type="DICT_TYPE.DOWNLOAD_TYPE" :value="row.type"/>
           </template>
       </el-table-column>
       <!--<el-table-column :label="$t('业务编号')" align="center" prop="type" width="100" /-->
-      <el-table-column :label="$t('下载内容')" align="center" prop="name" />
+      <el-table-column :label="$t('下载内容')" align="left" prop="name" />
       <el-table-column :label="$t('开始下载时间')" align="center" prop="createTime"  width="150">
           <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -47,11 +47,11 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope" >
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDownload(scope.row)"
-                     v-hasPermi="['system:notice:update']" v-if="scope.row.status == 2">{{$t('下载')}}</el-button>
+                     v-if="scope.row.status == 2">{{$t('下载')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleRetry(scope.row)"
-                     v-hasPermi="['system:notice:update']" v-if="scope.row.status == 3">{{$t('重试')}}</el-button>
+                     v-if="scope.row.status == 3">{{$t('重试')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDel(scope.row)"
-                     v-hasPermi="['system:notice:update']">{{$t('删除')}}</el-button>
+                     >{{$t('删除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>