Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/boxSea.js

@@ -367,7 +367,7 @@ export function secGoodsList(params) {
 }
 
 /**
- * 获得订单预装分页
+ * 获得预装分页
  *
  * @export
  * @param {*} params
@@ -375,7 +375,7 @@ export function secGoodsList(params) {
  */
 export function preloadPage(params) {
   return request({
-    url: "/ecw/order/preloadPage",
+    url: "/ecw/box-preload-goods/preloadPage",
     method: "get",
     params,
   });

src/utils/dict.js

@@ -182,6 +182,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_PRICE_UNIT: 'shipping_price_unit', // 金额单位
   BOX_SHIPPING_TICKET_EXCEPTION: 'shipping_ticket_exception', // 票异常
   BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
+  BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
 }
 
 /**

src/views/ecw/box/shippingDetail.vue

@@ -53,7 +53,7 @@
 
       <el-row style="marginTop:15px">
         <el-table :data="loadDetail.sectionOrderList" border>
-          <el-table-column prop="" label="部分" align="center"></el-table-column>
+          <el-table-column prop="sectionName" label="部分" align="center"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" align="center">
             <template v-slot="{row}">
               <el-button type="text" @click="jumpOrderDetail(row)">{{row.orderNo}}</el-button>

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

@@ -43,7 +43,7 @@
           <el-row class="right-title">
             <div>货物筛选</div>
             <div>当前装柜：{{partData.title}}</div>
-            <div>可预装方数：无返回m³，重量：无返回Kg</div>
+            <div>可预装方数：{{unloadStatistics.volume}}m³，重量：{{unloadStatistics.weight}}Kg</div>
           </el-row>
 
           <!-- 搜索工作栏 -->
@@ -76,7 +76,7 @@
                 <div>
                   <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                 </div>
-                <div>入仓时间：{{item.rucangtime}}</div>
+                <div>入仓时间：{{formatDate(item.rucangTime)}}</div>
                 <div>
                   <el-button type="text" @click="handleGoods('all', item)">[全部预装]</el-button>
                   <el-button type="text" @click="foldTable(index, item)">[{{item.fold ? '展开' : '收起'}}]</el-button>
@@ -84,12 +84,12 @@
               </el-row>
               <el-collapse-transition>
                 <div v-show="!item.fold">
-                  <el-table v-loading="loading" :data="item.orderItemList" border>
+                  <el-table v-loading="loading" :data="item.boxOrderItemList" border>
                     <el-table-column label="序号" type="index" align="center" width="50" />
                     <el-table-column label="品名" align="center" prop="prodTitleZh" min-width="500" />
                     <el-table-column label="品牌" align="center" prop="brandType" width="120">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.brandType" />
+                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
                       </template>
                     </el-table-column>
                     <el-table-column label="箱数" align="center" prop="num" width="120" />
@@ -103,7 +103,9 @@
                         <p v-if="scope.row.weight">{{scope.row.weight}}kg</p>
                       </template>
                     </el-table-column>
-                    <el-table-column label="预装柜" align="center" prop="weight" width="120" />
+                    <el-table-column label="预装柜" align="center" prop="" width="120">
+                      无返回
+                    </el-table-column>
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                       <template slot-scope="scope">
                         <el-button type="text" size="small" @click="handleGoods('singele',scope.row)">预装</el-button>
@@ -125,11 +127,11 @@
       <el-col :span="6" class="totle-info">
         <div>
           <p>总计：</p>
-          <p>111</p>
+          <p>无返回</p>
         </div>
         <div>
           <p>容量：</p>
-          <p>111</p>
+          <p>无返回</p>
         </div>
       </el-col>
     </el-row>
@@ -149,6 +151,7 @@ import {
   createGoods,
   remove,
 } from "@/api/ecw/boxSea";
+import { formatDate } from "../../utils";
 /**
  * 补单
  */
