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

src/layout/components/AppMain.vue

@@ -17,20 +17,27 @@
       </div>
     </transition>
     <serviceRemind />
-    <div style="z-index:5000">
+    <div style="z-index: 5000">
       <el-dialog
         :visible.sync="guideVisible"
-        title="您需要完成以下设置"
-        width="800px"
+        width="680px"
         :modal="false"
         v-if="guideList.length > 0"
         append-to-body
+        class="dialogGuide"
       >
+        <template #title>
+          <div class="dialogHead">
+            <h2 class="guideH2">您需要完成以下设置</h2>
+            <el-divider class="guideLine"></el-divider>
+          </div>
+        </template>
         <div class="guideWrap">
           <div class="guideItem" v-for="guide in guideList" :key="guide.name">
             <p>
               <span class="guideTitle">{{ guide.name }}</span>
               <el-button
+                class="guideSet"
                 type="text"
                 @click="gotoSet(guide)"
                 v-if="permission(guide.permission)"
@@ -38,8 +45,14 @@
               >
               <span v-else>您暂无此设置权限,请联系机构管理员</span>
             </p>
-            <p>{{ guide.desc }}</p>
+            <p class="guideDesc">{{ guide.desc }}</p>
           </div>
+          <el-button
+            type="primary"
+            style="width: 100%"
+            @click="guideVisible = false"
+            >暂不设置</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -53,9 +66,10 @@
     <el-drawer
       title="操作手册"
       :visible.sync="outOptionvisible"
-      size="400px"
+      size="410px"
       :append-to-body="true"
     >
+      <el-divider class="outOptionLine"></el-divider>
       <div class="drawerWrap">
         <el-form :model="form" :inline="true">
           <el-form-item>
@@ -71,7 +85,7 @@
             <el-button @click="getMUal()" type="danger">搜索</el-button>
           </el-form-item>
           <br />
-          <div class="topline"></div>
+          <!-- <div class="topline"></div> -->
           <div
             v-for="(item, index) in optionList"
             :key="index"
@@ -79,7 +93,8 @@
             @click="openDetail(item)"
           >
             <el-row>
-              {{ item.name }}
+              <el-col :span="23">{{ item.name }}</el-col>
+              <el-col :span="1"><i class="el-icon-arrow-right"></i></el-col>
             </el-row>
           </div>
         </el-form>
@@ -90,7 +105,7 @@
       :append-to-body="true"
       v-if="activeRow"
       :visible.sync="innerDrawer"
-      size="400px"
+      size="410px"
       custom-class="innerDrawer"
     >
       <p class="submitTitle">更新时间: {{ activeRow.updateTime }}</p>
