乐团改造

1

src/views/resetTeaming/modals/user-pay-form.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-show='isShow'>
+  <div v-show="isShow">
     <el-alert
       title="课程信息设置"
       :closable="false"
@@ -15,7 +15,10 @@
     <userBaseinfo
       :form.sync="form"
       :isCommon="isCommon"
-      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'&&paymentTypeString !== 'ADD_STUDENT'"
+      v-if="
+        paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST' &&
+        paymentTypeString !== 'ADD_STUDENT'
+      "
       :isUserType="isUserType"
       @getCharges="getCharges"
       @changeActive="changeActive"
@@ -102,20 +105,12 @@
         class="alert"
         style="margin-top: 20px"
         type="info"
-        v-if="
-          paymentType &&
-          paymentType != 2 &&
-          form.leixing != 2
-        "
+        v-if="paymentType && paymentType != 2 && form.leixing != 2"
       >
       </el-alert>
       <memberSetting
         ref="memberSetting"
-        v-if="
-          paymentType &&
-          paymentType != 2 &&
-          form.leixing != 2
-        "
+        v-if="paymentType && paymentType != 2 && form.leixing != 2"
         :form="memberForm"
         :viewDetail="nowDetail"
         :isUserType="isUserType"
@@ -215,7 +210,9 @@
           :isCommon="isCommon"
           :hidePaymentPattern="true"
           :isUserType="isUserType"
-          :hideMoney='paymentTypeString=="SPAN_GROUP_CLASS_ADJUST"?true:false'
+          :hideMoney="
+            paymentTypeString == 'SPAN_GROUP_CLASS_ADJUST' ? true : false
+          "
           :isDisabled="
             form.leixing === '1' ||
             form.leixing === '2' ||
@@ -261,7 +258,7 @@ import {
   queryByMusicGroupOrganizationCourseSettingsId,
   musicGroupPaymentCalenderView,
   musicGroupPaymentAuditListDetail,
-  musicGroupresetCalender
+  musicGroupresetCalender,
 } from "../api";
 import { paymentPatternType } from "@/constant";
 import { getTimes, objectToOptions } from "@/utils";
@@ -341,7 +338,7 @@ export default {
       },
       money: "",
       isSetCourseSettingsId: false,
-      isShow:false
+      isShow: false,
     };
   },
   computed: {
@@ -414,7 +411,9 @@ export default {
       let paymentType = "";
       if (this.viewDetail) {
         const { musicGroupPaymentCalenders } = this.viewDetail;
-        paymentType = this.viewDetail?.calender?.paymentType || this.viewDetail?.auditDto?.paymentType;
+        paymentType =
+          this.viewDetail?.calender?.paymentType ||
+          this.viewDetail?.auditDto?.paymentType;
       }
       return paymentType;
     },
@@ -556,7 +555,7 @@ export default {
               this.viewDetail.calender.deadlinePaymentDate,
             ]);
 
-                  this.$set(this.other, "memo", this.viewDetail.calender.memo);
+            this.$set(this.other, "memo", this.viewDetail.calender.memo);
             this.syncAllMoney();
           } catch (e) {
             console.log(e);
@@ -568,7 +567,7 @@ export default {
               batchNo: this.rowDetail.batchNo,
             });
             this.viewDetail = res.data;
-              // this.$set(this.other, "memo", this.viewDetail.auditDto.memo);
+            // this.$set(this.other, "memo", this.viewDetail.auditDto.memo);
             const firstPayment = res.data.musicGroupPaymentCalenders[0] || {};
             this.eclass = (
               res.data.musicGroupPaymentCalenderCourseSettings || []
@@ -630,7 +629,7 @@ export default {
             this.syncAllMoney();
           } catch (error) {}
         }
