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

src/views/ecw/channel/edit.vue

@@ -93,6 +93,17 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row :gutter="20">
+                <el-col :span="12">
+                  <el-form-item label="渠道泡重比例" prop="attrId">
+                   <el-input v-model.number="form.bubbleWeightRatio" style="width: 200px" >
+                   <template #suffix>
+                     <span>%</span>
+                   </template>
+                   </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <div style="display: flex; justify-content: space-between;">
                 <h1>
                   <span style="color: red;font-size: 14px;font-weight: 700;">*</span>
@@ -103,7 +114,7 @@
                   <el-button type="text" @click="dialogVisible = true;">选择渠道包装模板</el-button>
                 </div>
               </div>
-              <el-row :gutter="20" v-for="(itemm, index) in form.channelPackagingList" :key="index">
+              <el-row :gutter="20" v-for="(itemm, index) in form.channelPackagingList" style="margin-bottom: 50px;border-bottom: 1px solid #cccccc" :key="index">
                 <el-col :span="2">包装类型{{index + 1}}：</el-col>
                 <el-col :span="5">
                   <el-select multiple  v-model="itemm.packagingTypes" >
@@ -187,6 +198,7 @@ export default {
 		return {
       dialogVisible:false,
 			form: {
+             bubbleWeightRatio:100,
              channelCostCreateReqVO:{},
              channelPackagingList:[],
              attrId:[],
@@ -250,6 +262,9 @@ export default {
                 if(this.form.warehouseIds.length){
                     this.warehouseIdsArr = this.form.warehouseIds.split(',')?.filter(item => !!item)
                 }
+                if(this.form.bubbleWeightRatio){
+                  this.form.bubbleWeightRatio = this.form.bubbleWeightRatio * 100
+                }
             });
         }else {
           this.addPackaging()
@@ -365,6 +380,7 @@ export default {
          form.channelPackagingList.forEach(item =>{
            item.packagingTypes = item.packagingTypes.join(',')
          })
+        form.bubbleWeightRatio = form.bubbleWeightRatio / 100
 				// 修改的提交
 				if (this.form.channelId != null) {
 					updateChannel(form).then((response) => {