@@ -250,10 +265,15 @@ export default {
 .previewImg {
 }
 /deep/.el-drawer__header {
+  font-size: 20px;
   margin-bottom: 0px;
-  color: #000;
+  line-height: 24px;
+  color: rgba(0, 0, 0, 0.9);
   font-weight: bold;
 }
+.outOptionLine {
+  margin: 20px 0 0 0;
+}
 .innerDrawer {
   .submitTitle {
     margin: 10px 0;
@@ -261,6 +281,7 @@ export default {
     padding: 0 20px;
     color: #999;
   }
+
   .optionWrap {
     box-sizing: border-box;
     width: 100%;
@@ -292,11 +313,28 @@ export default {
   z-index: 3999;
 }
 /deep/.line {
-  border-bottom: 1px solid #dcdfe6;
   height: 40px;
   line-height: 40px;
-  color: var(--color-primary);
+  color: rgba(#212121, 0.9);
+  padding: 0 17px;
+  background-color: #f9f9f9;
   cursor: pointer;
+  margin-bottom: 10px;
+  position: relative;
+  border-radius: 2px;
+  &:hover {
+    color: var(--color-primary);
+    &::after {
+      content: "";
+      width: 100%;
+      height: 100%;
+      background-color: var(--color-primary);
+      opacity: 0.1;
+      position: absolute;
+      left: 0;
+      top: 0;
+    }
+  }
 }
 .drawerWrap {
   padding: 20px;
@@ -304,7 +342,17 @@ export default {
     border-top: 1px solid #dcdfe6;
   }
 }
+.guideLine {
+  margin: 18px 0 0px;
+}
 .guideWrap {
+  .guideH2 {
+    font-size: 20px;
+    font-weight: 600;
+    color: #212121;
+    line-height: 28px;
+  }
+
   .guideItem {
     margin-bottom: 30px;
     .guideTitle {
@@ -312,7 +360,39 @@ export default {
       text-align: left;
       font-weight: bold;
       display: inline-block;
+      font-size: 16px;
+      font-weight: 600;
+      color: #212121;
+      line-height: 22px;
+      margin-bottom: 10px;
+    }
+    .guideDesc {
+      color: #666666;
+      line-height: 20px;
+      font-size: 14px;
     }
+    .guideSet {
+      font-size: 16px;
+    }
+  }
+}
+.dialogGuide {
+  border-radius: 6px;
+  /deep/.el-dialog__header {
+    background-color: #fff;
+    padding-top: 15px;
+    .el-dialog__headerbtn {
+      top:28px;
+      .el-icon {
+        color: #999;
+        font-size: 20px;
+        font-weight: bold;
+      }
+    }
+  }
+  .dialogHead {
+    background-color: #fff;
+    padding-top: 10px;
   }
 }
 

src/store/modules/user.js

@@ -132,7 +132,7 @@ const actions = {
           const organName = data.data.organName;
           const phone = data.data.phone
           const isSuperAdmin = data.data.isSuperAdmin
-          const roles = data.data.roles
+          const roles = data.data?.positions?.split(',')||[]
           const tenantId = data.data.tenantId
           const positionName = data.data.positionName
           sessionStorage.setItem('baseTenantId', tenantId)

src/views/HumanResources/form.vue

@@ -20,7 +20,7 @@
                 >
                   <el-input
                     v-model="form.realName"
-                    
+
                     placeholder="请输入姓名"
                   />
                 </el-form-item>
@@ -30,7 +30,7 @@
                 <el-form-item prop="age">
                   <el-input
                     v-model="form.age"
-                    
+
                     type="number"
                     min="1"
                     step="1"
@@ -42,7 +42,7 @@
               <td class="description-content">
                 <el-form-item prop="gender">
                   <el-select
-                    
+
                     v-model.trim="form.gender"
                     clearable
                     filterable
@@ -75,7 +75,7 @@
                   ]"
                 >
                   <el-input
-                    
+
                     minlength="11"
                     maxlength="11"
                     v-model="form.mobileNo"
@@ -89,7 +89,7 @@
               <td class="description-content">
                 <el-form-item prop="wechatNo">
                   <el-input
-                    
+
                     v-model="form.wechatNo"
                     placeholder="请输入微信号"
                   />
@@ -99,7 +99,7 @@
               <td class="description-content">
                 <el-form-item prop="idCard">
                   <el-input
-                    
+
                     v-model="form.idCard"
                     placeholder="请输入身份证号"
                   />
@@ -139,7 +139,7 @@
                 <el-form-item :prop="'educations.' + index + '.level'">
                   <el-input
                     v-model="form.educations[index].level"
-                    
+
                     placeholder="请输入学历"
                   />
                 </el-form-item>
@@ -148,7 +148,7 @@
               <td class="description-content">
                 <el-form-item :prop="'educations.' + index + '.school'">
                   <el-input
-                    
+
                     v-model="form.educations[index].school"
                     placeholder="请输入学校"
                   />
@@ -158,7 +158,7 @@
               <td class="description-content">
                 <el-form-item :prop="'educations.' + index + '.subject'">
                   <el-input
-                    
+
                     v-model="form.educations[index].subject"
                     placeholder="请输入专业"
                   />
@@ -170,7 +170,7 @@
                   <el-date-picker
                     type="month"
                     placeholder="请选择毕业时间"
-                    
+
                     v-model="form.educations[index].year"
                   />
                 </el-form-item>
@@ -191,7 +191,7 @@
               <td class="description-content">
                 <el-form-item prop="liveCity">
                   <el-input
-                    
+
                     v-model.trim="form.liveCity"
                     placeholder="请输入所在城市"
                   />
@@ -201,7 +201,7 @@
               <td class="description-content">
                 <el-form-item prop="intentionCity">
                   <el-input
-                    
+
                     v-model.trim="form.intentionCity"
                     placeholder="请输入意向城市"
                   />
@@ -211,7 +211,7 @@
               <td class="description-content">
                 <el-form-item prop="jobNature">
                   <el-select
-                    
+
                     v-model.trim="form.jobNature"
                     clearable
                     filterable
@@ -228,7 +228,7 @@
               <td class="description-content">
                 <el-form-item prop="jobType">
                   <el-select
-                    
+
                     v-model.trim="form.jobType"
                     clearable
                     filterable
@@ -244,7 +244,7 @@
               <td class="description-content" colspan="3">
                 <el-form-item prop="subjectIdList">
                   <el-select
-                    
+
                     v-model.trim="form.subjectIdList"
                     clearable
                     filterable
@@ -271,7 +271,7 @@
                     v-model.trim="form.sourceFrom"
                     clearable
                     filterable
-                    
+
                     placeholder="请选择信息来源"
                   >
                     <el-option label="BOSS" value="BOSS"></el-option>
@@ -284,7 +284,7 @@
               <td class="description-content">
                 <el-form-item prop="status">
                   <el-select
-                    
+
                     v-model.trim="form.status"
                     clearable
                     filterable
@@ -304,7 +304,7 @@
               <td class="description-content">
                 <el-form-item prop="hrbp">
                   <el-select
-                    
+
                     v-model.trim="form.hrbp"
                     clearable
                     filterable
@@ -338,7 +338,7 @@
                   <el-date-picker
                     type="date"
                     placeholder="选择入职日期"
-                    
+
                     v-model="form.entryDate"
                   />
                 </el-form-item>
@@ -349,7 +349,7 @@
                   <el-date-picker
                     type="date"
                     placeholder="选择离职日期"
-                    
+
                     v-model="form.resignationDate"
                   />
                 </el-form-item>
@@ -358,7 +358,7 @@
               <td class="description-content">
                 <el-form-item prop="resignationReason">
                   <el-input
-                    
+
                     v-model.trim="form.resignationReason"
                     placeholder="请输入离职原因"
                   />
@@ -374,7 +374,7 @@
                     placeholder="请选择分部"
                     clearable
                     filterable
-                    
+
                   >
                     <el-option
                       v-for="(item, index) in organList"
@@ -393,7 +393,7 @@
                     v-model.trim="form.position"
                     clearable
                     filterable
-                    
+
                     placeholder="请选择职位"
                   >
                     <el-option label="指导老师" value="ADVISER"></el-option>
@@ -406,7 +406,7 @@
               <td class="description-content">
                 <el-form-item prop="jobSubjectIdList">
                   <el-select
-                    
+
                     v-model.trim="form.jobSubjectIdList"
                     clearable
                     filterable
@@ -430,7 +430,7 @@
               <td class="description-content">
                 <el-form-item prop="emergencyContactName">
                   <el-input
-                    
+
                     v-model.trim="form.emergencyContactName"
                     placeholder="请输入紧急联系人姓名"
                   />
@@ -447,7 +447,7 @@
                   }"
                 >
                   <el-input
-                    
+
                     v-model.trim="form.emergencyContactRelation"
                     placeholder="请输入紧急联系人关系"
                   />
@@ -467,7 +467,7 @@
                   ]"
                 >
                   <el-input
-                    
+
                     v-model.trim="form.emergencyContactPhone"
                     minlength="11"
                     maxlength="11"
@@ -481,7 +481,7 @@
               <td class="description-content">
                 <el-form-item prop="bankAddress">
                   <el-input
-                    
+
                     v-model="form.bankAddress"
                     placeholder="请输入开户行"
                   />
@@ -491,7 +491,7 @@
               <td class="description-content" colspan="3">
                 <el-form-item prop="bankCardNo">
                   <el-input
-                    
+
                     v-model="form.bankCardNo"
                     placeholder="请输入银行卡号"
                   />
@@ -729,7 +729,7 @@ export default {
           this.form = { ...this.form };
         } catch (error) {}
 
-        console.log(this.form);
+        // console.log(this.form);
       } else {
         this.form.educations = [
           { level: "", school: "", year: "", subject: "" },

src/views/auditList/index.vue

@@ -212,24 +212,23 @@
             </template>
           </el-table-column>
           <!--  -->
-          <el-table-column
-            align="center"
-            label="操作"
-            fixed="right"
-          >
+          <el-table-column align="center" label="操作" fixed="right">
             <template slot-scope="scope">
+              <!--     'musicGroupPaymentCalender/auditListDetail/update'
+                       'musicGroupPaymentCalender/auditListDetail/look' -->
+              <el-button
+                @click="lookDetail(scope.row)"
+                type="text"
+                v-if="scope.row.status == 'AUDITING' && $helpers.permission('musicGroupPaymentCalender/auditListDetail/update')"
+              >
+                审核
+              </el-button>
               <el-button
                 @click="lookDetail(scope.row)"
                 type="text"
-                v-if="
-                  $helpers.permission(
-                    scope.row.status === 'AUDITING'
-                      ? 'musicGroupPaymentCalender/auditListDetail/update'
-                      : 'musicGroupPaymentCalender/auditListDetail/look'
-                  )
-                "
+                v-if="scope.row.status != 'AUDITING' && $helpers.permission('musicGroupPaymentCalender/getDetail/look')"
               >
-                {{ scope.row.status === "AUDITING" ? "审核" : "查看" }}
+                查看
               </el-button>
             </template>
           </el-table-column>
@@ -348,7 +347,7 @@ export default {
         id: row.id,
         musicGroupId: row.musicGroupId,
         status: row.status,
-        batchNo:row.batchNo
+        batchNo: row.batchNo,
       };
       this.typeStatus = true;
     },

src/views/baseRulesManager/components/dayaTeamRules.vue

@@ -130,7 +130,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -143,7 +143,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/baseRulesManager/components/goodsRules.vue

@@ -128,7 +128,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -141,7 +141,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/baseRulesManager/components/otherRules.vue

@@ -273,7 +273,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -286,7 +286,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/baseRulesManager/index.vue

@@ -31,6 +31,14 @@
         >
           <otherRules v-if="activeIndex == 4" />
         </el-tab-pane>
+           <el-tab-pane
+          label="乐保设置"
+          lazy
+          name="1"
+          v-if="permission('/institutionLeBaoRules')"
+        >
+          <leBaoRules v-if="activeIndex==1"/>
+        </el-tab-pane>
         <!-- <el-tab-pane
           label="服务异常提醒"
           lazy
@@ -53,7 +61,7 @@
 </template>
 <script>
 import overallManager from "@/views/categroyManager/generalSettings/overallManager";
-
+import leBaoRules from "@/views/courseRulersManager/components/leBaoRules";//
 import dayaTeamRules from "./components/dayaTeamRules";
 import goodsRules from "./components/goodsRules";
 import institutionRules from "./components/institutionRules";
@@ -65,7 +73,8 @@ export default {
     institutionRules,
     overallManager,
     dayaTeamRules,
-    otherRules
+    otherRules,
+    leBaoRules
   },
   name: "baseRulersManager",
   data() {

src/views/baseRulesManager/special.vue

@@ -7,14 +7,14 @@
     <div class="m-core">
       <!-- navMenu -->
       <tab-router v-model.trim="activeIndex" @tab-click="handleClick">
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="乐团参数"
           lazy
           name="1"
           v-if="permission('/platformDayaTeamRules')"
         >
           <dayaTeamRules :isPlatform='true' v-if="activeIndex==1"/>
-        </el-tab-pane>
+        </el-tab-pane> -->
 
         <el-tab-pane
           label="商品库存规则"
@@ -32,6 +32,14 @@
         >
           <otherRules v-if="activeIndex == 4" :isPlatform='true'/>
         </el-tab-pane>
+              <el-tab-pane
+          label="乐保设置"
+          lazy
+          name="1"
+          v-if="permission('/platformLeBaoRules')"
+        >
+          <leBaoRules :isPlatform='true'  v-if="activeIndex==1"/>
+        </el-tab-pane>
       </tab-router>
     </div>
   </div>
@@ -42,6 +50,7 @@ import dayaTeamRules from "./components/dayaTeamRules";
 import goodsRules from "./components/goodsRules";
 import institutionRules from "./components/institutionRules";
 import otherRules from './components/otherRules'
+import leBaoRules from "@/views/courseRulersManager/components/leBaoRules";//
 import { permission } from "@/utils/directivePage";
 export default {
   components: {
@@ -49,7 +58,8 @@ export default {
     institutionRules,
     overallManager,
     dayaTeamRules,
-    otherRules
+    otherRules,
+    leBaoRules
   },
   name: "baseRulersManager",
   data() {

src/views/categroyManager/accompanyBaseConfig.vue

@@ -190,7 +190,7 @@ export default {
         });
 
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/categroyManager/generalSettings/overallManager.vue

@@ -36,7 +36,7 @@
               class="marginLR5"
               v-model="form['18']"
               placeholder="请输入链接地址"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -49,7 +49,7 @@
               class="marginLR5"
               v-model="form['19']"
               placeholder="请输入链接地址"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -62,7 +62,7 @@
               class="marginLR5"
               v-model="form['19']"
               placeholder="请输入电话"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -82,7 +82,7 @@
             <el-input
               v-model="form['23']"
               placeholder="请输入分钟数"
-              
+
             >
               <template slot="append">分钟</template>
             </el-input>
@@ -103,7 +103,7 @@
             <el-input
               v-model="form['24']"
               placeholder="请输入分钟数"
-              
+
             >
               <template slot="append">分钟</template>
             </el-input>
@@ -134,7 +134,7 @@
               class="marginLR5"
               v-model="form['32']"
               placeholder="请输入地址"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -147,7 +147,7 @@
               class="marginLR5"
               v-model="form['52']"
               placeholder="请输入数据"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -160,7 +160,7 @@
               class="marginLR5"
               v-model="form['53']"
               placeholder="请输入URL"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -173,7 +173,7 @@
               class="marginLR5"
               v-model="form['54']"
               placeholder="请输入URL"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -188,7 +188,7 @@
               format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择截止时间"
-              
+
             >
             </el-date-picker>
           </el-form-item>
@@ -204,7 +204,7 @@
               format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择截止时间"
-              
+
             >
             </el-date-picker>
           </el-form-item>
@@ -217,7 +217,7 @@
               class="marginLR5"
               v-model="form['62']"
               placeholder="请输入URL"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -230,7 +230,7 @@
               class="marginLR5"
               v-model="form['64']"
               placeholder="请输入URL"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -245,7 +245,7 @@
               format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择截止时间"
-              
+
             >
             </el-date-picker>
           </el-form-item>
@@ -265,7 +265,7 @@
             <el-input
               v-model="form['203']"
               placeholder="请输入分钟数"
-              
+
             >
               <template slot="append">分钟</template> </el-input
             >进入教室
@@ -286,7 +286,7 @@
             <el-input
               v-model="form['204']"
               placeholder="请输入分钟数"
-              
+
             >
               <template slot="append">分钟</template> </el-input
             >关闭教室
@@ -300,7 +300,7 @@
               v-model="form['89']"
               format="HH:mm"
               value-format="HH:mm"
-              
+
               :picker-options="{
                 selectableRange: '00:00:00 - 23:59:59',
               }"
@@ -315,7 +315,7 @@
               v-model="form['205']"
               format="HH:mm"
               value-format="HH:mm"
-              
+
               :picker-options="{
                 selectableRange: '00:00:00 - 23:59:59',
               }"
@@ -333,7 +333,7 @@
               class="marginLR5"
               v-model="form['103']"
               placeholder="请输入问卷编号"
-              
+
             >
             </el-input>
           </el-form-item>
@@ -374,7 +374,7 @@
             @click="onSave(config, index)"
             v-permission="'sysConfig/update/overallManager'"
             type="primary"
-            
+
             >保存</el-button
           >
         </el-col>
@@ -412,7 +412,7 @@ export default {
             this.$set(this.form, item.id, item.paranValue);
           });
           // this.$forceUpdate()
-          console.log(this.form);
+          // console.log(this.form);
         }
       });
     },

