平均分配

src/views/contract_manage/components/allocationNumber.vue

@@ -18,7 +18,7 @@
       <div class="content-box">
         <div v-for="item in listArr" :key="item.ChartPermissionName">
           <div class="industry-ul">
-            <span :class="['industry-name', item.ChartPermissionId == '31' && 'name-yanxuan',item.ChartPermissionId == '52' && 'points-name']">{{ item.ChartPermissionName }}</span>
+            <span :class="['industry-name', item.ChartPermissionId == '31' && 'name-yanxuan', item.ChartPermissionId == '52' && 'points-name']">{{ item.ChartPermissionName }}</span>
             <template v-if="item.ChartPermissionId != '31' && item.ChartPermissionId != '52'">
               <el-input :min="-100" :max="100" type="number" v-model="item.Proportion" size="small" @input="restrictInput(item)" style="width: 76px; margin: 0 5px 0 8px">
                 <div class="per_cent_" slot="suffix">%</div>
@@ -28,7 +28,7 @@
             <p style="width: 38px; height: 32px; line-height: 32px; text-align: center" v-else>{{ item.Money }}</p>
           </div>
           <div v-for="study in item.List" :key="study.RealName" class="industry-ul">
-            <span :class="['study-name', item.ChartPermissionId == '31' && 'name-yanxuan',item.ChartPermissionId == '52' && 'points-name']">{{ study.RealName }}</span>
+            <span :class="['study-name', item.ChartPermissionId == '31' && 'name-yanxuan', item.ChartPermissionId == '52' && 'points-name']">{{ study.RealName }}</span>
             <template v-if="!study.RealName.includes('研选')">
               <el-input :min="-100" :max="100" type="number" v-model="study.Proportion" size="small" style="width: 76px; margin: 0 5px 0 8px">
                 <div class="per_cent_" slot="suffix">%</div>
@@ -143,15 +143,20 @@ export default {
     },
     // 平均分配
     averageaAllocation() {
-      let isName = this.listArr.some((item) => item.ChartPermissionName == "研选订阅");
-      let num = 100 / (isName ? this.listArr.length - 1 : this.listArr.length);
+      let isName = [];
       this.listArr.forEach((item) => {
-        if (item.ChartPermissionName != "研选订阅") {
+        if (!item.ChartPermissionName.includes("研选")) {
+          isName.push(true);
+        }
+      });
+      let num = 100 / isName.length;
+      this.listArr.forEach((item) => {
+        if (item.ChartPermissionName != "研选订阅" && item.ChartPermissionName != "研选扣点包") {
           item.Proportion = num;
         }
         let childrenNum = num / item.List.length;
         item.List.forEach((key) => {
-          if (key.RealName != "研选订阅") {
+          if (key.RealName != "研选订阅" && key.RealName != "研选扣点包") {
             key.Proportion = childrenNum;
           }
         });