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

src/utils/dict.js

@@ -183,6 +183,8 @@ export const DICT_TYPE = {
   ORDER_COD_EXCEPTION_RESULT:'order_cod_exception_result',//代收货款异常处理结果
   ORDER_OTHER_EXCEPTION_RESULT:'order_other_exception_result',//其它异常处理结果
   ORDER_BULKY_CARGO_EXCEPTION_RESULT:'order_bulky_cargo_exception_result',//泡货异常处理结果
+  ORDER_QUERY_PROD_FIELD: 'order_query_prod_field',//订单查询产品字段
+  ORDER_QUERY_NO_FIELD: 'order_query_no_field',//订单查询非产品字段
   NEED_KNOW_TYPE:'need_know_type',//需知类型
   NEED_KNOW_STATUS:'need_know_status',//需知状态
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
@@ -223,6 +225,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
   BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
 
+
   APP_TYPE:"app_type",   //系统类型
   AIR_SHIPMENT_PROCESS:'air_shipment_process'
 }

src/views/ecw/box/indexAir.vue

@@ -118,7 +118,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="batchMarkup">{{$t('批量加价')}}</el-dropdown-item>
-              <el-dropdown-item  :disabled="scope.row.ldStatus<46"  command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item  :disabled="scope.row.prStatus<25"  command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
 <!--              <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>-->
 
             </el-dropdown-menu>

src/views/ecw/box/queryAir.vue

@@ -494,7 +494,7 @@ export default {
           break;
 
         case "router":
-          this.$router.push("/boxSea/shippingSea/" + this.shipmentId);
+          this.$router.push("/boxAir/shippingAir/" + this.shipmentId);
           break;
 
         case "cost":

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

@@ -2,7 +2,8 @@
   <div>
     <el-form ref="agentForm" :model="agentObj" :rules="rules" label-width="120px">
       <el-form-item :label="$t('代理商Agent')" prop="agentId">
-        <supplierSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
+        <supplierOutSelect v-model="agentObj.agentId" :companyType="'1'" :areaType="1" :placeholder="$t('请选择代理商')" :allSupplier="this.$attrs.allSupplier" />
+        <el-button v-hasPermi="['ecw:supplier:query']" type="text" style="font-size: 13px; margin-left: 240px;" @click="SupplierDetail">{{$t('查看代理商详情')}}</el-button>
       </el-form-item>
     </el-form>
     <el-row class="operate-button">
@@ -14,7 +15,7 @@
 
 <script>
 import { agentSet } from "@/api/ecw/boxSea";
-import supplierSelect from "./common/supplierSelect.vue";
+import supplierOutSelect from "./common/supplierOutSelect.vue";
 import { formatStringNumber, serviceMsg } from "../utils";
 /**
  * agent
@@ -22,7 +23,7 @@ import { formatStringNumber, serviceMsg } from "../utils";
 export default {
   name: "agent",
   inheritAttrs: false,
-  components: { supplierSelect },
+  components: { supplierOutSelect },
   data() {
     return {
       // agent对象
@@ -31,6 +32,7 @@ export default {
       rules: {
         agentId: [{ required: true, message: this.$t("必填"), trigger: "change" }],
       },
+      supplierId: 0
     };
   },
   created() {
@@ -60,6 +62,10 @@ export default {
     cancel(type) {
       this.$emit("closeDialog", type);
     },
+    SupplierDetail(){
+      this.supplierId = this.agentObj.agentId 
+      this.$router.push('/supplier/detail?id='+this.supplierId)
+    },
   },
 };
 </script>

src/views/ecw/box/shippingAir/nodePage/common/supplierOutSelect.vue

+<template>
+  <div>
+    <el-select
+    filterable
+    :value="value === 0 ? undefined : value"
+    @change="change"
+    v-bind="$attrs"
+    clearable
+  >
+    <el-option
+      v-for="supplier in getSuppliers"
+      :key="supplier.id"
+      :label="$t('公司名称:')+$l(supplier, 'company')+$t('，地址:')+supplier.externalBackVO.receiveAddress+$t('，邮箱:')+supplier.externalBackVO.receiveEmail+$t('，品名:')+supplier.externalBackVO.goodName+$t('，From M No:')+supplier.externalBackVO
+.fromNo+$t('，BA No:')+supplier.externalBackVO
+.baNo"
+      :value="supplier.id"
+    ></el-option>
+  </el-select>
+  </div>
+  
+</template>
+
+<script>
+/**
+ * 供应商
+ */
+export default {
+  name: "supplierSelect",
+  props: {
+    companyType: String,
+    value: Number,
+    allSupplier: Array,
+    areaType: {
+      type: Number,
+      default: 0
+    },
+  },
+  model: {
+    prop: "value",
+    event: "change",
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    getSuppliers() {
+      let allSupplier = this.allSupplier.filter(
+        (item) => item.areaType == this.areaType
+      );
+      allSupplier.forEach(map=>{
+        map.externalBackVO.receiveAddress = map.externalBackVO.receiveAddress?map.externalBackVO.receiveAddress: ''
+        map.externalBackVO.receiveEmail = map.externalBackVO.receiveEmail?map.externalBackVO.receiveEmail:''
+        map.externalBackVO.goodName = map.externalBackVO.goodName?map.externalBackVO.goodName:''
+        map.externalBackVO.fromNo = map.externalBackVO.fromNo?map.externalBackVO.fromNo:''
+        map.externalBackVO.baNo = map.externalBackVO.baNo?map.externalBackVO.baNo:''
+      })
+      if(this.areaType == 1 || !this.companyType) return allSupplier;
+      return allSupplier.filter((item) =>
+        item.companyTypes.includes(this.companyType)
+      );
+     
+    },
+  },
+  methods: {
+    change(val) {
+      this.$emit("change", val);
+    },
+  },
+};
+</script>

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

@@ -70,7 +70,7 @@
           {{getCheckExamineStatus}}
         </el-form-item>
       </el-form-item>
-      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1">
+      <el-form-item v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 1 && shipmentObj.overMachineExamineStatus == 0 && (typeof cusDeclarationObj.id != 'undefined')">
         <el-button type="primary" @click="approvalCreate">{{$t('提交删单退场审核')}}</el-button>
       </el-form-item>
       <el-form-item prop="weightMisreport"  v-show="cusDeclarationObj.overMachineStatus == 2 && cusDeclarationObj.overMachineAbnormalStatus == 2">
@@ -106,11 +106,8 @@
       </el-form-item>
 
     </el-form>
-    <el-row class="operate-button" v-if="inReview">
-      <el-button type="primary" @click="jumpReviewDetail">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('全部退场审核中') : $t('部分退场审核中')}}</el-button>
-      <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? $t('取消全部退场审核') : $t('取消部分退场审核')}}</el-button>
-    </el-row>
     <el-row class="operate-button">
