Merge branch '02/23reviewBUG' into test

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

@@ -151,7 +151,7 @@
         ></el-input>
       </el-form-item> -->
     <!-- </el-form> -->
-    <quiteTeam :quitForm="quitForm" ref="musicForm"  :isDisabled="musicForm.status!= 'PROCESSING'"/>
+    <quiteTeam :quitForm="quitForm" ref="musicForm"  :isDisabled="musicForm.status!= 'PROCESSING'|| (isManage == 'manage' && musicForm.currentApproveRole == '4')|| (!isManage&&musicForm.currentApproveRole == '3')"/>
     <span
       slot="footer"
       class="dialog-footer question"
@@ -181,6 +181,7 @@
           type="primary"
           v-permission="'musicGroupQuit/quitMusicGroup/conform'"
           v-if="!isManage"
+          :disabled='musicForm.currentApproveRole == "3"'
           @click="onSubmitGroup(musicForm, 'PROCESSING')"
           >提交审核</el-button
         >
@@ -196,7 +197,7 @@
         >
         <el-button
           :disabled="
-            isManage == 'manage' && musicForm.currentApproveRole == '4'
+            (isManage == 'manage' && musicForm.currentApproveRole == '4')|| (!isManage&&musicForm.currentApproveRole == '3')
           "
           type="danger"
           v-permission="'musicGroupQuit/quitMusicGroup'"

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 = {