|  | @@ -118,7 +118,7 @@
 | 
											
												
													
														|  |          <el-form-item class="moreRule" :label-width="formLabelWidth" style="margin-bottom: 0;">
 |  |          <el-form-item class="moreRule" :label-width="formLabelWidth" style="margin-bottom: 0;">
 | 
											
												
													
														|  |            <span class="min">分部</span>
 |  |            <span class="min">分部</span>
 | 
											
												
													
														|  |            <span class="min">比例</span>
 |  |            <span class="min">比例</span>
 | 
											
												
													
														|  | -          <span class="max">是否承担手续费</span>
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <!-- <span class="max">是否承担手续费</span> -->
 | 
											
												
													
														|  |          </el-form-item>
 |  |          </el-form-item>
 | 
											
												
													
														|  |          <div class="moreRule">
 |  |          <div class="moreRule">
 | 
											
												
													
														|  |            <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
 |  |            <div class="moreRuleIn" v-for="(domain, index) in result.domains" :key="domain.key">
 | 
											
										
											
												
													
														|  | @@ -153,7 +153,7 @@
 | 
											
												
													
														|  |                </el-input>
 |  |                </el-input>
 | 
											
												
													
														|  |              </el-form-item>
 |  |              </el-form-item>
 | 
											
												
													
														|  |              <el-form-item>
 |  |              <el-form-item>
 | 
											
												
													
														|  | -              <el-select
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <!-- <el-select
 | 
											
												
													
														|  |                  v-model.trim="domain.feeFlag"
 |  |                  v-model.trim="domain.feeFlag"
 | 
											
												
													
														|  |                  placeholder="请选择是否承担手续费"
 |  |                  placeholder="请选择是否承担手续费"
 | 
											
												
													
														|  |                  style="width: 150px !important;"
 |  |                  style="width: 150px !important;"
 | 
											
										
											
												
													
														|  | @@ -161,7 +161,7 @@
 | 
											
												
													
														|  |                >
 |  |                >
 | 
											
												
													
														|  |                  <el-option value="Y" label="是"></el-option>
 |  |                  <el-option value="Y" label="是"></el-option>
 | 
											
												
													
														|  |                  <el-option value="N" label="否"></el-option>
 |  |                  <el-option value="N" label="否"></el-option>
 | 
											
												
													
														|  | -              </el-select>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              </el-select> -->
 | 
											
												
													
														|  |                <el-button
 |  |                <el-button
 | 
											
												
													
														|  |                  v-if="index != 0"
 |  |                  v-if="index != 0"
 | 
											
												
													
														|  |                  @click.prevent="removeDomain(result, domain)"
 |  |                  @click.prevent="removeDomain(result, domain)"
 | 
											
										
											
												
													
														|  | @@ -243,7 +243,7 @@ export default {
 | 
											
												
													
														|  |            {
 |  |            {
 | 
											
												
													
														|  |              organId: null,
 |  |              organId: null,
 | 
											
												
													
														|  |              scale: null,
 |  |              scale: null,
 | 
											
												
													
														|  | -            feeFlag: null,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            // feeFlag: null,
 | 
											
												
													
														|  |              disabled: false,
 |  |              disabled: false,
 | 
											
												
													
														|  |              key: Date.now()
 |  |              key: Date.now()
 | 
											
												
													
														|  |            }
 |  |            }
 | 
											
										
											
												
													
														|  | @@ -268,7 +268,7 @@ export default {
 | 
											
												
													
														|  |          {
 |  |          {
 | 
											
												
													
														|  |            organId: null,
 |  |            organId: null,
 | 
											
												
													
														|  |            scale: null,
 |  |            scale: null,
 | 
											
												
													
														|  | -          feeFlag: null,
 |  | 
 | 
											
												
													
														|  | 
 |  | +          // feeFlag: null,
 | 
											
												
													
														|  |            disabled: false,
 |  |            disabled: false,
 | 
											
												
													
														|  |            key: Date.now()
 |  |            key: Date.now()
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
										
											
												
													
														|  | @@ -325,7 +325,7 @@ export default {
 | 
											
												
													
														|  |                tempResult.push({
 |  |                tempResult.push({
 | 
											
												
													
														|  |                  organId: item.organId,
 |  |                  organId: item.organId,
 | 
											
												
													
														|  |                  scale: item.scale,
 |  |                  scale: item.scale,
 | 
											
												
													
														|  | -                feeFlag: item.feeFlag
 |  | 
 | 
											
												
													
														|  | 
 |  | +                // feeFlag: item.feeFlag
 | 
											
												
													
														|  |                });
 |  |                });
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  |            });
 |  |            });
 | 
											
										
											
												
													
														|  | @@ -383,8 +383,8 @@ export default {
 | 
											
												
													
														|  |          singleLength = domains.length,
 |  |          singleLength = domains.length,
 | 
											
												
													
														|  |          lastDate = domains[singleLength - 1]; // 获取倒数一个对象
 |  |          lastDate = domains[singleLength - 1]; // 获取倒数一个对象
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -      // 如果三个值都为空,则不用检验
 |  | 
 | 
											
												
													
														|  | -      if (!lastDate.organId && !lastDate.scale && !lastDate.feeFlag && checked) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +      // 如果三个值都为空,则不用检验 && !lastDate.feeFlag
 | 
											
												
													
														|  | 
 |  | +      if (!lastDate.organId && !lastDate.scale && checked) {
 | 
											
												
													
														|  |          form.errorText = ''
 |  |          form.errorText = ''
 | 
											
												
													
														|  |          return;
 |  |          return;
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
										
											
												
													
														|  | @@ -402,19 +402,19 @@ export default {
 | 
											
												
													
														|  |            isScale = false
 |  |            isScale = false
 | 
											
												
													
														|  |        domains.forEach(item => {
 |  |        domains.forEach(item => {
 | 
											
												
													
														|  |          countScale += Number(item.scale);
 |  |          countScale += Number(item.scale);
 | 
											
												
													
														|  | -        if(forms.type == 2) {
 |  | 
 | 
											
												
													
														|  | -          if(item.feeFlag == 'Y') {
 |  | 
 | 
											
												
													
														|  | -            selectFeeCount++
 |  | 
 | 
											
												
													
														|  | -          }
 |  | 
 | 
											
												
													
														|  | -        } else if(forms.type == 1) {
 |  | 
 | 
											
												
													
														|  | -          if(item.feeFlag == 'N') {
 |  | 
 | 
											
												
													
														|  | -            selectFeeCount2++
 |  | 
 | 
											
												
													
														|  | -          }
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | 
 |  | +        // if(forms.type == 2) {
 | 
											
												
													
														|  | 
 |  | +        //   if(item.feeFlag == 'Y') {
 | 
											
												
													
														|  | 
 |  | +        //     selectFeeCount++
 | 
											
												
													
														|  | 
 |  | +        //   }
 | 
											
												
													
														|  | 
 |  | +        // } else if(forms.type == 1) {
 | 
											
												
													
														|  | 
 |  | +        //   if(item.feeFlag == 'N') {
 | 
											
												
													
														|  | 
 |  | +        //     selectFeeCount2++
 | 
											
												
													
														|  | 
 |  | +        //   }
 | 
											
												
													
														|  | 
 |  | +        // }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -        if(!isFeeFlag) {
 |  | 
 | 
											
												
													
														|  | -          isFeeFlag = !item.feeFlag ? true : false
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | 
 |  | +        // if(!isFeeFlag) {
 | 
											
												
													
														|  | 
 |  | +        //   isFeeFlag = !item.feeFlag ? true : false
 | 
											
												
													
														|  | 
 |  | +        // }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          if(!isOrganId) {
 |  |          if(!isOrganId) {
 | 
											
												
													
														|  |            isOrganId = !item.organId ? true : false
 |  |            isOrganId = !item.organId ? true : false
 | 
											
										
											
												
													
														|  | @@ -448,10 +448,10 @@ export default {
 | 
											
												
													
														|  |          return;
 |  |          return;
 | 
											
												
													
														|  |        }
 |  |        }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -      if (!lastDate.feeFlag) {
 |  | 
 | 
											
												
													
														|  | -        form.errorText = "请选择是否承担手续费";
 |  | 
 | 
											
												
													
														|  | -        return;
 |  | 
 | 
											
												
													
														|  | -      }
 |  | 
 | 
											
												
													
														|  | 
 |  | +      // if (!lastDate.feeFlag) {
 | 
											
												
													
														|  | 
 |  | +      //   form.errorText = "请选择是否承担手续费";
 | 
											
												
													
														|  | 
 |  | +      //   return;
 | 
											
												
													
														|  | 
 |  | +      // }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |        form.errorText = null;
 |  |        form.errorText = null;
 | 
											
												
													
														|  |        if (!checked) {
 |  |        if (!checked) {
 | 
											
										
											
												
													
														|  | @@ -459,7 +459,7 @@ export default {
 | 
											
												
													
														|  |          domains.push({
 |  |          domains.push({
 | 
											
												
													
														|  |            organId: null,
 |  |            organId: null,
 | 
											
												
													
														|  |            scale: null,
 |  |            scale: null,
 | 
											
												
													
														|  | -          feeFlag: null,
 |  | 
 | 
											
												
													
														|  | 
 |  | +          // feeFlag: null,
 | 
											
												
													
														|  |            disabled: false,
 |  |            disabled: false,
 | 
											
												
													
														|  |            key: Date.now()
 |  |            key: Date.now()
 | 
											
												
													
														|  |          });
 |  |          });
 | 
											
										
											
												
													
														|  | @@ -546,7 +546,7 @@ export default {
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  |              temp.organId = item.organId;
 |  |              temp.organId = item.organId;
 | 
											
												
													
														|  |              temp.scale = item.scale;
 |  |              temp.scale = item.scale;
 | 
											
												
													
														|  | -            temp.feeFlag = item.feeFlag;
 |  | 
 | 
											
												
													
														|  | 
 |  | +            // temp.feeFlag = item.feeFlag;
 | 
											
												
													
														|  |              this.result.domains.push(temp);
 |  |              this.result.domains.push(temp);
 | 
											
												
													
														|  |            });
 |  |            });
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
										
											
												
													
														|  | @@ -583,7 +583,7 @@ export default {
 | 
											
												
													
														|  |            {
 |  |            {
 | 
											
												
													
														|  |              organId: null,
 |  |              organId: null,
 | 
											
												
													
														|  |              scale: null,
 |  |              scale: null,
 | 
											
												
													
														|  | -            feeFlag: null,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            // feeFlag: null,
 | 
											
												
													
														|  |              disabled: false,
 |  |              disabled: false,
 | 
											
												
													
														|  |              key: Date.now()
 |  |              key: Date.now()
 | 
											
												
													
														|  |            }
 |  |            }
 |