Merge branch '10/23-test' into online

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

@@ -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>