From 621bd1e65350d17756863f35783dbab5619a54d4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 15 八月 2023 17:27:54 +0800
Subject: [PATCH] 1.组织架构、岗位管理初稿
---
src/views/template3.vue | 411 ++++++++++++
src/permission.js | 24
src/store/modules/user.js | 4
src/views/template2.vue | 332 ++++++++++
src/api/basicSettings.js | 72 ++
src/views/basicSettings/postList.vue | 338 ++++++++++
src/styles/global.css | 1
src/layout/components/Navbar.vue | 68 +-
src/views/systemSetting/encodingRules.vue | 2
src/views/basicSettings/organizationList.vue | 633 +++++++++++--------
10 files changed, 1,549 insertions(+), 336 deletions(-)
diff --git a/src/api/basicSettings.js b/src/api/basicSettings.js
index a66e9c8..2a53228 100644
--- a/src/api/basicSettings.js
+++ b/src/api/basicSettings.js
@@ -1,13 +1,67 @@
import request from '@/utils/request'
// 缁勭粐鏋舵瀯,鏌ヨ缁勭粐淇℃伅
-// export function STorgData(data) {
-// return request({
-// url: 'BasicSetting/STorgData',
-// method: 'get',
-// params: data
-// })
-// }
+export function STorgData(data) {
+ return request({
+ url: 'BasicSetting/STorgData',
+ method: 'get',
+ params: data
+ })
+}
+
+// 缁勭粐鏋舵瀯鏌ユ壘
+export function PrentOrganization(data) {
+ return request({
+ url: 'BasicSetting/PrentOrganization',
+ method: 'get',
+ params: data
+ })
+}
+
+// 缁勭粐鏋舵瀯鏂板
+export function AddUpdateOrganization(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateOrganization',
+ method: 'post',
+ data
+ })
+}
+
+// 缁勭粐鏋舵瀯鍒犻櫎
+export function DeleteOrganization(data) {
+ return request({
+ url: 'BasicSetting/DeleteOrganization',
+ method: 'post',
+ params: data
+ })
+}
+
+// 宀椾綅淇℃伅鍒楄〃鏌ヨ
+export function PostData(data) {
+ return request({
+ url: 'BasicSetting/PostData',
+ method: 'get',
+ params: data
+ })
+}
+
+// 宀椾綅鏂板鏇存柊
+export function AddUpdatePost(data) {
+ return request({
+ url: 'BasicSetting/AddUpdatePost',
+ method: 'post',
+ data
+ })
+}
+
+// 宀椾綅鍒犻櫎
+export function DeletePost(data) {
+ return request({
+ url: 'BasicSetting/DeletePost',
+ method: 'post',
+ params: data
+ })
+}
// 瑙掕壊鏉冮檺鏌ヨ瑙掕壊
export function RolePermissionSearchRole(data) {
@@ -17,6 +71,7 @@
params: data
})
}
+
// 瑙掕壊鏂板銆佺紪杈戜繚瀛�
export function RoleAddUpdateSava(data) {
return request({
@@ -25,6 +80,7 @@
params: data
})
}
+
// 瑙掕壊鍒犻櫎
export function RoleDeleteSava(data) {
return request({
@@ -51,6 +107,7 @@
params: data
})
}
+
// 瑙掕壊鏉冮檺鎻愪氦
export function RolePermissionSava(data, rolecode, type) {
return request({
@@ -71,6 +128,7 @@
method: 'get'
})
}
+
// 鏁版嵁鏉冮檺鍩虹璧勬枡
export function DataPermissions() {
return request({
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index bb804f2..65f97ef 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -72,34 +72,34 @@
</el-tooltip>
<div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;cursor: pointer">
- <!-- {{ stu_torgname }}-->
+ {{ stu_torgname }}
- <el-dropdown v-if="stu_torgname.toString().length>0" class="avatar-container" trigger="hover">
- <div class="avatar-wrapper">
- <div style="display: flex;align-items: center;margin-top: -5px">
+ <!-- <el-dropdown v-if="stu_torgname.toString().length>0" class="avatar-container" trigger="hover">-->
+ <!-- <div class="avatar-wrapper">-->
+ <!-- <div style="display: flex;align-items: center;margin-top: -5px">-->
- <i class="el-icon-office-building" style="font-weight: bolder;font-size: 18px;margin-right: 5px;color:#A7A7A7" />
- <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA">{{ stu_torgname }}</div>
- </div>
+ <!-- <i class="el-icon-office-building" style="font-weight: bolder;font-size: 18px;margin-right: 5px;color:#A7A7A7" />-->
+ <!-- <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA">{{ stu_torgname }}</div>-->
+ <!-- </div>-->
- </div>
- <el-dropdown-menu
- v-if="stu_torgname.toString().length>0"
- slot="dropdown"
- class="user-dropdown"
- style="text-align: center"
- >
- <el-dropdown-item
- v-for="(item,index) in $stu_torg"
- :key="item.torg_code"
- :divided="index!==0"
- @click.native="changeTrog(item)"
- >
- <span style="display:block;">{{ item.torg_name }}</span>
- </el-dropdown-item>
+ <!-- </div>-->
+ <!-- <el-dropdown-menu-->
+ <!-- v-if="stu_torgname.toString().length>0"-->
+ <!-- slot="dropdown"-->
+ <!-- class="user-dropdown"-->
+ <!-- style="text-align: center"-->
+ <!-- >-->
+ <!-- <el-dropdown-item-->
+ <!-- v-for="(item,index) in $stu_torg"-->
+ <!-- :key="item.torg_code"-->
+ <!-- :divided="index!==0"-->
+ <!-- >-->
+ <!-- <!– @click.native="changeTrog(item)"–>-->
+ <!-- <span style="display:block;">{{ item.torg_name }}</span>-->
+ <!-- </el-dropdown-item>-->
- </el-dropdown-menu>
- </el-dropdown>
+ <!-- </el-dropdown-menu>-->
+ <!-- </el-dropdown>-->
</div>
<!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">-->
@@ -301,16 +301,16 @@
}
},
methods: {
- changeTrog(val) {
- if (val.torg_name !== this.stu_torgname) {
- this.stu_torgname = val.torg_name
- localStorage.setItem('torg_code', val.torg_code)
- localStorage.setItem('torg_name', val.torg_name)
-
- store.dispatch('user/getMenu')
- // this.$store.state.tagsView.visitedViews = this.$store.state.tagsView.visitedViews.filter(i => i.title === '绯荤粺棣栭〉')
- }
- },
+ // changeTrog(val) {
+ // if (val.torg_name !== this.stu_torgname) {
+ // this.stu_torgname = val.torg_name
+ // localStorage.setItem('torg_code', val.torg_code)
+ // localStorage.setItem('torg_name', val.torg_name)
+ //
+ // store.dispatch('user/getMenu')
+ // // this.$store.state.tagsView.visitedViews = this.$store.state.tagsView.visitedViews.filter(i => i.title === '绯荤粺棣栭〉')
+ // }
+ // },
// 寤虹珛hub杩炴帴
async getHubConnectionBuilder() {
const url = 'http://121.196.36.24:8019/chatHub'
diff --git a/src/permission.js b/src/permission.js
index 0272301..a51a284 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -39,18 +39,20 @@
// jwt瑙ｅ瘑鑾峰彇鐢ㄦ埛缂栫爜
const jwt = decode(localStorage.getItem('token'))
localStorage.setItem('usercode', jwt.usercode)
+ localStorage.setItem('torg_name', jwt.storg_name)
+ localStorage.setItem('torg_code', jwt.storg_code)
- const code = await store.dispatch('user/getUserTorgData')
- if (code === '200') {
- // 鎷夊彇鑿滃崟淇℃伅琛�
- const menu = await store.dispatch('user/getMenu')
- // 鐢熸垚鍙闂殑璺敱琛�
- await store.dispatch('permission/generateRoutes', menu)
- // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
- router.addRoutes(store.getters.addRouters)
- // hack鏂规硶 纭繚addRoutes宸插畬鎴�
- next({ ...to, replace: true })
- }
+ // const code = await store.dispatch('user/getUserTorgData')
+ // if (code === '200') {
+ // 鎷夊彇鑿滃崟淇℃伅琛�
+ const menu = await store.dispatch('user/getMenu')
+ // 鐢熸垚鍙闂殑璺敱琛�
+ await store.dispatch('permission/generateRoutes', menu)
+ // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+ router.addRoutes(store.getters.addRouters)
+ // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+ next({ ...to, replace: true })
+ // }
// // 鎷夊彇鑿滃崟淇℃伅琛�
// const menu = await store.dispatch('user/getMenu')
// // 鐢熸垚鍙闂殑璺敱琛�
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index fa624eb..edcfb01 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -113,6 +113,10 @@
torg_code: localStorage.getItem('torg_code')
}).then(res => {
if (res.code === '200') {
+ ButtonData().then(res2 => {
+ localStorage.setItem('ButtonData', JSON.stringify(res2.data))
+ })
+
commit('SET_NAME', res.message)
commit('SET_MENU', res.data)
resolve(res.data)
diff --git a/src/styles/global.css b/src/styles/global.css
index d291fc1..5bc8580 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -114,6 +114,7 @@
/*justify-content: space-between;*/
/*justify-content: space-around;*/
width: 100%;
+ height:50px;
flex-wrap: wrap;
}
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 5fdc897..c785190 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -1,298 +1,270 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div
- class="elTableDiv"
- >
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ </div>
- <div style="width: 300px;background:#fff">
-
- <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
- <div style="display: flex;">
- <div
- style="width: 5px;height: 100%;border-radius: 5px;"
- :style="{background:$store.state.settings.theme}"
- />
- <div style="margin-left: 8px;">缁勭粐鍚嶇О</div>
- </div>
-
- <!-- <div style="margin-right:10px">-->
- <!-- <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
- <!-- </div>-->
- <!-- @click="rolePlusClick"-->
- </div>
-
- <el-tree
- ref="treeLeftRef"
- style="padding: 10px;overflow: auto"
- :style="{height:(tableHeight-20)+'px'}"
- :data="treeLeft"
- node-key="code"
- highlight-current
- :props="defaultPropsLeft"
- :default-expand-all="true"
- :expand-on-click-node="false"
- draggable
- :allow-drop="treeLeftAllowDrop"
- >
- <!-- @node-click="treeLeftNodeClick"-->
-
- <span slot-scope="{ node, data }" class="custom-tree-node">
- <span v-if="!data.isEdit">{{ data.name }}</span>
- <input
- v-if="data.isEdit"
- :ref="data.code"
- v-model="data.name"
- type="text"
- @click.stop
- @blur="treeSave(data)"
- @keyup.enter="treeSave(data)"
- >
-
- <span v-if="!data.isEdit">
- <i
- class="el-icon-plus"
- style="margin-right:10px;color: #999"
- @click.stop="val=>treeAddClick(val,node,data)"
- />
- <i
- v-if="data.code!=='000'"
- class="el-icon-edit"
- style="margin-right:10px;color: #999"
- @click.stop="val=>treeEditClick(val,node,data)"
- />
- <i
- v-if="data.code!=='000'"
- class="el-icon-delete"
- style="margin-right: 4px;color: #999"
- @click.stop="val=>treeDeleteClick(val,node,data)"
- />
- </span>
- </span>
- </el-tree>
- </div>
-
- <div
- style="margin-left: 10px;width:100%;position: relative"
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
>
-
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :data="tableData"
- :height="(tableHeight-40)+'px'"
- border
- row-class-name="custom-row"
- :style="{width: 100+'%',height:(tableHeight-40)+'px',marginBottom:'10px'}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
+ <div class="elForm">
+ <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
+ <el-input v-model="form.storg_code" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.storg_name" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
>
- <!-- prop="RowNum"-->
- <el-table-column
- type="index"
- width="50"
- fixed
- label="搴忓彿"
- />
- <el-table-column
- prop="code"
- label="鐢ㄦ埛缂栫爜"
- sortable="custom"
- />
- <!-- <el-table-column-->
- <!-- label="鎿嶄綔"-->
- <!-- width="120"-->
- <!-- fixed="right"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div class="operationClass">-->
- <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
- <!-- <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
- <!-- </el-tooltip>-->
- <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
- <!-- <i class="el-icon-delete" @click="del(row)" />-->
- <!-- </el-tooltip>-->
- <!-- </div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- </el-table>
-
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes,jumper"
- popper-class="select_bottom"
- @pagination="getOrganizationSearch"
- />
-
- </div>
+ <el-button v-waves type="primary" icon="el-icon-search" @click="getSTorgData">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
</div>
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ row-key="torg_code"
+ default-expand-all
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- prop="rowNum"-->
+ <!-- width="120"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <el-table-column
+ prop="torg_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="torg_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ @click="del(row)"
+ />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getSTorgData"
+ />
</div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐缂栫爜" prop="OrganCode">
+ <el-input v-model="dialogForm.OrganCode" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrganName">
+ <el-input v-model="dialogForm.OrganName" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎵�灞炵粍缁�" prop="parent_id">
+ <el-cascader
+ ref="cascader"
+ v-model="dialogForm.parent_id"
+ :options="cascaderOptions"
+ filterable
+ :props="defaultProps"
+ :show-all-levels="false"
+ @change="cascaderChange"
+ />
+ </el-form-item>
+ <el-form-item required label="缁勭粐鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
+import Pagination from '@/components/Pagination'
+import {
+ AddUpdateOrganization,
+ DeleteOrganization,
+ PrentOrganization,
+ STorgData
+} from '@/api/basicSettings'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
-import { throttle } from '@/utils/debounceAndThrottle'
-import Pagination from '@/components/Pagination'
export default {
- name: 'RoleList',
- directives: { waves },
+ name: 'Zzjg',
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
return {
mainHeight: 0,
tableHeight: 0,
-
- treeLeft: [
- {
- code: '000',
- name: '澶у矝鐢靛櫒',
- isEdit: false,
- children: [
- {
- code: '001',
- name: '鐮斿彂閮�',
- isEdit: false,
- children: []
- }, {
- code: '002',
- name: '閿�鍞儴',
- isEdit: false,
- children: []
- }, {
- code: '003',
- name: '鐢熶骇閮�',
- isEdit: false,
- children: [
- {
- code: '004',
- name: '閲戝伐杞﹂棿涓�',
- isEdit: false,
- children: []
- }, {
- code: '005',
- name: '閲戝伐杞﹂棿浜�',
- isEdit: false,
- children: []
- }
- ]
- }
- ]
- }
- ], // 宸︿晶鏍�
- defaultPropsLeft: {
- children: 'children',
- label: 'name'
- },
- tableData: [
- { code: '001' },
- { code: '002' },
- { code: '003' }
- ],
form: {
- page: 1,
- rows: 20
+ storg_code: '', // 缁勭粐鏋舵瀯缂栫爜
+ storg_name: '', // 缁勭粐鏋舵瀯鍚嶇О
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
- total: 0
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrganCode: '', // 缁勭粐缂栫爜
+ OrganName: '', // 缁勭粐鍚嶇О
+ leve: 0, // 灞傜骇缂栫爜
+ parent_id: '', // 鐖剁骇缂栫爜
+ torg_seq: '', // 鎺掑簭
+ status: 'Y'// 鐘舵��
+ },
+ operation: '',
+ dialogFormRules: {
+ OrganCode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+ ],
+ OrganName: [
+ { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
+ ],
+ parent_id: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�', trigger: ['blur', 'change'] }
+ ]
+ },
+ defaultProps: {
+ checkStrictly: true,
+ expandTrigger: 'hover',
+ value: 'torg_code',
+ label: 'torg_name'
+ },
+ Options: [],
+ cascaderOptions: []
}
},
- watch: {
- // treeLeft: {
- // handler(newValue, oldValue) {
- // newValue[0].roles.forEach(i => {
- // if (i.isEdit) {
- // this.$nextTick(() => {
- // this.$refs[i.code].focus()
- // })
- // }
- // })
- // },
- // deep: true
- // }
- },
-
created() {
-
+ this.getSTorgData()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
- // 鑾峰彇椤甸潰楂樺害
- getHeight() {
- this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 75
- this.tableHeight = this.mainHeight - 50
+ // 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
+ async getSTorgData() {
+ const res = await STorgData(this.form)
+ this.tableData = arrayToTree(res.data, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
+ })
+ this.total = res.count
+ },
+ // 缁勭粐鏋舵瀯绾ц仈閫夋嫨鍣�
+ async getPrentOrganization() {
+ const { data: res } = await PrentOrganization()
+ this.Options = res
+ this.cascaderOptions = arrayToTree(res, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
})
},
- // 宸︿晶鏍戝舰鎷栧姩澶勭悊
- treeLeftAllowDrop(draggingNode, dropNode, type) {
- // console.log(draggingNode, dropNode, type)
- // 娉ㄦ帀鐨勬槸鍚岀骇鎷栨嫿
- // if (draggingNode.level === dropNode.level) {
- // return type === 'prev' || type === 'next'
- // } else {
- // // 涓嶅悓绾ц繘琛屽鐞�
- // return false
- // }
- },
- getTreeAttr(val) {
- console.log(val, 1)
- if (val['children']) {
- val['children'].push({
- code: '',
- name: '',
- isEdit: true,
- children: []
- })
- } else {
- val.children.push(
- { code: '', name: '', isEdit: true }
- )
- }
- this.$nextTick(() => {
- this.$refs[''].focus()
- })
- },
- // 瑙掕壊鍚嶇О淇濆瓨 閲囩敤闃叉姈褰㈠紡
- treeSave: throttle(function(val) {
- val.isEdit = false
-
- console.log('鎵ц浜嗭紒')
- }, 1000, true),
-
- treeEditClick(val, node, data) {
- data.isEdit = true
- this.$nextTick(() => {
- this.$refs[data.code].focus()
- })
- },
- treeDeleteClick(val, node, data) {
-
- },
- treeAddClick(val, node, data) {
- // console.log(val, node, data, 2)
-
- // this.treeLeft = data.children.push({ code: '', name: '', isEdit: true })
- this.getTreeAttr(data)
-
- // console.log(this.treeLeft, 3)
- },
+ // 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
order = 'desc'
@@ -303,30 +275,137 @@
}
this.form.order = order
this.form.prop = prop
- // this.getOrganizationSearch()
+ this.getSTorgData()
},
- getOrganizationSearch() {
-
+ // 閲嶇疆
+ reset() {
+ this.form.storg_code = ''
+ this.form.storg_name = ''
+ this.getSTorgData()
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Add'
+ this.getPrentOrganization()
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Update'
+ await this.getPrentOrganization()
+ this.cascaderOptions = this.filterChildren(this.cascaderOptions, row.torg_code)
+ this.$nextTick(() => {
+ this.dialogForm.OrganCode = row.torg_code
+ this.dialogForm.OrganName = row.torg_name
+ this.dialogForm.leve = parseFloat(row.leve)
+ this.dialogForm.torg_seq = row.torg_seq
+ this.dialogForm.status = row.status
+ this.dialogForm.parent_id = this.findParent([], row.parent_id, this.cascaderOptions).reverse()
+ })
+ },
+ filterChildren(treeData, code) {
+ treeData.forEach(item => {
+ if (code.split(',').includes(item.torg_code)) {
+ item.disabled = true
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, item.children.map(it => it.torg_code).join(','))
+ }
+ } else {
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, code)
+ }
+ }
+ })
+ return treeData
+ },
+ // parents:鐢ㄤ簬杩斿洖鐨勬暟缁勶紝childNode:瑕佹煡璇㈢殑鑺傜偣锛宼reeData锛歫son鏍戝舰鏁版嵁
+ findParent(parents, childNode, treeData) {
+ // console.log(parents, childNode, treeData, 2)
+ for (let i = 0; i < treeData.length; i++) {
+ // 鐖惰妭鐐规煡璇㈡潯浠�
+ if (treeData[i].torg_code === childNode) {
+ // 濡傛灉鎵惧埌缁撴灉,淇濆瓨褰撳墠鑺傜偣
+ parents.push(treeData[i].torg_code)
+ // 鐢ㄥ綋鍓嶈妭鐐瑰啀鍘诲師鏁版嵁鏌ユ壘褰撳墠鑺傜偣鐨勭埗鑺傜偣
+ this.findParent(parents, treeData[i].parent_id, this.cascaderOptions)
+ break
+ } else {
+ if (treeData[i].children instanceof Array) {
+ // 娌℃壘鍒帮紝閬嶅巻璇ヨ妭鐐圭殑瀛愯妭鐐�
+ this.findParent(parents, childNode, treeData[i].children)
+ }
+ }
+ }
+ return parents
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgcode: row.torg_code }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getSTorgData()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrganCode = ''
+ this.dialogForm.OrganName = ''
+ this.dialogForm.parent_id = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.leve = 0
+ this.$refs.cascader.checkedValue = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ cascaderChange(val) {
+ const temp = this.Options.find(i => i.torg_code === val[val.length - 1])
+ this.dialogForm.parent_id = val
+ this.dialogForm.leve = parseFloat(temp.leve) + 1
+ this.dialogForm.torg_seq = this.Options.filter(i => i.parent_id === val[val.length - 1]).length + 1
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ this.dialogForm.parent_id = this.dialogForm.parent_id[this.dialogForm.parent_id.length - 1]
+ AddUpdateOrganization(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getSTorgData()
+ } else {
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
+ })
}
}
}
</script>
-
-<style scoped lang="scss">
-.custom-tree-node {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: space-between;
- font-size: 14px;
- padding-right: 8px;
-}
-
-//::v-deep .el-checkbox__label {
-// width: 55px;
-//}
-//
-.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
- color: #000 !important;
-}
-</style>
diff --git a/src/views/basicSettings/postList.vue b/src/views/basicSettings/postList.vue
index f521893..00f76f9 100644
--- a/src/views/basicSettings/postList.vue
+++ b/src/views/basicSettings/postList.vue
@@ -1,11 +1,337 @@
-<template />
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="宀椾綅缂栫爜" style=" display: flex;">
+ <el-input v-model="form.postcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宀椾綅鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.postname" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="getPostData">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ row-key="torg_code"
+ default-expand-all
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <el-table-column
+ prop="rowNum"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="postcode"
+ label="宀椾綅缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="postname"
+ label="宀椾綅鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="description"
+ label="鎻忚堪"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ @click="del(row)"
+ />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getPostData"
+ />
+ </div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="宀椾綅缂栫爜" prop="postcode">
+ <el-input v-model="dialogForm.postcode" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宀椾綅鍚嶇О" prop="postname">
+ <el-input v-model="dialogForm.postname" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎻忚堪">
+ <el-input
+ v-model="dialogForm.description"
+ type="textarea"
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item required label="宀椾綅鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ </div>
+</template>
<script>
+import Pagination from '@/components/Pagination'
+import {
+ AddUpdateOrganization, AddUpdatePost,
+ DeleteOrganization, DeletePost, PostData,
+ PrentOrganization,
+ STorgData
+} from '@/api/basicSettings'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+
export default {
- name: 'PostList'
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ postcode: '', // 缁勭粐鏋舵瀯缂栫爜
+ postname: '', // 缁勭粐鏋舵瀯鍚嶇О
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ postcode: '', // 缁勭粐缂栫爜
+ postname: '', // 缁勭粐鍚嶇О
+ description: '', // 鎻忚堪
+ status: 'Y'// 鐘舵��
+ },
+ operation: '',
+ dialogFormRules: {
+ postcode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+ ],
+ postname: [
+ { required: true, message: '璇疯緭鍏ュ矖浣嶅悕绉�', trigger: ['blur', 'change'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getPostData()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ // 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
+ async getPostData() {
+ const res = await PostData(this.form)
+ this.tableData = res.data
+ this.total = res.count
+ },
+
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getPostData()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.postcode = ''
+ this.form.postname = ''
+ this.getPostData()
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Add'
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Update'
+
+ this.$nextTick(() => {
+ this.dialogForm.postcode = row.postcode
+ this.dialogForm.postname = row.postname
+ this.dialogForm.description = row.description
+ this.dialogForm.status = row.status
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeletePost({ postcode: row.postcode }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getPostData()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.postcode = ''
+ this.dialogForm.postname = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.description = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ AddUpdatePost(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getPostData()
+ } else {
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
+ })
+ }
+ }
}
</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/systemSetting/encodingRules.vue b/src/views/systemSetting/encodingRules.vue
index 3fe663a..fa4f4b8 100644
--- a/src/views/systemSetting/encodingRules.vue
+++ b/src/views/systemSetting/encodingRules.vue
@@ -433,7 +433,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 255
+ this.tableHeight = this.mainHeight - 245
this.$refs.tableDataRef.doLayout()
})
}
diff --git a/src/views/template2.vue b/src/views/template2.vue
new file mode 100644
index 0000000..ffd502f
--- /dev/null
+++ b/src/views/template2.vue
@@ -0,0 +1,332 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div
+ class="elTableDiv"
+ >
+
+ <div style="width: 300px;background:#fff">
+
+ <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+ <div style="display: flex;">
+ <div
+ style="width: 5px;height: 100%;border-radius: 5px;"
+ :style="{background:$store.state.settings.theme}"
+ />
+ <div style="margin-left: 8px;">缁勭粐鍚嶇О</div>
+ </div>
+
+ <!-- <div style="margin-right:10px">-->
+ <!-- <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
+ <!-- </div>-->
+ <!-- @click="rolePlusClick"-->
+ </div>
+
+ <el-tree
+ ref="treeLeftRef"
+ style="padding: 10px;overflow: auto"
+ :style="{height:(tableHeight-20)+'px'}"
+ :data="treeLeft"
+ node-key="code"
+ highlight-current
+ :props="defaultPropsLeft"
+ :default-expand-all="true"
+ :expand-on-click-node="false"
+ draggable
+ :allow-drop="treeLeftAllowDrop"
+ >
+ <!-- @node-click="treeLeftNodeClick"-->
+
+ <span slot-scope="{ node, data }" class="custom-tree-node">
+ <span v-if="!data.isEdit">{{ data.name }}</span>
+ <input
+ v-if="data.isEdit"
+ :ref="data.code"
+ v-model="data.name"
+ type="text"
+ @click.stop
+ @blur="treeSave(data)"
+ @keyup.enter="treeSave(data)"
+ >
+
+ <span v-if="!data.isEdit">
+ <i
+ class="el-icon-plus"
+ style="margin-right:10px;color: #999"
+ @click.stop="val=>treeAddClick(val,node,data)"
+ />
+ <i
+ v-if="data.code!=='000'"
+ class="el-icon-edit"
+ style="margin-right:10px;color: #999"
+ @click.stop="val=>treeEditClick(val,node,data)"
+ />
+ <i
+ v-if="data.code!=='000'"
+ class="el-icon-delete"
+ style="margin-right: 4px;color: #999"
+ @click.stop="val=>treeDeleteClick(val,node,data)"
+ />
+ </span>
+ </span>
+ </el-tree>
+ </div>
+
+ <div
+ style="margin-left: 10px;width:100%;position: relative"
+ >
+
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="(tableHeight-40)+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:(tableHeight-40)+'px',marginBottom:'10px'}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- prop="RowNum"-->
+ <el-table-column
+ type="index"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="code"
+ label="鐢ㄦ埛缂栫爜"
+ sortable="custom"
+ />
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="120"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
+ <!-- <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
+ <!-- </el-tooltip>-->
+ <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+ <!-- <i class="el-icon-delete" @click="del(row)" />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ </el-table>
+
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getOrganizationSearch"
+ />
+
+ </div>
+
+ </div>
+
+ </div>
+
+ </div>
+</template>
+
+<script>
+import waves from '@/directive/waves'
+import arrayToTree from 'array-to-tree'
+import { throttle } from '@/utils/debounceAndThrottle'
+import Pagination from '@/components/Pagination'
+
+export default {
+ name: 'RoleList',
+ directives: { waves },
+ components: {
+ Pagination
+ },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+
+ treeLeft: [
+ {
+ code: '000',
+ name: '澶у矝鐢靛櫒',
+ isEdit: false,
+ children: [
+ {
+ code: '001',
+ name: '鐮斿彂閮�',
+ isEdit: false,
+ children: []
+ }, {
+ code: '002',
+ name: '閿�鍞儴',
+ isEdit: false,
+ children: []
+ }, {
+ code: '003',
+ name: '鐢熶骇閮�',
+ isEdit: false,
+ children: [
+ {
+ code: '004',
+ name: '閲戝伐杞﹂棿涓�',
+ isEdit: false,
+ children: []
+ }, {
+ code: '005',
+ name: '閲戝伐杞﹂棿浜�',
+ isEdit: false,
+ children: []
+ }
+ ]
+ }
+ ]
+ }
+ ], // 宸︿晶鏍�
+ defaultPropsLeft: {
+ children: 'children',
+ label: 'name'
+ },
+ tableData: [
+ { code: '001' },
+ { code: '002' },
+ { code: '003' }
+ ],
+ form: {
+ page: 1,
+ rows: 20
+ },
+ total: 0
+
+ }
+ },
+ watch: {
+ // treeLeft: {
+ // handler(newValue, oldValue) {
+ // newValue[0].roles.forEach(i => {
+ // if (i.isEdit) {
+ // this.$nextTick(() => {
+ // this.$refs[i.code].focus()
+ // })
+ // }
+ // })
+ // },
+ // deep: true
+ // }
+ },
+
+ created() {
+
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 75
+ this.tableHeight = this.mainHeight - 50
+ })
+ },
+ // 宸︿晶鏍戝舰鎷栧姩澶勭悊
+ treeLeftAllowDrop(draggingNode, dropNode, type) {
+ // console.log(draggingNode, dropNode, type)
+ // 娉ㄦ帀鐨勬槸鍚岀骇鎷栨嫿
+ if (draggingNode.level === dropNode.level) {
+ return type === 'prev' || type === 'next'
+ } else {
+ // 涓嶅悓绾ц繘琛屽鐞�
+ return false
+ }
+ },
+ getTreeAttr(val) {
+ console.log(val, 1)
+ if (val['children']) {
+ val['children'].push({
+ code: '',
+ name: '',
+ isEdit: true,
+ children: []
+ })
+ } else {
+ val.children.push(
+ { code: '', name: '', isEdit: true }
+ )
+ }
+ this.$nextTick(() => {
+ this.$refs[''].focus()
+ })
+ },
+ // 瑙掕壊鍚嶇О淇濆瓨 閲囩敤闃叉姈褰㈠紡
+ treeSave: throttle(function(val) {
+ val.isEdit = false
+
+ console.log('鎵ц浜嗭紒')
+ }, 1000, true),
+
+ treeEditClick(val, node, data) {
+ data.isEdit = true
+ this.$nextTick(() => {
+ this.$refs[data.code].focus()
+ })
+ },
+ treeDeleteClick(val, node, data) {
+
+ },
+ treeAddClick(val, node, data) {
+ // console.log(val, node, data, 2)
+
+ // this.treeLeft = data.children.push({ code: '', name: '', isEdit: true })
+ this.getTreeAttr(data)
+
+ // console.log(this.treeLeft, 3)
+ },
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ // this.getOrganizationSearch()
+ },
+ getOrganizationSearch() {
+
+ }
+ }
+}
+</script>
+
+<style scoped lang="scss">
+.custom-tree-node {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ font-size: 14px;
+ padding-right: 8px;
+}
+
+//::v-deep .el-checkbox__label {
+// width: 55px;
+//}
+//
+.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
+ color: #000 !important;
+}
+</style>
diff --git a/src/views/template3.vue b/src/views/template3.vue
new file mode 100644
index 0000000..c785190
--- /dev/null
+++ b/src/views/template3.vue
@@ -0,0 +1,411 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="100px"
+ inline
+ style="display: flex;"
+ >
+ <div class="elForm">
+ <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
+ <el-input v-model="form.storg_code" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.storg_name" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ </div>
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="getSTorgData">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+
+ </div>
+
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="tableData"
+ :height="tableHeight+'px'"
+ border
+ row-class-name="custom-row"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ row-key="torg_code"
+ default-expand-all
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- prop="rowNum"-->
+ <!-- width="120"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <el-table-column
+ prop="torg_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="torg_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="status"
+ label="鐘舵��"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status==='Y'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='N'" size="small" type="danger">鍋滅敤</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-edit-outline"
+ :style="{color:$store.state.settings.theme}"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i
+ v-if="row.leve!==0"
+ class="el-icon-delete"
+ :style="{color:$store.state.settings.theme}"
+ @click="del(row)"
+ />
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes,jumper"
+ popper-class="select_bottom"
+ @pagination="getSTorgData"
+ />
+ </div>
+
+ <el-dialog
+ v-el-drag-dialog
+ :title="operation==='add'?'鏂板':'缂栬緫'"
+ :visible.sync="dialogVisible"
+ width="800px"
+ :close-on-click-modal="false"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐缂栫爜" prop="OrganCode">
+ <el-input v-model="dialogForm.OrganCode" :disabled="operation!=='add'" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrganName">
+ <el-input v-model="dialogForm.OrganName" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="鎵�灞炵粍缁�" prop="parent_id">
+ <el-cascader
+ ref="cascader"
+ v-model="dialogForm.parent_id"
+ :options="cascaderOptions"
+ filterable
+ :props="defaultProps"
+ :show-all-levels="false"
+ @change="cascaderChange"
+ />
+ </el-form-item>
+ <el-form-item required label="缁勭粐鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="Y">姝ｅ父</el-radio>
+ <el-radio label="N">鍋滅敤</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import {
+ AddUpdateOrganization,
+ DeleteOrganization,
+ PrentOrganization,
+ STorgData
+} from '@/api/basicSettings'
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
+import arrayToTree from 'array-to-tree'
+
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ directives: { elDragDialog, waves },
+ data() {
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ storg_code: '', // 缁勭粐鏋舵瀯缂栫爜
+ storg_name: '', // 缁勭粐鏋舵瀯鍚嶇О
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 20 // 姣忛〉澶氬皯鏉�
+ },
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrganCode: '', // 缁勭粐缂栫爜
+ OrganName: '', // 缁勭粐鍚嶇О
+ leve: 0, // 灞傜骇缂栫爜
+ parent_id: '', // 鐖剁骇缂栫爜
+ torg_seq: '', // 鎺掑簭
+ status: 'Y'// 鐘舵��
+ },
+ operation: '',
+ dialogFormRules: {
+ OrganCode: [
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
+ ],
+ OrganName: [
+ { required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
+ ],
+ parent_id: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�', trigger: ['blur', 'change'] }
+ ]
+ },
+ defaultProps: {
+ checkStrictly: true,
+ expandTrigger: 'hover',
+ value: 'torg_code',
+ label: 'torg_name'
+ },
+ Options: [],
+ cascaderOptions: []
+
+ }
+ },
+ created() {
+ this.getSTorgData()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ // 缁勭粐鏋舵瀯澶у垪琛ㄦ煡璇�
+ async getSTorgData() {
+ const res = await STorgData(this.form)
+ this.tableData = arrayToTree(res.data, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
+ })
+ this.total = res.count
+ },
+ // 缁勭粐鏋舵瀯绾ц仈閫夋嫨鍣�
+ async getPrentOrganization() {
+ const { data: res } = await PrentOrganization()
+ this.Options = res
+ this.cascaderOptions = arrayToTree(res, {
+ parentProperty: 'parent_id',
+ customID: 'torg_code',
+ childrenProperty: 'children'
+ })
+ },
+ // 鎺掑簭鏀瑰彉鏃�
+ sortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getSTorgData()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.storg_code = ''
+ this.form.storg_name = ''
+ this.getSTorgData()
+ },
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Add'
+ this.getPrentOrganization()
+ },
+ // 淇敼鎸夐挳
+ async edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ this.dialogForm.OperType = 'Update'
+ await this.getPrentOrganization()
+ this.cascaderOptions = this.filterChildren(this.cascaderOptions, row.torg_code)
+ this.$nextTick(() => {
+ this.dialogForm.OrganCode = row.torg_code
+ this.dialogForm.OrganName = row.torg_name
+ this.dialogForm.leve = parseFloat(row.leve)
+ this.dialogForm.torg_seq = row.torg_seq
+ this.dialogForm.status = row.status
+ this.dialogForm.parent_id = this.findParent([], row.parent_id, this.cascaderOptions).reverse()
+ })
+ },
+ filterChildren(treeData, code) {
+ treeData.forEach(item => {
+ if (code.split(',').includes(item.torg_code)) {
+ item.disabled = true
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, item.children.map(it => it.torg_code).join(','))
+ }
+ } else {
+ if (item.children && item.children.length > 0) {
+ this.filterChildren(item.children, code)
+ }
+ }
+ })
+ return treeData
+ },
+ // parents:鐢ㄤ簬杩斿洖鐨勬暟缁勶紝childNode:瑕佹煡璇㈢殑鑺傜偣锛宼reeData锛歫son鏍戝舰鏁版嵁
+ findParent(parents, childNode, treeData) {
+ // console.log(parents, childNode, treeData, 2)
+ for (let i = 0; i < treeData.length; i++) {
+ // 鐖惰妭鐐规煡璇㈡潯浠�
+ if (treeData[i].torg_code === childNode) {
+ // 濡傛灉鎵惧埌缁撴灉,淇濆瓨褰撳墠鑺傜偣
+ parents.push(treeData[i].torg_code)
+ // 鐢ㄥ綋鍓嶈妭鐐瑰啀鍘诲師鏁版嵁鏌ユ壘褰撳墠鑺傜偣鐨勭埗鑺傜偣
+ this.findParent(parents, treeData[i].parent_id, this.cascaderOptions)
+ break
+ } else {
+ if (treeData[i].children instanceof Array) {
+ // 娌℃壘鍒帮紝閬嶅巻璇ヨ妭鐐圭殑瀛愯妭鐐�
+ this.findParent(parents, childNode, treeData[i].children)
+ }
+ }
+ }
+ return parents
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgcode: row.torg_code }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
+ this.getSTorgData()
+ }
+ })
+ }).catch(() => {
+ this.$notify.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrganCode = ''
+ this.dialogForm.OrganName = ''
+ this.dialogForm.parent_id = ''
+ this.dialogForm.status = 'Y'
+ this.dialogForm.leve = 0
+ this.$refs.cascader.checkedValue = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ cascaderChange(val) {
+ const temp = this.Options.find(i => i.torg_code === val[val.length - 1])
+ this.dialogForm.parent_id = val
+ this.dialogForm.leve = parseFloat(temp.leve) + 1
+ this.dialogForm.torg_seq = this.Options.filter(i => i.parent_id === val[val.length - 1]).length + 1
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ this.dialogForm.parent_id = this.dialogForm.parent_id[this.dialogForm.parent_id.length - 1]
+ AddUpdateOrganization(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.getSTorgData()
+ } else {
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ this.$refs.tableDataRef.doLayout()
+ })
+ }
+ }
+}
+</script>
--
Gitblit v1.9.3