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

src/views/ecw/order/detail.vue

@@ -71,7 +71,9 @@
         <el-descriptions-item :label="$t('运输方式')" >
           <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
         </el-descriptions-item>
-        <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >{{channelName}}</el-descriptions-item>
+        <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'":label="$t('出货渠道')" >
+          {{order.channelName}}
+        </el-descriptions-item>
       </el-descriptions>
     </el-card>
 
@@ -557,10 +559,6 @@ export default {
         return JSON.parse(this.order.departureVO.departure)
       }
       return {}
-    },
-    channelName(){
-      if(!this.channel) return '/'
-      return this.$l(this.chanel, 'name')
     }
   },
   watch:{
@@ -573,7 +571,7 @@ export default {
       }
     },
     'order.channelId'(){
-      this.getChannel()
+      // this.getChannel()
     },
     'order.consigneeVO'(val){
       if(!val) return '-'
@@ -735,12 +733,12 @@ export default {
         })
       })
     }, */
-    getChannel(){
+    /*getChannel(){
       if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
       getChannel(this.order.channelId).then(res => {
         this.channel = res.data
       })
-    },
+    },*/
     loadFeeList(){
       getReceivableListByOrderId({id: this.orderId}).then(res => {
         this.feeList = res.data

src/views/ecw/order/stocking/components/Package.vue

@@ -26,7 +26,8 @@
               remote
               @change="handleBrandChange"
               :remote-method="getProductBrandPage"
-              disabled>
+              disabled
+              >
               <el-option
                 v-for="item in brandList"
                 :key="item.id"
@@ -368,24 +369,6 @@ export default {
         feeType: undefined,
         recordMode: undefined
       },
-      form1: {
-        table: [],
-        brandType: undefined,
-        orderId: undefined,
-        orderNo: undefined,
-        brand: undefined,
-        inTime: undefined,
-        material: undefined,
-        orderItemId: undefined,
-        prodAttrIds: [],
-        prodId: undefined,
-        prodTitleEn: undefined,
-        prodTitleZh: undefined,
-        prodType: undefined,
-        type: 1,
-        feeType: undefined,
-        recordMode: undefined
-      },
       brandList: [],
       brandList1: [],
       formRules: {
@@ -474,15 +457,15 @@ export default {
       })
 
       if (!this.edit){
-        let protectRowCount = 0
+        /*let protectRowCount = 0
         this.protectRowCount = this.form.table.map(e => {
           if (e.id){
             protectRowCount++
           }
         })
-        this.protectRowCount = protectRowCount
+        this.protectRowCount = protectRowCount*/
         this.handleAdd()
-        this.handleAdd(1)
+        // this.handleAdd(1)
       }
     },
     handleClose() {
@@ -516,6 +499,7 @@ export default {
           }
           // 首次入仓、入仓补充
           return finishPacked({
+            brand: this.form.brand,
             orderId: this.warehousing.orderId,
             orderItemId: this.warehousing.orderItemId,
             orderWarehouseInItemDtoList: this.form.table.map(e => {
@@ -608,7 +592,7 @@ export default {
         cartonsNum = this.warehousing.num - hasCartonsNum
       }
 
-      const form = val === 1 ? this.form1 : this.form
+      const form = {...this.form}
       const formLength = form.table.length
       let orderLocationBackVOList = []
       /* // 不默认使用上一条记录的储位 https://zentao.test.jdshangmen.com/bug-view-3344.html