-        this.isShow=true;
+        this.isShow = true;
       }
     },
     formatCourse() {
@@ -812,7 +811,7 @@ export default {
       if (valided.length === forms.length) {
         if (this.rowDetail.paymentType == "ADD_STUDENT") {
           const data = {
-            calenderId:this.viewDetail.calender.id,
+            calenderId: this.viewDetail.calender.id,
             calenderMember: {
               ...this.memberForm,
               actualAmount: this.memberForm.memberPaymentAmount,
@@ -835,10 +834,27 @@ export default {
             ...this.other,
           };
           try {
-            await musicGroupresetCalender(data);
-            this.$message.success("提交成功");
-            this.$listeners.submited();
-            this.$listeners.close();
+          const res =  await musicGroupresetCalender(data);
+
+            if (res.code == 200) {
+              this.$message.success("提交成功");
+              this.$listeners.submited();
+              this.$listeners.close();
+            }
+            if (res.code == 207) {
+              await this.$confirm(
+                res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
+                "提示",
+                {
+                  type: "warning",
+                }
+              );
+              data.confirmCreate = true;
+              await musicGroupresetCalender(data);
+               this.$message.success("提交成功");
+              this.$listeners.submited();
+              this.$listeners.close();
+            }
           } catch (error) {
             console.log(error);
           }

src/views/setQuestions/operation.vue

@@ -68,7 +68,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="12" :md="12" :lg="9" :xl="9" v-if="form.loginFlag">
+          <el-col
+            :xs="12"
+            :sm="12"
+            :md="12"
+            :lg="9"
+            :xl="9"
+            v-if="form.loginFlag"
+          >
             <el-form-item
               label="是否逐题提交"
               prop="commitType"
@@ -93,7 +100,7 @@
           </el-col>
         </el-row>
         <el-row>
-            <el-form-item
+          <el-form-item
             label="问卷模板"
             prop="templateType"
             :rules="[{ required: true, message: '请选择问卷模板' }]"
@@ -109,7 +116,7 @@
                       class="chioseBox"
                       :label="1"
                       :checked="form.templateType == 1"
-                       :disabled='disabled'
+                      :disabled="disabled"
                       ><br
                     /></el-checkbox>
                     <!-- <div
@@ -128,7 +135,7 @@
                       class="chioseBox"
                       :label="2"
                       :checked="form.templateType == 2"
-                       :disabled='disabled'
+                      :disabled="disabled"
                       ><br
                     /></el-checkbox>
                     <!-- <div
@@ -145,7 +152,7 @@
                       class="chioseBox"
                       :label="3"
                       :checked="form.templateType == 3"
-                       :disabled='disabled'
+                      :disabled="disabled"
                       ><br
                     /></el-checkbox>
                     <!-- <div
@@ -154,7 +161,7 @@
                   ></div> -->
                   </div>
                 </div>
-                    <div class="chioseItem" @click="settemplateType(4)">
+                <div class="chioseItem" @click="settemplateType(4)">
                   <img src="./images/img4.png" alt="" />
                   <div class="remberBox">
                     <div class="wrap"></div>
@@ -162,7 +169,7 @@
                       class="chioseBox"
                       :label="4"
                       :checked="form.templateType == 4"
-                      :disabled='disabled'
+                      :disabled="disabled"
                       ><br
                     /></el-checkbox>
                     <!-- <div
@@ -313,7 +320,7 @@
       <el-button type="primary" :disabled="disabled" @click="onSubmit">{{
         type == "create" ? "生成问卷" : "修改问卷"
       }}</el-button>
-        <el-button type="primary" @click="onPreview">预览</el-button>
+      <el-button type="primary" @click="onPreview">预览</el-button>
       <el-button @click="onReset" :disabled="disabled">重置</el-button>
 
       <!--     -->
@@ -324,7 +331,7 @@
         width="415px"
         v-if="questionStatus"
       >
-        <questionManger :form='form' @close="questionStatus = false"/>
+        <questionManger :form="form" @close="questionStatus = false" />
         <!-- <iframe
           src="http://192.168.3.8:9001/#/question"
           width="375px"
@@ -344,11 +351,11 @@ import {
   questionnaireTopicGetDetail,
   questionnaireTopicUpdate,
 } from "./api";
-import questionManger from './questionManger'
+import questionManger from "./questionManger";
 import AnswerList from "./components/answerList";
 export default {
   name: "operationQuestion",
-  components: { questionList, AnswerList,questionManger },
+  components: { questionList, AnswerList, questionManger },
   data() {
     let query = this.$route.query;
     let titleName = "问卷";
@@ -372,7 +379,7 @@ export default {
       },
       disabled: query.type == "look" ? true : false,
       questionStatus: false,
-      checkList:[],
+      checkList: [],
     };
   },
   async mounted() {
@@ -381,7 +388,7 @@ export default {
         let res = await questionnaireTopicGetDetail({ id: this.id });
         this.form = res.data;
         this.questionList = res.data;
-        this.settemplateType(res.data.templateType)
+        this.settemplateType(res.data.templateType);
         // let list = res.data.questionnaireQuestionList || []
         // list.forEach((item, index) => {
         //     this.activeName.push(index)
@@ -507,17 +514,13 @@ export default {
       questWindow.postMessage(
         {
           cmd: "getFormJson",
-          data:{...this.form}
+          data: { ...this.form },
         },
         "*"
       );
     },
-<<<<<<< Updated upstream
-        settemplateType(index) {
-          if(this.disabled)return
-=======
-        setPreTemplate(index) {
->>>>>>> Stashed changes
+    settemplateType(index) {
+      if (this.disabled) return;
       this.$set(this.form, "templateType", index);
       if (this.checkList.indexOf(index) == -1) {
         this.checkList.push(index);
@@ -527,18 +530,17 @@ export default {
       this.bindCheckBox();
     },
 
-
     bindCheckBox() {
       if (this.checkList.length > 1) {
         this.checkList.splice(0, 1);
       }
       this.$set(this.form, "templateType", this.checkList[0] || null);
     },
-    changeLoginFlag(val){
-      if(!val){
-        this.form.commitType = 0
+    changeLoginFlag(val) {
+      if (!val) {
+        this.form.commitType = 0;
       }
-    }
+    },
   },
 };
 </script>
@@ -634,6 +636,4 @@ export default {
     }
   }
 }
-
-
 </style>

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -370,7 +370,7 @@ export default {
           });
           this.eclass = [..._];
           this.syncAllMoney();
-        }else{
+        } else {
           this.eclass = [];
         }
       } catch (error) {
@@ -425,16 +425,19 @@ export default {
       }
       if (forms.length === valided.length) {
         const data = {
-          calenderMember:{
-             ...this.memberForm,
-             actualAmount:this.memberForm.memberPaymentAmount,
-             originalAmount:this.memberForm.originalMemberPaymentAmount
+          calenderMember: {
+            ...this.memberForm,
+            actualAmount: this.memberForm.memberPaymentAmount,
+            originalAmount: this.memberForm.originalMemberPaymentAmount,
           },
-          calenderAddStudent:{
+          calenderAddStudent: {
             classGroupIds: this.ids,
-             studentIds: this.createdUserId,
+            studentIds: this.createdUserId,
           },
-          ...getTimes(this.cycle.paymentDate, ["startPaymentDate", "deadlinePaymentDate"]),
+          ...getTimes(this.cycle.paymentDate, [
+            "startPaymentDate",
+            "deadlinePaymentDate",
+          ]),
           // paymentPattern: this.payment.paymentPattern,
           musicGroupId: this.musicGroupId,
           paymentType: "ADD_STUDENT",
@@ -444,10 +447,27 @@ export default {
           ...this.other,
         };
         try {
-          await musicGroupcreateCalender(data);
-          this.$message.success("提交成功");
-          this.$listeners.submited();
-          this.$listeners.close();
+         const res =  await musicGroupcreateCalender(data);
+
+          if (res.code == 200) {
+            this.$message.success("提交成功");
+            this.$listeners.submited();
+            this.$listeners.close();
+          }
+          if (res.code == 207) {
+            await this.$confirm(
+              res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
+              "提示",
+              {
+                type: "warning",
+              }
+            );
+            data.confirmCreate = true;
+           await musicGroupcreateCalender(data);
+            this.$message.success("提交成功");
+            this.$listeners.submited();
+            this.$listeners.close();
+          }
         } catch (error) {
           console.log(error);
         }