修复员工样式

1

src/api/auditManager.js

@@ -5,7 +5,7 @@ let api = '/api-web'
 // 分页查询活动列表
 export function getAuditList(data) {
     return request({
-      url: api + '/musicGroupPaymentCalender/auditList',
+      url: api + '/musicGroupPaymentCalender/queryPage',
       method: 'get',
       params: data
     })
@@ -14,7 +14,7 @@ export function getAuditList(data) {
 // 查看缴费详情
 export function getAuditListDetail(data) {
     return request({
-      url: api + '/musicGroupPaymentCalender/auditListDetail',
+      url: api + '/musicGroupPaymentCalender/getDetail',
       method: 'get',
       params: data
     })
@@ -37,4 +37,4 @@ export function auditRefuse(data) {
       method: 'post',
      data:qs.stringify(data)
     })
-}
+}

src/router/index.js

@@ -501,6 +501,8 @@ export const asyncRoutes = {
   groupRecordManager:() => import('@/views/tenantSetting/groupRecordManager.vue'),
   // 扣费记录
   chargingRecord:() => import('@/views/tenantSetting/chargingRecord.vue'),
+  // 操作手册管理
+  operationManual:() => import('@/views/operationManual')
 }
 
 export default router

src/views/accompaniment/index.vue

@@ -72,14 +72,15 @@
           <el-cascader
             ref="myCascader"
             popper-class="myCascader"
+            @change="changeCategor"
+            :show-all-levels="true"
+             clearable
             v-model="searchForm.categoriesId"
             style="width: 100%"
             :options="tree"
             placeholder="请选择分类"
-            clearable
-            :show-all-levels="true"
+
             :props="treeProps"
-            @change="changeCategor"
           ></el-cascader>
         </el-form-item>
         <el-form-item prop="subjectId">
@@ -142,14 +143,24 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="organName" label="所属分部" width="180px">
+        <el-table-column
+          align="center"
+          prop="organName"
+          label="所属分部"
+          width="180px"
+        >
           <template slot-scope="scope">
             <div>
               <Tooltip :content="scope.row.organName" />
             </div>
           </template>
         </el-table-column>
-                <el-table-column align="center" prop="subjectName" label="所属声部" width="180px">
+        <el-table-column
+          align="center"
+          prop="subjectName"
+          label="所属声部"
+          width="180px"
+        >
           <template slot-scope="scope">
             <div>
               <Tooltip :content="scope.row.subjectName" />
@@ -238,7 +249,12 @@
             <el-button
               type="text"
               @click="looker(scope.row)"
-              :disabled="(scope.row.isOpenMetronome ? !scope.row.url : !scope.row.metronomeUrl) || scope.row.clientType != 'SMART_PRACTICE'"
+              :disabled="
+                (scope.row.isOpenMetronome
+                  ? !scope.row.url
+                  : !scope.row.metronomeUrl) ||
+                scope.row.clientType != 'SMART_PRACTICE'
+              "
               >预览</el-button
             >
             <el-button
@@ -332,7 +348,7 @@ export default {
     saveform,
     pagination,
     "submit-form": form,
-    Tooltip
+    Tooltip,
   },
   data() {
     return {

src/views/auditList/index.vue

@@ -72,7 +72,10 @@
         <el-form-item>
           <el-button @click="search" type="primary">搜索</el-button>
           <el-button @click="reset" type="danger">重置</el-button>
-          <auth auths="musicGroupPaymentCalender/batchAuditing" style="margin-left: 10px">
+          <auth
+            auths="musicGroupPaymentCalender/batchAuditing"
+            style="margin-left: 10px"
+          >
             <el-button
               @click="typesStatus = true"
               :disabled="!selList.length > 0"
@@ -113,7 +116,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            width="180px"
+            width="100px"
             prop="musicGroupId"
             label="乐团编号"
           >
@@ -121,6 +124,13 @@
               <copy-text>{{ scope.row.musicGroupId }}</copy-text>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="paymentType" label="收费模式">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.paymentType | auditPaymentType }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="paymentType" label="申请类型">
             <template slot-scope="scope">
               <div>
@@ -135,19 +145,23 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="addCourseTotalTime"
             label="加课总时长(分钟)"
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
             prop="courseOriginalPrice"
-            label="原现价(元)"
+            label="总原价(元)"
           >
             <template slot-scope="scope">
               <div>
-                {{ (scope.row.courseOriginalPrice+scope.row.originalMemberPaymentAmount) | moneyFormat }}
+                {{
+                  (scope.row.courseOriginalPrice +
+                    scope.row.originalMemberPaymentAmount)
+                    | moneyFormat
+                }}
               </div>
             </template>
           </el-table-column>
@@ -158,28 +172,31 @@
           >
             <template slot-scope="scope">
               <div>
-                {{ (scope.row.courseCurrentPrice+scope.row.memberPaymentAmount) | moneyFormat }}
+                {{
+                  (scope.row.courseCurrentPrice + scope.row.memberPaymentAmount)
+                    | moneyFormat
+                }}
               </div>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="memo"
-            width="200px"
+            width="100px"
             label="备注"
           >
             <template slot-scope="scope">
-              <overflow-text width="200px" :text="scope.row.memo" />
+              <overflow-text width="80px" :text="scope.row.memo" />
             </template>
           </el-table-column>
           <el-table-column
             align="center"
             prop="auditMemo"
-            width="200px"
-            label="审核备注"
+            width="100px"
+            label="审核意见"
           >
             <template slot-scope="scope">
-              <overflow-text width="200px" :text="scope.row.auditMemo" />
+              <overflow-text width="80px" :text="scope.row.auditMemo" />
             </template>
           </el-table-column>
           <el-table-column
@@ -189,13 +206,13 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            prop="auditStatus"
+            prop="status"
             label="状态"
             width="100px"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.auditStatus | auditType }}
