Merge branch 'ol_12_30' into online

src/views/workBenchManager/journal/musicGroup.vue

@@ -194,6 +194,7 @@
 <script>
 import {  queryCountOfUnread, sysMessageList, setRead,
   queryApplyRefundDetail, applyRefundAudit, musicGroupQuit, quitMusicGroup} from '@/api/journal'
+import cleanDeep from 'clean-deep'
 export default {
   name: 'musicGroup',
   data () {
@@ -333,26 +334,33 @@ export default {
       }
     },
     onSubmitGroup (params, status) {
-      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
-                })
+      if(status == 'DENIED') {
+        this.onSubmitGroups(params, status)
+      } else {
+        this.$refs["quitForm"].validate(res => {
+          if (res) {
+            this.onSubmitGroups(params, status)
+          }
+        });
+      }
+    },
+    onSubmitGroups(params, status) {
+      this.$confirm("确定此操作吗?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(async () => {
+            let query = this.quitForm
+            query.id = params.id,
+            query.status = status
+            await quitMusicGroup(cleanDeep(query)).then(res => {
+              this.$message.success('处理成功')
+              this.getItemInfo({
+                Id: params.id,
+                type: params.type
               })
-          }).catch(() => { });
-        }
-      });
+            })
+        }).catch(() => { });
     },
     onSubmit (id, str, type) {
       if (!this.remark || this.remark == '') {