yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整系统管理--组织架构管理--新增/编辑页面样式和查看二维码提示404的问题

master
yunuo970428 3 years ago
parent
78824c64d4
commit
164fb9b1ac
2 changed files with 456 additions and 464 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 73
      anrui-system-ui/src/api/system/departments/departments.js
  2. 305
      anrui-system-ui/src/views/organizationManage/organizationManage.vue

73
anrui-system-ui/src/api/system/departments/departments.js
View File

@ -1,70 +1,77 @@
import request from '@/utils/request'
import qs from 'qs';
import qs from 'qs'
//let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
let tokens = window.sessionStorage.getItem('token');
//获取菜单 分页列表
// let tokens = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI2IiwiaXNzIjoiV0JLIiwiZXhwIjoxNjMwMDI3MDA3fQ.9bEgBzFW2g1CUT7s5VXxhNCa10cyU_WTCFeqpQje0iY'
let tokens = window.sessionStorage.getItem('token')
// 获取菜单 分页列表
export function pageList(data) {
return request({
url: '/portal/v1/sysorganization/listPage',
method: 'POST',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 查询左侧部门列表
export function orgList(data){
export function orgList(data) {
return request({
url: '/portal/v1/sysorganization/list',
method: 'get',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 编辑部门信息
export function postOrgtree(data){
export function postOrgtree(data) {
return request({
url: '/portal/v1/sysorganization/update/' +data.sid,
url: '/portal/v1/sysorganization/update/' + data.sid,
method: 'POST',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 获取 机构分页列表
export function putOrgtree(data) {
return request({
url: '/portal/v1/sysorganization/update/' +data.sid,
url: '/portal/v1/sysorganization/update/' + data.sid,
method: 'POST',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens}
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 新增部门信息
export function addOrgTree(data){
export function addOrgTree(data) {
return request({
url: '/portal/v1/sysorganization/save',
method: 'POST',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 树 节点名称 删除
export function delOrgtree(data) {
return request({
url: `/portal/v1/sysorganization/delBySid/`+data.sid,
url: `/portal/v1/sysorganization/delBySid/` + data.sid,
method: 'get',
data: qs.stringify(data),
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
@ -74,24 +81,20 @@ export function getStaff(data) {
url: '/portal/v1/sysstafforg/staffinfoList',
method: 'post',
data: data,
headers: {'Content-Type': 'application/json',
'token':tokens
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
}
// 查看二维码
export function getQrCode(data) {
return request({
url: `/system/v1/departments/getQrCode/`+data.sid,
method: 'POST',
data: qs.stringify(data)
url: '/portal/v1/sysorganization/getQrCode/' + data.sid,
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}

305
anrui-system-ui/src/views/organizationManage/organizationManage.vue
View File

@ -1,100 +1,95 @@
<template xmlns="" xmlns="" xmlns="">
<div class="container" style="display: flex;">
<div class="org-tree">
<el-tree :data="treedata"
node-key="sid"
:props="props"
default-expand-all
@node-click="handleNodeClick"
:expand-on-click-node="false"
>
<span class="custom-tree-node" slot-scope="{ node, data }"
@mouseenter="mouseenter(data)"
@mouseleave="mouseleave(data)"
@click.stop.native>
<el-tree :data="treedata" node-key="sid" :props="props" default-expand-all @node-click="handleNodeClick" :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" @click.stop.native>
<span>{{ node.label || $store.getters.userInfo.Orgname }}</span>
<span v-show="data.del" class="handle">
<el-tooltip class="item" effect="dark" content="新增" placement="top-start">
<el-button type="text" size="mini" @click.stop="() => append(data)" icon="el-icon-circle-plus-outline">
</el-button>
</el-tooltip>
<el-tooltip v-show="data.sid" class="item" effect="dark" content="修改" placement="top-start">
<el-button type="text" size="mini" @click.stop="() => deit(data)" icon="el-icon-edit">
</el-button>
</el-tooltip>
<el-tooltip v-show="data.sid" class="item" effect="dark" content="删除" placement="top-start">
<el-button type="text" size="mini" @click.stop="() => remove(data)" icon="el-icon-delete">
</el-button>
</el-tooltip>
<!-- <el-tooltip v-show="data.sid" class="item" effect="dark" content="修改" placement="top-start">-->
<!-- <el-button type="text" size="mini" @click.stop="() => deit(data)" icon="el-icon-edit">-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip v-show="data.sid" class="item" effect="dark" content="删除" placement="top-start">-->
<!-- <el-button type="text" size="mini" @click.stop="() => remove(data)" icon="el-icon-delete">-->
<!-- </el-button>-->
<!-- </el-tooltip>-->
</span>
</span>
</el-tree>
</div>
<el-dialog title="编辑节点" :visible.sync="dialogVisible" width="50%" class="edit">
<el-form :model="nodeForm" label-width="160px">
<el-form-item label="部门名称" prop="name">
<table class="e-table" cellspacing="0">
<tr>
<td>部门名称</td>
<td>
<el-input v-model="form.name" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="部门编码" prop="orgCode">
</td>
<td>部门编码</td>
<td>
<el-input v-model="form.orgCode" style="width:300px"></el-input>
</el-form-item>
<!-- <el-form-item label="部门地理位置" prop="jwd">
<el-input v-model="form.jwd" style="width:300px" readonly>
&lt;!&ndash; <el-button slot="append" icon="el-icon-map-location" @click='mapDialog = true'></el-button>&ndash;&gt;
</el-input>
</el-form-item>-->
<el-form-item label="部门地址" prop="addrs">
</td>
</tr>
<tr>
<td>部门地址</td>
<td>
<el-input v-model="form.addrs" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="主管人员" prop="zgStaffSid">
</td>
<td>主管人员</td>
<td>
<el-select v-model="form.zgStaffSid" style="width:300px">
<el-option
v-for="(item, i) in staffdata"
:key="i"
:label="item.staffName"
:value="item.staffSid">
<el-option v-for="(item, i) in staffdata" :key="i" :label="item.staffName" :value="item.staffSid">
</el-option>
</el-select>
<!--<el-input v-model="form.zgStaffSid"></el-input>-->
</el-form-item>
<el-form-item label="分管人员" prop="fgStaffSid">
</td>
</tr>
<tr>
<td>分管人员</td>
<td>
<el-select v-model="form.fgStaffSid" style="width:300px">
<el-option
v-for="(item, i) in staffdata2"
:key="i"
:label="item.staffName"
:value="item.staffSid">
<el-option v-for="(item, i) in staffdata2" :key="i" :label="item.staffName" :value="item.staffSid">
</el-option>
</el-select>
<!--<el-input v-model="form.fgStaffSid"></el-input>-->
</el-form-item>
<el-form-item label="部门联系人" prop=" linkPerson">
</td>
<td>部门联系人</td>
<td>
<el-input v-model="form.linkPerson" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="linkPhone">
</td>
</tr>
<tr>
<td>联系电话</td>
<td>
<el-input v-model="form.linkPhone" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="排序号" prop="sort">
</td>
<td>排序号</td>
<td>
<el-input v-model="form.sort" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="是否是部门" prop="isOwedMoney">
</td>
</tr>
<tr>
<td>是否是部门</td>
<td>
<el-radio v-model="form.isDept" :label="1">是</el-radio>
<el-radio v-model="form.isDept" :label="0">否</el-radio>
</el-form-item>
<!--<el-form-item label="部门名称" label-width="120px">
<el-input v-model="nodeForm.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="排序号" label-width="120px">
<el-input v-model="nodeForm.sortNo" autocomplete="off"></el-input>
</el-form-item>-->
</el-form>
</td>
<td>
<!-- 部门地理位置-->
</td>
<td>
<!-- <el-input v-model="form.jwd" style="width:300px" readonly>-->
<!-- &lt;!&ndash; <el-button slot="append" icon="el-icon-map-location" @click='mapDialog = true'></el-button>&ndash;&gt;-->
<!-- </el-input>-->
</td>
</tr>
</table>
<div slot="footer" class="text-center">
<el-button type="primary" @click="nodeSave()">保 存</el-button>
<el-button @click="dialogVisible = false">返 回</el-button>
</div>
</el-dialog>
<div class="org-table" v-show="isshow == 'table'">
<div class="tab-header">
<el-form ref="form" :inline="true" :model="form" label-width="80px">
@ -113,10 +108,7 @@
</div>
<!-- table -->
<el-table
:data="tableData"
default-expand-all
border style="width: 100%;">
<el-table :data="tableData" default-expand-all border style="width: 100%;">
<!--<el-table-column label="序号" type="index" width="40px" align="center"></el-table-column>-->
<el-table-column label="操作" align="center" width="160px">
<template slot-scope="scope">
@ -171,9 +163,9 @@
<div class="ewm" style="display: flex;justify-content: center; align-items: center;" ref="print">
<img style="width: 200px; height: 200px;" :src="ewmForm.qrFilePath" alt="">
<ul style="list-style:none; line-height: 32px; font-size: 16px;">
<li><label for="">单位名称: </label><span>{{ewmForm.organizationName}}</span></li>
<li><label for="">部门名称: </label><span>{{ewmForm.departmentName}}</span></li>
<li><label for="">部门地址: </label><span>{{ewmForm.address}}</span></li>
<li><label for="">单位名称: </label><span>{{ ewmForm.organizationName }}</span></li>
<li><label for="">部门名称: </label><span>{{ ewmForm.departmentName }}</span></li>
<li><label for="">部门地址: </label><span>{{ ewmForm.address }}</span></li>
</ul>
</div>
</div>
@ -196,57 +188,63 @@
</div>
<!-- center -->
<div class="ediut">
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-form-item label="部门名称" prop="name">
<table class="e-table" cellspacing="0">
<tr>
<td>部门名称</td>
<td>
<el-input v-model="form.name" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="部门编码" prop="orgCode">
</td>
<td>部门编码</td>
<td>
<el-input v-model="form.orgCode" style="width:300px"></el-input>
</el-form-item>
<!-- <el-form-item label="部门地理位置" prop="jwd">
<el-input v-model="form.jwd" style="width:300px" readonly>
&lt;!&ndash; <el-button slot="append" icon="el-icon-map-location" @click='mapDialog = true'></el-button>&ndash;&gt;
</el-input>
</el-form-item>-->
<el-form-item label="部门地址" prop="addrs">
</td>
</tr>
<tr>
<td>部门地址</td>
<td>
<el-input v-model="form.addrs" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="主管人员" prop="zgStaffSid">
</td>
<td>主管人员</td>
<td>
<el-select v-model="form.zgStaffSid" style="width:300px">
<el-option
v-for="(item, i) in staffdata"
:key="i"
:label="item.staffName"
:value="item.staffSid">
<el-option v-for="(item, i) in staffdata" :key="i" :label="item.staffName" :value="item.staffSid">
</el-option>
</el-select>
<!--<el-input v-model="form.zgStaffSid"></el-input>-->
</el-form-item>
<el-form-item label="分管人员" prop="fgStaffSid">
</td>
</tr>
<tr>
<td>分管人员</td>
<td>
<el-select v-model="form.fgStaffSid" style="width:300px">
<el-option
v-for="(item, i) in staffdata2"
:key="i"
:label="item.staffName"
:value="item.staffSid">
<el-option v-for="(item, i) in staffdata2" :key="i" :label="item.staffName" :value="item.staffSid">
</el-option>
</el-select>
<!--<el-input v-model="form.fgStaffSid"></el-input>-->
</el-form-item>
<el-form-item label="部门联系人" prop=" linkPerson">
</td>
<td>部门联系人</td>
<td>
<el-input v-model="form.linkPerson" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="linkPhone">
</td>
</tr>
<tr>
<td>联系电话</td>
<td>
<el-input v-model="form.linkPhone" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="排序号" prop="sort">
</td>
<td>排序号</td>
<td>
<el-input v-model="form.sort" style="width:300px"></el-input>
</el-form-item>
<el-form-item label="是否是部门" prop="isOwedMoney">
</td>
</tr>
<tr>
<td>是否是部门</td>
<td>
<el-radio v-model="form.isDept" :label="1">是</el-radio>
<el-radio v-model="form.isDept" :label="0">否</el-radio>
</el-form-item>
</el-form>
</td>
<td></td>
<td></td>
</tr>
</table>
</div>
</div>
<!-- <Position v-if="mapDialog" :address.sync="form.addrs" :maker-position.sync="form.jwd"
@ -255,29 +253,28 @@
</template>
<script>
import {
import {
pageList,
orgList,
addOrgTree,
getPagelist,
putOrgtree,
postOrgtree,
delOrgtree,
getQrCode,
getStaff
} from '@/api/system/departments/departments.js'
import Position from '@/components/amap/amap.vue'
} from '@/api/system/departments/departments.js'
import Position from '@/components/amap/amap.vue'
export default {
components: {Position},
export default {
components: { Position },
data() {
return {
dialogVisible: false,
mapDialog: false,
dialogTitle: '',
props: {
label: "name",
children: "children",
label: 'name',
children: 'children'
},
nodeForm: {
sid: '',
@ -293,7 +290,7 @@
form: {
sid: '',
name: '',
orgCode:'',
orgCode: '',
/* jwd: '',*/
addrs: '',
zgStaffSid: '',
@ -301,7 +298,7 @@
linkPerson: '',
linkPhone: '',
sort: '',
isDept:'',
isDept: ''
},
formBackup: Object.assign({}, this.form),
@ -321,27 +318,17 @@
staffdata: [],
staffdata2: [],
rules: {
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
orgCode: [
{required: true, message: '请输入', trigger: 'blur'}
],
name: [{ required: true, message: '请输入', trigger: 'blur' }],
orgCode: [{ required: true, message: '请输入', trigger: 'blur' }],
/* jwd: [
{required: true, message: '请输入', trigger: 'blur'}
],*/
addrs: [
{required: true, message: '请输入', trigger: 'blur'}
],
zgStaffSid: [
{required: true, message: '请输入', trigger: 'blur'}
],
fgStaffSid: [{required: true, message: '请输入', trigger: 'blur'}],
linkPerson: [{required: true, message: '请输入', trigger: 'blur'}],
linkPhone: [{required: true, message: '请输入', trigger: 'blur'}],
sort: [
{required: true, message: '请输入', trigger: 'blur'},
]
addrs: [{ required: true, message: '请输入', trigger: 'blur' }],
zgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
fgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
linkPerson: [{ required: true, message: '请输入', trigger: 'blur' }],
linkPhone: [{ required: true, message: '请输入', trigger: 'blur' }],
sort: [{ required: true, message: '请输入', trigger: 'blur' }]
}
}
},
@ -384,7 +371,7 @@
putOrgtree(this.form).then(res => {
this.isshow = 'table'
this.getOrgTree()
this.handleNodeClick({sid: this.form.psid})
this.handleNodeClick({ sid: this.form.psid })
this.$message({
message: res.msg,
type: 'success'
@ -394,7 +381,7 @@
addOrgTree(this.form).then(res => {
this.isshow = 'table'
this.getOrgTree()
this.handleNodeClick({sid: this.form.psid})
this.handleNodeClick({ sid: this.form.psid })
this.$message({
message: res.msg,
type: 'success'
@ -403,6 +390,7 @@
}
},
append(data) {
console.log(123456789)
this.dialogTitle = '新增'
this.isshow = 'edit'
this.form = Object.assign({}, this.formBackup)
@ -420,7 +408,7 @@
// console.log(row)
this.form.sid = row.sid
this.form.name = row.name
this.form.orgCode=row.orgCode
this.form.orgCode = row.orgCode
/* this.form.jwd = row.jwd*/
this.form.addrs = row.addrs
this.form.linkPerson = row.linkPerson
@ -432,12 +420,13 @@
this.getStaff2()
},
deit(data) { // 节点编辑保存
console.log(data, 8888)
this.dialogVisible = true
// this.form = Object.assign({}, data)
this.form.sid = data.sid
this.form.psid = null
this.form.name = data.name
this.form.orgCode=row.orgCode
this.form.orgCode = data.orgCode
/* this.form.jwd = data.jwd*/
this.form.addrs = data.addrs
this.form.linkPerson = data.linkPerson
@ -465,9 +454,9 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delOrgtree({sid: data.sid}).then(res => {
delOrgtree({ sid: data.sid }).then(res => {
this.getOrgTree()
this.handleNodeClick({sid: data.psid})
this.handleNodeClick({ sid: data.psid })
this.$message({
message: res.msg,
type: 'success'
@ -477,7 +466,7 @@
},
lookRow(row) { // 查看二维码
this.isshow = 'ewm'
getQrCode({sid: row.sid}).then(res => {
getQrCode({ sid: row.sid }).then(res => {
this.ewmForm = res.data
})
},
@ -513,28 +502,28 @@
this.staffdata2 = res.data
})
}
},
}
}
</script>
<style>
.el-icon-arrow-right:before {
.el-icon-arrow-right:before {
content: '\e6e0';
color: #727272;
}
}
</style>
<style scoped="scoped" lang="scss">
.org-tree {
.org-tree {
width: 240px;
min-height: 100%;
box-sizing: border-box;
/*padding-right: 10px;*/
border: 1px solid #edf1f7;
overflow: scroll;
}
}
.org-table {
.org-table {
flex: 1;
// padding-left: 10px;
margin: 0 10px;
@ -551,9 +540,9 @@
margin: 30px auto 0;
/*width:750px;*/
}
}
}
.custom-tree-node {
.custom-tree-node {
position: relative;
overflow: hidden;
width: 100%;
@ -563,9 +552,9 @@
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
}
}
.handle {
.handle {
position: absolute;
right: 0;
@ -573,13 +562,13 @@
font-size: 15px;
background-color: #FFFFFF;
}
}
}
.my-tabs {
.my-tabs {
margin-top: 10px;
}
}
.edit {
.edit {
.el-form-item__label {
width: 100px !important;
display: inline-block !important;
@ -588,5 +577,5 @@
.el-input {
width: 70%;
}
}
}
</style>

Write Preview
Loading…
Cancel
Save