@@ -174,6 +177,7 @@ export default {
       toBePreList: [],
       total: 0,
       loading: false,
+      unloadStatistics: {},
     };
   },
   created() {
@@ -211,8 +215,10 @@ export default {
         ...this.queryParams,
       };
       preloadPage({ ...params, ...this.pageParam }).then((res) => {
-        this.toBePreList = res.data.list;
-        this.total = res.data.total;
+        const { data } = res;
+        this.toBePreList = data.dataList?.list ?? [];
+        this.total = data.dataList?.total ?? 0;
+        this.unloadStatistics = data.unloadStatistics ?? {};
         this.loading = false;
       });
     },
@@ -317,6 +323,7 @@ export default {
         })
         .catch((_) => {});
     },
+    formatDate,
   },
   computed: {
     /** 目的地 */

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

 <template>
   <div>
     <el-form ref="cusDeclarationForm" :rules="rules" :model="cusDeclarationObj" label-width="120px">
-      <el-form-item label="单证要求">我司全代 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
+      <el-form-item label="单证要求">无返回 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
       </el-form-item>
       <el-form-item label="柜重" prop="dcBoxWgt">
         <el-input v-model="cusDeclarationObj.dcBoxWgt" placeholder="请输入柜重" clearable />

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

@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="订单号" prop="toBePreOrderNo">
-        <el-input v-model="queryParams.orderNo" placeholder="请输入订单号码" clearable />
+        <el-input v-model="queryParams.toBePreOrderNo" placeholder="请输入订单号码" clearable />
       </el-form-item>
       <el-form-item label="已预装单号" prop="preOrderNo">
         <el-input v-model="queryParams.preOrderNo" placeholder="请输入已预装单号" clearable />
@@ -126,7 +126,7 @@
                     <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="destWarehouseName" width="120" />
-                    <el-table-column label="入仓时间" align="center" prop="rucangtime" width="120" />
+                    <el-table-column label="入仓时间" align="center" prop="rucangTime" width="120" />
                     <el-table-column label="品名" align="center" prop="prodTitleZh" width="120" />
                     <el-table-column label="箱数" align="center" prop="num" />
                     <el-table-column label="体积/重量/重货比" align="center" width="140" prop="volumeWeight">
@@ -142,7 +142,7 @@
                     </el-table-column>
                     <el-table-column label="备案" align="center" prop="productRecord" width="100">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.productRecord" />
+                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.productRecord" />
                       </template>
                     </el-table-column>
                     <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
@@ -169,15 +169,15 @@
             <div class="preinstall-title preinstalled">
               <div class="red-label">
                 <p>筛选后待预装数量：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.num}}箱</p>
               </div>
               <div class="red-label">
                 <p>方数：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.volume}}m³</p>
               </div>
               <div class="red-label">
                 <p>重量：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.weight}}kg</p>
               </div>
             </div>
           </el-row>
@@ -199,7 +199,7 @@
                 </div>
                 <div>
                   <p>入仓时间：</p>
-                  <p>{{item.rucangtime}}</p>
+                  <p>{{formatDate(item.rucangTime)}}</p>
                 </div>
                 <div>
                   <p>重货比：</p>
@@ -214,12 +214,12 @@
                   </el-dropdown>
                 </div>
               </el-row>
-              <el-table v-loading="toBePreLoading" :data="item.orderItemList" border show-summary :summary-method="getSummaries">
+              <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" label="序号" width="50" />
                 <el-table-column label="品名" align="center" prop="prodTitleZh" />
                 <el-table-column label="备案" align="center" prop="brandType">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.brandType" />
+                    <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
                   </template>
                 </el-table-column>
                 <el-table-column label="箱数" align="center" prop="num" />
@@ -229,8 +229,14 @@
                     <p v-if="scope.row.weight">{{scope.row.weight}}kg</p>
                   </template>
                 </el-table-column>
-                <el-table-column label="报关方式" align="center" prop="" />
-                <el-table-column label="包装类型" align="center" prop="" />
+                <el-table-column label="报关方式" align="center" prop="">
+                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                </el-table-column>
+                <el-table-column label="包装类型" align="center" prop="">
+                  <template slot-scope="scope">
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGE_TYPE" :value="scope.row.unit" />
+                  </template>
+                </el-table-column>
                 <el-table-column label="材质" align="center" prop="material" />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
