1

dist/static/css/chunk-1b87893d.7dd96364.css → dist/static/css/chunk-02fbef41.cffbae93.css

@@ -1 +1 @@
-.studenTable[data-v-9cc29692]{height:300px;overflow:auto}.infoMsg[data-v-9cc29692]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-9cc29692]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-9cc29692]{font-size:20px}.infoMsg .left[data-v-9cc29692]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-9cc29692],.infoMsg .right[data-v-9cc29692]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-9cc29692]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-9cc29692]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-9cc29692]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-9cc29692]{width:300px}.wrap[data-v-9cc29692]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-9cc29692]{margin-right:20px}.inputStyle[data-v-9cc29692]{width:180px}
+.studenTable[data-v-206e3cb4]{height:300px;overflow:auto}.infoMsg[data-v-206e3cb4]{margin:30px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:center}.infoMsg .title[data-v-206e3cb4]{color:#999;font-size:14px;line-height:30px;min-width:100px}.infoMsg .status[data-v-206e3cb4]{font-size:20px}.infoMsg .left[data-v-206e3cb4]{width:200px;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-right:200px}.infoMsg .left[data-v-206e3cb4],.infoMsg .right[data-v-206e3cb4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-direction:normal;height:60px}.infoMsg .right[data-v-206e3cb4]{text-align:center;line-height:30px;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoMsg .right .expectBox[data-v-206e3cb4]{width:220px;border-right:1px solid #ccc}.infoMsg .right .expectBox[data-v-206e3cb4]:last-child{border-right:none!important}.infoMsg .right .expectBox.first[data-v-206e3cb4]{width:300px}.wrap[data-v-206e3cb4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.wrap div[data-v-206e3cb4]{margin-right:20px}.inputStyle[data-v-206e3cb4]{width:180px}

dist/static/css/chunk-2aed7932.354260ed.css

@@ -1 +0,0 @@
-.tableWrap[data-v-0072b5f8]{height:300px;overflow:auto}

dist/static/css/chunk-37bf19f8.4e06f5ad.css

@@ -0,0 +1 @@
+.tableWrap[data-v-3a694394]{height:300px;overflow:auto}

src/views/categroyManager/globalConfig.vue

@@ -26,7 +26,7 @@
         </el-tab-pane>
         <el-tab-pane label="折扣设置"
                      name="9"
-                     v-if="permissionList.typesManager">
+                     v-if="permissionList.discountManage">
           <discountManage v-if="activeIndex == 9" />
         </el-tab-pane>
         <el-tab-pane label="乐团收费标准"
@@ -112,6 +112,7 @@ export default {
         errorManager: permission('/globalConfig/errorManager'),
         holidaySetting: permission('/globalConfig/holidaySetting'),
         musicCourseFee:permission('/globalConfig/musicCourseFee'),
+        discountManage:permission('/globalConfig/discountManage'),
       }
     }
   },

src/views/resetTeaming/components/resetPayList.vue

@@ -46,6 +46,12 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         :data="tableList"
       >
+           <el-table-column
+          align="center"
+          prop="batchNo"
+          width="120"
+          label="订单编号"
+        ></el-table-column>
         <el-table-column
           align="center"
           prop="startPaymentDate"

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -46,6 +46,12 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         :data="tableList"
       >
+            <el-table-column
+          align="center"
+          prop="batchNo"
+          width="120"
+          label="订单编号"
+        ></el-table-column>
         <el-table-column
           align="center"
           prop="expectNum"

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -148,9 +148,9 @@
   OPEN: '开启缴费',
   OVER: '缴费已结束', -->
       <div class="wrap">
-        <!-- <div class="newBand"
+        <div class="newBand"
              @click="resetPay"
-             v-permission="'musicGroupPaymentCalenderDetail/updateExpectAmount'">修改缴费金额</div> -->
+             v-permission="'musicGroupPaymentCalenderDetail/updateExpectAmount'">修改缴费金额</div>
         <!-- <div class="newBand"
              @click="startPay"
              v-if="info.paymentStatus != 'OPEN'"
@@ -561,8 +561,10 @@ export default {
     // },
     goBack() {
       let query = this.$route.query;
-      sessionStorage.setItem("resetCode", 3);
-      this.$router.push({ path: "/business/resetTeaming", query });
+      if(query.type == 'resetTeam'){
+        sessionStorage.setItem('resetCode','3')
+      }
+      this.$router.go(-1)
     },
     handleSelectionChange(val) {
       this.activeChiose = val;
@@ -750,6 +752,7 @@ export default {
          }
        })
       })
+      str = str.substring(0,str.length-1)+'。'
       return str
     }
   }

src/views/resetTeaming/components/studentPayBase.vue

@@ -103,7 +103,7 @@
           <el-input disabled
                     value="张三"></el-input>
         </el-form-item> -->
-        <el-form-item label="预计缴费金额"
+        <el-form-item label="应缴金额"
                       :rules="[{ required: true, message: '请输入预计缴费金额',trigger: 'blur'},{pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/, message: '请输入正确的金额',trigger: 'blur' }]"
                       prop="momey">
           <el-input v-model="resetPayForm.momey"></el-input>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -115,9 +115,7 @@
                           :disabled="basdisabled"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          :picker-options="{
-              firstDayOfWeek: 1,
-            }"
+                          :picker-options="beginDate()"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="预计开团时间"
@@ -127,9 +125,7 @@
                           :disabled="basdisabled"
                           type="date"
                           value-format="yyyy-MM-dd"
-                          :picker-options="{
-              firstDayOfWeek: 1,
-            }"
+                         :picker-options="beginDate()"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="缴费方式"

src/views/teamBuild/index.vue

@@ -21,7 +21,7 @@
         </span>
         <span
           class="stepspan stepspan2"
-          v-if="activeIndex  >= 1"
+          v-if="showFlag?activeIndex>= 1:true"
           @click="activeIndex = 1"
         >
           <!--    -->
@@ -39,7 +39,7 @@
         </span>
         <span
           class="stepspan stepspan3"
-          v-if="activeIndex  >=  2"
+          v-if="showFlag?activeIndex  >=  2:true"
           @click="activeIndex = 2"
         >
           <div
@@ -49,7 +49,7 @@
             创建缴费
           </div>
           <img
-            :src="activeIndex <= 2 ? stepImgs.nol : stepImgs.active"
+            :src="activeIndex >= 2 ? stepImgs.nol : stepImgs.active"
             alt=""
             class="arrow"
           />
@@ -139,6 +139,11 @@ export default {
       this.pageName = baseInfo.musicGroup?.name
     },
   },
+  computed:{
+    showFlag(){
+      return (this.teamStatus=='newTeam' || this.teamStatus=='teamList')
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -231,7 +231,7 @@ export default {
               list.push({
                 type: (this.detail ? undefined : this.activeType),
                 courseType: key,
-                name: (this.studentSubmitedData?.name || this.detail?.name),
+                classGroupName: (this.studentSubmitedData?.name || this.detail?.name),
                 classGroupId: this.detail?.id,
                 musicGroupId: this.musicGroupId,
                 startDate: item.courseTime,