07/06 18:34

111

src/views/categroyManager/vipActiveList.vue

@@ -228,11 +228,21 @@
               </el-select>
               <!--   v-show='onlineSalary!= "TEACHER_DEFAULT"' -->
               <el-input placeholder="请输入"
-                        style="width:100px"
+                        style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
-                        :class="onlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
-                        v-model.trim="onlineprice"></el-input>
+                        v-if="onlineSalary == 'TEACHER_DEFAULT'"
+                        v-model.trim="onlineprice">
+                <template slot="append">元</template>
+              </el-input>
+              <el-input placeholder="请输入"
+                        style="width:150px"
+                        type="number"
+                        @mousewheel.native.prevent
+                        v-if="onlineSalary == 'RATIO_DISCOUNT'"
+                        v-model.trim="onlineprice">
+                <template slot="append">%</template>
+              </el-input>
               <el-checkbox label="是否参加梯度"
                            style="margin-left:20px;"
                            v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
@@ -250,12 +260,24 @@
                 <el-option label="固定课酬"
                            value="FIXED_SALARY"></el-option>
               </el-select>
+              <!-- unonlineSalary -->
               <el-input placeholder="请输入"
-                        style="width:100px"
-                        :class="unonlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
+                        style="width:150px"
                         type="number"
                         @mousewheel.native.prevent
-                        v-model.trim="unonlineprice"></el-input>
+                        v-if="unonlineSalary == 'TEACHER_DEFAULT'"
+                        v-model.trim="unonlineprice">
+                <template slot="append">元</template>
+              </el-input>
+              <el-input placeholder="请输入"
+                        style="width:150px"
+                        type="number"
+                        @mousewheel.native.prevent
+                        v-if="unonlineSalary == 'RATIO_DISCOUNT'"
+                        v-model.trim="unonlineprice">
+
+                <template slot="append">%</template>
+              </el-input>
               <el-checkbox label="是否参加梯度"
                            style="margin-left:20px;"
                            v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
@@ -286,7 +308,8 @@
                    @click="activeType='DISCOUNT'">折扣</div>
               <el-input v-if="activeType=='DISCOUNT'"
                         v-model.trim="attribute1"
-                        placeholder="请输入折扣数值"></el-input>
+                        placeholder="请输入折扣数值">
+                <template slot="append">%</template></el-input>
             </div>
             <div>
               <div class="head"
@@ -539,6 +562,20 @@ export default {
         }
       });
     },
+    loadNumber (event) {
+      var el = event.currentTarget;
+      var elValue = el.value;
+      console.log(elValue)
+      var reg = /^((?!0)\d{1,2}|100)$/;
+      if (!elValue.match(reg)) {
+        elValue = "";
+        return false;
+      } else {
+        return true;
+      }
+
+    },
+
     onCheckAllBranch () {
       // 适用所有分部
       this.resetForm.organ = [];
@@ -677,6 +714,7 @@ export default {
       this.onlineClassJoinGradientRewards = !!parseInt(
         row.onlineClassJoinGradientRewards
       );
+
       this.activeType = row.type;
       this.attribute1 = row.attribute1;
       this.attribute2 = row.attribute2;
@@ -709,11 +747,25 @@ export default {
           endTime = this.resetForm.activeTime[1] || null;
           let organId = this.resetForm.organ.join(",");
           let type = this.activeType;
+          if (type == 'DISCOUNT') {
+            if (this.attribute1 < 0 || this.attribute1 > 100) {
+              this.$message('折扣必须大于0且小于100')
+              return
+            }
+          }
           let vipGroupCategoryIdList = this.resetForm.stauts.join(",");
           let onlineSalarySettlement;
           let offlineSalarySettlement;
           if (this.online) {
             // 勾选线上
+
+            // 判断勾选的是折扣还是现金
+            if (this.onlineSalary == 'RATIO_DISCOUNT') {
+              if (this.onlineprice < 0 || this.onlineprice > 100) {
+                this.$message.error('折扣比必须大于0且小于100')
+                return
+              }
+            }
             onlineSalarySettlement = {
               salarySettlementType: this.onlineSalary,
               settlementValue: this.onlineprice
@@ -723,6 +775,12 @@ export default {
           }
           if (this.unonline) {
             // 勾选线下
+            if (this.unonlineSalary == 'RATIO_DISCOUNT') {
+              if (this.unonlineprice < 0 || this.unonlineprice > 100) {
+                this.$message.error('折扣比必须大于0且小于100')
+                return
+              }
+            }
             offlineSalarySettlement = {
               salarySettlementType: this.unonlineSalary,
               settlementValue: this.unonlineprice
@@ -737,6 +795,7 @@ export default {
             onlineSalarySettlement,
             offlineSalarySettlement
           };
+
           // 发请求创建活动
           resetVipActive({
             paymentReadonlyFlag,

src/views/categroyManager/vipNewActive.vue

@@ -301,11 +301,23 @@ export default {
           let endTime = this.vipform.activeTime[1];
           let organId = this.vipform.organ.join(",");
           let type = this.activeType;
+          if (type == 'DISCOUNT') {
+            if (this.attribute1 < 0 || this.attribute1 > 100) {
+              this.$message('折扣必须大于0且小于100')
+              return
+            }
+          }
           let vipGroupCategoryIdList = this.vipform.stauts.join(",");
           let onlineSalarySettlement;
           let offlineSalarySettlement;
           if (this.online) {
             // 勾选线上
+            if (this.onlineSalary == 'RATIO_DISCOUNT') {
+              if (this.onlineprice < 0 || this.onlineprice > 100) {
+                this.$message.error('折扣比必须大于0且小于100')
+                return
+              }
+            }
             onlineSalarySettlement = {
               salarySettlementType: this.onlineSalary,
               settlementValue: this.onlineprice
@@ -315,6 +327,12 @@ export default {
           }
           if (this.unonline) {
             // 勾选线下
+            if (this.unonlineSalary == 'RATIO_DISCOUNT') {
+              if (this.unonlineprice < 0 || this.unonlineprice > 100) {
+                this.$message.error('折扣比必须大于0且小于100')
+                return
+              }
+            }
             offlineSalarySettlement = {
               salarySettlementType: this.unonlineSalary,
               settlementValue: this.unonlineprice