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

src/api/ecw/order.js

@@ -181,6 +181,17 @@ export function orderWarehouseInUpdateLabel(data){
   })
 }
 
+// 根据订单id获取标签箱号列表
+export function getLabelByOrder(orderId){
+  return request({
+    url: '/order/order-warehouse-in/get-label-by-order',
+    method: 'get',
+    params: {
+      orderId
+    }
+  })
+}
+
 // 入仓修改储位
 export function saveOrUpdateOrderLocation(data){
   return request({

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

@@ -102,9 +102,9 @@
         <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">{{$t('修改箱号')}}</el-button>
-      </div>
+<!--      <div style="text-align: center">-->
+<!--        <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>-->
+<!--      </div>-->
     </el-card>
 
     <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
@@ -194,6 +194,7 @@
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
 import {
+  getLabelByOrder,
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
@@ -293,13 +294,22 @@ export default {
         return arr.indexOf(state) == -1
       }
     },
-    handleLabelSubmit(){
-      orderWarehouseInUpdateLabel({
-        ...this.label,
-        orderId: this.orderId
-      }).then(r => {
-        if (r.code === 0){
-          this.$message.success(r.msg || this.$t('修改标签箱号成功'))
+    // handleLabelSubmit(){
+    //   orderWarehouseInUpdateLabel({
+    //     ...this.label,
+    //     orderId: this.orderId
+    //   }).then(r => {
+    //     if (r.code === 0){
+    //       this.$message.success(r.msg || this.$t('修改标签箱号成功'))
+    //     }
+    //   })
+    // },
+
+    // 箱号标签回显
+    getLabelByOrder(){
+      getLabelByOrder(this.orderId).then(r => {
+        if (r.code === 0 && !! r.data && r.data.length > 0) {
+          this.label.orderLabelDtoList = r.data
         }
       })
     },
@@ -323,6 +333,8 @@ export default {
       return getOrder(this.orderId).then(r => {
         this.order = r.data
         this.getTowSum()
+      }).then(() => {
+        this.getLabelByOrder()
       })
     },
     specialHas0(){
@@ -353,6 +365,12 @@ export default {
         sumVolume: this.form.sumVolume,
         sumWeight: this.form.sumWeight
       }
+
+      // 标签箱号
+      if (this.order.parentOrderId) {
+        form.labelList = this.label.orderLabelDtoList || []
+      }
+
       if (this.escapeBol) {
         form.exceptionUrls = this.form.exceptionUrls.split(',');
         form.descZh = this.form.descZh;