修复问题

1

src/views/resetTeaming/components/payInfoDetail.vue

@@ -42,7 +42,7 @@
                   class="checkBtn"
                   :class="[
                     teamCourse ? 'active' : '',
-                    teamCourseDisabled ? 'disabled' : ''
+                    teamCourseDisabled ? 'disabled' : '',
                   ]"
                   @click.prevent="
                     () => {
@@ -77,7 +77,7 @@
                   class="checkBtn"
                   :class="[
                     member ? 'active' : '',
-                    memberDisabled ? 'disabled' : ''
+                    memberDisabled ? 'disabled' : '',
                   ]"
                   @click.prevent="
                     () => {
@@ -104,13 +104,13 @@
                 <div
                   v-if="
                     isShowLeBao &&
-                      tenantId == 1 &&
-                      $route.query.team_status != 'PROGRESS'
+                    tenantId == 1 &&
+                    $route.query.team_status != 'PROGRESS'
                   "
                   class="checkBtn"
                   :class="[
                     leBao ? 'active' : '',
-                    leBaoDisabled ? 'disabled' : ''
+                    leBaoDisabled ? 'disabled' : '',
                   ]"
                   @click.prevent="
                     () => {
@@ -138,7 +138,7 @@
                   class="checkBtn"
                   :class="[
                     teamActive ? 'active' : '',
-                    teamActiveDisabled ? 'disabled' : ''
+                    teamActiveDisabled ? 'disabled' : '',
                   ]"
                   @click.prevent="
                     () => {
@@ -212,7 +212,7 @@
               <backMoney
                 v-if="
                   $route.query.payUserType == 'SCHOOL' &&
-                    form.currentTotalAmount > 0
+                  form.currentTotalAmount > 0
                 "
                 :form="form"
               />
@@ -232,8 +232,8 @@
                       {
                         required: true,
                         message: '请选择缴费时间',
-                        trigger: 'blur'
-                      }
+                        trigger: 'blur',
+                      },
                     ]"
                     ref="paymentDate"
                   >
@@ -311,8 +311,8 @@
                       {
                         required: true,
                         message: '请输入备注',
-                        trigger: 'blur'
-                      }
+                        trigger: 'blur',
+                      },
                     ]"
                     ref="memo"
                   >
@@ -351,10 +351,10 @@
           <div
             v-if="
               !teamCourse &&
-                !member &&
-                !leBao &&
-                !teamActive &&
-                $route.query.team_status == 'PROGRESS'
+              !member &&
+              !leBao &&
+              !teamActive &&
+              $route.query.team_status == 'PROGRESS'
             "
           >
             <empty desc="暂无缴费项目配置" />
@@ -415,7 +415,7 @@ import dayjs from "dayjs";
 import subjectPreview from "@/views/resetTeaming/modals/subject-preview";
 import {
   chargeTypeList,
-  musicGroupOrganizationCourseSettingsQueryPage
+  musicGroupOrganizationCourseSettingsQueryPage,
 } from "@/api/specialSetting";
 import { getSysTenantConfig } from "@/views/courseRulersManager/api";
 import { sysConfigList } from "@/api/generalSettings";
@@ -424,12 +424,12 @@ import {
   getAllmemberRank,
   musicGroupcreateCalender,
   musicGroupresetCalender,
-  getAutoActivationFlag
+  getAutoActivationFlag,
 } from "../api";
 import {
   getMusicGroupPaymentCalenderDetail,
   findMusicGroupSubjectInfo,
-  getAgreement
+  getAgreement,
 } from "@/api/buildTeam";
 import { vipGroupActivity } from "@/api/vipSeting";
 export default {
@@ -440,14 +440,14 @@ export default {
     payTeamActive,
     subjectPreview,
     paySchoolInfo,
-    backMoney
+    backMoney,
   },
   data() {
     return {
       form: {
         paymentType: "",
         memo: "",
-        eclass: [{}],
+        eclass: [],
         memberList: [
           {
             period: "",
@@ -456,11 +456,11 @@ export default {
             actualAmount: "",
             memberRankSettingId: "",
             optionalFlag: null,
-            autoActivationFlag: false
-          }
+            autoActivationFlag: false,
+          },
         ],
-        leBaoList: [{}],
-        activeList: [{}],
+        leBaoList: [],
+        activeList: [],
         teacherFeeList: [],
         isShowMemberForPay: true,
         isShowMusicInsuranceForPay: true,
@@ -471,12 +471,12 @@ export default {
         calenderFeeJson: {
           discountTotal: "",
           allTotal: "",
-          sutdentNumber: ""
+          sutdentNumber: "",
         },
         calenderFeeType: "STUDENT",
         musicGroupCalenderRefundPeriods: [{ refundDate: "", refundAmount: "" }],
         currentTotalAmount: 0,
-        contractUrl: ""
+        contractUrl: "",
       },
       teamCourse: false,
       member: false,
@@ -506,7 +506,7 @@ export default {
         minHalfYearFee: null,
         maxHalfYearFee: null,
         minYearFee: null,
-        maxYearFee: null
+        maxYearFee: null,
       },
       dialogSubjectVisible: false, // 预览
       dialogSubjectList: [],
@@ -515,7 +515,7 @@ export default {
       tenantId: null,
       isField: false,
       showAutoActivationFlag: false,
-      initDetail: false
+      initDetail: false,
     };
   },
   mounted() {
@@ -580,8 +580,8 @@ export default {
         // 说明是修改  查缴项目详情
         this.initDetail = true;
         await getMusicGroupPaymentCalenderDetail({
-          id: this.$route.query.calenderId
-        }).then(res => {
+          id: this.$route.query.calenderId,
+        }).then((res) => {
           if (res.code == 200) {
             if (res.data?.calender?.musicGroupOrganizationCourseSettingId) {
               this.form.leixing = "1";
@@ -590,14 +590,14 @@ export default {
             } else {
               this.form.leixing = "2";
             }
-            console.log(res.data?.calender?.startPaymentDate);
+
             if (
               res.data?.calender?.startPaymentDate &&
               res.data?.calender?.deadlinePaymentDate
             ) {
               this.$set(this.form, "paymentDate", [
                 res.data?.calender?.startPaymentDate,
-                res.data?.calender?.deadlinePaymentDate
+                res.data?.calender?.deadlinePaymentDate,
               ]);
             }
 
@@ -683,7 +683,7 @@ export default {
               this.teamActive = true;
 
               this.$set(this.form, "activeList", res.data.activity);
-              this.form.activeList.forEach(active => {
+              this.form.activeList.forEach((active) => {
                 active.vipGroupCategoryNames = active.categoryName;
               });
             }
@@ -701,8 +701,8 @@ export default {
         page: 1,
         status: "PROGRESS",
         activityChannel: 1,
-        enable: true
-      }).then(res => {
+        enable: true,
+      }).then((res) => {
         if (res.code == 200) {
           this.activeList = res.data.rows;
           if (this.activeList.length <= 0) {
@@ -724,7 +724,7 @@ export default {
       try {
         const res = await sysConfigList({ group: "DEFAULT" });
         const paramName = "cloud_price_range";
-        res.data.forEach(item => {
+        res.data.forEach((item) => {
           if (item.paramName == paramName) {
             const itemValue = item.paranValue
               ? JSON.parse(item.paranValue)
@@ -742,7 +742,7 @@ export default {
       try {
         const res = await getSysTenantConfig({ group: "MUSIC_REPAIR" });
         this.leBaoInfo = res.data;
-        res.data.forEach(element => {
+        res.data.forEach((element) => {
           if (element.id == 188) {
             this.isShowLeBao = !!element.paranValue;
           }
@@ -771,9 +771,9 @@ export default {
         const res = await musicGroupOrganizationCourseSettingsQueryPage({
           row: 9999,
           chargeTypeId,
-          organId
+          organId,
         });
-        const ids = res.data.rows.map(item => item.id);
+        const ids = res.data.rows.map((item) => item.id);
         if (!ids.includes(this.form.musicGroupOrganizationCourseSettingId)) {
           this.$set(this.form, "musicGroupOrganizationCourseSettingId", null);
         }
@@ -799,13 +799,13 @@ export default {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",
-          query
+          query,
         });
       } else if (query.type == "look") {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",
-          query
+          query,
         });
       } else if (
         query.type == "teamDraft" ||
@@ -815,7 +815,7 @@ export default {
         this.$store.dispatch("delVisitedViews", this.$route);
         this.$router.push({
           path: "/business/resetTeaming",
-          query
+          query,
         });
       }
     },
@@ -825,7 +825,7 @@ export default {
       const chargeTypeId = this.musicGroup?.chargeTypeId;
       const _ = {};
       const list = (this.organizationCourseUnitPriceSettings || []).filter(
-        item =>
+        (item) =>
           organId &&
           organId == item.organId &&
           chargeTypeId &&
@@ -893,19 +893,23 @@ export default {
       this.$set(
         this.form,
         "activeList",
-        this.form.activeList.filter(item => !!item)
+        this.form.activeList.filter((item) => !!item)
       );
     },
     removeExtraClass(index) {
       this.form.eclass[index] = null;
-      this.$set(this.form, "eclass", this.form.eclass.filter(item => !!item));
+      this.$set(
+        this.form,
+        "eclass",
+        this.form.eclass.filter((item) => !!item)
+      );
       // this.form.eclass = this.form.eclass.filter((item) => !!item);
     },
     async onPreview() {
       // 开始预览
       const musicGroupId = this.$route.query.id;
       await findMusicGroupSubjectInfo({ musicGroupId: musicGroupId }).then(
-        res => {
+        (res) => {
           if (res.code == 200) {
             this.dialogSubjectList = res.data.musicGroupSubjectPlans;
             // 默认预览第一个
@@ -929,7 +933,7 @@ export default {
             this.$confirm("是否创建缴费?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
-              type: "warning"
+              type: "warning",
             })
               .then(() => {
                 this.onSubmit();
@@ -948,16 +952,15 @@ export default {
       });
     },
     onSubmit() {
-      this.$refs.form.validate(async isok => {
+      this.$refs.form.validate(async (isok) => {
         if (isok) {
           let obj = this.fommatDate();
           if (obj.payUserType == "SCHOOL") {
             let total = 0;
-            this.form.musicGroupCalenderRefundPeriods.forEach(item => {
+            this.form.musicGroupCalenderRefundPeriods.forEach((item) => {
               total += item.refundAmount * 1;
             });
             if (total != this.form.currentTotalAmount) {
-              console.log(total, this.form.currentTotalAmount);
               this.$message.error("付款金额与回款金额不一致,请重新设置");
               return;
             }
@@ -975,7 +978,7 @@ export default {
                   res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
                   "提示",
                   {
-                    type: "warning"
+                    type: "warning",
                   }
                 );
                 obj.confirmCreate = true;
@@ -998,7 +1001,7 @@ export default {
                   res.msg || `当前乐团存在未排课的缴费项目，请再次确认操作`,
                   "提示",
                   {
-                    type: "warning"
+                    type: "warning",
                   }
                 );
                 obj.confirmCreate = true;
@@ -1028,7 +1031,7 @@ export default {
           // 值有start,center,end，nearest，当前显示在视图区域中间
           block: "center",
           // 值有auto、instant,smooth，缓动动画（当前是慢速的）
-          behavior: "smooth"
+          behavior: "smooth",
         });
         break; // 跳出循环了
       }
@@ -1041,7 +1044,7 @@ export default {
       let tmpActiveList = form.activeList?.length > 0 ? form.activeList : [];
       let activeList = [];
       if (tmpActiveList.length > 0) {
-        tmpActiveList.forEach(active => {
+        tmpActiveList.forEach((active) => {
           if (active.activityId) {
             active.categoryName = active.vipGroupCategoryNames;
             activeList.push(active);
@@ -1052,7 +1055,7 @@ export default {
         form.memberList?.length > 0 ? { ...form.memberList[0] } : null;
       // 获取会员名称
       if (memberObj) {
-        this.memberRankList.forEach(item => {
+        this.memberRankList.forEach((item) => {
           if (item.id == memberObj.memberRankSettingId) {
             memberObj.name = item.name;
           }
@@ -1062,7 +1065,7 @@ export default {
       let tempCourseList = form.eclass?.length > 0 ? form.eclass : [];
       let courseList = [];
       if (tempCourseList.length > 0) {
-        tempCourseList.forEach(course => {
+        tempCourseList.forEach((course) => {
           if (course.courseType) {
             course.isStudentOptional = true;
             courseList.push(course);
@@ -1074,7 +1077,7 @@ export default {
         musicGroup: this.musicGroup,
         paymentCalender: {
           calender: {
-            isShowSalePrice: form.isShowSalePrice
+            isShowSalePrice: form.isShowSalePrice,
           },
           activity: [...activeList], // 小班课
           course: courseList, // 课程
@@ -1085,12 +1088,12 @@ export default {
             this.isShowLeBao &&
             this.$route.query.team_status != "PROGRESS"
               ? { ...form.leBaoList[0], optionalFlag: false }
-              : null // 乐保
+              : null, // 乐保
         },
         isShowMemberForPay: form.isShowMemberForPay,
         isShowMusicInsuranceForPay: form.isShowMusicInsuranceForPay,
         isShowVipCourseForPay: form.isShowVipCourseForPay,
-        isShowMusicCourseForPay: form.isShowMusicCourseForPay
+        isShowMusicCourseForPay: form.isShowMusicCourseForPay,
       };
     },
     fommatDate() {
@@ -1120,9 +1123,9 @@ export default {
             isShowMemberForPay: this.form.isShowMemberForPay,
             isShowMusicInsuranceForPay: this.form.isShowMusicInsuranceForPay,
             isShowVipCourseForPay: this.form.isShowVipCourseForPay,
-            isShowMusicCourseForPay: this.form.isShowMusicCourseForPay
+            isShowMusicCourseForPay: this.form.isShowMusicCourseForPay,
           }),
-          isShowSalePrice: this.form.isShowSalePrice
+          isShowSalePrice: this.form.isShowSalePrice,
         };
       } else {
         let calenderFeeJson = this.form.calenderFeeJson;
@@ -1155,14 +1158,14 @@ export default {
             isShowMemberForPay: this.form.isShowMemberForPay,
             isShowMusicInsuranceForPay: this.form.isShowMusicInsuranceForPay,
             isShowVipCourseForPay: this.form.isShowVipCourseForPay,
-            isShowMusicCourseForPay: this.form.isShowMusicCourseForPay
+            isShowMusicCourseForPay: this.form.isShowMusicCourseForPay,
           }),
           calenderFeeType: this.form.calenderFeeType,
           calenderFeeJson: JSON.stringify(calenderFeeJson),
-          musicGroupCalenderRefundPeriods: this.form
-            .musicGroupCalenderRefundPeriods,
+          musicGroupCalenderRefundPeriods:
+            this.form.musicGroupCalenderRefundPeriods,
           currentTotalAmount: this.form.currentTotalAmount,
-          contractUrl: this.form.contractUrl
+          contractUrl: this.form.contractUrl,
         };
       }
     },
@@ -1179,14 +1182,21 @@ export default {
     },
     setAllTotal(val) {
       this.form.calenderFeeJson.allTotal = val;
-      this.form.currentTotalAmount =
+      if(this.form.calenderFeeJson.discountTotal){
+        this.form.currentTotalAmount =
         this.form.calenderFeeJson.allTotal -
         this.form.calenderFeeJson.discountTotal;
+      }else{
+        this.form.currentTotalAmount =
+        this.form.calenderFeeJson.allTotal
+
+      }
+
       this.$set(this.form, "currentTotalAmount", this.form.currentTotalAmount);
     },
     currentTotalAmount(val) {
       this.$set(this.form, "currentTotalAmount", val);
-    }
+    },
   },
   watch: {
     teamCourse(val) {
@@ -1212,23 +1222,28 @@ export default {
       }
     },
     "form.eclass": {
-      handler(newValue) {
-        if (this.initDetail) {
+      handler(newValue,oldValue) {
+
+        let oldString = JSON.stringify(oldValue)
+        let newString = JSON.stringify(newValue)
+        if (this.initDetail || oldString == newString) {
           this.initDetail = false;
           return;
-        }
-        let arr = [];
-        newValue.forEach(item => {
-          arr.push({
-            courseType: item.courseType,
-            teacherNumber: 0,
-            courseNumber: 0,
-            courseCurrentPrice: 0
+        } else {
+          let arr = [];
+          newValue.forEach((item) => {
+            arr.push({
+              courseType: item.courseType,
+              teacherNumber: 0,
+              courseNumber: 0,
+              courseCurrentPrice: 0,
+            });
           });
-        });
-        this.$set(this.form, "teacherFeeList", arr);
+
+          this.$set(this.form, "teacherFeeList", arr);
+        }
       },
-      deep: true
+      deep: true,
     },
     "form.currentTotalAmount"(val) {
       // console.log(val,'form.currentTotalAmount');
@@ -1240,11 +1255,11 @@ export default {
       if (val && !this.isSetCourseSettingsId) {
         try {
           const res = await queryByMusicGroupOrganizationCourseSettingsId({
-            id: val
+            id: val,
           });
-          let CourseSettingDetail = res.data.map(course => {
+          let CourseSettingDetail = res.data.map((course) => {
             return {
-              ...course
+              ...course,
             };
           });
           this.$set(this.form, "eclass", res.data);
@@ -1273,13 +1288,13 @@ export default {
         this.$set(this.form, "eclass", [{}]);
       }
       this.isSetCourseSettingsId = false;
-    }
+    },
   },
   computed: {
     musicGroup() {
       return this.baseInfo?.musicGroup;
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/resetTeaming/modals/review-detail.vue

@@ -17,6 +17,7 @@
     </descriptions>
     <el-alert title="申请信息" :closable="false" class="alert" type="info">
     </el-alert>
+
     <descriptions :column="2">
       <descriptions-item label="分部名称：">{{
         calender.organName
@@ -355,6 +356,7 @@
       v-if="calenderRefundPeriods&&calenderRefundPeriods.length > 0"
     >
     </el-alert>
+
     <el-table
       :data="calenderRefundPeriods"
       stripe
@@ -366,9 +368,13 @@
       </el-table-column>
       <el-table-column prop="refundDate" label="回款状态" >
         <template slot-scope="scope">
-          <div>
+
+          <div v-if="calender.status == 'NO'||calender.status == 'OPEN'||calender.status == 'OVER'||calender.status == 'PAID'">
             {{scope.row.refundFlag?'已回款':'回款中'}}
           </div>
+          <div v-else>
+            --
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="refundDate" label="回款时间" >

src/views/teamBuild/components/teamBaseInfo.vue

@@ -472,10 +472,13 @@
           </el-form-item>
           <el-form-item label="销售活动" prop="saleActivityDesc">
             <el-input
+            style="width:300px"
               placeholder="请输入销售活动"
               :maxlength="100"
               v-model.trim="topFrom.saleActivityDesc"
               show-word-limit
+              type="textarea"
+              :rows="3"
               :disabled="basdisabled"
             ></el-input>
           </el-form-item>