fix

src/views/auditList/index.vue

@@ -312,4 +312,4 @@ export default {
 .newBand {
   display: inline-block;
 }
-</style>
+</style>

src/views/resetTeaming/modals/extra-class.vue

@@ -146,14 +146,14 @@
         key="close"
         width="60">
         <template slot-scope="scope">
-          <i v-if="form.length > 1" @click="$listeners.remove(scope.$index)" class="el-icon-circle-close"></i>
+          <i v-if="form.length > 1" @click="$listeners.remove && $listeners.remove(scope.$index)" class="el-icon-circle-close"></i>
         </template>
       </el-table-column>
     </el-table>
     <el-button
       icon="el-icon-circle-plus-outline"
       plain
-      v-if="!isCommon"
+      v-if="!isCommon && $listeners.create"
       type="info"
       size="small"
       style="width: 100%;margin: 20px 0;"

src/views/resetTeaming/modals/review.vue

@@ -30,6 +30,7 @@ export default {
   data() {
     return {
       remark: "",
+      permission
     };
   },
   methods: {

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

@@ -2,52 +2,62 @@
   <div>
     <el-alert title="班级信息" :closable="false" class="alert" type="info">
     </el-alert>
-    <el-form :model="form">
-      <el-form-item label="单技班">
-        <el-select v-model.trim="form.signClass" filterable clearable>
-          <el-option
-            v-for="(item, index) in signList"
-            :key="index"
-            :value="item.id"
-            :label="item.name"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="合奏班">
-        <el-select v-model.trim="form.mixClass" filterable clearable>
-          <el-option
-            v-for="(item, index) in mixList"
-            :key="index"
-            :value="item.id"
-            :label="item.name"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="基础技能班">
-        <el-select v-model.trim="form.highClass" filterable clearable>
-          <el-option
-            v-for="(item, index) in highList"
-            :key="index"
-            :value="item.id"
-            :label="item.name"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="临时班">
-        <el-select
-          v-model.trim="form.snapClass"
-          filterable
-          clearable
-          multiple
-        >
-          <el-option
-            v-for="(item, index) in snapList"
-            :key="index"
-            :value="item.id"
-            :label="item.name"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+    <el-form :model="form" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="单技班">
+            <el-select v-model.trim="form.signClass" filterable clearable>
+              <el-option
+                v-for="(item, index) in signList"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="合奏班">
+            <el-select v-model.trim="form.mixClass" filterable clearable>
+              <el-option
+                v-for="(item, index) in mixList"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="基础技能班">
+            <el-select v-model.trim="form.highClass" filterable clearable>
+              <el-option
+                v-for="(item, index) in highList"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="临时班">
+            <el-select
+              v-model.trim="form.snapClass"
+              filterable
+              clearable
+              multiple
+            >
+              <el-option
+                v-for="(item, index) in snapList"
+                :key="index"
+                :value="item.id"
+                :label="item.name"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <el-alert title="课程信息设置" :closable="false" class="alert" type="info">
     </el-alert>
@@ -57,8 +67,6 @@
       :isUserType="true"
       :isCommon="false"
       :isDisabled="true"
-      @create="addExtraClass"
-      @remove="removeExtraClass"
       @moneyChange="syncAllMoney"
     />
     <el-alert title="缴费设置" :closable="false" class="alert" type="info">
@@ -70,20 +78,27 @@
       :isCommon="false"
       :isDisabled="true"
     />
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="$listeners.close">取 消</el-button>
+      <el-button type="primary" @click="submit">确认</el-button>
+    </div>
   </div>
 </template>
 <script>
 import paymentCycle from "../../../resetTeaming/modals/payment-cycle";
 import extraClass from "../../../resetTeaming/modals/extra-class";
+import { musicGroupPaymentCalenderAdd } from '../../../resetTeaming/api'
 import { queryRemainCourseTypeDuration } from '../../api'
+import { getTimes } from "@/utils";
 export default {
-  props: ["snapList", "highList", "mixList", "signList", 'createdUserId'],
+  props: ["snapList", "highList", "mixList", "signList", 'createdUserId', 'organizationCourseUnitPriceSettings', 'musicGroupId'],
   components: {
     paymentCycle,
     extraClass
   },
   data() {
     return {
+      ids: '',
       form: {
         signClass: '',
         mixClass: '',
@@ -94,6 +109,15 @@ export default {
       eclass: [],
     }
   },
+  computed: {
+    organizationCourseUnitPriceSettingsByType() {
+      const _ = {}
+      for (const item of this.organizationCourseUnitPriceSettings) {
+        _[item.courseType] = item
+      }
+      return _
+    }
+  },
   watch: {
     'form.signClass'() {
       this.classChange()
@@ -109,12 +133,82 @@ export default {
     },
   },
   methods: {
+    addExtraClass() {
+      this.eclass.push({});
+    },
+    syncAllMoney() {
+      let money = 0;
+      for (const item of this.eclass) {
+        money += item.courseCurrentPrice;
+      }
+      if (!money) {
+        this.$set(this.cycle, "paymentAmount", undefined);
+      } else {
+        this.$set(this.cycle, "paymentAmount", money);
+      }
+
+      return money;
+    },
+    removeExtraClass(index) {
+      this.eclass[index] = null;
+      this.eclass = this.eclass.filter((item) => !!item);
+    },
     async classChange() {
       try {
-        await queryRemainCourseTypeDuration({
-          classGroupIdList: [this.form.signClass, this.form.mixClass, this.form.highClass, ...this.form.snapClass].filter(item => !!item).join(',')
-        })
-      } catch (error) {}
+        const ids = [this.form.signClass, this.form.mixClass, this.form.highClass, ...this.form.snapClass].filter(item => !!item).join(',')
+        if (ids) {
+          const res = await queryRemainCourseTypeDuration({
+            classGroupIdList: ids
+          })
+          this.ids = ids
+          const _ = res.data.map(item => {
+            const active = this.organizationCourseUnitPriceSettings[item.courseType] || {}
+            const money = Math.ceil((active.unitPrice || 1) * (item.remainMinutes || 1))
+            return {
+              courseType: item.courseType,
+              courseTotalMinuties: item.remainMinutes,
+              courseOriginalPrice: money,
+              courseCurrentPrice: money,
+            }
+          })
+          this.eclass = [..._]
+          this.syncAllMoney()
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    getForms() {
+      const { $refs: refs } = this;
+      return [refs.eclass, refs.cycle]
+        .filter((item) => !!item)
+        .map((item) => item.$refs.form);
+    },
+    async submit() {
+      const forms = this.getForms();
+      const valided = [];
+      for (const form of forms) {
+        form.validate((valid) => {
+          if (valid) {
+            valided.push(form);
+          }
+        });
+      }
+      if (forms.length === valided.length) {
+        const { paymentDate, paymentValid, ...rest} = this.cycle
+        const data = {
+          attribute1: this.ids,
+          ...rest,
+          musicGroupId: this.musicGroupId,
+          musicGroupPaymentCalenderCourseSettingsList: this.eclass,
+          ...getTimes(paymentDate, ["startPaymentDate", "deadlinePaymentDate"]),
+          ...getTimes(paymentValid, [
+            "paymentValidStartDate",
+            "paymentValidEndDate",
+          ]),
+        }
+        await musicGroupPaymentCalenderAdd(data)
+      }
     }
   },
 };

src/views/teamDetail/components/studentList.vue

@@ -704,7 +704,7 @@
     <el-dialog
       title="选择班级"
       destroy-on-close
-      width="600px"
+      width="700px"
       :visible.sync="createUserPayVisible"
     >
       <createUserPay
@@ -712,7 +712,10 @@
         :mixList="mixList"
         :highList="highList"
         :snapList="snapList"
+        :musicGroupId="this.teamid"
+        :organizationCourseUnitPriceSettings="organizationCourseUnitPriceSettings"
         :createdUserId="createdUserId"
+        @close="createUserPayVisible = false"
       />
     </el-dialog>
   </div>
@@ -736,6 +739,9 @@ import {
   getStudentClass,
   getStudentInfoByPhone
 } from "@/api/studentManager";
+import {
+  getOrganizationCourseUnitPriceSettings
+} from '@/api/specialSetting'
 import { visitChiose } from '@/utils/searchArray'
 import pagination from "@/components/Pagination/index";
 import { vaildStudentUrl } from "@/utils/validate";
@@ -771,6 +777,7 @@ export default {
         isActive: "",
         classGroupId: null
       },
+      organizationCourseUnitPriceSettings: [],
       quitForm: {
         // 退团信息确认
         isRefundCourseFee: null,
@@ -935,7 +942,13 @@ export default {
   activated () {
     this.init();
   },
-  mounted () {
+  async mounted () {
+    try {
+      const res = await getOrganizationCourseUnitPriceSettings({
+        rows: 9999
+      })
+      this.organizationCourseUnitPriceSettings = res.data.rows
+    } catch (error) {}
     this.init();
   },
   methods: {