Merge branch '08/24teamQuest' into jenkins

src/store/modules/permission.js

@@ -317,14 +317,14 @@ function setDetailRoute(accessedRoutes) {
           }
         },
         {
-          name: "学员缴费设置",
+          name: "缴费设置",
           path: "studentPaySet",
           component: () =>
             import("@/views/resetTeaming/components/payInfoDetail"),
           hidden: true,
           meta: {
             noCache: "1",
-            title: "学员缴费设置",
+            title: "缴费设置",
             belongTopMenu: "/business",
             activeMenu: "/teamList",
             id: "xx3"

src/views/branchPayManager/payList.vue

@@ -100,7 +100,7 @@
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <auth auths="userCashAccountLog/update">
+                <auth auths="musicGroupCalenderRefundPeriod/queryCoopCalender">
                   <el-button type="text" @click="gotoDetail(scope.row)"
                     >详情</el-button
                   >

src/views/branchPayManager/payShareList.vue

@@ -0,0 +1,271 @@
+ <!--  -->
+ <template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      合作单位分润列表
+    </h2>
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        :model="searchForm"
+        ref="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.organId"
+            filterable
+            clearable
+            collapse-tags
+            placeholder="请选择分部"
+            @change="changeOrgan"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="search">
+          <el-select
+            v-model.trim="searchForm.search"
+            :disabled="!searchForm.organId"
+            filterable
+            clearable
+            placeholder="请选择合作单位"
+          >
+            <el-option
+              v-for="(item, index) in cooperationList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="refundStatus">
+          <el-select
+            v-model.trim="searchForm.refundStatus"
+            clearable
+            placeholder="付款状态"
+          >
+            <el-option label="已付款" :value="1"></el-option>
+            <el-option label="未付款" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="primary">搜索</el-button>
+          <el-button native-type="reset" type="danger">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="organName"
+            label="所属分部"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="cooperationOrganName"
+            label="合作单位"
+          ></el-table-column>
+          <el-table-column align="center" prop="studentId" label="应收总额">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.receivable | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="studentId" label="实收总额">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.income | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="studentId" label="待收金额">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.prepaidFee | moneyFormat }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="educationUserName"
+            label="乐团主管"
+            width="100px"
+          >
+          </el-table-column>
+          <el-table-column align="center" prop="studentId" label="操作">
+            <template slot-scope="scope">
+              <div>
+                <auth auths="musicGroupCalenderRefundPeriod/queryCoopCalender">
+                  <el-button type="text" @click="gotoDetail(scope.row)"
+                    >详情</el-button
+                  >
+                </auth>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import { getTimes } from "@/utils";
+import load from "@/utils/loading";
+import { backTypeList } from "@/utils/searchArray";
+import { Export } from "@/utils/downLoadFile";
+import { getCoopRefundList } from './api'
+import { queryByOrganId } from "@/api/systemManage";
+import qs from "qs";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        search: null,
+        returnFeeType: null,
+        organId: null,
+        backTime: [],
+        payTime: [],
+        returnFeeFlag:null
+      },
+      backTypeList,
+      tableList: [],
+      cooperationList: [],
+      activeRow: null,
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      form: {
+        id: null,
+      },
+      resetVisible: false,
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  async mounted() {
+    // 获取分部
+    await this.$store.dispatch("setBranchs");
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getList();
+    },
+    async getList() {
+      // let { , payTime, organId, ...rest } = this.searchForm;
+      let params = {
+        ...this.searchForm,
+        page: this.rules.page,
+        rows: this.rules.limit,
+      };
+      try {
+        const res = await getCoopRefundList(params);
+        this.tableList = res.data.pageInfo.rows;
+        this.rules.total = res.data.pageInfo.total;
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {
+      this.$refs["searchForm"].resetFields();
+      this.search();
+    },
+    gotoDetail(row) {
+      this.$router.push({path:'/financialManager/payschoolList',query:{id:row.cooperationOrganId,name:row.cooperationOrganName}})
+      // /financialManager/payschoolList
+    },
+
+    exportBack() {
+      let { backTime, payTime, organId, ...rest } = this.searchForm;
+      let params = {
+        ...rest,
+        page: this.rules.page,
+        rows: this.rules.limit,
+        organId: organId.join(","),
+        ...getTimes(backTime, ["createStartTime", "createEndTime"]),
+        ...getTimes(payTime, ["payStartTime", "payEndTime"]),
+      };
+      Export(
+        this,
+        {
+          url: "/api-web/export/userCashAccountLog",
+          fileName: "退费列表.xls",
+          method: "post",
+          params: qs.stringify(params),
+        },
+        "您确定导出退费列表?"
+      );
+    },
+    changeOrgan(val) {
+      this.searchForm.cooperationId = null;
+    },
+  },
+  watch: {
+    "searchForm.organId"(val) {
+      if (val) {
+        queryByOrganId({ organId: val }).then((res) => {
+          if (res.code == 200) {
+            this.cooperationList = res.data;
+          }
+        });
+      }
+    },
+    // "searchForm.cooperationId"(val) {
+    //   if (val) {
+    //     getMusicGroup({ cooperationId: val }).then((res) => {
+    //       this.musicList = res.data;
+    //     });
+    //   }
+    // },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.search {
+  ::v-deep .el-input__inner {
+    width: 260px !important;
+  }
+}
+.form {
+  ::v-deep .el-input {
+    width: 220px;
+  }
+}
+</style>

src/views/branchPayManager/payschoolList.vue

@@ -113,7 +113,7 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.nextRefundDate }}
+                {{ scope.row.nextRefundDate | dayjsFormat }}
               </div>
             </template>
           </el-table-column>
