暂时提交一下测试

1

src/views/teamBuild/signupList.vue

@@ -1251,10 +1251,10 @@ export default {
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
     if (isSuperAdmin) {
-      this.isManage = true;
+      this.isManage = 'super';
     } else {
-      if (roles.indexof(3) != -1) {
-        this.isManage = true;
+      if (roles.indexOf(3) != -1) {
+        this.isManage = 'manage';
       } else {
         this.isManage = false;
       }
@@ -1841,14 +1841,6 @@ export default {
               } else {
                 params.status = 'PROCESSING'
               }
-              if( this.activeRow.memberFee < parseFloat(params.returnFeeDto.memberFee)){
-                this.$message.error('会员金额不能超过默认金额')
-                return
-              }
-              if(this.activeRow.maintenanceFee < parseFloat(params.returnFeeDto.maintenanceFee)){
-                 this.$message.error('乐保金额不能超过默认金额')
-                return
-              }
               // 发请求 退团
               applyMusicGroupQuit(params).then((res) => {
                 if (res.code == 200) {

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

@@ -187,7 +187,6 @@
             label="退还乐保费用"
             :rules="[{required: true, message: '请选择是否退还乐保费用'}]"
             prop="isReturnMaintenanceFee"
-            v-if="quitForm.hasMaintenance"
           >
             <el-radio
              :disabled='isDisabled'
@@ -204,7 +203,7 @@
             label="退还乐保金额"
             :rules="[{required: true, message: '请输入乐保金额'}]"
             prop="maintenanceFee"
-            v-if="quitForm.hasMaintenance&&quitForm.isReturnMaintenanceFee"
+            v-if="quitForm.isReturnMaintenanceFee"
           >
             <el-input
               type="number"

src/views/teamDetail/components/studentList.vue

@@ -1214,10 +1214,10 @@ export default {
       let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
     if (isSuperAdmin) {
-      this.isManage = true;
+      this.isManage = 'super';
     } else {
-      if (roles.indexof(3) != -1) {
-        this.isManage = true;
+      if (roles.indexOf(3) != -1) {
+        this.isManage = 'manage';
       } else {
         this.isManage = false;
       }
@@ -1516,20 +1516,7 @@ export default {
                 params.status = "PROCESSING";
               }
               // 退还乐器练习云教练费用
-              if (
-                this.activeRow.memberFee <
-                parseFloat(params.returnFeeDto.memberFee)
-              ) {
-                this.$message.error("会员金额不能超过默认金额");
-                return;
-              }
-              if (
-                this.activeRow.maintenanceFee <
-                parseFloat(params.returnFeeDto.maintenanceFee)
-              ) {
-                this.$message.error("乐保金额不能超过默认金额");
-                return;
-              }
+
               // 发请求 退团
               applyMusicGroupQuit(params).then((res) => {
                 if (res.code == 200) {

src/views/withdrawal-application/index.vue

@@ -75,11 +75,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="申请人"></el-table-column>
+        <el-table-column prop="applyUserName" label="申请人"></el-table-column>
         <el-table-column prop="createTime" label="退费金额">
           <template slot-scope="scope">
             <div>
-              <p v-if="scope.row.status == 'PROCESSING'">--</p>
+              <p v-if="!scope.row.returnTotalFee">--</p>
               <p v-else>
                 {{ scope.row.returnTotalFee | moneyFormat }}
               </p>
@@ -95,7 +95,11 @@
         </el-table-column>
         <el-table-column label="状态">
           <template slot-scope="scope">
-            {{ scope.row.status | withdrawalStatus }}
+            <div>
+                {{ scope.row.status | withdrawalStatus }}
+                <span v-if="scope.row.status=='PROCESSING'">({{scope.row.currentApproveRole==3?'分部经理':'乐团主管'}})</span>
+            </div>
+
           </template>
         </el-table-column>
         <el-table-column
@@ -110,32 +114,50 @@
           "
         >
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
-              :disabled="(scope.row.status != 'PROCESSING'||scope.row.status =='DENIED'||scope.row.status =='CANCELED')||!isManage&&currentApproveRole=='4'"
-              @click="quieTeamMask(scope.row)"
-              >立即处理</el-button
-            >
-            <el-button
-              type="text"
-              v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
-              :disabled="scope.row.status == 'PROCESSING'"
-              @click="quieTeamMask(scope.row,'look')"
-              >查看</el-button
-            >
-            <!-- <el-button
+            <div>
+              <el-button
+                type="text"
+                v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
+                :disabled="
+                  scope.row.status != 'PROCESSING' ||
+                  scope.row.status == 'DENIED' ||
+                  scope.row.status == 'CANCELED' ||
+                  (scope.row.status == 'PROCESSING' &&
+                    isManage=='manage' &&
+                    scope.row.currentApproveRole == '4')||(scope.row.status == 'PROCESSING' &&
+                    !isManage &&
+                    scope.row.currentApproveRole == '3')
+                "
+                @click="quieTeamMask(scope.row)"
+                >立即处理</el-button
+              >
+              <el-button
+                type="text"
+                v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
+                :disabled="!( scope.row.status != 'PROCESSING' ||
+                  scope.row.status == 'DENIED' ||
+                  scope.row.status == 'CANCELED' ||
+                  (scope.row.status == 'PROCESSING' &&
+                    isManage=='manage' &&
+                    scope.row.currentApproveRole == '4')||(scope.row.status == 'PROCESSING' &&
+                    !isManage &&
+                    scope.row.currentApproveRole == '3'))"
+                @click="quieTeamMask(scope.row, 'look')"
+                >查看</el-button
+              >
+              <!-- <el-button
               type="text"
               v-if="permission('musicGroupQuit/quitMusicGroup/quit-only')"
               :disabled="scope.row.status != 'PROCESSING'"
               @click="quieTeam(scope.row)"
             >退团</el-button> -->
-            <el-button
-              type="text"
-              v-if="permission('visit/add/tuituanliebiao')"
-              @click="addVisit(scope.row)"
-              >新增回访</el-button
-            >
+              <el-button
+                type="text"
+                v-if="permission('visit/add/tuituanliebiao')"
+                @click="addVisit(scope.row)"
+                >新增回访</el-button
+              >
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -148,7 +170,11 @@
         @pagination="FetchList"
       />
     </div>
-    <el-dialog :title="isDisabled?'查看':'立即处理'" width="700px" :visible.sync="quitVisible">
+    <el-dialog
+      :title="isDisabled ? '查看' : '立即处理'"
+      width="700px"
+      :visible.sync="quitVisible"
+    >
       <quitModal
         v-if="quitVisible"
         :quitForm="quitForm"
@@ -270,17 +296,18 @@ export default {
         userComment: null,
       },
       isManage: false,
-      isDisabled:false
+      isDisabled: false,
     };
   },
   mounted() {
     let isSuperAdmin = this.$store.getters.isSuperAdmin;
     let roles = this.$store.getters.roles;
+    console.log(roles)
     if (isSuperAdmin) {
-      this.isManage = true;
+      this.isManage = 'super';
     } else {
-      if (roles.indexof(3) != -1) {
-        this.isManage = true;
+      if (roles.indexOf(3) != -1) {
+        this.isManage = 'manage';
       } else {
         this.isManage = false;
       }
@@ -301,13 +328,13 @@ export default {
       this.searchForm = { ...initSearch };
       this.submit();
     },
-    async quieTeamMask(row,look) {
+    async quieTeamMask(row, look) {
       await musicGroupQuit({ id: row.id }).then((res) => {
         if (res.code == 200) {
-          if(look=='look'){
-            this.isDisabled = true
-          }else{
-            this.isDisabled = false
+          if (look == "look") {
+            this.isDisabled = true;
+          } else {
+            this.isDisabled = false;
           }
           this.musicForm = res.data;
           this.activeRow = { ...row, ...res.data.returnFeeDto };
@@ -318,7 +345,7 @@ export default {
           this.quitForm.studentName = res.data.user?.username;
           this.quitForm.musicGroupName = res.data.musicGroup?.name;
           this.quitForm.hasMaintenance = res.data.hasMaintenance;
-          this.quitForm.reason = res.data.reason
+          this.quitForm.reason = res.data.reason;
           this.quitForm.id = res.data.id;
           this.quitForm = { ...this.quitForm, ...res.data.returnFeeDto };
           this.quitVisible = true;
@@ -386,19 +413,6 @@ export default {
             memberFee: query.memberFee,
             musicalFee: query.musicalFee,
           };
-          if (
-            this.activeRow.memberFee < parseFloat(query.returnFeeDto.memberFee)
-          ) {
-            this.$message.error("会员金额不能超过默认金额");
-            return;
-          }
-          if (
-            this.activeRow.maintenanceFee <
-            parseFloat(query.returnFeeDto.maintenanceFee)
-          ) {
-            this.$message.error("乐保金额不能超过默认金额");
-            return;
-          }
           await quitMusicGroup(cleanDeep(query)).then((res) => {
             this.$message.success("处理成功");
             this.activeRow = null;
@@ -423,5 +437,4 @@ export default {
   flex-direction: row;
   justify-content: space-between;
 }
-
 </style>

src/views/workBenchManager/journal/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>系统日志
+      <div class="squrt"></div>系统消息
     </h2>
     <div class="m-core">
         <tab-router v-model="activeIndex" type="card" >

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

@@ -151,7 +151,7 @@
         ></el-input>
       </el-form-item> -->
     <!-- </el-form> -->
-    <quiteTeam :quitForm="quitForm" ref="musicForm" />
+    <quiteTeam :quitForm="quitForm" ref="musicForm"  :isDisabled="musicForm.status!= 'PROCESSING'"/>
     <span
       slot="footer"
       class="dialog-footer question"
@@ -187,11 +187,17 @@
         <el-button
           v-else
           type="primary"
+          :disabled="
+            isManage == 'manage' && musicForm.currentApproveRole == '4'
+          "
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
           @click="onSubmitGroup(musicForm, 'APPROVED')"
           >同意</el-button
         >
         <el-button
+          :disabled="
+            isManage == 'manage' && musicForm.currentApproveRole == '4'
+          "
           type="danger"
           v-permission="'musicGroupQuit/quitMusicGroup'"
           @click="onSubmitGroup(musicForm, 'DENIED')"
@@ -323,10 +329,10 @@ export default {
       let isSuperAdmin = this.$store.getters.isSuperAdmin;
       let roles = this.$store.getters.roles;
       if (isSuperAdmin) {
-        this.isManage = true;
+        this.isManage = "super";
       } else {
-        if (roles.indexof(3) != -1) {
-          this.isManage = true;
+        if (roles.indexOf(3) != -1) {
+          this.isManage = "manage";
         } else {
           this.isManage = false;
         }
@@ -361,8 +367,9 @@ export default {
             if (this.$refs["musicForm"].$refs.quitForm) {
               this.$refs["musicForm"].$refs.quitForm.resetFields();
             }
-            this.activeRow = {...res.data.returnFeeDto }
+            this.activeRow = { ...res.data.returnFeeDto };
             this.quitForm.courseViewType = res.data.musicGroup.courseViewType;
+              this.quitForm.reason = res.data.reason
             this.quitForm.userComment = res.data.userComment;
             this.quitForm.isVisit = res.data.isVisit;
             this.quitForm.visitTime = res.data.visitTime;
@@ -417,19 +424,7 @@ export default {
             memberFee: query.memberFee,
             musicalFee: query.musicalFee,
           };
-                 if (
-            this.activeRow.memberFee < parseFloat(query.returnFeeDto.memberFee)
-          ) {
-            this.$message.error("会员金额不能超过默认金额");
-            return;
-          }
-          if (
-            this.activeRow.maintenanceFee <
-            parseFloat(query.returnFeeDto.maintenanceFee)
-          ) {
-            this.$message.error("乐保金额不能超过默认金额");
-            return;
-          }
+
           await quitMusicGroup(cleanDeep(query)).then((res) => {
             this.$message.success("处理成功");
             this.$listeners.close();

vue.config.js

@@ -18,9 +18,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
-// let target = 'http://192.168.3.112:8000' //勇哥
+let target = 'http://192.168.3.112:8000' //勇哥
 // let target = 'http://dev.dayaedu.com' // 开发环境
-let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {