Merge branch '03/12permission' into dev

src/views/withdrawal-application/index.vue

@@ -85,13 +85,13 @@
               v-if="permission('musicGroupQuit/quitMusicGroup/quit')"
               :disabled="scope.row.status != 'PROCESSING'"
               @click="quieTeamMask(scope.row)"
-            >退团退费</el-button>
-            <el-button
+            >审核</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> -->
             <el-button
               type="text"
               v-if="permission('visit/add/tuituanliebiao')"
@@ -109,7 +109,7 @@
         @pagination="FetchList"
       />
     </div>
-    <el-dialog title="退团退费" width="640px" :visible.sync="quitVisible">
+    <el-dialog title="审核" width="640px" :visible.sync="quitVisible">
       <quitModal
         v-if="quitVisible && detail"
         :detail="detail"
@@ -117,14 +117,14 @@
         @submited="FetchList"
       />
     </el-dialog>
-    <el-dialog title="退团" width="500px" :visible.sync="quitOnlyVisible">
+    <!-- <el-dialog title="退团" width="500px" :visible.sync="quitOnlyVisible">
       <quitOnlyModal
         v-if="quitOnlyVisible && detail"
         :detail="detail"
         @close="quitOnlyVisible = false"
         @submited="FetchList"
       />
-    </el-dialog>
+    </el-dialog> -->
     <el-dialog title="新增回访" width="500px" :visible.sync="visitVisible">
       <visit
         v-if="visitVisible && detail"

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

@@ -9,7 +9,7 @@
           >拒绝</el-radio
         >
       </el-form-item>
-      <el-form-item label="退还课程费用" prop="isRefundCourseFee">
+      <el-form-item label="退还课程费用" prop="isRefundCourseFee" v-if="quitForm.status == 'APPROVED'">
         <el-radio v-model.trim="quitForm.isRefundCourseFee" :label="true"
           >是</el-radio
         >
@@ -17,7 +17,7 @@
           >否</el-radio
         >
       </el-form-item>
-      <el-form-item label="退还乐器费用" prop="isRefundInstrumentFee">
+      <el-form-item label="退还乐器费用" prop="isRefundInstrumentFee" v-if="quitForm.status == 'APPROVED'">
         <el-radio v-model.trim="quitForm.isRefundInstrumentFee" :label="true"
           >是</el-radio
         >
@@ -25,7 +25,7 @@
           >否</el-radio
         >
       </el-form-item>
-      <el-form-item label="退还教辅费用" prop="isRefundTeachingAssistantsFee">
+      <el-form-item label="退还教辅费用" prop="isRefundTeachingAssistantsFee" v-if="quitForm.status == 'APPROVED'">
         <el-radio
           v-model.trim="quitForm.isRefundTeachingAssistantsFee"
           :label="true"
@@ -38,7 +38,7 @@
         >
       </el-form-item>
       <el-form-item label="退团原因" prop="reason">
-        <el-input type="textarea" v-model.trim="quitForm.reason" placeholder="请填写退团退费原因"></el-input>
+        <el-input type="textarea" v-model.trim="quitForm.reason" placeholder="请填写退团原因"></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: right;">
@@ -49,6 +49,7 @@
 </template>
 <script>
 import { quitMusicGroup } from '@/api/journal'
+import cleanDeep from 'clean-deep'
 export default {
   props: ['detail'],
   data() {
@@ -76,7 +77,7 @@ export default {
         isRefundTeachingAssistantsFee: [
           { required, message: "选择是否退还教辅费用" },
         ],
-        reason: [{ required: true, message: "请填写退团退费原因" }],
+        reason: [{ required: true, message: "请填写退团原因" }],
       }
     }
   },
@@ -88,10 +89,10 @@ export default {
             await this.$confirm("是否确定提交?", "提示", {
               type: 'warning',
             })
-            await quitMusicGroup({
+            await quitMusicGroup(cleanDeep({
               id: this.detail.id,
               ...this.quitForm
-            })
+            }))
             this.$emit('close')
             this.$emit('submited')
             this.$message.success("提交成功")