修改声部

1

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -42,16 +42,47 @@
               >
             </el-checkbox-group>
           </div>
-          <div class="chioseWrap">
+          <div class="chioseWrap"     v-show="
+                music.type && music.type.length > 0
+                  ? music.type.includes('GROUP')
+                  : false
+              ">
             <p
               class="title"
+
+            >
+              团购价:
+            </p>
+
+            <div
               v-show="
                 music.type && music.type.length > 0
                   ? music.type.includes('GROUP')
                   : false
               "
+              style="width: 180px;margin-top: 20px;"
             >
-              团购价:
+
+                <el-form-item
+                  :prop="'chioseMusic.'+index+'.groupPrice'"
+                >
+                  <el-input type="number" v-model="music.groupPrice" :disabled="true">
+                    <template slot="append">元</template></el-input
+                  >
+                </el-form-item>
+
+            </div>
+          </div>
+          <div class="chioseWrap"     v-show="
+                music.type && music.type.length > 0
+                  ? music.type.includes('GROUP')
+                  : false
+              ">
+            <p
+              class="title"
+
+            >
+              分润金额:
             </p>
 
             <div
@@ -64,10 +95,10 @@
             >
 
                 <el-form-item
-                  :prop="'chioseMusic.'+index+'.groupPrice'"
+                  :prop="'chioseMusic.'+index+'.organShareProfit'"
                   :rules="[{ validator:(rule, value, callback)=> checkGroupPrice(rule, value, callback,music), trigger: 'blur' }]"
                 >
-                  <el-input type="number" v-model="music.groupPrice">
+                  <el-input type="number" v-model="music.organShareProfit" >
                     <template slot="append">元</template></el-input
                   >
                 </el-form-item>
@@ -179,6 +210,7 @@ export default {
         groupPrice: 0,
         borrowPrice: 1500,
         groupRemissionCourseFee: false,
+        organShareProfit:0
       });
     }
   },
@@ -198,6 +230,7 @@ export default {
         groupPrice: null,
         borrowPrice: 1500,
         groupRemissionCourseFee: 0,
+        organShareProfit:0
       });
       this.$emit("lookMusic");
     },
@@ -226,10 +259,12 @@ export default {
       console.log(rule, value, this.dividend,music);
       if (!value) {
         callback(new Error("请输入团购价格"));
-      } else if (value*1 >(music.groupPurchasePrice+this.dividend)) {
-        callback(new Error(`团购金额不得大于${music.groupPurchasePrice+this.dividend}`));
-      } else if (value*1 <(music.groupPurchasePrice)) {
-        callback(new Error(`团购金额不得小于${music.groupPurchasePrice}`));
+      } else if (value*1>this.dividend) {
+        console.log(rule, value, this.dividend,music,'团购金额不得大于');
+        callback(new Error(`团购金额不得大于${this.dividend}元`));
+      } else if (value*1 <0 ){
+        console.log(rule, value, this.dividend,music,'团购金额不得小于0元');
+        callback(new Error(`团购金额不得小于${0}元`));
       }else {
         callback();
       }

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -525,6 +525,7 @@ export default {
           expectedStudentNum: active.expectedStudentNum,
           subName: active.sound,
           subjectId: active.id,
+
         };
         obj.musicGroupSubjectPlans.push(item);
         // 格式化商品数据 chioseMusic: [{ musical: '', type: ["GROUP"], groupPrice: 0, borrowPrice: 1500 }],
@@ -533,6 +534,7 @@ export default {
           let goodsItem = null;
           let depositFee = music.borrowPrice;
           let price = music.groupPrice;
+          let organShareProfit = music.organShareProfit;
           let groupRemissionCourseFee;
           if (music.type.indexOf("GROUP") != -1) {
             groupRemissionCourseFee = music.groupRemissionCourseFee * 1;
@@ -572,6 +574,7 @@ export default {
               depositFee,
               price,
               groupRemissionCourseFee,
+              organShareProfit
             };
             obj.musicGroupSubjectGoodsGroups.push(some);
           }