src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -78,7 +78,7 @@ export default {
             this.$set(this.form, item.id, item.paranValue);
           });
           // this.$forceUpdate()
-          console.log(this.form);
+          // console.log(this.form);
         }
       });
     },

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -704,7 +704,6 @@ export default {
             if (itemValue) {
               this.rulesForm = itemValue;
             }
-            console.log(this.rulesForm);
             // this.$set(this.form, item.id, item.paranValue);
           }
           // this.form[item.paramName] = item.paranValue

src/views/courseRulersManager/components/leBaoRules.vue

@@ -121,7 +121,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -134,7 +134,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/loginRules.vue

@@ -118,7 +118,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -789,7 +789,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -802,7 +802,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/remberRules.vue

@@ -86,7 +86,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/serverMinitor.vue

@@ -188,7 +188,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -201,7 +201,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/studentAttRules.vue

@@ -155,7 +155,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -168,7 +168,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/components/teamRules.vue

@@ -247,7 +247,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }
@@ -260,7 +260,7 @@ export default {
           this.$set(this.form, item.id, item.paranValue);
         });
         // this.$forceUpdate()
-        console.log(this.form);
+        // console.log(this.form);
       } catch (e) {
         console.log(e);
       }

src/views/courseRulersManager/index.vue

@@ -42,14 +42,14 @@
         >
           <onlineCloudRules v-if="activeIndex==3"/>
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="乐保设置"
           lazy
           name="4"
           v-if="permission('/institutionLeBaoRules')"
         >
           <leBaoRules v-if="activeIndex==4"/>
