装柜外部仓以及批量装柜修改

src/api/ecw/box.js

@@ -229,10 +229,20 @@ export function getBoxApproval(params) {
   });
 }
 
-// 下载清关文件
-export function downloadClearanceFiles(params) {
+// 下载agent list文件
+export function downloadAgentListFiles(params) {
   return request({
-    url: "/ecw/box-preload-goods/downloadClearanceFiles",
+    url: "/ecw/box-preload-goods/downloadAgentListFiles",
+    responseType: "arraybuffer",
+    method: "get",
+    params,
+  });
+}
+
+// 下载son cap文件
+export function downloadSoncapFiles(params) {
+  return request({
+    url: "/ecw/box-preload-goods/downloadSoncapFiles",
     responseType: "arraybuffer",
     method: "get",
     params,

src/views/ecw/box/indexSea.vue

@@ -135,8 +135,8 @@
               <el-dropdown-item command="downloadPreloadGoodsList">预装单</el-dropdown-item>
               <el-dropdown-item command="downloadLoadGoodsList">已装单</el-dropdown-item>
               <el-dropdown-item command="downloadReceivableList">应收汇总表</el-dropdown-item>
-              <el-dropdown-item command="">agent list</el-dropdown-item>
-              <el-dropdown-item command="">soncap</el-dropdown-item>
+              <el-dropdown-item command="downloadAgentListFiles">agent list</el-dropdown-item>
+              <el-dropdown-item command="downloadSoncapFiles">soncap</el-dropdown-item>
               <el-dropdown-item command="">提货单</el-dropdown-item>
               <el-dropdown-item command="">提单Copy</el-dropdown-item>
             </el-dropdown-menu>
@@ -301,7 +301,9 @@ export default {
       this.$set(this.dialogCfg, "width", "600px");
       this.$set(this.dialogCfg, "fullscreen", false);
       this.$set(this.dialogCfg, "open", true);
-      this.currRow = {};
+      this.currRow = {
+        transportType: "1",
+      };
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -416,6 +418,22 @@ export default {
             "xlsx"
           );
           break;
+        case "downloadAgentListFiles":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `agentList(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
+        case "downloadSoncapFiles":
+          downloadFile(
+            command,
+            { shipmentId: row.id },
+            `soncap(${row.selfNo}).xlsx`,
+            "xlsx"
+          );
+          break;
       }
 
       if (["editLadingBill", "cost", "error"].includes(command)) {

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

@@ -195,11 +195,9 @@ export default {
       this.$set(this.dialogCfg, "visible", true);
     },
     makeBill(row) {
-      // TODO zgDate需要返回
       makeBillService({
         orderId: row.orderId,
-        zgDate: "2022-09-27",
-        // zgDate: bookSeaInfo.sailTime,
+        shipmentId: this.shipmentObj.id,
       }).then((res) => {
         const { data } = res;
         const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};

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

@@ -202,9 +202,9 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="箱数">
-                <el-input-number v-if="boxOrderInfo.isExternalWarehouse === 1" v-model="batchObj.boxNum" :min="0" :max="batchObj.boxNum" />
+                <el-input-number v-if="boxOrderInfo.isExternalWarehouse === 1" v-model="batchObj.boxNum" :min="0" :max="boxOrderInfo.num" />
                 <template v-else>
-                  {{batchObj.boxNum}}
+                  {{boxOrderInfo.num}}
                 </template>
               </el-form-item>
             </el-col>
@@ -576,7 +576,7 @@ export default {
           }).then((res) => {
             const { data } = res;
             this.boxOrderInfo = data;
-            this.batchObj.boxNum = data.num - data.installNum;
+            this.batchObj.boxNum = data.num;
           });
         }
       });
@@ -590,6 +590,7 @@ export default {
         this.$message.error("箱数不能为0");
         return;
       }
+
       let params = {
         boxNum: this.boxOrderInfo.num,
         orderId: this.boxOrderInfo.orderId,

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

@@ -214,6 +214,9 @@
                   <p>重货比：</p>
                   <p>{{item.weightRatio}}</p>
                 </div>
+                <div v-if="item.isExternalWarehouse === 0" style="color:blue;fontWeight:bold;">
+                  <p>外部仓</p>
+                </div>
                 <div class="table-button">
                   <el-dropdown trigger="click" @command="(command)=>handleGoods('all',item,command)">
                     <el-button type="success" size="small">预装全部</el-button>