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

src/views/ecw/order/components/PackHistoryDetail.vue

@@ -30,7 +30,7 @@
           <div slot="header" class="card-title">
             {{$t('打包前')}}
           </div>
-          <el-table v-if="orderWarehouseInContent" :data="orderWarehouseInContent.orderWarehouseInItemDtoList">
+          <el-table v-if="orderWarehouseInContent" :data="orderWarehouseInContent.orderWarehouseInBackItemDoList">
             <el-table-column type="index" :label="$t('序号')" />
             <el-table-column :label="$t('箱数')" prop="cartonsNum">
                 <template slot-scope="{row}">

src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue

@@ -7,7 +7,7 @@
     <el-row :gutter="10">
       <el-col :span="12">
         <el-form-item :label="$t('中文品名')">
-          <product-selector v-model="value.prodId" @change="onProductChange" determined protect-once :disabled="readonly" />
+          <product-selector v-model="value.prodId" @change="onProductChange" determined :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -147,9 +147,10 @@ export default {
       this.getProductBrandPage()
     }
 
-    if (typeof this.value.prodAttrIds === 'string') {
-      this.prodAttrIds = this.value.prodAttrIds.split(',').map(e => +e) || []
+    if (typeof this.value.prodAttrIds === 'string' && this.value.prodAttrIds.length > 0) {
+      this.prodAttrIds.push(...this.value.prodAttrIds.split(',').map(e => +e))
     }
+    console.log(this.prodAttrIds)
 
     if (this.value.usageIds) {
       await this.$nextTick()
@@ -182,7 +183,7 @@ export default {
       this.$emit('handle-delete')
     },
     onProductChange(product){
-      if (!product) {
+      if (!product || this.readonly) {
         return
       }
       this.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []