Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -162,7 +162,7 @@
         </el-form-item>
         <div v-for="(item, index) in dataList" :key="index">
           <el-form-item
-            :label="`${item.name}乐团`"
+            :label="`${item.name}`"
             :label-width="formLabelWidth"
             :rules="[
               {
@@ -483,7 +483,6 @@ export default {
                     item.chargeTypeId
                   )
                 ) {
-                  console.log(item.chargeTypeId)
                   this.$set(
                     this.createForm,
                     unitPriceJson[item.chargeTypeId],

src/views/resetTeaming/components/payInfoDetail.vue

@@ -225,7 +225,7 @@
             <empty desc="暂无缴费项目配置" />
           </div>
           <div v-else style="text-align:center;">
-            <el-button  class="submitBtn" @click="submitForm">确认提交</el-button>
+            <el-button  class="submitBtn" @click="submitForm">确认</el-button>
           </div>
         </div>
       </div>
@@ -254,7 +254,7 @@
       </el-tabs>
 
       <div>
-        <el-button style="width: 100%; border-radius: 0; line-height: 30px" size="medium" type="primary" @click="onSubmit">提交</el-button>
+        <el-button style="width: 100%; border-radius: 0; line-height: 30px" size="medium" type="primary" @click="onSubmit">确认提交</el-button>
       </div>
     </el-dialog>
   </div>

src/views/resetTeaming/modals/payMember.vue

@@ -68,8 +68,40 @@
           </el-form-item>
         </template>
       </el-table-column>
+
+      <el-table-column label="会员周期" prop="num" key="num" width="170px">
+        <template slot-scope="scope">
+          <el-form-item
+            :prop="'memberList.' + scope.$index + '.num'"
+            :rules="[
+              {
+                required: true,
+                message: '请选择会员周期',
+                trigger: 'blur',
+              },
+            ]"
+          >
+            <!--    @change="
+                            $listeners.priceChange(scope.row, scope.$index)
+                          " -->
+            <el-input-number
+              style="width: 90% !important"
+              class="number-input"
+              v-model="form.memberList[scope.$index].num"
+              :controls="false"
+              :precision="0"
+              :min="0"
+              @change="
+                changeMemberperiodEnum(form.memberList[scope.$index].period)
+              "
+              placeholder="会员数量"
+              :disabled="!form.memberList[scope.$index].memberRankSettingId"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column
-        label="会员周期"
+        label="周期单位"
         prop="period"
         key="period"
         width="170px"
@@ -80,7 +112,7 @@
             :rules="[
               {
                 required: true,
-                message: '请选择会员周期',
+                message: '请选择周期单位',
                 trigger: 'blur',
               },
             ]"
@@ -101,37 +133,6 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="会员数量" prop="num" key="num" width="170px">
-        <template slot-scope="scope">
-          <el-form-item
-            :prop="'memberList.' + scope.$index + '.num'"
-            :rules="[
-              {
-                required: true,
-                message: '请选择会员数量',
-                trigger: 'blur',
-              },
-            ]"
-          >
-            <!--    @change="
-                            $listeners.priceChange(scope.row, scope.$index)
-                          " -->
-            <el-input-number
-              style="width: 90% !important"
-              class="number-input"
-              v-model="form.memberList[scope.$index].num"
-              :controls="false"
-              :precision="0"
-              :min="0"
-              @change="
-                changeMemberperiodEnum(form.memberList[scope.$index].period)
-              "
-              placeholder="会员数量"
-              :disabled="!form.memberList[scope.$index].memberRankSettingId"
-            />
-          </el-form-item>
-        </template>
-      </el-table-column>
       <el-table-column
         label="售价(元)"
         prop="actualAmount"

src/views/teamBuild/components/teamBaseInfo.vue

@@ -10,6 +10,17 @@
         label-position="left"
       >
         <div class="head">乐团基本信息：</div>
+        <el-form-item
+          label="乐团名称"
+          prop="name"
+          :rules="[{ required: true, message: '乐团名称不能为空' }]"
+        >
+          <el-input
+            placeholder="请输入乐团名称"
+            v-model.trim="topFrom.name"
+            :disabled="basdisabled"
+          ></el-input>
+        </el-form-item>
         <!-- style="margin-left: 11px"  -->
         <el-form-item
           label="所属分部"
@@ -129,17 +140,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="乐团名称"
-          prop="name"
-          :rules="[{ required: true, message: '乐团名称不能为空' }]"
-        >
-          <el-input
-            placeholder="请输入乐团名称"
-            v-model.trim="topFrom.name"
-            :disabled="basdisabled"
-          ></el-input>
-        </el-form-item>
+
         <!-- <el-form-item
           label="运营主管"
           prop="boss"
@@ -796,9 +797,9 @@ export default {
         // 乐团主管
         this.educationList = ruselt?.data?.EDUCATION;
         // 维修技师
-        this.technician =ruselt?.data?.REPAIR
+        this.technician = ruselt?.data?.REPAIR;
         // this.bossList = ruselt?.data?.TEAM_TEACHER;
-             // 衔接老师
+        // 衔接老师
         this.transactionList = ruselt?.data?.JOIN_TEACHER;
       } catch (e) {
         console.log(e);
@@ -841,7 +842,7 @@ export default {
           if (item.id == val) {
             console.log(item);
             this.$set(this.topFrom, "teacher", item.educationUserId);
-            console.log(this.topFrom)
+            console.log(this.topFrom);
           }
         });
       }
@@ -1529,16 +1530,16 @@ input[disabled] {
   color: #606266;
 }
 /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner {
-  background-color: #00A79D;
-  border-color: #00A79D;
+  background-color: #00a79d;
+  border-color: #00a79d;
   // -webkit-box-shadow: -1px 0 0 0 rgb (19, 129, 122);
-  box-shadow: -1px 0 0 #00A79D;
+  box-shadow: -1px 0 0 #00a79d;
   color: #fff;
   outline: none;
 }
 /deep/.el-radio-button__inner {
   &:hover {
-    color: #00A79D;
+    color: #00a79d;
   }
   outline: none;
 }

src/views/teamBuild/signupList.vue

@@ -866,7 +866,7 @@
           <el-button
             @click="onPartPayment"
             type="primary"
-            >开启缴费</el-button
+            >提前缴费</el-button
           >
         </auth>
         <!-- <div class='newBand' v-show="status=='APPLY'">允许缴费</div> -->