Merge branch 'iteration_adminOptimiz' of http://git.dayaedu.com/molingzhide/dy-admin-manager into iteration_adminOptimiz

src/views/workBenchManager/journal/index.vue

@@ -1,50 +1,23 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>
-      系统日志
+      <div class="squrt"></div>系统日志
     </h2>
     <div class="m-core">
-      <location-hash v-model="activeIndex" @change="handleClick">
-        <el-tabs
-          type="border-card"
-          v-model.trim="activeIndex"
-          @tab-click="handleClick"
-        >
-          <el-tab-pane
-            label="系统通知" lazy
-            v-if="permissionList.journalItem"
-            name="0"
-          >
-            <item v-if="activeIndex == 0" />
+      <location-hash v-model="activeIndex">
+        <el-tabs v-model="activeIndex" type="card">
+          <el-tab-pane label="系统通知" lazy v-if="permissionList.journalItem" name="SYSTEM">
+            <list :type="activeIndex" />
           </el-tab-pane>
-          <el-tab-pane
-            label="学员申诉" lazy
-            v-if="permissionList.studentComplain"
-            name="1"
-          >
-            <studentComplain v-if="activeIndex == 1" />
+          <el-tab-pane label="学生申诉" lazy v-if="permissionList.studentComplain" name="STUDENT">
+            <list :type="activeIndex" />
           </el-tab-pane>
-          <el-tab-pane
-            label="退团退课" lazy
-            v-if="permissionList.musicGroupCourse"
-            name="2"
-          >
-            <musicGroup v-if="activeIndex == 2" />
+          <!-- <el-tab-pane label="退团退课" value="MUSICGROUP"></el-tab-pane> -->
+          <el-tab-pane label="请假处理" lazy v-if="permissionList.leaveOperation" name="LEAVE">
+            <list :type="activeIndex" />
           </el-tab-pane>
-          <el-tab-pane
-            label="请假处理" lazy
-            v-if="permissionList.leaveOperation"
-            name="3"
-          >
-            <leaveOperation v-if="activeIndex == 3" />
-          </el-tab-pane>
-          <el-tab-pane
-            label="VIP申请审核" lazy
-            v-if="permissionList.vipApply"
-            name="4"
-          >
-            <vipApply v-if="activeIndex == 4" />
+          <el-tab-pane label="VIP申请审核" lazy v-if="permissionList.vipApply" name="VIPAPPLY">
+            <list :type="activeIndex" />
           </el-tab-pane>
         </el-tabs>
       </location-hash>
@@ -52,39 +25,27 @@
   </div>
 </template>
 <script>
-import item from "./journalItem";
-import studentComplain from "./studentComplain";
-import musicGroup from "./musicGroup";
-import leaveOperation from "./leaveOperation";
-import vipApply from "./vipApply";
-import { permission } from "@/utils/directivePage";
+import { permission } from '@/utils/directivePage'
+import List from './model/list'
 export default {
-  components: {
-    item,
-    studentComplain,
-    musicGroup,
-    leaveOperation,
-    vipApply
-  },
-  name: "journal",
-  data() {
-    const query = this.$route.query
+  name: 'journal',
+  components: { List },
+  data () {
+    const query = this.$route.query;
     return {
-      activeIndex: query.opt || "0",
+      activeIndex: query.opt || 'SYSTEM',
       permissionList: {
         journalItem: permission("/journalItem"),
         studentComplain: permission("/studentComplain"),
         musicGroupCourse: permission("/musicGroupCourse"),
         leaveOperation: permission("/leaveOperation"),
         vipApply: permission("/vipApply")
-      }
-    };
+      },
+    }
+  },
+  mounted() {
   },
   methods: {
-    handleClick(val) {
-      this.activeIndex = val.name;
-    }
   }
-};
-</script>
-<style lang="scss" scoped></style>
+}
+</script>

src/views/workBenchManager/journal/index11.vue

