装柜功能开发

src/api/ecw/boxSea.js

@@ -443,6 +443,82 @@ export function loadSecGoodsList(params) {
   });
 }
 
+/**
+ * 订单装箱编号列表
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function orderTagList(data) {
+  return request({
+    url: "/ecw/box-load-info/orderTagList",
+    method: "post",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    data: jsonToFormData(data),
+  });
+}
+
+/**
+ * 批量装柜
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function batchCreate(data) {
+  return request({
+    url: "/ecw/box-load-info/batchCreate",
+    method: "post",
+    data,
+  });
+}
+
+/**
+ * 批量删除已装柜标签
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function batchDelete(data) {
+  return request({
+    url: "/ecw/box-load-info/batchDelete",
+    method: "post",
+    data,
+  });
+}
+
+/**
+ * 移出
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function remove(data) {
+  return request({
+    url: "/ecw/box-load-info/remove",
+    method: "post",
+    data,
+  });
+}
+
+/**
+ * 修改柜信息
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function boxUpdate(data) {
+  return request({
+    url: "/ecw/box-load-info/boxUpdate",
+    method: "post",
+    data,
+  });
+}
+
 /*****************************  装柜 end **********************************/
 
 /**

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

@@ -75,27 +75,23 @@ export default {
     onSubmit(operateType) {
       this.$refs["cabinetForm"].validate((valid) => {
         if (valid) {
+          if (operateType === 2) {
+            const { currNode, shipmentObj } = this.$attrs;
+            const status = shipmentObj[currNode.keyName];
+            if (status !== 46) {
+              this.$message.error("请先进行装柜->审批->确认封柜");
+              return;
+            }
+          }
           cabinetCreate({
             shipmentId: this.$attrs.shipmentObj.id,
             ...this.cabinetObj,
             operateType,
-          }).then((res) => {
-            if (operateType === 2) {
-              approvalCreate({
-                shipmentId: this.$attrs.shipmentObj.id,
-                approvalStatus: 0,
-                approvalType: 2,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
               this.cancel("submit");
             });
           });
-            } else {
-              serviceMsg(res, this).then(() => {
-                this.cancel("submit");
-              });
-            }
-          });
         }
       });
     },

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

@@ -120,9 +120,11 @@
                   <el-button type="primary" size="small" @click="foldTable(index, part)">{{part.fold ? '展开' : '收起'}}</el-button>
                 </div>
               </el-row>
-              <el-table v-loading="preLoading" border :data="part.sectionGoodsList" v-show="!part.fold" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)">
+              <el-collapse-transition>
+                <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="orderId" width="120" />
+                    <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="prodTitleZh" width="120" />
@@ -155,6 +157,8 @@
                       </template>
                     </el-table-column>
                   </el-table>
+                </div>
+              </el-collapse-transition>
             </el-row>
           </el-scrollbar>
         </el-col>
@@ -177,8 +181,8 @@
               </div>
             </div>
           </el-row>
-          <el-scrollbar style="height:calc(100% - 40px)">
           <el-pagination background layout="prev, pager, next" :page-size="pageParam.pageSize" :total="total" @current-change="pageChange" v-show="total > 0"></el-pagination>
+          <el-scrollbar style="height:calc(100% - 75px)">
             <el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row">
               <el-row class="preinstall-title order-title">
                 <div>
@@ -189,7 +193,9 @@
                   <p>{{item.destWarehouseName}}</p>
                 </div>
                 <div>
-                  <p>{{item.warehouseType}}</p>
+                  <p>
+                    <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                  </p>
                 </div>
                 <div>
                   <p>入仓时间：</p>
@@ -309,7 +315,7 @@ export default {
 
       // 查询参数
       queryParams: {},
-      pageParam: { pageNo: 1, pageSize: 5 },
+      pageParam: { pageNo: 1, pageSize: 10 },
       // 目的地操作员
       operatorData: {},
       // 校验
@@ -441,7 +447,7 @@ export default {
     },
     /* 待预装订单分页 */
     pageChange(page) {
-      this.queryParams.page = page;
+      this.pageParam.pageNo = page;
       this.getPreLoad();
     },
     /* 折叠 */

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

@@ -21,7 +21,7 @@
 
 <script>
 import { shipConfigure, serviceMsg } from "@/api/ecw/boxSea";
-import { formatNumberString, constantDict } from "../utils";
+import { formatNumberString, formatDateStr, constantDict } from "../utils";
 /**
  * 配船
  */
@@ -47,6 +47,7 @@ export default {
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
     oldData = formatNumberString(oldData, ["saExmtStatus"]);
+    oldData = formatDateStr(oldData, ["configTime"]);
     this.shipObj = oldData;
   },
   methods: {

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

@@ -59,7 +59,8 @@ export default {
       this.$refs["unloadingForm"].validate((valid) => {
         if (valid) {
           if (operateType === 2) {
-            const { ulStatus } = this.$attrs.shipmentObj;
+            const { keyName } = this.$attrs.currNode;
+            const ulStatus = this.$attrs.shipmentObj[keyName];
             if (ulStatus !== 145) {
               this.$message.warning("请先通过卸柜审批");
               return;