Merge branch 'ol_12_30' into online

src/views/workBenchManager/journal/musicGroup.vue

@@ -92,7 +92,7 @@
             </el-input>
           </el-col>
         </el-row>
-        <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
+        <el-row v-permission="'vipGroupManage/applyRefundAudit'">
           <el-col :span="24"
                   v-if="showMessage.studentApplyRefunds.status == 'ING'">
             <el-button type="primary"
@@ -134,7 +134,7 @@
           <el-col :span="20"> {{ showMessage.userComment }}</el-col>
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-input :disabled="showMessage.status != 'PROCESSING'"
                       type="textarea"
@@ -142,8 +142,38 @@
                       placeholder="请输入内容"
                       v-model.trim="remark"> </el-input>
           </el-col>
-        </el-row>
-        <el-row v-permission="'vipGroupManage/applyRefundAudit'">
+        </el-row> -->
+        <el-form :model="quitForm"
+               ref="quitForm"
+               :rules="quitRules">
+            <el-form-item label="退还课程费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundCourseFee">
+              <el-radio v-model.trim="quitForm.isRefundCourseFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundCourseFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退还乐器费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundInstrumentFee">
+              <el-radio v-model.trim="quitForm.isRefundInstrumentFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundInstrumentFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退还教辅费用" v-if="showMessage.status == 'PROCESSING'"
+                          prop="isRefundTeachingAssistantsFee">
+              <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
+                        :label="true">是</el-radio>
+              <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
+                        :label="false">否</el-radio>
+            </el-form-item>
+            <el-form-item label="退团原因"
+                          prop="reason">
+              <el-input type="textarea" :disabled="showMessage.status != 'PROCESSING'"
+                        v-model.trim="quitForm.reason"></el-input>
+            </el-form-item>
+          </el-form>
+        <el-row v-permission="'musicGroupQuit/quitMusicGroup'">
           <el-col :span="24"
                   v-if="showMessage.status == 'PROCESSING'">
             <el-button type="primary"
@@ -176,6 +206,25 @@ export default {
         boxicon: require('@/assets/images/base/boxicon.png'),
         Hboxicon: require('@/assets/images/base/boxicon-h.png')
       },
+      quitForm: {
+        // 退团信息确认
+        isRefundCourseFee: null,
+        isRefundInstrumentFee: null,
+        isRefundTeachingAssistantsFee: null,
+        reason: ""
+      },
+      quitRules: {
+        isRefundCourseFee: [
+          { required: true, message: "请选择是否退还课程费用", trigger: 'change' }
+        ],
+        isRefundInstrumentFee: [
+          { required: true, message: "选择是否退还乐器费用", trigger: 'change' }
+        ],
+        isRefundTeachingAssistantsFee: [
+          { required: true, message: "选择是否退还教辅费用", trigger: 'change' }
+        ],
+        reason: [{ required: true, message: "请填写退团退费原因" }]
+      },
       pageInfo: {
         isSinglePage: false, // 是否只有一页
         limit: 10,
@@ -275,6 +324,8 @@ export default {
             this.showMessage = res.data
             this.showMessage.type = memo.type
             this.remark = res.data.reason
+            this.$refs.quitForm.resetFields()
+            this.quitForm.reason = res.data.reason
           } else {
             this.$message.error(res.msg)
           }
@@ -282,23 +333,26 @@ export default {
       }
     },
     onSubmitGroup (params, status) {
-      if (!this.remark || this.remark == '') {
-        this.$message.error('请输入退团理由')
-        return
-      }
-
-      quitMusicGroup({
-        id: params.id,
-        status: status,
-        reason: this.remark
-      }).then(res => {
-        this.$message.success('处理成功')
-
-        this.getItemInfo({
-          Id: params.id,
-          type: params.type
-        })
-      })
+      this.$refs["quitForm"].validate(res => {
+        if (res) {
+          this.$confirm("确定此操作吗?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(async () => {
+              let query = this.quitForm
+              query.id = params.id,
+              query.status = status
+              await quitMusicGroup(query).then(res => {
+                this.$message.success('处理成功')
+                this.getItemInfo({
+                  Id: params.id,
+                  type: params.type
+                })
+              })
+          }).catch(() => { });
+        }
+      });
     },
     onSubmit (id, str, type) {
       if (!this.remark || this.remark == '') {