+                {{ scope.row.status | auditType }}
               </div>
             </template>
           </el-table-column>
@@ -215,12 +232,21 @@
           <el-table-column
             align="center"
             label="操作"
-            width="100px"
             fixed="right"
           >
             <template slot-scope="scope">
-              <el-button @click="lookDetail(scope.row)" type="text" v-if="$helpers.permission(scope.row.auditStatus === 'AUDITING' ? 'musicGroupPaymentCalender/auditListDetail/update' : 'musicGroupPaymentCalender/auditListDetail/look')">
-                  {{ scope.row.auditStatus === "AUDITING" ? "审核" : "查看" }}
+              <el-button
+                @click="lookDetail(scope.row)"
+                type="text"
+                v-if="
+                  $helpers.permission(
+                    scope.row.status === 'AUDITING'
+                      ? 'musicGroupPaymentCalender/auditListDetail/update'
+                      : 'musicGroupPaymentCalender/auditListDetail/look'
+                  )
+                "
+              >
+                {{ scope.row.status === "AUDITING" ? "审核" : "查看" }}
               </el-button>
             </template>
           </el-table-column>

src/views/categroyManager/insideSetting/staffManager.vue

@@ -12,11 +12,11 @@
         @submit="search"
         @reset="reset"
         :model="searchForm"
-        
+
       >
         <el-form-item prop="search">
           <el-input
-            
+
             type="text"
             clearable
             v-model.trim="searchForm.search"
@@ -26,7 +26,7 @@
         </el-form-item>
         <el-form-item prop="jobNature">
           <el-select
-            
+
             v-model.trim="searchForm.jobNature"
             clearable
             filterable
@@ -40,7 +40,7 @@
         </el-form-item>
         <el-form-item prop="organId">
           <el-select
-            
+
             v-model.trim="searchForm.organId"
             clearable
             filterable
@@ -57,7 +57,7 @@
         <el-form-item prop="roleId">
           <!--   multiple -->
           <el-select
-            
+
             v-model.trim="searchForm.roleId"
             clearable
             filterable
@@ -73,10 +73,10 @@
           <!-- collapse-tags -->
         </el-form-item>
         <el-form-item>
-          <el-button native-type="submit" type="danger" 
+          <el-button native-type="submit" type="danger"
             >搜索</el-button
           >
-          <el-button native-type="reset" type="primary" 
+          <el-button native-type="reset" type="primary"
             >重置</el-button
           >
         </el-form-item>
@@ -86,13 +86,13 @@
         style="margin-bottom:20px"
         @click="roleOperation('create')"
         v-permission="'employee/add'"
-        
+
         >添加</el-button
       >
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table
-          
+
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
@@ -232,7 +232,7 @@
               :label-width="formLabelWidth"
             >
               <el-input
-                
+
                 v-model.trim="form.realName"
                 placeholder="请输入姓名"
                 autocomplete="off"
@@ -246,7 +246,7 @@
               :label-width="formLabelWidth"
             >
               <el-select
-                
+
                 v-model.trim="form.gender"
                 placeholder="请选择性别"
                 clearable
@@ -266,7 +266,7 @@
               :label-width="formLabelWidth"
             >
               <el-input
-                
+
                 v-model.trim.number="form.phone"
                 placeholder="请输入手机号"
                 autocomplete="off"
@@ -280,7 +280,7 @@
               :label-width="formLabelWidth"
             >
               <el-select
-                
+
                 v-model.trim="form.jobNature"
                 clearable
                 placeholder="请选择工作类型"