-        </el-tab-pane>
+        </el-tab-pane>  -->
         <el-tab-pane
           label="课程规则设置"
           lazy

src/views/luckyDraw/lotteryManager.vue

@@ -156,7 +156,7 @@ export default {
         onSubmit(formName) {
             this.$refs[formName].validate(item => {
                 if(item) {
-                    console.log(this.form)
+                    // console.log(this.form)
                     let form = Object.assign({}, this.form)
                     let params = {
                         name: form.name,

src/views/mailInfoManager/index.vue

@@ -122,6 +122,7 @@ export default {
         password: null,
         from: null,
         fromName: null,
+        tenantId:-1
       },
     };
   },
@@ -132,7 +133,7 @@ export default {
     async getList() {
 
       try{
-        const res = await getEmail()
+        const res = await getEmail({tenantId:-1})
         if(res.data){
           this.form = {...res.data}
           this.activeRow = {...res.data}
@@ -159,7 +160,7 @@ export default {
             .then(async () => {
               try {
 
-                const res = await resetEmail({...this.form});
+                const res = await resetEmail({...this.form,tenantId:-1});
                 this.$message.success("保存成功");
                 this.getList()
               } catch (e) {

src/views/main/cloudDate/allDate.vue

@@ -65,15 +65,14 @@ export default {
       //        "eVipStudentNum",
       let arr = [
         "vipStudentNum",
-
         "cloudStudyLivelyStudentNum",
         "newCloudStudyStudentNum",
         "cloudStudyTodayUseStudentNum",
         "cloudStudyUseStudentNum",
       ];
       arr.forEach((str) => {
-        if (this.dataList[str]) {
-          obj[str] ={title:titles[str],percent:this.dataList[str],desc:descs[str]} ;
+        if (this.dataList[str]+'') {
+          obj[str] ={title:titles[str],percent:this.dataList[str],desc:descs[str]};
         }
       });
       return obj;

src/views/operationManual/index.vue

@@ -294,7 +294,7 @@ export default {
       } catch (e) {
         console.log(e);
       }
-      console.log(this.form);
+      // console.log(this.form);
     },
   },
 };

src/views/platformManager/platformCourseDeault/index.vue

@@ -32,14 +32,14 @@
         >
           <onlineCloudRules :isPlatform='true'  v-if="activeIndex==3"/>
         </el-tab-pane>
-        <el-tab-pane
+        <!-- <el-tab-pane
           label="乐保设置"
           lazy
           name="4"
           v-if="permission('/platformLeBaoRules')"
         >
           <leBaoRules :isPlatform='true'  v-if="activeIndex==4"/>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane
           label="课程规则设置"
           lazy

src/views/reportForm/index.vue

@@ -5,6 +5,19 @@
       报表中心
     </h2>
     <div class="m-core">
+      <el-collapse v-model="activeName" accordion class="formCollapse">
+        <template slot="title">
+          一致性 Consistency<i class="header-icon el-icon-info"></i>
+        </template>
+        <el-collapse-item title="一致性 Consistency" name="1">
+          <div>
+            与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；
+          </div>
+          <div>
+            在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。
+          </div>
+        </el-collapse-item>
+      </el-collapse>
       <div class="m-wrap">
         <div class="title">课酬导出：</div>
         <el-date-picker
@@ -494,22 +507,28 @@
       <el-divider></el-divider>
       <div class="m-core">
         <div class="m-wrap">
-        <div class="title">异常处理数据导出：</div>
-        <el-select
-          clearable
-          filterable
-          v-model="Abnormal.organId"
-          placeholder="请选择分部"
-        >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
+          <div class="title">异常处理数据导出：</div>
+          <el-select
+            clearable
+            filterable
+            v-model="Abnormal.organId"
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
 
-        <el-button type="primary"  style="margin-left: 10px"  v-permission="'export/exportIndexErrData'" @click="exportAbnormal">导出</el-button>
+          <el-button
+            type="primary"
+            style="margin-left: 10px"
+            v-permission="'export/exportIndexErrData'"
+            @click="exportAbnormal"
+            >导出</el-button
+          >
         </div>
       </div>
     </div>
@@ -554,6 +573,7 @@ export default {
       Abnormal: {
         organId: null,
       },
+      activeName:[]
     };
   },
   mounted() {
@@ -1169,7 +1189,7 @@ export default {
 <style lang="scss" scoped>
 .m-container {
   .m-core {
-    margin-top: 20px;
+    // margin-top: 20px;
     .m-wrap {
       display: flex;
       flex-direction: row;
@@ -1197,6 +1217,13 @@ export default {
       }
     }
   }
+  .formCollapse {
+    border:none;
+    /deep/.el-collapse-item__header{
+      border-bottom: none;
+      background-color: #F8F8F8;
+    }
+  }
 }
 /deep/.el-input__icon.el-icon-date {
   height: 40px !important;

src/views/resetTeaming/components/archicesComponents/modals/surveyMask.vue

@@ -168,7 +168,7 @@ export default {
           }
         }
       });
-      console.log(this.form);
+      // console.log(this.form);
     },
     changeSelect() {
       this.$forceUpdate();

src/views/resetTeaming/components/payInfoDetail.vue

@@ -137,6 +137,7 @@
                 </div>
               </div>
             </div>
+            <div class="wall" style="height:184px" v-if="isField"></div>
             <div class="coreList">
               <payTeamCourse
                 :form="form"
@@ -881,6 +882,7 @@ export default {
       if (!val) {
         this.$set(this.form, "eclass", [{}]);
         this.$set(this.form, "leixing", "1");
+        this.$set(this.form, "musicGroupOrganizationCourseSettingId", null);
       }
     },
     member(val) {

src/views/resetTeaming/components/resetPayList.vue

@@ -172,7 +172,7 @@
                 auths="musicGroupPaymentCalender/revoke"
                 v-if="
                   (team_status == 'FEE_AUDIT' || team_status == 'PROGRESS') &&
-                  scope.row.auditStatus === 'AUDITING' &&
+                  scope.row.status === 'AUDITING' &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
                   scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
                 "
@@ -187,7 +187,9 @@
                 v-if="
                   teamStatus &&
                   scope.row.paymentType != 'ADD_STUDENT' &&
-                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'
+                  scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST' &&
+                  (scope.row.status == 'DRAFT' ||
+                    scope.row.status == 'REJECT')
                 "
               >
                 <el-button type="text" @click="removeBatchNo(scope.row)"
@@ -199,8 +201,8 @@
                 v-if="
                   teamStatus &&
                   scope.row.paymentType == 'ADD_STUDENT' &&
-                  (scope.row.auditStatus == 'DRAFT' ||
-                    scope.row.auditStatus == 'REJECT')
+                  (scope.row.status == 'DRAFT' ||
+                    scope.row.status == 'REJECT')
                 "
               >
                 <el-button type="text" @click="removeBatchNo(scope.row)"
@@ -213,7 +215,8 @@
                 v-if="
                   !isNewGropu &&
                   teamStatus &&
-                  scope.row.paymentType != 'MUSIC_APPLY'
+                  scope.row.paymentType != 'MUSIC_APPLY' &&
+                  scope.row.status == 'OPEN'
                 "
                 @click="onCreateQRCode(scope.row)"
                 >续费二维码</el-button
@@ -497,7 +500,7 @@
           v-for="(subject, index) in dialogSubjectList"
           :key="index"
           :name="subject.subjectId.toString()"
-          style="max-height: 500px;overflow-y: auto;"
+          style="max-height: 500px; overflow-y: auto"
         >
           <subject-preview
             :subjectId="subject.subjectId"

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -42,6 +42,14 @@
           >
             {{ "已结束" }}
           </p>
+              <p
+            class="status"
+            style="color: #5ccdb8"
+            v-if="info.paymentStatus == 'REJECT'"
+          >
+            {{ "已拒绝" }}
+          </p>
+
         </span>
       </statistic-item>
       <statistic-item>

src/views/resetTeaming/modals/member-setting.vue

@@ -215,7 +215,6 @@ export default {
       }
     },
     changeMemberperiodEnum(val) {
-      console.log(val, this.memberPrice);
       if (val == "DAY") {
         this.$set(
           this.form,
@@ -278,10 +277,10 @@ export default {
       }
     },
     async changeMember(val) {
-      this.$set(this.form, "memberPaymentAmount", null);
-      this.$set(this.form, "originalMemberPaymentAmount", null);
-      this.$set(this.form, "num", null);
-      this.$set(this.form, "period", null);
+      // this.$set(this.form, "memberPaymentAmount", null);
+      // this.$set(this.form, "originalMemberPaymentAmount", null);
+      // this.$set(this.form, "num", null);
+      // this.$set(this.form, "period", null);
       if (val) {
         if (this.getMemberFeeFlag) {
           this.getMemberFeeFlag = false;
@@ -340,7 +339,6 @@ export default {
       const one = Number(value);
       let min = 0;
       let max = 0;
-      console.log(this.rulesForm)
       switch (this.form.period) {
         case "MONTH": {
           min = Number(this.rulesForm.minMonthFee) * this.form.num;
@@ -401,6 +399,8 @@ export default {
         this.$set(this.form, "originalMemberPaymentAmount", null);
         this.$set(this.form, "num", null);
         this.$set(this.form, "period", null);
+      }else{
+        this.changeMember(val)
       }
     },
   },

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

@@ -70,7 +70,10 @@
       v-if="course && course.length > 0"
     >
     </el-alert>
-    <descriptions :column="3" v-if="course && course.length > 0&&course[0].name">
+    <descriptions
+      :column="3"
+      v-if="course && course.length > 0 && course[0].name"
+    >
       <descriptions-item :span="2" label="收费标准：" v-if="course[0].name">{{
         course[0].name
       }}</descriptions-item>
@@ -112,7 +115,11 @@
           </p>
         </template>
       </el-table-column>
-            <el-table-column prop="courseOriginalPrice" label="原价(元)" width="100px"></el-table-column>
+      <el-table-column
+        prop="courseOriginalPrice"
+        label="原价(元)"
+        width="100px"
+      ></el-table-column>
 
       <el-table-column> </el-table-column>
     </el-table>
@@ -158,13 +165,7 @@
       <el-table-column prop="courseOriginalPrice" label="原价(元)">
         <template slot-scope="scope">
           <div>
-            {{
-              (musicGroupPaymentCalenders[0] &&
-              musicGroupPaymentCalenders[0].paymentType ===
-                "SPAN_GROUP_CLASS_ADJUST"
-                ? scope.row.masterSubCoursePrice
-                : scope.row.courseOriginalPrice) | moneyFormat
-            }}
+            {{ scope.row.courseOriginalPrice | moneyFormat }}
           </div>
         </template>
       </el-table-column>
@@ -213,7 +214,7 @@
           </p>
         </template>
       </el-table-column>
-       <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
       <el-table-column> </el-table-column>
     </el-table>
     <el-alert
@@ -221,13 +222,13 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="repair&&repair.calenderId"
+      v-if="repair && repair.calenderId"
     >
     </el-alert>
     <el-table
       :data="[{ ...repair }]"
       stripe
-      v-if="repair&&repair.calenderId"
+      v-if="repair && repair.calenderId"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -241,7 +242,7 @@
       </el-table-column>
 
       <el-table-column prop="num" label="数量" width="100px"> </el-table-column>
-      <el-table-column prop="actualAmount" label="售价(元)"  width="100px">
+      <el-table-column prop="actualAmount" label="售价(元)" width="100px">
         <template slot="header">
           <p style="position: relative">
             售价(元)
@@ -255,7 +256,7 @@
           </p>
         </template>
       </el-table-column>
-             <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
     </el-table>
     <el-alert
       title="乐团活动"
@@ -268,7 +269,7 @@
     <el-table
       :data="activity"
       stripe
-      v-if="activity&&activity.length>0"
+      v-if="activity && activity.length > 0"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
@@ -279,7 +280,7 @@
           scope.row.optionalFlag ? "是" : "否"
         }}</template>
       </el-table-column>
-      <el-table-column label="活动课程"  prop="categoryName" width="100px">
+      <el-table-column label="活动课程" prop="categoryName" width="100px">
         <template slot-scope="scope">{{ scope.row.categoryName }}</template>
       </el-table-column>
 
@@ -298,7 +299,7 @@
           </p>
         </template>
       </el-table-column>
-       <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
+      <el-table-column prop="originalAmount" label="原价(元)"></el-table-column>
     </el-table>
 
     <!-- 会员信息 -->

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show='isShow'>
     <el-alert
       title="课程信息设置"
       :closable="false"
@@ -11,10 +11,11 @@
     >
     </el-alert>
     <!-- && courseViewType != 2 -->
+
     <userBaseinfo
       :form.sync="form"
       :isCommon="isCommon"
-      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
+      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'&&paymentTypeString !== 'ADD_STUDENT'"
       :isUserType="isUserType"
       @getCharges="getCharges"
       @changeActive="changeActive"
@@ -102,7 +103,6 @@
         style="margin-top: 20px"
         type="info"
         v-if="
-          courseViewType == 2 &&
           paymentType &&
           paymentType != 2 &&
           form.leixing != 2
@@ -112,7 +112,6 @@
       <memberSetting
         ref="memberSetting"
         v-if="
-          courseViewType == 2 &&
           paymentType &&
           paymentType != 2 &&
           form.leixing != 2
@@ -342,6 +341,7 @@ export default {
       },
       money: "",
       isSetCourseSettingsId: false,
+      isShow:false
     };
   },
   computed: {
@@ -522,27 +522,29 @@ export default {
             this.$set(
               this.memberForm,
               "memberRankSettingId",
-              this.viewDetail.member.memberRankSettingId || null
+              this.viewDetail.member?.memberRankSettingId || null
             );
+
+            // 重新请求价格
             this.$set(
               this.memberForm,
               "num",
-              this.viewDetail.member.num || null
+              this.viewDetail.member?.num || null
             );
             this.$set(
               this.memberForm,
               "period",
-              this.viewDetail.member.period || null
+              this.viewDetail.member?.period || null
             );
             this.$set(
               this.memberForm,
               "memberPaymentAmount",
-              this.viewDetail.member.actualAmount || null
+              this.viewDetail.member?.actualAmount || null
             );
             this.$set(
               this.memberForm,
               "originalMemberPaymentAmount",
-              this.viewDetail.member.originalAmount || null
+              this.viewDetail.member?.originalAmount || null
             );
 
             this.$set(this.memberForm, "memberValidDate", [
@@ -578,7 +580,7 @@ export default {
                 if (this.paymentTypeString === "SPAN_GROUP_CLASS_ADJUST") {
                   return {
                     ...item,
-                    courseOriginalPrice: item.masterSubCoursePrice,
+                    // courseOriginalPrice: item.masterSubCoursePrice,
                   };
                 }
                 return item;
@@ -628,6 +630,7 @@ export default {
             this.syncAllMoney();
           } catch (error) {}
         }
+        this.isShow=true;
       }
     },
     formatCourse() {

src/views/studentManager/memberList.vue

@@ -204,7 +204,7 @@
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
-              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
+              <p v-if="tenantId == 1">退还乐保费用：报名缴费时缴费的乐保费用</p>
 
             </div>
             <el-button
@@ -288,6 +288,7 @@ export default {
       quitVisible: false,
       activeRow: null,
       visitVisible: false,
+      tenantId:''
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -295,6 +296,7 @@ export default {
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
     // 获取分部
+    this.tenantId = this.$helpers.tenantId;
     this.$store.dispatch("setBranchs");
     this.init();
   },

src/views/studentManager/studentList.vue

@@ -465,7 +465,7 @@
                 是否是新用户
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                    未购买VIP课程的学员为新用户
                   </div>
 
                   <i
@@ -571,7 +571,7 @@
         :rules="studentRules"
       >
         <el-alert
-          title="课程信息"
+          title="基本信息"
           type="info"
           :closable="false"
           style="margin-bottom: 15px"
@@ -696,7 +696,7 @@
           </el-select>
         </el-form-item>
         <el-alert
-          title="课程信息"
+          title="运营信息"
           type="info"
           :closable="false"
           style="margin-bottom: 15px"
@@ -721,13 +721,13 @@
             <el-option :value="0" label="否"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="是否是新用户" prop="isNewUser">
+        <el-form-item label="是否是新用户" prop="isNewUser">
           <template #label>
             <p style="position: relative; display: inline-block">
               是否是新用户
               <el-tooltip placement="top" popper-class="mTooltip">
                 <div slot="content">
-                  没有有效的VIP课程或未参与2020年双十一活动的用户为新用户
+                   未购买VIP课程的学员为新用户
                 </div>
                 <i
                   class="el-icon-question"
@@ -744,7 +744,7 @@
             <el-option :value="1" label="是"></el-option>
             <el-option :value="0" label="否"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="关心包" prop="carePackage">
           <el-select
             class="multiple"

src/views/teamBuild/signupList.vue

@@ -1023,7 +1023,7 @@
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
-              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
+              <p v-if="$helpers.tenantId ==1">退还乐保费用：报名缴费时缴费的乐保费用</p>
             </div>
             <el-button
               type="text"
@@ -1310,13 +1310,13 @@ export default {
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(3) != -1) {
+      if (roles.indexOf(1) != -1) {
         this.isManage = "manage";
       } else {
         this.isManage = false;
       }
     }
-    if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
       this.isManage = "super";
     }
 

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

@@ -101,11 +101,9 @@
       class="alert"
       style="margin-top: 20px"
       type="info"
-      v-if="courseViewType == 2"
     >
     </el-alert>
     <memberSetting
-      v-if="courseViewType == 2"
       :addStudent="true"
       :form="memberForm"
       :isUserType="isUserType"
@@ -284,7 +282,6 @@ export default {
       let money = 0;
       let first = 0;
       let other = 0;
-      console.log(this.eclass);
       for (const item of this.eclass) {
         money += item.courseCurrentPrice;
         if (this.cycles && this.cycles.length) {
@@ -373,7 +370,6 @@ export default {
           });
           this.eclass = [..._];
           this.syncAllMoney();
-          console.log("更换班级");
         }
       } catch (error) {
         console.log(error);

src/views/teamDetail/components/modals/quite-team.vue

@@ -205,7 +205,7 @@
             </el-input>
           </el-form-item>
         </el-row>
-        <el-row>
+        <el-row v-if="$helpers.tenantId ==1">
           <el-form-item
             label="退还乐保费用"
             :rules="[{ required: true, message: '请选择是否退还乐保费用' }]"

src/views/teamDetail/components/studentList.vue

@@ -784,7 +784,7 @@
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
-              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
+              <p v-if="$helpers.tenantId ==1">退还乐保费用：报名缴费时缴费的乐保费用</p>
             </div>
             <el-button
               type="text"
@@ -1227,13 +1227,13 @@ export default {
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(3) != -1) {
+      if (roles.indexOf(1) != -1) {
         this.isManage = "manage";
       } else {
         this.isManage = false;
       }
     }
-    if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
       this.isManage = "super";
     }
     try {

src/views/withdrawal-application/index.vue

@@ -64,8 +64,8 @@
             clearable
             placeholder="请选择角色"
           >
-            <el-option label="分部经理" value="3"></el-option>
-            <el-option label="乐团主管" value="4"></el-option>
+            <el-option label="分部经理" value="1"></el-option>
+            <el-option label="乐团主管" value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -144,7 +144,7 @@
               {{ scope.row.status | withdrawalStatus }}
               <span v-if="scope.row.status == 'PROCESSING'"
                 >({{
-                  scope.row.currentApproveRole == 3 ? "分部经理" : "乐团主管"
+                  scope.row.currentApproveRole == 1 ? "分部经理" : "乐团主管"
                 }})</span
               >
             </div>
@@ -172,10 +172,10 @@
                   scope.row.status == 'CANCELED' ||
                   (scope.row.status == 'PROCESSING' &&
                     isManage == 'manage' &&
-                    scope.row.currentApproveRole == '4') ||
+                    scope.row.currentApproveRole == '2') ||
                   (scope.row.status == 'PROCESSING' &&
                     !isManage &&
-                    scope.row.currentApproveRole == '3')
+                    scope.row.currentApproveRole == '1')
                 "
                 @click="quieTeamMask(scope.row)"
                 >立即处理</el-button
@@ -190,10 +190,10 @@
                     scope.row.status == 'CANCELED' ||
                     (scope.row.status == 'PROCESSING' &&
                       isManage == 'manage' &&
-                      scope.row.currentApproveRole == '4') ||
+                      scope.row.currentApproveRole == '2') ||
                     (scope.row.status == 'PROCESSING' &&
                       !isManage &&
-                      scope.row.currentApproveRole == '3')
+                      scope.row.currentApproveRole == '1')
                   )
                 "
                 @click="quieTeamMask(scope.row, 'look')"
@@ -246,8 +246,8 @@
               <p>退还团练宝费用：报名缴费时缴费的团练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
-              <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
-              <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
+              <p >退还教辅费用：报名缴费时缴费的教辅费用</p>
+              <p v-if="$helpers.tenantId ==1">退还乐保费用：报名缴费时缴费的乐保费用</p>
             </div>
             <el-button
               type="text"
@@ -361,17 +361,18 @@ export default {
     that = this;
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
+
     await this.$store.dispatch("setBranchs");
     if (isSuperAdmin) {
       this.isManage = "super";
     } else {
-      if (roles.indexOf(3) != -1) {
+      if (roles.indexOf(1) != -1) {
         this.isManage = "manage";
       } else {
         this.isManage = false;
       }
     }
-    if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+    if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
       this.isManage = "super";
     }
     this.FetchList();
@@ -564,7 +565,7 @@ export default {
         });
     },
     checkSeleabled(row) {
-      if (row.status == "PROCESSING" && row.currentApproveRole == "3") {
+      if (row.status == "PROCESSING" && row.currentApproveRole == "1") {
         return 1;
       } else {
         return 0;

src/views/withdrawal-application/modals/quit.vue

@@ -81,7 +81,7 @@
       <el-form-item
         label="退还乐保费用"
         prop="isMaintenanceFee"
-        v-if="detail.hasMaintenance&&quitForm.status == 'APPROVED'"
+        v-if="detail.hasMaintenance&&quitForm.status == 'APPROVED'&&$helpers.tenantId ==1"
       >
         <el-radio v-model.trim="quitForm.isMaintenanceFee" :label="true"
           >是</el-radio

src/views/workBenchManager/journal/model/musicGroup.vue

@@ -156,8 +156,8 @@
       ref="musicForm"
       :isDisabled="
         musicForm.status != 'PROCESSING' ||
-        (isManage == 'manage' && musicForm.currentApproveRole == '4') ||
-        (!isManage && musicForm.currentApproveRole == '3')
+        (isManage == 'manage' && musicForm.currentApproveRole == '2') ||
+        (!isManage && musicForm.currentApproveRole == '1')
       "
     />
      <p style="color:red;paddingLeft:150px">退费金额暂不进入账户余额</p>
@@ -174,7 +174,7 @@
             <p>退还课程费用：缴费总额-已结束课时单价之和</p>
             <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
             <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
-            <p>退还乐保费用：报名缴费时缴费的乐保费用</p>
+            <p v-if="$helpers.tenantId ==1">退还乐保费用：报名缴费时缴费的乐保费用</p>
           </div>
           <el-button
             type="text"
@@ -190,7 +190,7 @@
           type="primary"
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
           v-if="!isManage"
-          :disabled="musicForm.currentApproveRole == '3'"
+          :disabled="musicForm.currentApproveRole == '1'"
           @click="onSubmitGroup(musicForm, 'PROCESSING')"
           >提交审核</el-button
         >
@@ -198,7 +198,7 @@
           v-else
           type="primary"
           :disabled="
-            isManage == 'manage' && musicForm.currentApproveRole == '4'
+            isManage == 'manage' && musicForm.currentApproveRole == '2'
           "
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
           @click="onSubmitGroup(musicForm, 'APPROVED')"
@@ -206,8 +206,8 @@
         >
         <el-button
           :disabled="
-            (isManage == 'manage' && musicForm.currentApproveRole == '4') ||
-            (!isManage && musicForm.currentApproveRole == '3')
+            (isManage == 'manage' && musicForm.currentApproveRole == '2') ||
+            (!isManage && musicForm.currentApproveRole == '1')
           "
           type="danger"
           v-permission="'musicGroupQuit/quitMusicGroup'"
@@ -342,13 +342,13 @@ export default {
       if (isSuperAdmin) {
         this.isManage = "super";
       } else {
-        if (roles.indexOf(3) != -1) {
+        if (roles.indexOf(1) != -1) {
           this.isManage = "manage";
         } else {
           this.isManage = false;
         }
       }
-      if (roles.indexOf(3) != -1 && roles.indexOf(4) != -1) {
+      if (roles.indexOf(1) != -1 && roles.indexOf(2) != -1) {
         this.isManage = "super";
       }
       //   isSuperAdmin:state=>state.user.isSuperAdmin,