@@ -0,0 +1,90 @@
+<template>
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      系统日志
+    </h2>
+    <div class="m-core">
+      <location-hash v-model="activeIndex" @change="handleClick">
+        <el-tabs
+          type="border-card"
+          v-model.trim="activeIndex"
+          @tab-click="handleClick"
+        >
+          <el-tab-pane
+            label="系统通知" lazy
+            v-if="permissionList.journalItem"
+            name="0"
+          >
+            <item v-if="activeIndex == 0" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="学员申诉" lazy
+            v-if="permissionList.studentComplain"
+            name="1"
+          >
+            <studentComplain v-if="activeIndex == 1" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="退团退课" lazy
+            v-if="permissionList.musicGroupCourse"
+            name="2"
+          >
+            <musicGroup v-if="activeIndex == 2" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="请假处理" lazy
+            v-if="permissionList.leaveOperation"
+            name="3"
+          >
+            <leaveOperation v-if="activeIndex == 3" />
+          </el-tab-pane>
+          <el-tab-pane
+            label="VIP申请审核" lazy
+            v-if="permissionList.vipApply"
+            name="4"
+          >
+            <vipApply v-if="activeIndex == 4" />
+          </el-tab-pane>
+        </el-tabs>
+      </location-hash>
+    </div>
+  </div>
+</template>
+<script>
+import item from "./journalItem";
+import studentComplain from "./studentComplain";
+import musicGroup from "./musicGroup";
+import leaveOperation from "./leaveOperation";
+import vipApply from "./vipApply";
+import { permission } from "@/utils/directivePage";
+export default {
+  components: {
+    item,
+    studentComplain,
+    musicGroup,
+    leaveOperation,
+    vipApply
+  },
+  name: "journal",
+  data() {
+    const query = this.$route.query
+    return {
+      activeIndex: query.opt || "0",
+      permissionList: {
+        journalItem: permission("/journalItem"),
+        studentComplain: permission("/studentComplain"),
+        musicGroupCourse: permission("/musicGroupCourse"),
+        leaveOperation: permission("/leaveOperation"),
+        vipApply: permission("/vipApply")
+      }
+    };
+  },
+  methods: {
+    handleClick(val) {
+      this.activeIndex = val.name;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped></style>

src/views/workBenchManager/journal/index111.vue

@@ -1,51 +0,0 @@
-<template>
-  <div class="m-container">
-    <h2>
-      <div class="squrt"></div>系统日志
-    </h2>
-    <div class="m-core">
-      <location-hash v-model="activeIndex">
-        <el-tabs v-model="activeIndex">
-          <el-tab-pane label="系统通知" lazy v-if="permissionList.journalItem" name="SYSTEM">
-            <list :type="activeIndex" />
-          </el-tab-pane>
-          <el-tab-pane label="学生申诉" lazy v-if="permissionList.studentComplain" name="STUDENT">
-            <list :type="activeIndex" />
-          </el-tab-pane>
-          <!-- <el-tab-pane label="退团退课" value="MUSICGROUP"></el-tab-pane> -->
-          <el-tab-pane label="请假处理" lazy v-if="permissionList.leaveOperation" name="LEAVE">
-            <list :type="activeIndex" />
-          </el-tab-pane>
-          <el-tab-pane label="VIP申请审核" lazy v-if="permissionList.vipApply" name="VIPAPPLY">
-            <list :type="activeIndex" />
-          </el-tab-pane>
-        </el-tabs>
-      </location-hash>
-    </div>
-  </div>
-</template>
-<script>
-import { permission } from '@/utils/directivePage'
-import List from './model/list'
-export default {
-  name: 'journal',
-  components: { List },
-  data () {
-    const query = this.$route.query;
-    return {
-      activeIndex: query.opt || 'SYSTEM',
-      permissionList: {
-        journalItem: permission("/journalItem"),
-        studentComplain: permission("/studentComplain"),
-        musicGroupCourse: permission("/musicGroupCourse"),
-        leaveOperation: permission("/leaveOperation"),
-        vipApply: permission("/vipApply")
-      },
-    }
-  },
-  mounted() {
-  },
-  methods: {
-  }
-}
-</script>

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

@@ -21,13 +21,17 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         :data="tableList"
       >
-        <el-table-column label="申请人" prop="userId" width="100px">
+        <el-table-column label="申请人" prop="userId" width="200px">
           <template slot-scope="scope">
             <el-badge
               :is-dot="!scope.row.readStatus"
               style="vertical-align: sub;"
             ></el-badge>
-            {{ scope.row.userId }}
+            <span v-if="scope.row.user">{{ scope.row.user.username }}</span>
+            <span style="color: red">
+              （<copy-text>{{ scope.row.userId }}</copy-text
+              >）
+            </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -39,7 +43,11 @@
           align="center"
           label="内容"
           prop="content"
-        ></el-table-column>
+        >
+          <template slot-scope="scope">
+            <overflow-text width="100%" :text="scope.row.content"></overflow-text>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="onLook(scope.row)">查看</el-button>