Merge branch 'Nov16thResetMusic' into online

src/views/categroyManager/specialSetup/discountManage.vue

@@ -187,7 +187,10 @@ export default {
       rules: {
         chargeTypeId: [{ required: true, message: '请选择收费类型', trigger: 'blur' }],
         subjectId: [{ required: true, message: '请选择声部组合', trigger: 'change' }],
-        goodsDiscountRate: [{ required: true, message: '请输入折扣', trigger: 'blur' }],
+        goodsDiscountRate: [
+          { required: true, message: '请输入折扣', trigger: 'blur' },
+          { pattern: /^\d+(\.\d{1,8})?$/, message: '请输入正确的折扣' }
+        ],
       },
       pageInfo: {
         // 分页规则

src/views/categroyManager/specialSetup/modals/chargesForm.vue

@@ -105,7 +105,6 @@
                                class="number-input"
                                v-model="item.courseCurrentPrice"
                                :controls="false"
-                               :precision="2"
                                :min="0"
                                placeholder="课程现价" />
             </el-form-item>
@@ -116,7 +115,6 @@
                                class="number-input"
                                v-model="item.courseOriginalPrice"
                                :controls="false"
-                               :precision="2"
                                :min="0"
                                placeholder="课程原价" />
             </el-form-item>
@@ -182,7 +180,7 @@ const plusNum = (items = [], key) => {
   let money = 0
   for (const item of items) {
     if (item) {
-      money += parseFloat(parseFloat(item[key] || 0).toFixed(2) || 0)
+      money += item[key] || 0
     }
   }
   return money
@@ -268,10 +266,11 @@ export default {
       if (item.courseType) {
         const active = this.courseTypesByType[item.courseType] || {}
         const _list = this.form.details
+        const price = Math.round(numeral((active.unitPrice || 1)).multiply((item.courseTotalMinuties || 1)).value())
         _list[index] = {
           ...item,
-          courseCurrentPrice: Math.ceil(active.unitPrice * (item.courseTotalMinuties || 1)),
-          courseOriginalPrice: Math.ceil(active.unitPrice * (item.courseTotalMinuties || 1))
+          courseCurrentPrice: price,
+          courseOriginalPrice: price
         }
         this.$refs.form.validateField(`details.${index}.courseTotalMinuties`)
         this.$set(this.form, `details`, [..._list])

src/views/categroyManager/specialSetup/modals/create-discount.vue

@@ -27,7 +27,10 @@
                     :label="item.label + '模式折扣(%)'"
                     :prop="`types.${item.value}`"
                     :label-width="formLabelWidth"
-                    :rules="[{ required: true, message: '请输入折扣', trigger: 'blur' }]">
+                    :rules="[
+                      { required: true, message: '请输入折扣', trigger: 'blur' },
+                      { pattern: /^\d+(\.\d{1,8})?$/, message: '请输入正确的折扣' }
+                    ]">
         <el-input v-model.trim="form.types[item.value]"
                   autocomplete="off"
                   type="number"

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -133,7 +133,7 @@
         </el-form-item>
         <div v-for="(item, index) in dataList"
              :key="index">
-          <el-form-item :label="`${item.name}每分钟费用`"
+          <el-form-item :label="`${item.name}模式`"
                         :label-width="formLabelWidth"
                         :rules="[
               {
@@ -144,8 +144,10 @@
             ]"
                         :prop="`unitPriceJson.${item.id}`">
             <el-input type="number"
+                      min="0"
+                      step="0.00000001"
                       v-model="createForm.unitPriceJson[item.id]">
-              <template slot="append">元</template>
+              <template slot="append">每分钟费用(元)</template>
             </el-input>
           </el-form-item>
         </div>
@@ -198,7 +200,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="actvieRow"
-                      :label="`${actvieRow.chargeType.name}每分钟费用`"
+                      :label="`${actvieRow.chargeType.name}模式`"
                       :label-width="formLabelWidth"
                       :rules="[
             {
@@ -209,8 +211,10 @@
           ]"
                       prop="unitPrice">
           <el-input type="number"
+                    min="0"
+                    step="0.00000001"
                     v-model="resetForm.unitPrice">
-            <template slot="append">元</template>
+            <template slot="append">每分钟费用(元)</template>
           </el-input>
         </el-form-item>
       </el-form>

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

@@ -110,7 +110,7 @@
               class="number-input"
               v-model="list.form[scope.$index].courseCurrentPrice"
               :controls="false"
-              :precision="2"
+              :precision="0"
               :min="0"
               @change="change"
               placeholder="请输入现价"
@@ -133,7 +133,7 @@
               class="number-input"
               v-model="list.form[scope.$index].courseOriginalPrice"
               :controls="false"
-              :precision="2"
+              :precision="0"
               :min="0"
               placeholder="请输入原价"
             />

src/views/resetTeaming/modals/payment-cycle.vue

@@ -15,7 +15,7 @@
         class="number-input"
         v-model="form.paymentAmount"
         :controls="false"
-        :precision="2"
+        :precision="0"
         :min="0"
         @change="paymentAmountChange"
         :disabled="isDisabled"

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

@@ -9,12 +9,12 @@
       <descriptions-item label="分部名称：">{{
         auditDto.organName
       }}</descriptions-item>
-      <descriptions-item label="乐团名称：">{{
-        auditDto.musicGroupName
-      }}</descriptions-item>
-      <descriptions-item label="乐团编号：">{{
-        auditDto.musicGroupId
-      }}</descriptions-item>
+      <descriptions-item label="乐团名称：">
+        <overflow-text :text="auditDto.musicGroupName" width="100%"></overflow-text>
+      </descriptions-item>
+      <descriptions-item label="乐团编号：">
+        <copy-text>{{ auditDto.musicGroupId }}</copy-text>
+      </descriptions-item>
       <descriptions-item label="申请时间：">{{
         auditDto.createTime
       }}</descriptions-item>
@@ -67,7 +67,7 @@
     </el-alert>
     <descriptions v-for="item in musicGroupPaymentCalenders" :key="item.id" :column="2">
       <descriptions-item label="缴费金额：">{{
-        item.paymentAmount|moneyFormat
+        numeral(item.paymentAmount).format('0,0')
       }}</descriptions-item>
       <descriptions-item label="缴费方式：">{{
         item.paymentPattern | paymentPatternTypeFormat
@@ -107,6 +107,7 @@
 </template>
 <script>
 import Vue from "vue";
+import numeral from 'numeral'
 import { musicGroupPaymentCalenderView } from "../api";
 import descriptions from "@/components/Descriptions";
 Vue.use(descriptions);
@@ -138,6 +139,7 @@ export default {
     this.init();
   },
   methods: {
+    numeral,
     async init () {
       try {
         const res = await musicGroupPaymentCalenderView({

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

@@ -149,6 +149,7 @@ import classrooms from "./classrooms";
 import otherform from "./other";
 import baseInfoVue from '../../teamDetail/components/baseInfo.vue';
 import merge from 'webpack-merge'
+import numeral from 'numeral'
 
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -353,7 +354,7 @@ export default {
     priceChange (item, index) {
       const _ = [...this.eclass]
       const active = this.organizationCourseUnitPriceSettingsByType[item.courseType] || {}
-      const price = ((item.courseTotalMinuties || 1) * (active.unitPrice || 1)).toFixed(2)
+      const price = Math.round(numeral(active.unitPrice || 1).multiply((item.courseTotalMinuties || 1)).value())
       item.courseCurrentPrice = price
       item.courseOriginalPrice = price
       _[index] = item
@@ -368,20 +369,22 @@ export default {
         money += item.courseCurrentPrice;
         if (this.cycles && this.cycles.length) {
           if (item.isStudentOptional) {
-            first += (item.courseCurrentPrice * 100)
+            first += item.courseCurrentPrice
           } else {
-            const floorMoney = Math.floor((item.courseCurrentPrice * 100) / this.cycles.length)
-            const remainder = (item.courseCurrentPrice * 100) % this.cycles.length
+            const floorMoney = Math.floor(item.courseCurrentPrice / this.cycles.length)
+            const remainder = item.courseCurrentPrice % this.cycles.length
+            console.log(remainder)
             first += floorMoney + remainder
             other += floorMoney
           }
         }
       }
+      console.log(first, other)
       if (this.cycles && this.cycles.length) {
         this.cycles = this.cycles.map((item, index) => {
           return {
             ...item,
-            paymentAmount: (index === 0 ? first / 100 : (other / 100))
+            paymentAmount: (index === 0 ? first : other)
           }
         })
       }

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

@@ -217,10 +217,10 @@ export default {
         money += item.courseCurrentPrice;
         if (this.cycles && this.cycles.length) {
           if (item.isStudentOptional) {
-            first += (item.courseCurrentPrice * 100)
+            first += item.courseCurrentPrice
           } else {
-            const floorMoney = Math.floor((item.courseCurrentPrice * 100) / this.cycles.length)
-            const remainder = (item.courseCurrentPrice * 100) % this.cycles.length
+            const floorMoney = Math.floor(item.courseCurrentPrice / this.cycles.length)
+            const remainder = item.courseCurrentPrice % this.cycles.length
             first += floorMoney + remainder
             other += floorMoney
           }
@@ -232,7 +232,7 @@ export default {
         this.cycles = this.cycles.map((item, index) => {
           return {
             ...item,
-            paymentAmount: (index === 0 ? first / 100 : (other / 100))
+            paymentAmount: (index === 0 ? first : other)
           }
         })
       }