机构管理去掉新增子项,用户管理去掉左侧机构树,改为下拉列表搜索条件,统计table居左显示

main
xuechunyuan 3 years ago
parent 2bf61a429f
commit cd37512bf3
  1. 12
      src/option/system/dict.js
  2. 12
      src/option/system/dictbiz.js
  3. 6
      src/views/system/dept.vue
  4. 36
      src/views/system/user.vue
  5. 4
      vue.config.js

@ -30,7 +30,7 @@ export const optionParent = {
label: "字典名称", label: "字典名称",
prop: "dictValue", prop: "dictValue",
search: true, search: true,
align: "center", // align: "center",
rules: [ rules: [
{ {
required: true, required: true,
@ -43,7 +43,7 @@ export const optionParent = {
label: "字典排序", label: "字典排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
align: "right", // align: "right",
width: 100, width: 100,
rules: [ rules: [
{ {
@ -57,7 +57,7 @@ export const optionParent = {
label: "封存", label: "封存",
prop: "isSealed", prop: "isSealed",
type: "switch", type: "switch",
align: "center", // align: "center",
width: 100, width: 100,
dicData: [ dicData: [
{ {
@ -121,7 +121,7 @@ export const optionChild = {
label: "字典名称", label: "字典名称",
prop: "dictValue", prop: "dictValue",
search: true, search: true,
align: "center", // align: "center",
rules: [ rules: [
{ {
required: true, required: true,
@ -165,7 +165,7 @@ export const optionChild = {
label: "字典排序", label: "字典排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
align: "right", // align: "right",
hide: true, hide: true,
rules: [ rules: [
{ {
@ -179,7 +179,7 @@ export const optionChild = {
label: "封存", label: "封存",
prop: "isSealed", prop: "isSealed",
type: "switch", type: "switch",
align: "center", // align: "center",
width: 80, width: 80,
dicData: [ dicData: [
{ {

@ -30,7 +30,7 @@ export const optionParent = {
label: "字典名称", label: "字典名称",
prop: "dictValue", prop: "dictValue",
search: true, search: true,
align: "center", // align: "center",
rules: [ rules: [
{ {
required: true, required: true,
@ -43,7 +43,7 @@ export const optionParent = {
label: "字典排序", label: "字典排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
align: "right", // align: "right",
width: 100, width: 100,
hide: true, hide: true,
rules: [ rules: [
@ -58,7 +58,7 @@ export const optionParent = {
label: "封存", label: "封存",
prop: "isSealed", prop: "isSealed",
type: "switch", type: "switch",
align: "center", // align: "center",
width: 100, width: 100,
dicData: [ dicData: [
{ {
@ -123,7 +123,7 @@ export const optionChild = {
label: "字典Value", label: "字典Value",
prop: "dictValue", prop: "dictValue",
search: true, search: true,
align: "center", // align: "center",
rules: [ rules: [
{ {
required: true, required: true,
@ -168,7 +168,7 @@ export const optionChild = {
label: "字典排序", label: "字典排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
align: "right", // align: "right",
hide: true, hide: true,
rules: [ rules: [
{ {
@ -182,7 +182,7 @@ export const optionChild = {
label: "封存", label: "封存",
prop: "isSealed", prop: "isSealed",
type: "switch", type: "switch",
align: "center", // align: "center",
width: 80, width: 80,
dicData: [ dicData: [
{ {

@ -10,11 +10,11 @@
@click="handleDelete"> @click="handleDelete">
</el-button> </el-button>
</template> </template>
<template slot-scope="scope" slot="menu"> <!-- <template slot-scope="scope" slot="menu">
<el-button type="text" icon="el-icon-circle-plus-outline" size="small" <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
@click.stop="handleAdd(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">新增子项 @click.stop="handleAdd(scope.row, scope.index)" v-if="userInfo.role_name.includes('admin')">新增子项
</el-button> </el-button>
</template> </template> -->
<template slot-scope="{row}" slot="imgUrl2"> <template slot-scope="{row}" slot="imgUrl2">
<img v-if="row.imgUrl" :src="website.filePrex + row.imgUrl" style="width:30px;height:30px;" /> <img v-if="row.imgUrl" :src="website.filePrex + row.imgUrl" style="width:30px;height:30px;" />
<img v-else src="@/assets/image/hospital_logo.png" style="width:30px;height:30px;" /> <img v-else src="@/assets/image/hospital_logo.png" style="width:30px;height:30px;" />
@ -162,7 +162,7 @@ export default {
label: "排序", label: "排序",
prop: "sort", prop: "sort",
type: "number", type: "number",
align: "right", // align: "right",
width: 80, width: 80,
rules: [{ rules: [{
required: true, required: true,

@ -1,6 +1,6 @@
<template> <template>
<el-row> <el-row>
<el-col :span="5"> <!-- <el-col :span="5">
<div class="box"> <div class="box">
<el-scrollbar> <el-scrollbar>
<basic-container> <basic-container>
@ -8,8 +8,8 @@
</basic-container> </basic-container>
</el-scrollbar> </el-scrollbar>
</div> </div>
</el-col> </el-col> -->
<el-col :span="19"> <el-col :span="24">
<basic-container> <basic-container>
<avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave" v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
@ -78,16 +78,16 @@ import {
grant, grant,
resetPassword, unlock resetPassword, unlock
} from "@/api/system/user"; } from "@/api/system/user";
import { exportBlob } from "@/api/common"; // import { exportBlob } from "@/api/common";
import { getDeptTree, getDeptLazyTree } from "@/api/system/dept"; import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role"; import { getRoleTree } from "@/api/system/role";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import website from '@/config/website'; import website from '@/config/website';
import { getToken } from '@/util/auth'; // import { getToken } from '@/util/auth';
import { dateNow } from "@/util/date"; // import { dateNow } from "@/util/date";
import NProgress from 'nprogress'; // import NProgress from 'nprogress';
import 'nprogress/nprogress.css'; import 'nprogress/nprogress.css';
import func from "@/util/func"; // import func from "@/util/func";
export default { export default {
data() { data() {
@ -169,6 +169,22 @@ export default {
dialogType: 'drawer', dialogType: 'drawer',
dialogClickModal: false, dialogClickModal: false,
column: [ column: [
{
label: '机构名称',
prop: 'treeDeptId',
type: 'select',
hide: true,
viewDisplay: false,
editDisplay: false,
addDisplay: false,
props: {
label: 'title',
value: 'value'
},
slot: true,
dicData: [],
search: true
},
{ {
label: "机构名称", label: "机构名称",
prop: "deptName", prop: "deptName",
@ -506,7 +522,9 @@ export default {
}); });
getDeptTree(tenantId).then(res => { getDeptTree(tenantId).then(res => {
const column = this.findObject(this.option.column, "deptId"); const column = this.findObject(this.option.column, "deptId");
const columnSearch = this.findObject(this.option.column, "treeDeptId");//使
column.dicData = res.data.data; column.dicData = res.data.data;
columnSearch.dicData = res.data.data;
}); });
}, },
submitRole() { submitRole() {
@ -695,7 +713,7 @@ export default {
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => { getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.query.treeDeptId).then(res => {
const data = res.data.data; const data = res.data.data;
this.page.total = data.total; this.page.total = data.total;
this.data = data.records; this.data = data.records;

@ -27,8 +27,8 @@ module.exports = {
"/api": { "/api": {
//本地服务接口地址 //本地服务接口地址
// target: "http://www.qdscgs.com:80",//生成 // target: "http://www.qdscgs.com:80",//生成
// target: "http://192.168.1.3:8080", target: "http://192.168.1.3:8080",
target: "http://192.168.1.106", // target: "http://192.168.1.106",
//远程演示服务地址,可用于直接启动项目 //远程演示服务地址,可用于直接启动项目
// target: 'https://saber.bladex.vip/api', // target: 'https://saber.bladex.vip/api',
ws: true, ws: true,

Loading…
Cancel
Save