@@ -278,6 +284,7 @@ import {
   approvalCreate,
 } from "@/api/ecw/boxSea";
 import userSelect from "./common/userSelect.vue";
+import { formatDate } from "../utils";
 
 /**
  * 预装
@@ -309,6 +316,7 @@ export default {
       toBePreLoading: false,
       toBePreList: [],
       total: 0,
+      unloadStatistics: {},
 
       // 显示搜索条件
       showSearch: true,
@@ -345,6 +353,7 @@ export default {
     this.handleQuery("toBePre");
   },
   methods: {
+    formatDate,
     /* 获取城市 */
     importCityName(id) {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
@@ -358,9 +367,10 @@ export default {
     getSecGoods() {
       this.preLoading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = this.getParams();
       // 已预装单号
       params.orderNo = params.preOrderNo;
+      delete params.preOrderNo;
       params.shipmentId = this.shipmentObj.id;
       secGoodsList(params).then((res) => {
         this.preList = res.data;
@@ -371,12 +381,15 @@ export default {
     getPreLoad() {
       this.toBePreLoading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = this.getParams();
       // 订单号
       params.orderNo = params.toBePreOrderNo;
+      delete params.toBePreOrderNo;
       preloadPage({ ...params, ...this.pageParam }).then((res) => {
-        this.toBePreList = res.data.list;
-        this.total = res.data.total;
+        const { data } = res;
+        this.toBePreList = data.dataList?.list ?? [];
+        this.total = data.dataList?.total ?? 0;
+        this.unloadStatistics = data.unloadStatistics ?? {};
         this.toBePreLoading = false;
       });
     },
@@ -525,6 +538,15 @@ export default {
       this.pageParam.pageNo = 1;
       this.getPreLoad();
     },
+    getParams() {
+      const { rucangtime = [] } = this.queryParams;
+      delete this.queryParams.rucangtime;
+      return {
+        ...this.queryParams,
+        rucangTimeStart: rucangtime[0],
+        rucangTimeEnd: rucangtime[1],
+      };
+    },
   },
 };
 </script>

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

@@ -18,9 +18,9 @@
       <el-select v-model="currPart" placeholder="请选择当前部分">
       </el-select>
       <p>
-        <span>13箱</span>
-        <span>10.83m3</span>
-        <span>210kg</span>
+        <span>无返回 箱</span>
+        <span>无返回 m3</span>
+        <span>无返回 kg</span>
       </p>
     </el-row>
 
@@ -62,15 +62,16 @@
       <div class="label-font">
         <p>
           <span>总计：</span>
-          <span>{{pageData.totalStatistics ? pageData.totalStatistics.num : 0}}箱</span>
+          <span>无返回</span>
+          <!-- <span>{{pageData.totalStatistics ? pageData.totalStatistics.num : 0}}箱</span>
           <span>{{pageData.totalStatistics ? pageData.totalStatistics.volume : 0}}m3</span>
-          <span>{{pageData.totalStatistics ? pageData.totalStatistics.weight : 0}}kg</span>
+          <span>{{pageData.totalStatistics ? pageData.totalStatistics.weight : 0}}kg</span> -->
         </p>
       </div>
       <div class="label-font">
         <p>
           <span>已卸：</span>
-          <span>0</span>
+          <span>无返回</span>
         </p>
       </div>
     </el-row>

src/views/ecw/box/shippingSea/utils.js

@@ -859,6 +859,11 @@ function formatDateStr(obj, keys, format = "YYYY-MM-DD") {
   return obj;
 }
 
+function formatDate(date, format = "YYYY-MM-DD") {
+  if (!date) return date;
+  return dayjs(date).format(format);
+}
+
 function getSeaStatus(val) {
   let currNodeStatus = 11,
     isBreak = false,
@@ -911,4 +916,5 @@ export {
   formatStringNumber,
   formatDateStr,
   formatNumberString,
+  formatDate,
 };