Bladeren bron

薪酬验证

1
mo 3 jaren geleden
bovenliggende
commit
3f396c188a
2 gewijzigde bestanden met toevoegingen van 25 en 17 verwijderingen
  1. 1 0
      src/views/categroyManager/modals/salaryInfo.vue
  2. 24 17
      src/views/categroyManager/vipNewActive.vue

+ 1 - 0
src/views/categroyManager/modals/salaryInfo.vue

@@ -15,6 +15,7 @@
       label-width="150px"
       label-position="right"
       :inline="true"
+      ref="salaryForm"
     >
       <el-row v-if="payForm.courseType == 'VIP'">
         <el-form-item

+ 24 - 17
src/views/categroyManager/vipNewActive.vue

@@ -36,6 +36,7 @@
         :isDisabled="isDisabled || statuss != 'DRAFT'"
       />
       <salaryInfo
+        ref="salaryInfo"
         :salaryForm="salaryForm"
         v-if="active == 3"
         :activeType="baseForm.activityType"
@@ -98,7 +99,7 @@ import {
 import cleanDeep from "clean-deep";
 const payBaseForm = {
   courseType: "",
-  vipGroupCategoryIdList: '',
+  vipGroupCategoryIdList: "",
   applyToStudentType: [],
   teachMode: null,
   allowOnlineToOffline: "",
@@ -185,9 +186,9 @@ export default {
       this.baseForm.id = this.$route.query.id;
       const rusult = await getVipGroupActivity({ id: this.$route.query.id });
       this.formatDetail(rusult.data);
-    }else{
-      this.payInfo = {...payBaseForm}
-      this.salaryForm = {...baseSalaryForm}
+    } else {
+      this.payInfo = { ...payBaseForm };
+      this.salaryForm = { ...baseSalaryForm };
     }
   },
   methods: {
@@ -237,14 +238,14 @@ export default {
     changeCourseType(val) {
       // this.$emit("changeCourseType", val);
       if (val == "PRACTICE") {
-        this.$set(this.payForm, "vipGroupCategoryIdList", '');
+        this.$set(this.payForm, "vipGroupCategoryIdList", "");
         this.$set(this.payForm, "teachMode", "");
         this.$set(this.payForm, "singleCourseTime", 25);
         this.$set(this.payForm, "allowOnlineToOffline", []);
       } else {
         this.$set(this.payForm, "singleCourseTime", 45);
         this.$set(this.payForm, "allowOnlineToOffline", []);
-        this.$set(this.payForm, "vipGroupCategoryIdList", '');
+        this.$set(this.payForm, "vipGroupCategoryIdList", "");
         this.$set(this.payForm, "teachMode", "");
       }
       // vip
@@ -272,9 +273,13 @@ export default {
       this.salaryForm = { ...baseSalaryForm };
       this.$forceUpdate();
     },
-    submit() {
-      this.baseForm.status = "PROGRESS";
-      this.submitDataFormat("PROGRESS");
+    async submit() {
+      this.$refs.salaryInfo.$refs.salaryForm.validate((flag) => {
+        if (flag) {
+          this.baseForm.status = "PROGRESS";
+          this.submitDataFormat("PROGRESS");
+        }
+      });
     },
     save() {
       this.baseForm.status = "DRAFT";
@@ -294,7 +299,9 @@ export default {
         endTime = this.baseForm.activeTime[1];
       }
       let organId = this.baseForm.organ.join(",");
-      this.baseForm.studentMaxUsedTimes?this.baseForm.studentMaxUsedTimes:this.baseForm.studentMaxUsedTimes=-1
+      this.baseForm.studentMaxUsedTimes
+        ? this.baseForm.studentMaxUsedTimes
+        : (this.baseForm.studentMaxUsedTimes = -1);
       for (let item in this.salaryForm) {
         if (this.salaryForm[item].salarySettlementType == "TEACHER_DEFAULT") {
           this.salaryForm[item].settlementValue = null;
@@ -326,7 +333,7 @@ export default {
                   id: res.data.id,
                 }),
               });
-              this.formatDetail(res.data)
+              this.formatDetail(res.data);
             } else {
               localStorage.removeItem("newVip");
               localStorage.removeItem(`newPractice`);
@@ -411,11 +418,11 @@ export default {
       //     }),)
       this.payForm = {
         courseType: data.courseType,
-        vipGroupCategoryIdList: data.vipGroupCategoryIdList?data.vipGroupCategoryIdList
-          .split(",")
-          .map((id) => {
-            return Number(id);
-          })[0]:null,
+        vipGroupCategoryIdList: data.vipGroupCategoryIdList
+          ? data.vipGroupCategoryIdList.split(",").map((id) => {
+              return Number(id);
+            })[0]
+          : null,
         teachMode: data.teachMode + "",
         allowOnlineToOffline: data.allowOnlineToOffline + "",
         singleCourseTime: data.singleCourseTime,
@@ -434,7 +441,7 @@ export default {
         giveCourseNum: data.giveCourseNum,
         giveMemberRankId: data.giveMemberRankId,
         givePeriod: data.givePeriodEnum,
-        giveMemberTime:data.giveMemberTime?data.giveMemberTime:null
+        giveMemberTime: data.giveMemberTime ? data.giveMemberTime : null,
       };
       // 格式化缴费金额
       if (data.salarySettlementJson && data.salarySettlementJson != "null") {