@@ -302,7 +302,7 @@
               :label-width="formLabelWidth"
             >
               <el-date-picker
-                
+
                 v-model.trim="form.entryDate"
                 type="date"
                 :picker-options="{
@@ -321,7 +321,7 @@
               :label-width="formLabelWidth"
             >
               <el-input
-                
+
                 v-model.trim="form.postalCode"
                 placeholder="请输入邮政编码"
                 autocomplete="off"
@@ -336,7 +336,7 @@
             :label-width="formLabelWidth"
           >
             <el-input
-              
+
               v-model.trim="form.contactAddress"
               placeholder="请输入通讯地址"
               autocomplete="off"
@@ -351,14 +351,14 @@
         >
         </el-alert>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item
               label="所属分部"
               prop="organIdLists"
               :label-width="formLabelWidth"
             >
               <select-all
-                
+
                 filterable
                 clearable
                 placeholder="请选择所属分部"
@@ -375,14 +375,16 @@
               </select-all>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+                <el-col :span="24">
             <el-form-item
               label="员工角色"
               prop="roleIds"
               :label-width="formLabelWidth"
             >
               <select-all
-                
+
                 v-model.trim="form.roleIds"
                 placeholder="请选择员工角色"
                 clearable
@@ -391,7 +393,7 @@
                 multiple
               >
                 <el-option
-                  v-for="item in roleResetList"
+                  v-for="item in roleList"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -415,7 +417,7 @@
               :label-width="formLabelWidth"
             >
               <el-cascader
-                
+
                 v-model="form.deptIds"
                 placeholder="请选择所属部门"
                 clearable
@@ -435,7 +437,7 @@
               :label-width="formLabelWidth"
             >
               <el-cascader
-                
+
                 v-model="form.deptId"
                 placeholder="请选择社保分部"
                 clearable
@@ -469,7 +471,7 @@
             <!-- :rules="[{ required: true, message: '请选择所属岗位', trigger: 'change' }]"  衔接老师，不用设置 -->
             <!-- 所属岗位（必填） -->
             <el-select
-              
+
               filterable
               clearable
               placeholder="所属岗位"
@@ -491,7 +493,7 @@
           >
             <!-- 管理部门（非必填） -->
             <el-cascader
-              
+
               v-model="postDeptIds.deptIds"
               placeholder="管理部门"
               clearable
@@ -502,14 +504,14 @@
             ></el-cascader>
           </el-form-item>
           <el-button
-            
+
             icon="el-icon-minus"
             circle
             v-if="form.postDeptIds.length > 1"
             @click.prevent="removePostDept(postDeptIds)"
           ></el-button>
           <el-button
-            
+
             icon="el-icon-plus"
             @click.prevent="addPostDept"
             circle
@@ -551,7 +553,7 @@
           ]"
         >
           <el-select
-            
+
             v-model.trim="educationForm.targetUserId"
             clearable
             filterable
@@ -848,19 +850,19 @@ export default {
         }
       });
       // 获取可编辑角色
-      try {
-        const res = await userRole();
-        this.roleBaseList = [];
-        res.data.forEach((item) => {
-          this.roleBaseList.push({
-            label: item.roleName,
-            value: item.id,
-            disabled: false,
-          });
-        });
-      } catch (e) {
-        console.log(e);
-      }
+      // try {
+      //   const res = await userRole();
+      //   this.roleResetList = [];
+      //   res.data.forEach((item) => {
+      //     this.roleResetList.push({
+      //       label: item.roleName,
+      //       value: item.id,
+      //       disabled: false,
+      //     });
+      //   });
+      // } catch (e) {
+      //   console.log(e);
+      // }
 
       getDepts({ rows: 9999 }).then((res) => {
         if (res.code == 200 && res.data && res.data.length > 0) {
@@ -941,17 +943,17 @@ export default {
       // 修改的时候
       if (type == "update") {
         let roleIdList = [...data.roleIds];
-        this.roleBaseList.forEach((item) => {
-          if (roleIdList.indexOf(item.value) == -1) {
-            roleIdList.push(item.value);
-          }
-        });
-        this.roleResetList = [];
-        this.roleList.forEach((role) => {
-          if (roleIdList.indexOf(role.value) != -1) {
-            this.roleResetList.push(role);
-          }
-        });
+        // this.roleBaseList.forEach((item) => {
+        //   if (roleIdList.indexOf(item.value) == -1) {
+        //     roleIdList.push(item.value);
+        //   }
+        // });
+        // this.roleResetList = [...this.roleList];
+        // this.roleList.forEach((role) => {
+        //   if (roleIdList.indexOf(role.value) != -1) {
+        //     this.roleResetList.push(role);
+        //   }
+        // });
         // 初始化数据
         let postDeptArr = [];
         const postDept = data.postDeptIds ? JSON.parse(data.postDeptIds) : [];

src/views/operationManual/api.js

@@ -0,0 +1,7 @@
+import request2 from '@/utils/request2'
+
+export const getSysManualList = data => request2({
+    url: '/api-web/sysManual/list',
+    params: data,
+    method: 'get',
+})

src/views/operationManual/index.vue

@@ -1,5 +1,206 @@
 <template>
-  <div>
-    操作手册
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>
+      操作手册管理
+    </h2>
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        :model="searchForm"
+        @submit="search"
+        @reset="onReSet"
+      >
+        <el-form-item prop="menuId">
+          <el-cascader
+            ref="myCascader"
+            class="myCascader"
+            popper-class="myCascader"
+            @change="changeCategor"
+            :show-all-levels="false"
+            clearable
+            v-model="searchForm.menuId"
+            style="width: 100%"
+            :options="silderList"
+            :props="optionProps"
+            placeholder="请选择菜单"
+          ></el-cascader>
+        </el-form-item>
+      </save-form>
+      <div class="tableWrap">
+        <el-table
+          style="width: 100%"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          :data="tableList"
+        >
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="菜单"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="手册名称"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="修改时间"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="修改人"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            prop="studentId"
+            label="操作"
+          ></el-table-column>
+        </el-table>
+        <pagination
+          sync
+          :total.sync="rules.total"
+          :page.sync="rules.page"
+          :limit.sync="rules.limit"
+          :page-sizes="rules.page_size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
   </div>
 </template>
+
+<script>
+import axios from "axios";
+import { getToken } from "@/utils/auth";
+import pagination from "@/components/Pagination/index";
+import load from "@/utils/loading";
+import { getSilder } from "@/api/silder";
+import { getSysManualList } from "./api";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        menuId: null,
+      },
+
+      tableList: [],
+      organList: [],
+      silderList: [],
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+      optionProps: {
+        value: "id",
+        label: "name",
+        children: "children",
+        checkStrictly: true,
+        expandTrigger: "hover",
+      },
+    };
+  },
+  //生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  //生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+    // 获取分部
+
+    this.init();
+  },
+  methods: {
+    init() {
+      getSilder({ hid: 0 }).then((res) => {
+        if (res.code == 200) {
+          this.silderList = this.setTableData(res.data);
+        }
+      });
+      this.getList();
+    },
+    async getList() {
+      try {
+        const res = await getSysManualList({
+          menuId: this.searchForm.menuId,
+          page: this.rules.page,
+          rows: this.rules.limit,
+        });
+        console.log(res);
+        this.tableList = res.data.rows;
+        this.rules.total = res.data.total;
+      } catch (e) {}
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    onReSet() {},
+    setTableData(result) {
+      let list = [];
+      for (let i in result) {
+        if (result[i].type == 1) {
+          continue;
+        }
+        let tempList = {};
+        tempList = {
+          id: result[i].id,
+          name: result[i].name,
+          type: result[i].type,
+          path: result[i].path,
+          permission: result[i].permission,
+          icon: result[i].icon,
+          parentId: result[i].parentId,
+          component: result[i].component,
+          sort: result[i].sort,
+          hid: result[i].hid,
+          icon: result[i].icon,
+          type: result[i].type,
+          keepAlive: result[i].keepAlive,
+          parentPermission: result[i].parentPermission,
+          memo: result[i].memo,
+        };
+        let flag = false;
+        if (result[i].sysMenus && result[i].sysMenus.length > 0) {
+          for (let j in result[i].sysMenus) {
+            if (result[i].sysMenus[j].type == 0) {
+              flag = true;
+              break;
+            }
+          }
+          if (flag) {
+            tempList.children = this.setTableData(result[i].sysMenus);
+          }
+        }
+        list.push(tempList);
+      }
+      return list;
+    },
+    changeCategor(e) {
+      this.$refs.myCascader.dropDownVisible = false;
+    },
+  },
+};
+</script>
+<style lang='scss'>
+.myCascader {
+  .el-radio {
+    width: 100%;
+    height: 100%;
+    z-index: 10;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+  }
+  .el-radio__input {
+    visibility: hidden;
+  }
+  .el-cascader-node__postfix {
+    top: 10px;
+  }
+}
+</style>

vue.config.js

@@ -17,13 +17,13 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.227:8000' // 何国威
-let target = 'http://192.168.3.250:8000' //邹璇
+// let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
 
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.124:8000' //邹璇
 // let target = 'http://192.168.3.119:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/