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

src/api/ecw/order.js

@@ -171,6 +171,16 @@ export function orderWarehouseInUpdateApply(data){
     data
   })
 }
+
+// 入仓修改箱号
+export function orderWarehouseInUpdateLabel(data){
+  return request({
+    url: '/order/order-warehouse-in/update-label',
+    method: 'post',
+    data
+  })
+}
+
 // 获取入仓修改审批单详情-审批使用
 export function getWarehouseUpdateApprovalInfo(id) {
   return request({

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

@@ -317,7 +317,7 @@ export default {
     /** 表格订单号点击 */
     orderClick(row) {
       orderTagList({ orderId: row.orderId }).then((res) => {
-        const { data = [] } = res;
+        const { data = {} } = res;
         this.orderList = [];
         // 取最长的list
         let dataLength = data.loadList.length;

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

@@ -74,6 +74,7 @@ export default {
     };
   },
   created() {
+    this.getBoxInfo();
     // 仓库
     getWarehouseList().then((r) => {
       this.warehouseList = r.data;
@@ -99,9 +100,6 @@ export default {
       this.allUsers = data.list ?? [];
     });
   },
-  activated() {
-    this.getBoxInfo();
-  },
   methods: {
     /* 获取仓库 */
     importCityName(id) {

src/views/ecw/order/warehousing/index.vue

@@ -86,7 +86,7 @@
     </el-table>
 
     <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
-    <el-form ref="form" :model="form" label-width="120px" style="max-width: 500px;">
+    <el-form ref="form" :model="form" label-width="120px" style="max-width: 550px;">
       <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value">
         <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
           <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
@@ -125,6 +125,20 @@
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
+
+      <template v-if="order.status === 5">
+        <h2>标枪箱号</h2>
+
+        <div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
+          <el-input-number v-model="item.start" controls-position="right"></el-input-number> -
+          <el-input-number v-model="item.end" controls-position="right"></el-input-number>
+          <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
+          <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
+        </div>
+        <div style="text-align: center">
+          <el-button type="primary" @click="handleLabelSubmit">修改箱号</el-button>
+        </div>
+      </template>
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
@@ -176,7 +190,7 @@ import {
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
-  orderWarehouseInFinish,
+  orderWarehouseInFinish, orderWarehouseInUpdateLabel,
   rollbackDelete
 } from '@/api/ecw/order'
 import orderBaseInfo from "@/components/OrderBaseInfo"
@@ -238,10 +252,36 @@ export default {
       isShowPrintTag: false,
       isShowPrint: false,
       escapeBol:false,
+
+      label: {
+        "orderId": 0,
+        "orderLabelDtoList": [
+          {
+            "end": 0,
+            "start": 0
+          }
+        ]
+      }
     }
   },
 
   methods: {
+    handleLabelSubmit(){
+      orderWarehouseInUpdateLabel({
+        ...this.label,
+        orderId: this.orderId
+      }).then(r => {
+        if (r.code === 0){
+
+        }
+      })
+    },
+    handleLabelAdd(index){
+      this.label.orderLabelDtoList.splice(index + 1, 0, {
+        "end": '',
+        "start": ''
+      })
+    },
     getTowSum(){
       let sumVolume = 0
       let sumWeight = 0