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

src/api/ecw/boxSea.js

@@ -870,6 +870,22 @@ export function extraCostList(params) {
   });
 }
 
+/**
+ * 获得额外报关费用列表
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function customsOrderList(data) {
+  return request({
+    url: "/shipment/box/customsOrderList",
+    method: "post",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    data: jsonToFormData(data),
+  });
+}
+
 /*****************************  报关费用 end **********************************/
 
 /*****************************  理货 start **********************************/

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -62,6 +62,11 @@
                   </section>
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
+                <template slot-scope="scope">
+                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('计划箱数')" align="center" prop="num">
                 <template slot-scope="scope">
                   {{getTotlContent(scope.row,['num'])}}
@@ -311,9 +316,15 @@ export default {
         startWarehouseId: [
           { required: true, message: this.$t("必填"), trigger: "change" },
         ],
-        cabinetId: [{ required: true, message: this.$t("必填"), trigger: "change" }],
-        qrCode: [{ required: true, message: this.$t("必填"), trigger: "change" }],
-        orderNo: [{ required: true, message: this.$t("必填"), trigger: "change" }],
+        cabinetId: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
+        qrCode: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
+        orderNo: [
+          { required: true, message: this.$t("必填"), trigger: "change" },
+        ],
       },
       // 当前行
       currRow: {},
@@ -338,7 +349,7 @@ export default {
         this.listData = data.map((item, index) => {
           return {
             ...item,
-            title: this.$t('第{index}部分', {index: 1+index}),
+            title: this.$t("第{index}部分", { index: 1 + index }),
           };
         });
         if (this.listData.length) {

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

@@ -25,7 +25,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('正常报关订单')">
-        <div v-for="item in shipmentObj.normalOrderList" :key="item.orderId">
+        <div v-for="item in normalOrderList" :key="item.orderId">
           <a href="javascript:void(0)" @click="jumpOrderDetail(item)">{{ item.orderNo }}</a>
         </div>
       </el-form-item>
@@ -164,6 +164,7 @@ import {
   approvalCancel,
   resetById,
   resetByShipmentId,
+  customsOrderList,
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -229,6 +230,7 @@ export default {
         this.DICT_TYPE.BOX_INSPECTION_TIME_CUSTOMS
       )[0].value,
       isDownload: false,
+      normalOrderList: [],
     };
   },
   created() {
@@ -258,8 +260,17 @@ export default {
     ]);
 
     this.cusDeclarationObj = oldData;
+    // this.getCustomsOrderList(oldData.dcCustomsType);
   },
   methods: {
+    getCustomsOrderList(dcCustomsType) {
+      customsOrderList({
+        shipmentId: this.shipmentObj.id,
+        customsTypes: dcCustomsType === "3" ? "2,3" : dcCustomsType,
+      }).then((res) => {
+        this.normalOrderList = res.data ?? [];
+      });
+    },
     regCloseDialog(type) {
       this.regDialogVisible = false;
       if (type === "error") {
@@ -534,6 +545,9 @@ export default {
     },
   },
   watch: {
+    "cusDeclarationObj.dcCustomsType"(val) {
+      this.getCustomsOrderList(val);
+    },
     "cusDeclarationObj.documentInfo"(val) {
       this.isDownload = false;
       if (val.includes("2")) {

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

@@ -45,6 +45,11 @@
                   <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
                 </template>
               </el-table-column>
+              <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
+                <template slot-scope="scope">
+                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('箱数')" align="center" prop="num">
                 <template slot-scope="scope">
                   <el-link type="primary" @click.native="showWarehouseLogs(scope.row)">

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

@@ -43,6 +43,11 @@
             </section>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('报关方式')" align="center" prop="customsType">
+          <template slot-scope="scope">
+            <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
+          </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="">
@@ -172,7 +177,7 @@ export default {
       this.sectionList = res.data.map((item, index) => {
         return {
           ...item,
-          title: this.$t('第{index}部分', {index: index + 1}),
+          title: this.$t("第{index}部分", { index: index + 1 }),
         };
       });
     });

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

@@ -31,7 +31,7 @@ export default {
             return JSON.parse(this.info.details)
         },
         pictures(){
-            if(!this.detail) return []
+            if(!this.detail || !this.detail.voucher) return []
             return this.detail.voucher.split(',').filter(item => !!item)
         }
     },

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

@@ -53,7 +53,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="320px">
+                    <el-form-item :label="$t('预付商品货值占总货值比例')+':'" label-width="320px">
                         {{orderFee.paymentGoodsWorthScale}}%
                     </el-form-item>
                 </el-col>
@@ -123,7 +123,7 @@ export default {
             }
         },
         orderFee(){
-            
+
         }
     },
     computed:{
@@ -182,4 +182,4 @@ export default {
 ::v-deep .prepay_exception_detail .el-form-item{
     margin-bottom: 0;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ecw/order/index.vue

@@ -180,12 +180,12 @@
           </template>
           <template v-else>
             <!--操作相关的-->
-            <el-dropdown v-if="exclude(scope.row.inWarehouseState, [204,205,206])">
+            <el-dropdown>
               <el-button type="text">{{$t('操作')}}</el-button>
               <el-dropdown-menu slot="dropdown">
                 <!-- 编辑 -->
                 <template v-if="
-                  ( scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314) ) && !scope.row.abnormalState
+                  ( scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314) ) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item>
                 </template>
@@ -205,7 +205,7 @@
 
                 <!-- 费用申请 -->
                 <template v-if="
-                  exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState
+                  exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId"  >{{$t('费用申请')}}</el-dropdown-item>
                 </template>
@@ -224,7 +224,8 @@
                 <!-- 特价 -->
                 <template v-if="
                   exclude(scope.row.status, [0]) &&
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
+                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
+                  exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item>
                 </template>
@@ -232,19 +233,24 @@
                 <!-- 确认提货 -->
                 <template v-if="
                   scope.row.status >= 5 &&
-                  !scope.row.abnormalState
+                  !scope.row.abnormalState &&
+                  exclude(scope.row.inWarehouseState, [204,205,206])
                   ">
                   <el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item>
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"  >{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
 
                 <!-- 合单日志，提货日志 -->
-                <template v-if="scope.row.status >= 5 && scope.row.status < 12 && !scope.row.abnormalState || (scope.row.status == 12 && scope.row.shipmentState == 314) ">
+                <template v-if="(
+                  scope.row.status > 2 &&
+                  exclude(scope.row.status + '-' + scope.row.shipmentState, ['17-391', '18-392', '15-332', '15-330']) &&
+                  exclude(scope.row.status + '-' + scope.row.inWarehouseState, ['16-202'])
+                )">
                   <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
                 </template>