提交dev

1

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/studentManager/studentList.vue

@@ -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,8 +721,8 @@
             <el-option :value="0" label="否"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="是否是新用户" prop="isNewUser">
-          <template #label>
+        <el-form-item label="是否是新用户" prop="isNewUser">
+          <!-- <template #label>
             <p style="position: relative; display: inline-block">
               是否是新用户
               <el-tooltip placement="top" popper-class="mTooltip">
@@ -735,7 +735,7 @@
                 ></i>
               </el-tooltip>
             </p>
-          </template>
+          </template> -->
           <el-select
             class="multiple"
             v-model.trim="studentForm.isNewUser"
@@ -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

@@ -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/studentList.vue

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

@@ -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>
@@ -366,13 +366,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";
     }
     this.FetchList();
@@ -565,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/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>
@@ -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,