+      <el-button type="primary" v-if="inReview" plain @click="canclAudit">{{$t('取消删单退场审核')}}</el-button>
       <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal('submit')">{{$t('保存')}}</el-button>
       <el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal('submit')">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
@@ -289,10 +286,15 @@ export default {
     oldData.overDealUser = this.strToArray(oldData.overDealUser)
     oldData.overOrders = this.strToArray(oldData.overOrders)
 
-    this.cusDeclarationObj = oldData;console.log(this.cusDeclarationObj.overDealUser)
+    this.cusDeclarationObj = oldData;
+    if(this.shipmentObj.overMachineExamineStatus == 1){
+      this.$set(this.cusDeclarationObj, "overMachineStatus", 2)
+      this.$set(this.cusDeclarationObj, "overMachineAbnormalStatus", 1)
+    }
   },
   methods: {
     strToArray(str) {
+      if(!str) return []
       let array = str?.split(",") ?? []
       return array.map(item=>{return Number(item)})
     },
@@ -369,10 +371,9 @@ export default {
       approvalCreate({
             shipmentId: this.shipmentObj.id,
             approvalStatus: 0,
-            approvalType: 10
+            approvalType: 11
           }).then((res) => {
             serviceMsg(res, this).then(() => {
-              this.cancel("submit");
             });
           });
     },
@@ -399,18 +400,18 @@ export default {
           }
           // 3.查验状态，查验后放行 直接提交
           if (dcCheckStatus === "3") {
-            const { checkExamineStatus } = this.shipmentObj;
+            const { overMachineExamineStatus } = this.shipmentObj;
             // 没有退场审核中的状态
-            if (checkExamineStatus !== 1) {
+            if (overMachineExamineStatus !== 1) {
               this.submitCustomsCreate(operateType);
               return;
             }
           }
           // 4.查验状态，退场/部分退场 提示
           if (["1", "2"].includes(dcCheckStatus)) {
-            const { checkExamineStatus } = this.shipmentObj;
+            const { overMachineExamineStatus } = this.shipmentObj;
             // 退场审核状态,1-审核中，2-审核成功，3-审核失败，4-取消
-            if ([0, 2, 3, 4].includes(checkExamineStatus)) {
+            if ([0, 2, 3, 4].includes(overMachineExamineStatus)) {
               this.$modal
                 .confirm(this.$t(
                   `您确认提交${
@@ -558,9 +559,10 @@ export default {
     },
     /* 取消审核 */
     canclAudit() {
+      console.log(this.shipmentObj)
       approvalCancel({
         applyReason: this.$t("取消审核"),
-        id: this.shipmentObj["customsApprovalInfo"].id,
+        id: this.shipmentObj["customsDeleteExitApprovalInfo"].id,
         shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
@@ -572,11 +574,11 @@ export default {
     },
     /* 判断查验选择是否禁用 */
     disabledRadio(item) {
-      const { checkExamineStatus, checkDealStatus, customsInfo } =
+      const { overMachineExamineStatus, checkDealStatus, customsInfo } =
         this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {}; // 部分退场状态并且审核通过，退场不可选择
       if (
-        checkExamineStatus === 2 &&
+        overMachineExamineStatus === 2 &&
         dcCheckStatus === 2 &&
         checkDealStatus === 0 &&
         item.value === "1"
@@ -627,8 +629,8 @@ export default {
       immediate: true,
       handler: function (val) {
         // 监听查验状态变化
-        let { checkExamineStatus } = val;
-        if (checkExamineStatus === 1) {
+        let { overMachineExamineStatus } = val;
+        if (overMachineExamineStatus === 1) {
           // 按钮变成审核中
           this.inReview = true;
         }
@@ -653,15 +655,15 @@ export default {
   computed: {
     /* 获取报关审核退场状态文字 */
     getCheckExamineStatus() {
-      const { checkExamineStatus, checkDealStatus, customsInfo } =
+      const { overMachineExamineStatus, checkDealStatus, customsInfo } =
         this.shipmentObj;
       const { dcCheckStatus } = customsInfo ?? {};
-      if (checkExamineStatus === 1) {
+      if (overMachineExamineStatus === 1) {
         return dcCheckStatus === 1
           ? this.$t("退场审核中")
           : this.$t("部分退场审核中");
       }
-      if (checkExamineStatus === 2 && checkDealStatus === 0) {
+      if (overMachineExamineStatus === 2 && checkDealStatus === 0) {
         return dcCheckStatus === 1
           ? this.$t("审核通过，退场中")
           : this.$t("审核通过，部分退场中");
@@ -671,7 +673,7 @@ export default {
     /* 判断是否已处理 */
     isCheckDeal() {
       return (type) => {
-        const { checkExamineStatus, checkDealStatus, customsInfo } =
+        const { overMachineExamineStatus, checkDealStatus, customsInfo } =
           this.shipmentObj;
         const { dcCheckStatus } = customsInfo ?? {};
 
@@ -679,7 +681,7 @@ export default {
         if (type === "status") {
           // 退场/部分退场 审核通过未处理，禁用
           if (
-            checkExamineStatus === 2 &&
+            overMachineExamineStatus === 2 &&
             [1, 2].includes(dcCheckStatus) &&
             checkDealStatus === 0
           ) {
@@ -692,7 +694,7 @@ export default {
           // 退场 审核通过未处理，禁用
           // 部分退场 审核通过未处理，由 disabledRadio 方法判断
           if (
-            checkExamineStatus === 2 &&
+            overMachineExamineStatus === 2 &&
             [1].includes(dcCheckStatus) &&
             checkDealStatus === 0
           ) {
@@ -704,7 +706,7 @@ export default {
         if (type === "submit") {
           const { dcCheckStatus: newCheckStatus } = this.cusDeclarationObj;
           // 退场/部分退场 审核通过未处理
-          if (checkExamineStatus === 2 && checkDealStatus === 0) {
+          if (overMachineExamineStatus === 2 && checkDealStatus === 0) {
             // 退场，禁用
             if (dcCheckStatus === 1) return true;
             // 部分退场

src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue

@@ -122,7 +122,7 @@
           </div>
         </el-dialog>
         <!-- 打印标签 -->
-        <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="300px" :modal-append-to-body="false" append-to-body>
+        <el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>
           <print-tag v-if="printdialogVisible" :tagData="tagData" />
         </el-dialog>
     </el-row>

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -64,7 +64,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('实装箱数')" align="center" prop="installNum" />
-        <el-table-column :label="$t('卸柜箱数')" align="center" prop="unloadNum" />
+        <el-table-column :label="$t('到仓箱数')" align="center" prop="unloadNum" />
         <el-table-column :label="$t('清关状态')" align="center" prop="">
           <template slot-scope="scope">{{clearStatus(scope.row)}}</template>
         </el-table-column>
@@ -106,7 +106,7 @@
       </div>
       <div class="label-font">
         <p>
-          <span>{{$t('已卸')}}：</span>
+          <span>{{$t('到仓')}}：</span>
           <span>{{getUnLoadNumCount}}</span>
         </p>
       </div>
@@ -263,6 +263,7 @@ export default {
     },
     /** 提交 */
     onSubmit() {
+      if(this.getUnLoadNumCount>0){
         approvalCreate({
             shipmentId: this.$attrs.shipmentObj.id,
             approvalStatus: 0,
@@ -273,6 +274,10 @@ export default {
               this.cancel();
             });
         });
+      }else{
+        this.$message.error(this.$t("货物到仓数小于实装数，请确认"));
+      }
+      
     },
     /** 取消 */
     cancel() {

src/views/ecw/order/edit.vue

@@ -832,8 +832,8 @@ export default {
         }
     },
     'form.transportId'(transportId, oldTransportId){
-        // 海运拼柜给表单默认值
-        if(this.form.transportId == 4){
+        // 空运
+        if(this.form.transportId == 4 || this.form.transportId == 3){
             this.$nextTick(() => {
                 this.$set(this, 'form', Object.assign(this.form, {
                     doubleClear: 2,
@@ -854,8 +854,9 @@ export default {
             this.$set(this.form, 'channelId', null)
         }
 
-        // 如果是专线空运默认目的港清关选择我司
+
         if(transportId == 3){
+          // 如果是专线空运默认目的港清关选择我司
           this.$set(this.form, 'portDestCustomsClear', 1)
         }
 

src/views/ecw/order/index.vue

@@ -4,7 +4,11 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item :label="$t('编号')" prop="orderNo">
-        <el-input v-model="queryParams.numberKey" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery">
+          <template slot="prepend">
+            <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" class="w-50" />
+          </template>
+        </el-input>
       </el-form-item>
       <!-- <el-form-item :label="$t('唛头')" prop="marks">
         <el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
@@ -54,7 +58,11 @@
       </el-form-item> -->
 
       <el-form-item :label="$t('商品')" prop="tidanNo">
-        <el-input v-model="queryParams.prodKey" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="prodParam.value" :placeholder="$t('请输入商品类型、品名或品牌')" clearable @keyup.enter.native="handleQuery">
+          <template slot="prepend">
+            <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="prodParam.key" class="w-50" />
+          </template>
+        </el-input>
       </el-form-item>
 
       <el-form-item :label="$t('控货')" prop="isCargoControl">
@@ -544,9 +552,11 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import { getCurrencyPage } from "@/api/ecw/currency";
 import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
 import {getChannelList} from "@/api/ecw/channel";
+import Template from "@/views/cms/template/index.vue";
 export default {
   name: "EcwOrderIndex",
   components: {
+    Template,
     UserSelector,
     FeeApplication,
     BatchSingleApplication,
@@ -620,7 +630,17 @@ export default {
 
       splitRevokeOrderId: null, // 撤销拆单的订单ID
       // 渠道列表，空运需要渠道筛选
-      channelList:[]
+      channelList:[],
+      // 编号搜索条件
+      noParam: {
+        key: 'numberKey',
+        value: ''
+      },
+      // 商品搜索条件
+      prodParam: {
+        key: 'prodKey',
+        value: ''
+      }
     };
   },
   watch:{
@@ -667,6 +687,12 @@ export default {
         if(this.transportId){
           queryParams.transportId = this.transportId
         }
+        if(this.noParam.value){
+          queryParams[this.noParam.key] = this.noParam.value
+        }
+        if(this.prodParam.value){
+          queryParams[this.prodParam.key] = this.prodParam.value
+        }
         return queryParams
     },
     /*batchWarehouseAdjustment(){
@@ -857,6 +883,8 @@ export default {
         page: 1,
         rows: 10
       }
+      this.noParam.value = ''
+      this.prodParam.value = ''
       this.dateFilter = []
       this.handleQuery();
     },