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

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

@@ -54,7 +54,7 @@
 
       <el-form-item :label="$t('特性')" prop="attrId">
         <el-select v-model="queryParams.attrId" :placeholder="$t('特性')">
-          <el-option v-for="item in attrIdList" :label="item" :value="item*1" :key="item"></el-option>
+          <el-option v-for="item in attrIdList" :label="item.label" :value="item.value*1" :key="item.value"></el-option>
         </el-select>
       </el-form-item>
 
@@ -288,7 +288,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
                   <template slot-scope="scope">
-                    <span style="color: bule" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span>
+                    <span style="color: blue;" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span>
                     <template v-else>
                       {{scope.row.warehouseInInfoVO.cartonsNum}}
                     </template>
@@ -514,7 +514,15 @@ export default {
       if(this.queryParams.shippingChannelId){
         let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId)
         if(attrs){
-          data = attrs.attrId.split(',')
+          let attrId = attrs.attrId.split(',')
+          attrId.forEach((item,index)=>{
+            data.push(
+              {
+                value: item,
+                label: attrs.attrNameList[index]
+              }
+            )
+          })
         }
       }
       return data