海运开发

src/views/ecw/box/indexSea.vue

@@ -340,7 +340,7 @@ export default {
           return exportboxExcel(params);
         })
         .then((response) => {
-          this.$download.excel(response, "${table.classComment}.xls");
+          this.$download.excel(response, "海运管理.xls");
           this.exportLoading = false;
         })
         .catch(() => {});

src/views/ecw/box/ladingBill/previewBill.vue

@@ -52,11 +52,6 @@ export default {
         });
     },
   },
-  watch: {
-    contentHtml(val) {
-      console.log(val);
-    },
-  },
 };
 </script>
 

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

@@ -28,7 +28,7 @@
     <!-- 操作 -->
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">保存</el-button>
-      <el-button type="success" @click="onSubmit(2)" :disabled="isStartCabinet">封柜</el-button>
+      <el-button type="success" @click="onSubmit(2)" :disabled="isSeal">封柜</el-button>
       <el-button @click="cancel">关闭</el-button>
       <el-button type="danger" @click="startCabinet" :disabled="isStartCabinet">开始装柜</el-button>
     </el-row>
@@ -114,6 +114,11 @@ export default {
   },
   computed: {
     isStartCabinet() {
+      const { currNode, shipmentObj } = this.$attrs;
+      const status = shipmentObj[currNode.keyName];
+      return [46, 47].includes(status) ? true : false;
+    },
+    isSeal() {
       const { currNode, shipmentObj } = this.$attrs;
       const status = shipmentObj[currNode.keyName];
       return status === 47 ? true : false;

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

@@ -40,7 +40,12 @@
               <el-table-column label="序号" type="index" align="center" width="50" />
               <el-table-column label="订单号" align="center" prop="orderNo">
                 <template slot-scope="scope">
+                  <div>
                     <a href="javascript:void(0);" class="order-href" @click="orderClick(scope.row)">{{ scope.row.orderNo }}</a>
+                  </div>
+                  <div style="color:blue;fontWeight:bold;">
+                    {{ scope.row.isExternalWarehouse === 1 ? '(外部仓)' : ''}}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column label="货物信息" align="center" prop="goodsList">

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

@@ -30,7 +30,7 @@
         <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcCutOffTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="状态" prop="dcCustomsStatus">
-        <el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview">
+        <el-radio-group v-model="cusDeclarationObj.dcCustomsStatus" :disabled="inReview || isCheckDeal">
           <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_DCCUSTOMS_STATUS)" :key="item.value" :label="item.value">{{item.label}}</el-radio>
         </el-radio-group>
       </el-form-item>
@@ -38,14 +38,14 @@
       <!-- 查验 -->
       <div v-show="cusDeclarationObj.dcCustomsStatus === '3'">
         <el-form-item label="查验">
-          <el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview">
-            <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value">{{item.label}}</el-radio>
+          <el-radio-group v-model="cusDeclarationObj.dcCheckStatus" :disabled="inReview || isCheckDeal">
+            <el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_CHECK_STATUS)" :key="item.value" :label="item.value" :disabled="disabledRadio(item)">{{item.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
       </div>
 
       <!-- 退场 -->
-      <div v-show="cusDeclarationObj.dcCheckStatus === '1' || cusDeclarationObj.dcCheckStatus === '2'">
+      <div v-show="['1','2','3'].includes(cusDeclarationObj.dcCheckStatus)">
         <el-form-item label="查验时间">
           <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
@@ -55,16 +55,19 @@
         <el-form-item label="新封条">
           <el-input v-model="cusDeclarationObj.dcStripSeal" placeholder="请输入新封条" clearable />
         </el-form-item>
+        <el-form-item label="退场状态" v-if="cusDeclarationObj.dcCheckStatus === '1' || cusDeclarationObj.dcCheckStatus === '2'">
+          {{getCheckExamineStatus}}
+        </el-form-item>
       </div>
 
       <!-- 放行 -->
-      <el-form-item label="放行时间" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCheckStatus === '2'">
+      <el-form-item label="放行时间" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCheckStatus === '3'">
         <el-date-picker type="datetime" placeholder="请选择日期" v-model="cusDeclarationObj.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
 
-      <el-form-item label="装箱单">
+      <!-- <el-form-item label="装箱单">
         <el-button type="primary">下载装箱单</el-button>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="报关单">
         <el-button type="primary">下载所有报关单</el-button>
       </el-form-item>
@@ -75,8 +78,8 @@
       <el-button type="primary" plain @click="canclAudit">{{cusDeclarationObj.dcCheckStatus === '1' ? '取消全部退场审核' : '取消部分退场审核'}}</el-button>
     </el-row>
     <el-row class="operate-button">
-      <el-button type="primary" @click="onSubmit(1)">保存</el-button>
-      <el-button type="success" v-if="!inReview" @click="onSubmit(2)">提交</el-button>
+      <el-button type="primary" @click="onSubmit(1)" :disabled="isCheckDeal">保存</el-button>
+      <el-button type="success" v-if="!inReview" @click="onSubmit(2)" :disabled="isCheckDeal">提交</el-button>
       <el-button @click="cancel">关闭</el-button>
       <el-button type="primary" @click="extraCost" v-show="cusDeclarationObj.dcCustomsStatus === '2' || cusDeclarationObj.dcCustomsStatus === '3'">额外费用</el-button>
     </el-row>
@@ -143,7 +146,7 @@ import {
   extraCostOrder,
   extraCostCreate,
   extraCostUpdate,
-  approvalCreate,
+  approvalCancel,
 } from "@/api/ecw/boxSea";
 import {
   formatNumberString,
@@ -260,7 +263,7 @@ export default {
           if (["1", "2"].includes(dcCheckStatus)) {
             const { checkExamineStatus } = this.shipmentObj;
             // 退场审核状态,1-审核中，2-审核成功，3-审核失败，4-取消
-            if ([0, 3, 4].includes(checkExamineStatus)) {
+            if ([0, 2, 3, 4].includes(checkExamineStatus)) {
               this.$modal
                 .confirm(
                   `您确认提交${
@@ -278,8 +281,9 @@ export default {
                       this.$emit("getBoxInfo");
                     });
                   });
-                })
-                .catch(() => {});
+                });
+            } else {
+              this.submitCustomsCreate(operateType);
             }
           }
         }
@@ -409,19 +413,36 @@ export default {
     },
     /* 取消审核 */
     canclAudit() {
-      const { currNode, shipmentObj } = this.$attrs;
-      const { voName } = currNode;
       approvalCancel({
         applyReason: "取消审核",
-        id: shipmentObj[voName].id,
-        shipmentId: shipmentObj.id,
+        id: this.shipmentObj["customsApprovalInfo"].id,
+        shipmentId: this.shipmentObj.id,
       }).then((res) => {
         serviceMsg(res, this).then(() => {
           // 触发外层重新查询出货信息
+          this.cancel("close");
           this.$emit("getBoxInfo");
         });
       });
     },
+    /* 判断查验选择是否禁用 */
+    disabledRadio(item) {
+      const {
+        checkExamineStatus,
+        checkDealStatus,
+        customsInfo = {},
+      } = this.shipmentObj;
+      const { dcCheckStatus } = customsInfo;
+      // 部分退场状态并且审核通过，退场不可选择
+      if (
+        checkExamineStatus === 2 &&
+        dcCheckStatus === 2 &&
+        item.value === "1"
+      ) {
+        return true;
+      }
+      return false;
+    },
   },
   watch: {
     "cusDeclarationObj.dcBoxWgt"(dcBoxWgt) {
@@ -433,6 +454,14 @@ export default {
     "cusDeclarationObj.dcCustomsStatus"(val) {
       if (val !== "3") {
         this.$set(this.cusDeclarationObj, "dcCheckStatus", "");
+      } else {
+        const { customsInfo = {} } = this.shipmentObj;
+        this.$set(
+          this.cusDeclarationObj,
+          "dcCheckStatus",
+          (customsInfo.dcCheckStatus && String(customsInfo.dcCheckStatus)) ||
+            "3"
+        );
       }
     },
     shipmentObj: {
@@ -448,6 +477,40 @@ export default {
       },
     },
   },
+  computed: {
+    /* 获取报关审核退场状态文字 */
+    getCheckExamineStatus() {
+      const { checkExamineStatus, customsInfo = {} } = this.shipmentObj;
+      const { dcCheckStatus } = customsInfo;
+      if (checkExamineStatus === 1) {
+        return dcCheckStatus === 1 ? "退场审核中" : "部分退场审核中";
+      }
+      if (checkExamineStatus === 2) {
+        return dcCheckStatus === 1
+          ? "审核通过，退场中"
+          : "审核通过，部分退场中";
+      }
+      return "未审核";
+    },
+    /* 判断是否已处理 */
+    isCheckDeal() {
+      const {
+        checkExamineStatus,
+        checkDealStatus,
+        customsInfo = {},
+      } = this.shipmentObj;
+      const { dcCheckStatus } = customsInfo;
+      // 退场未处理不能操作
+      if (
+        checkExamineStatus === 2 &&
+        dcCheckStatus === 1 &&
+        checkDealStatus === 0
+      ) {
+        return true;
+      }
+      return false;
+    },
+  },
 };
 </script>
 

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

@@ -120,7 +120,16 @@
                 <div v-show="!part.fold">
                   <el-table v-loading="preLoading" border :data="part.sectionGoodsList" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)">
                     <el-table-column type="selection" align="center" width="55" fixed="left" />
-                    <el-table-column label="订单号" align="center" prop="orderNo" width="120" />
+                    <el-table-column label="订单号" align="center" prop="orderNo" width="120">
+                      <template slot-scope="scope">
+                        <div>
+                          {{scope.row.orderNo}}
+                        </div>
+                        <div style="color:blue;fontWeight:bold;">
+                          {{ scope.row.isExternalWarehouse === 1 ? '(外部仓)' : ''}}
+                        </div>
+                      </template>
+                    </el-table-column>
                     <el-table-column label="目的地" align="center" prop="destWarehouseName" width="120" />
                     <el-table-column label="入仓时间" align="center" prop="rucangTime" width="120">
                       <template slot-scope="scope">

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

@@ -28,7 +28,16 @@
             <el-table border :data="tallyList" @select="checkboxSelect" @select-all="checkboxSelect" max-height="600px">
               <el-table-column type="selection" align="center" width="55" fixed="left" />
               <el-table-column type="index" align="center" label="序号" width="50" />
-              <el-table-column label="订单号" align="center" prop="orderNo" />
+              <el-table-column label="订单号" align="center" prop="orderNo">
+                <template slot-scope="scope">
+                  <div>
+                    {{scope.row.orderNo}}
+                  </div>
+                  <div style="color:blue;fontWeight:bold;">
+                    {{ scope.row.isExternalWarehouse === 1 ? '(外部仓)' : ''}}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column label="商品信息" width="250px" align="center" prop="prodTitleZh">
               </el-table-column>
               <el-table-column label="备案" align="center" prop="productRecord">