Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/components/RoutersSelector/index.vue

@@ -57,7 +57,11 @@
                             </el-table-column>
                             <el-table-column v-if="showAttr" :label="$t('商品特性')" prop="startTitleZh">
                               <template slot-scope="{row}">
-                                {{ getAttrNames(row.attrId) }}
+                                <!--{{ getAttrNames(row.attrId) }}-->
+                                <template v-if="row.channel && row.channel.attrNameList">
+                                  {{row.channel.attrNameList.join(',')}}
+                                </template>
+
                               </template>
                             </el-table-column>
                             <el-table-column :label="$t('操作')" prop="">
@@ -182,7 +186,7 @@ export default {
         // 显示产品特性
         getAttrName(){
           return (id) => {
-            let item = this.attrList.find(item => item.id == id)
+            let item = this.attrList.find(item => item.id === +id)
             if(!item) return ''
             return this.$l(item, 'attrName')
           }

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

@@ -46,8 +46,8 @@
         <el-input v-model="queryParams.weightRatioMin" :placeholder="$t('请输入 小')" clearable />
       </el-form-item>
 
-      <el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
-        <el-select v-model="queryParams.shippingChannelId" :placeholder="$t('请选择出货渠道')" @change="selectChannel">
+      <el-form-item :label="$t('出货渠道')" prop="channelId">
+        <el-select v-model="queryParams.channelId" :placeholder="$t('请选择出货渠道')" @change="selectChannel">
           <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
         </el-select>
       </el-form-item>

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

@@ -148,7 +148,7 @@ export default {
     }
 
     if (typeof this.value.prodAttrIds === 'string' && this.value.prodAttrIds.length > 0) {
-      this.prodAttrIds.push(...this.value.prodAttrIds.split(',').map(e => +e))
+      this.prodAttrIds = this.value.prodAttrIds.split(',').map(e => +e)
     }
     console.log(this.prodAttrIds)
 

src/views/ecw/productPrice/batchEdit.vue

@@ -339,12 +339,13 @@ export default {
       const res = await getProductPrice(id)
       // 填充商品、线路、价格信息、出货渠道（空运）
       // this.form.productIdList = [res.data.productId]
+      /* 23-11-07要求不复制商品和线路 https://zentao.test.jdshangmen.com/bug-view-5145.html
       this.selectedRoutes = [{
         "lineId": res.data.warehouseLineId,
         "channelId": res.data.shippingChannelId,
         "transportId": res.data.warehouseLineDO.transportType,
         "shippingChannelId":res.data.channelId
-      }]
+      }]*/
       // 要复制过来的字段
       const {
         allPrice,
@@ -395,9 +396,10 @@ export default {
       this.$set(this, 'form', Object.assign({}, this.form, data))
 
       // 产品选择器默认选择的商品
+      /* 23-11-07要求不复制商品和线路 https://zentao.test.jdshangmen.com/bug-view-5145.html
       getProduct(res.data.productId).then(res => {
         this.$refs.productSelector.choose(res.data)
-      })
+      })*/
     },
     // 同步全部单位
     syncAllUnit(){

src/views/ecw/productPrice/edit.vue

@@ -221,7 +221,7 @@
               <el-input v-model="quickForm.minus" class="w-100 ml-10 mr-10" :disabled="!!quickForm.plus"></el-input>
               <selector disabled v-model="currencyAndUnit.currency" :options="currencyList" :label-field="$l('title')" value-field="id" class="w-100" />
               / <selector disabled v-model="currencyAndUnit.unit" :options="unitList" :label-field="$l('title')" value-field="id" class="w-100" />
-              <div class="ml-10">{{$t('*针对所有价格加价')}}</div>
+              <div class="ml-10">{{$t('*针对所有价格减价')}}</div>
             </div>
             <div class="mt-10">
               <el-button @click="quickSet" type="primary" :disabled="!quickForm.plus && !quickForm.minus">{{$t('确定')}}</el-button>