11/09 18:12

11

package.json

@@ -43,7 +43,8 @@
     "vue-quill-editor": "^3.0.6",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
-    "wangeditor": "^4.0.0"
+    "wangeditor": "^4.0.0",
+    "webpack-merge": "^5.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",

src/main.js

@@ -3,6 +3,7 @@ import ElementUI from 'element-ui'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import 'default-passive-events'
 import 'babel-polyfill'
+
 // import './global.scss'
 
 import 'element-ui/lib/theme-chalk/index.css'
@@ -52,9 +53,9 @@ ElementUI.Dialog.props.closeOnClickModal.default = false;
 const SelectValueWatch = ElementUI.Select.watch.value
 ElementUI.Select.watch.value = function (newValue, oldValue) {
   SelectValueWatch.call(this, newValue, oldValue)
-  if(this.selected && this.selected.value === 0 && this.selected.currentLabel === 0 && newValue !== oldValue) {
+  if (this.selected && this.selected.value === 0 && this.selected.currentLabel === 0 && newValue !== oldValue) {
     this.handleClearClick.call(this, {
-      stopPropagation: () => {}
+      stopPropagation: () => { }
     })
   }
 }

src/views/resetTeaming/modals/user-pay-form.vue

@@ -88,6 +88,7 @@ import extraClass from "./extra-class";
 import classrooms from "./classrooms";
 import otherform from "./other";
 import baseInfoVue from '../../teamDetail/components/baseInfo.vue';
+import merge from 'webpack-merge'
 
 const paymentTypeFormat = {
   0: "MUSIC_APPLY",
@@ -333,15 +334,9 @@ export default {
             // 在这里
             if (this.$route.query.type == "teamDraft") {
               console.log('来了')
-              let query = this.$route.query;
-              query.type = "feeAudit";
-              query = JSON.parse(JSON.stringify(query))
               this.$router.push({
-                query: {
-                  ...query,
-                },
+                query: merge(this.$route.query, { 'type': 'feeAudit' })
               });
-              console.log(query)
             }
           } catch (error) { }
         } else {
@@ -352,15 +347,10 @@ export default {
             this.$listeners.submited(res.data);
             if (this.$route.query.type == "teamDraft") {
               console.log('来了')
-              let query = this.$route.query;
-              query.type = "feeAudit";
-              query = JSON.parse(JSON.stringify(query))
-              console.log(query)
               this.$router.push({
-                query: {
-                  ...query
-                },
+                query: merge(this.$route.query, { 'type': 'feeAudit' })
               });
+
             }
           } catch (error) { }
         }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -1130,8 +1130,8 @@ export default {
             if (res.code == 200) {
               if (this.teamStatus == "teamDraft") {
                 this.$message.success("保存成功");
-                // 跳到第二页
-                // 删掉结束
+                // 跳到第二页 
+                this.$emit('getBaseInfo', obj)
                 this.$emit("chiosetab", 1);
               } else {
                 this.$message.success("修改乐团成功");

src/views/teamDetail/teamList.vue

@@ -200,8 +200,12 @@
                            @click="lookTeamDetail(scope.row)">班级列表</el-button>
                 <!-- 审核中 编辑 -->
                 <el-button type="text"
-                           v-if="(scope.row.status == 'AUDIT' || scope.row.status == 'FEE_AUDIT')&& permission('teamDetail/audit/update')"
+                           v-if="(scope.row.status == 'AUDIT')&& permission('teamDetail/audit/update')"
                            @click="lookTeamDetail(scope.row)">审核</el-button>
+                <!-- 费用审核中  -->
+                <el-button type="text"
+                           v-if="( scope.row.status == 'FEE_AUDIT')&& permission('teamDetail/audit/update')"
+                           @click="lookTeamDetail(scope.row)">查看</el-button>
                 <!-- 编辑中 编辑 -->
                 <el-button type="text"
                            v-if="scope.row.status == 'DRAFT' && permission('teamDetail/draft/update')"