@@ -125,24 +125,25 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.refundStatus == "IN" ? "回款中" : "已回款" }}
+                {{ scope.row.refundStatus == "ING" ? "回款中" : "已回款" }}
               </div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="studentId" label="操作">
             <template slot-scope="scope">
               <div>
-                <auth auths="userCashAccountLog/update">
-                  <el-button type="text" @click="lookList(scope.row)">详情</el-button>
-                </auth>
-                <auth auths="userCashAccountLog/update">
-                  <el-button
-                    type="text"
-                    :disabled="!scope.row.contractUrl"
-                    @click="downLoad(scope.row)"
-                    >下载合同</el-button
+                <auth auths="musicGroupPaymentCalender/getDetail/barnch">
+                  <el-button type="text" @click="lookList(scope.row)"
+                    >详情</el-button
                   >
                 </auth>
+
+                <el-button
+                  type="text"
+                  :disabled="!scope.row.contractUrl"
+                  @click="downLoad(scope.row)"
+                  >下载合同</el-button
+                >
               </div>
             </template>
           </el-table-column>
@@ -191,7 +192,7 @@ import { queryByOrganId } from "@/api/systemManage";
 import reviewDetail from "@/views/resetTeaming/modals/review-detail";
 import qs from "qs";
 export default {
-  components: { pagination,reviewDetail },
+  components: { pagination, reviewDetail },
   data() {
     return {
       searchForm: {
@@ -217,7 +218,7 @@ export default {
         id: null,
       },
       reviewVisible: false,
-      viewDetail:null
+      viewDetail: null,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -260,7 +261,7 @@ export default {
     goBack() {},
     lookList(row) {
       this.viewDetail = row;
-      this.viewDetail.id = row.calenderId
+      this.viewDetail.id = row.calenderId;
       this.reviewVisible = true;
     },
     async downLoad(row) {

src/views/resetTeaming/components/payInfoDetail.vue

@@ -16,6 +16,26 @@
                 <div class="squrt"></div>
                 <p>基础项目配置</p>
                 <div class="payContext">请选择您需要的课程配置</div>
+                <el-form-item
+                  label="计价标准"
+                  class="vertical"
+                  prop="isShowMusicInsuranceForPay"
+                  v-if="$route.query.payUserType == 'SCHOOL'"
+                >
+                  <el-select
+                  size="mini"
+                    v-model="form.calenderFeeType"
+                    placeholder="请选择计价标准"
+                  >
+                    <el-option label="按学生" value="STUDENT"> </el-option>
+                    <el-option
+                      label="按老师"
+                      value="TEACHER"
+                      :disabled="!teamCourse"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
               </div>
               <div class="checkWrap">
                 <div
@@ -256,7 +276,7 @@
                         trigger: 'blur',
                       },
                     ]" -->
-                  <el-form-item prop="paymentDate" ref="paymentDate">
+                  <el-form-item prop="isShowSalePrice" ref="isShowSalePrice">
                     <template slot="label">
                       <p style="position: relative">
                         <!-- <span style="color: #f56c6c; margin-right: 4px">*</span> -->
@@ -456,7 +476,7 @@ export default {
         calenderFeeType: "STUDENT",
         musicGroupCalenderRefundPeriods: [{ refundDate: "", refundAmount: "" }],
         currentTotalAmount: 0,
-        contractUrl:''
+        contractUrl: "",
       },
       teamCourse: false,
       member: false,
@@ -570,10 +590,15 @@ export default {
             } else {
               this.form.leixing = "1";
             }
-            this.$set(this.form, "paymentDate", [
+            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,
             ]);
+            }
+
+            this.$set(this.form, "contractUrl", res.data?.calender?.contractUrl);
             this.$set(this.form, "memo", res.data?.calender?.memo);
 
             this.$set(
@@ -611,7 +636,7 @@ export default {
                 this.teamCourse = true;
                 this.isSetCourseSettingsId = true;
                 this.$set(this.form, "eclass", res.data?.course);
-                console.log('设置完成eclass')
+                console.log("设置完成eclass");
                 this.initDetail = true;
                 this.$set(
                   this.form,
@@ -640,7 +665,6 @@ export default {
                       calenderFeeJson.teacherFeeList
                     );
                   }
-
                 }
               });
             }
@@ -916,15 +940,15 @@ export default {
       this.$refs.form.validate(async (isok) => {
         if (isok) {
           let obj = this.fommatDate();
-          if(this.form.payUserType=='SCHOOL'){
+          if (this.form.payUserType == "SCHOOL") {
             let total = 0;
-            this.form.musicGroupCalenderRefundPeriods.forEach(item=>{
-              total+=item.refundAmount*1
-            })
-            if(total !=this.form.currentTotalAmount){
-              console.log(total,this.form.currentTotalAmount)
-              this.$message.error('付款金额与回款金额不一致,请重新设置')
-              return
+            this.form.musicGroupCalenderRefundPeriods.forEach((item) => {
+              total += item.refundAmount * 1;
+            });
+            if (total != this.form.currentTotalAmount) {
+              console.log(total, this.form.currentTotalAmount);
+              this.$message.error("付款金额与回款金额不一致,请重新设置");
+              return;
             }
           }
           if (this.$route.query.calenderId) {
@@ -1096,6 +1120,8 @@ export default {
           musicGroupOrganizationCourseSettingId:
             this.form.musicGroupOrganizationCourseSettingId || null,
           memo: this.form.memo,
+          startPaymentDate: this.form.paymentDate[0],
+          deadlinePaymentDate: this.form.paymentDate[1],
           calenderActivityList:
             this.form.activeList?.length > 0 ? this.form.activeList : null,
           musicRepair:
@@ -1121,7 +1147,7 @@ export default {
           musicGroupCalenderRefundPeriods:
             this.form.musicGroupCalenderRefundPeriods,
           currentTotalAmount: this.form.currentTotalAmount,
-          contractUrl:this.form.contractUrl
+          contractUrl: this.form.contractUrl,
         };
       }
     },
@@ -1355,14 +1381,14 @@ export default {
         position: relative;
         background-color: #fefefe;
         margin-right: 12px;
-        padding: 22px;
+        padding: 0 22px;
         display: flex;
         flex-direction: row;
         align-items: center;
         border-radius: 6px;
         border: 1px solid #dfe8ec;
         cursor: pointer;
-        height: 104px;
+        height: 84px;
         width: 251px;
         overflow: hidden;
         &:hover {

src/views/resetTeaming/components/resetPayList.vue

@@ -60,6 +60,13 @@
       >
         新建学校缴费
       </div>
+      <div
+            class="newBand"
+            v-permission="'musicGroup/extensionPayment'"
+            @click="extendTime"
+          >
+            延长缴费
+          </div>
       <!-- <div class="newBand"
            v-if="teamStatus"
            v-permission="'/studentPayBase'"
@@ -147,13 +154,17 @@
         </el-table-column> -->
         <el-table-column align="center" prop="status" label="缴费人数">
           <template slot-scope="scope">
-            <div v-if="scope.row.payUserType=='STUDENT'">{{ scope.row.actualNum }}/{{ scope.row.expectNum }}</div>
+            <div v-if="scope.row.payUserType == 'STUDENT'">
+              {{ scope.row.actualNum }}/{{ scope.row.expectNum }}
+            </div>
             <div V-esle>--</div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
-                         prop="currentTotalAmount"
-                         label="缴费金额(元)">
+        <el-table-column
+          align="center"
+          prop="currentTotalAmount"
+          label="缴费金额(元)"
+        >
         </el-table-column>
         <el-table-column align="center" prop="memo" width="200px" label="备注">
           <template slot-scope="scope">
@@ -178,7 +189,7 @@
                   teamStatus &&
                   scope.row.paymentType != 'MUSIC_APPLY' &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
-                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'&&
+                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST' &&
                   scope.row.payUserType === 'STUDENT'
                 "
               >
@@ -541,6 +552,32 @@
         <el-button @click="dialogSubjectVisible = false">取 消</el-button>
       </div> -->
     </el-dialog>
+
+    <el-dialog
+      :title="'延长缴费'"
+      :visible.sync="extendPaymentStatus"
+      v-if="extendPaymentStatus"
+      width="400px"
+    >
+      <el-form :model="extendForm" ref="extendForm" :rules="extendRule">
+        <el-form-item label="缴费时间" prop="expireDate">
+          <el-date-picker
+            v-model.trim="extendForm.expireDate"
+            value-format="yyyy-MM-dd"
+            type="date"
+            :picker-options="applyDates"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="extendPaymentStatus = false">取 消</el-button>
+        <el-button type="primary" @click="onExtendPayment('extendForm')"
+          >确 定</el-button
+        >
+      </div>
+    </el-dialog>
     <el-button type="primary" @click="submitAudit" v-if="team_status == 'DRAFT'"
       >提交审核</el-button
     >
@@ -576,6 +613,7 @@ import {
   resetMusicGroupPaymentCalender,
   delMusicGroupPaymentCalender,
   findMusicGroupSubjectInfo,
+  extensionPayment,
 } from "@/api/buildTeam";
 import { getAuditList } from "@/api/auditManager";
 import { getOrganizationCourseUnitPriceSettings } from "@/api/specialSetting";
@@ -669,6 +707,16 @@ export default {
       baseInfo: null,
       memberVisible: false, // 会员缴费,
       payUserTypeList: payUserTypeList,
+      extendPaymentStatus: "",
+      extendForm: {
+        expireDate: null,
+      },
+      extendRule: {
+        expireDate: [
+          { required: true, message: "请选择延长时间", trigger: "change" },
+        ],
+      },
+      applyDates: this.applyDate(),
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -925,6 +973,27 @@ export default {
         console.log(e);
       }
     },
+    extendTime() {
+      this.extendPaymentStatus = true;
+    },
+    onExtendPayment(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          extensionPayment({
+            musicGroupId: this.$route.query.id,
+            expireDate: this.extendForm.expireDate,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("延长缴费成功");
+              this.extendPaymentStatus = false;
+              this.getList()
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        }
+      });
+    },
     // setStudentPay () {
     //   let query = this.$route.query;
     //   this.$router.push({ path: "/business/studentPayBase", query });
@@ -1058,24 +1127,21 @@ export default {
       // 开始预览
       this.dialogCalenderId = row.id;
       const musicGroupId = this.$route.query.id;
-       findMusicGroupSubjectInfo({ musicGroupId: musicGroupId }).then(
-        (res) => {
-          if (res.code == 200) {
-
-            this.dialogSubjectList = res.data.musicGroupSubjectPlans;
+      findMusicGroupSubjectInfo({ musicGroupId: musicGroupId }).then((res) => {
+        if (res.code == 200) {
+          this.dialogSubjectList = res.data.musicGroupSubjectPlans;
 
-            // 默认预览第一个
-            if(this.dialogSubjectList.length<=0){
-              this.$message.error('请先设置声部信息')
-              return
-            }
-            this.activeName = this.dialogSubjectList[0].subjectId.toString();
-            this.dialogSubjectVisible = true;
-          } else {
-            this.$message.warning("没有可预览的声部");
+          // 默认预览第一个
+          if (this.dialogSubjectList.length <= 0) {
+            this.$message.error("请先设置声部信息");
+            return;
           }
+          this.activeName = this.dialogSubjectList[0].subjectId.toString();
+          this.dialogSubjectVisible = true;
+        } else {
+          this.$message.warning("没有可预览的声部");
         }
-      );
+      });
     },
     approval() {
       // 审核通过 验证商品
@@ -1126,6 +1192,15 @@ export default {
         }
       });
     },
+    applyDate() {
+      let self = this;
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+          return time.getTime() + 86400000 < new Date().getTime();
+        },
+      };
+    },
   },
   watch: {
     chioseStudentVisible() {

src/views/resetTeaming/modals/paySchoolInfo.vue

@@ -28,11 +28,7 @@
       >
         <el-select v-model="form.calenderFeeType" placeholder="请选择计价标准">
           <el-option label="按学生" value="STUDENT"> </el-option>
-          <el-option
-            label="按老师"
-            value="TEACHER"
-            :disabled="!teamCourse"
-          >
+          <el-option label="按老师" value="TEACHER" :disabled="!teamCourse">
           </el-option>
         </el-select>
       </el-form-item>
@@ -217,11 +213,10 @@
         <el-form-item
           class="vertical"
           label="付款金额"
-
           prop="isShowMusicInsuranceForPay"
         >
           <el-input-number
-          v-model="form.currentTotalAmount"
+            v-model="form.currentTotalAmount"
             :controls="false"
             :min="0"
             :precision="2"
@@ -232,25 +227,67 @@
       </div>
       <el-row>
         <el-form-item
-        label="上传合同"
-        prop="contractUrl"
-        :rules="[
-          {
-            required: true,
-            message: '请上传上传合同',
-            trigger: 'blur, change'
-          }
-        ]"
-      >
-        <singe-file-upload
-          tips="仅支持上传pdf格式文件"
-          buttonText="上传合同"
-          accept=".pdf"
-          v-model="form.contractUrl"
+          prop="paymentDate"
+          :rules="[
+            {
+              required: true,
+              message: '请选择缴费时间',
+              trigger: 'blur',
+            },
+          ]"
+          ref="paymentDate"
+        >
+          <template slot="label">
+            <p style="position: relative">
+              <span style="color: #f56c6c; margin-right: 4px">*</span>
+              缴费时间
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">在该时间段内学员才可缴费</div>
+                <i
+                  class="el-icon-question"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    position: relative;
+                    top: 2px;
+                  "
+                ></i>
+              </el-tooltip>
+            </p>
+          </template>
+          <el-date-picker
+            v-model="form.paymentDate"
+            type="daterange"
+            style="width: 280px"
+            :picker-options="{ firstDayOfWeek: 1 }"
+            value-format="yyyy-MM-dd"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="上传合同"
+          prop="contractUrl"
+          :rules="[
+            {
+              required: true,
+              message: '请上传上传合同',
+              trigger: 'blur, change',
+            },
+          ]"
+        >
+          <singe-file-upload
+            tips="仅支持上传pdf格式文件"
+            buttonText="上传合同"
+            accept=".pdf"
+            v-model="form.contractUrl"
             bucket_name="contracts"
-        />
-      </el-form-item>
+          />
+        </el-form-item>
       </el-row>
+
       <el-row>
         <el-col class="memoWrap">
           <el-form-item
@@ -324,7 +361,6 @@ export default {
     allTotal() {
       let num = 0;
       if (this.form.calenderFeeType == "STUDENT") {
-
         if (this.teamCourse) {
           this.form.eclass.forEach((element) => {
             num += element.courseCurrentPrice;
@@ -344,10 +380,13 @@ export default {
         num *= this.form.calenderFeeJson.sutdentNumber;
       } else {
         this.form.teacherFeeList.forEach((element) => {
-            num += (element.courseCurrentPrice*element.courseNumber*element.teacherNumber);
-          });
+          num +=
+            element.courseCurrentPrice *
+            element.courseNumber *
+            element.teacherNumber;
+        });
       }
-      this.$emit('setAllTotal',num)
+      this.$emit("setAllTotal", num);
       return num;
     },
   },
@@ -363,7 +402,7 @@ export default {
     padding-left: 10px;
   }
   .vertical {
-    margin-top: 0px!important;
+    margin-top: 0px !important;
   }
   .el-input-number {
     width: 180px;

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

@@ -40,7 +40,7 @@
         calender.payUserType | payUserTypeFormat
       }}</descriptions-item>
       <descriptions-item label="学生人数：" v-if="calenderFeeJson&&calenderFeeJson.sutdentNumber&&calender.calenderFeeType=='STUDENT'">{{
-        numeral(calenderFeeJson.sutdentNumber)
+        calenderFeeJson.sutdentNumber
       }}</descriptions-item>
       <descriptions-item label="缴费总金额：" v-if="calenderFeeJson&&calenderFeeJson.allTotal">{{
         numeral(calenderFeeJson.allTotal).format("0,0")
@@ -364,10 +364,10 @@
     >
       <el-table-column prop="refundAmount" label="回款金额" >
       </el-table-column>
-      <el-table-column prop="refundDate" label="回款时间" >
+      <el-table-column prop="refundDate" label="回款状态" >
         <template slot-scope="scope">
           <div>
-            {{scope.row.refundDate?'已回款':'回款中'}}
+            {{scope.row.refundFlag?'已回款':'回款中'}}
           </div>
         </template>
       </el-table-column>