From 79d7a61569f750719370b83f208d069be7718b2a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期日, 19 六月 2022 14:28:56 +0800
Subject: [PATCH] 1.用户清单关联角色2.角色清单查询
---
src/utils/request.js | 4
src/views/jcsz/zzjg.vue | 1
src/views/jcsz/yhqd.vue | 403 ++++++++++++++
vue.config.js | 10
src/views/jcsz/jsqd.vue | 520 +++++++++++++++++++
src/api/jcsz.js | 114 ++++
package.json | 1
src/layout/components/Sidebar/index.vue | 1
src/views/template.vue | 522 +++++++++++++++++++
9 files changed, 1,546 insertions(+), 30 deletions(-)
diff --git a/package.json b/package.json
index e0d6fd1..233fc16 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"core-js": "3.6.5",
"echarts": "^5.3.2",
"element-ui": "2.13.2",
+ "jquery": "^3.6.0",
"js-cookie": "2.2.0",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
diff --git a/src/api/jcsz.js b/src/api/jcsz.js
index bb43626..c5db989 100644
--- a/src/api/jcsz.js
+++ b/src/api/jcsz.js
@@ -76,3 +76,117 @@
params: data
})
}
+// 鐢ㄦ埛娓呭崟鍏宠仈瑙掕壊淇濆瓨
+export function SaveUserAssoctRole(data, usercode) {
+ return request({
+ url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode,
+ method: 'post',
+ data
+ })
+}
+
+// 瑙掕壊绫诲瀷鏌ヨ
+export function RoleTypeSearch(data) {
+ return request({
+ url: 'BasicSetting/RoleTypeSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 瑙掕壊绫诲瀷鏂板
+export function RoleTypeAdd(data) {
+ return request({
+ url: 'BasicSetting/RoleTypeAdd',
+ method: 'post',
+ params: data
+ })
+}
+// 瑙掕壊绫诲瀷鏂板
+export function RoleTypeDelete(data) {
+ return request({
+ url: 'BasicSetting/RoleTypeDelete',
+ method: 'post',
+ data
+ })
+}
+// 瑙掕壊娓呭崟鏌ヨ
+export function RoleSearch(data) {
+ return request({
+ url: 'BasicSetting/RoleSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 瑙掕壊娓呭崟鏂板缂栬緫
+export function AddUpdateRole(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateRole',
+ method: 'post',
+ data
+ })
+}
+// 瑙掕壊娓呭崟鍒犻櫎
+export function DeleteRole(data) {
+ return request({
+ url: 'BasicSetting/DeleteRole',
+ method: 'post',
+ data
+ })
+}
+
+// 瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛鏌ヨ
+export function RoleAssociationUser(data) {
+ return request({
+ url: 'BasicSetting/RoleAssociationUser',
+ method: 'get',
+ params: data
+ })
+}
+// 瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛鏌ヨ淇濆瓨
+export function SaveRoleAssoctUser(data) {
+ return request({
+ url: 'BasicSetting/SaveRoleAssoctUser',
+ method: 'post',
+ data
+ })
+}
+// 鐢ㄦ埛娓呭崟鍏宠仈鍔熻兘鏌ヨ
+export function RoleAssociationRight(data) {
+ return request({
+ url: 'BasicSetting/RoleAssociationRight',
+ method: 'get',
+ params: data
+ })
+}
+// 瑙掕壊娓呭崟鍏宠仈鍔熻兘淇濆瓨
+export function SaveUserAssoctRight(data) {
+ return request({
+ url: 'BasicSetting/SaveUserAssoctRight',
+ method: 'post',
+ data
+ })
+}
+// 寰�鏉ュ崟浣嶆煡璇�
+export function CurrentUnitSearch(data) {
+ return request({
+ url: 'BasicSetting/CurrentUnitSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 寰�鏉ュ崟浣嶆柊澧炵紪杈�
+export function AddUpdateCurrentUnit(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateCurrentUnit',
+ method: 'post',
+ data
+ })
+}
+// 寰�鏉ュ崟浣嶅垹闄�
+export function DeleteCurrentUnit(data) {
+ return request({
+ url: 'BasicSetting/DeleteCurrentUnit',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 6674620..aaf7bb1 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -101,6 +101,7 @@
}
})
return arr2
+ // return arr
},
activeMenu() {
const route = this.$route
diff --git a/src/utils/request.js b/src/utils/request.js
index 8a522e0..4c5a99f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -55,7 +55,7 @@
Message({
message: res.Message || 'Error',
type: 'error',
- duration: 5 * 1000
+ duration: 10 * 1000
})
// 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
@@ -81,7 +81,7 @@
Message({
message: error.message,
type: 'error',
- duration: 5 * 1000
+ duration: 10 * 1000
})
return Promise.reject(error)
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 12b088a..e9d6084 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1,13 +1,529 @@
<template>
+ <div>
+ <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
+ <div style="height: 50px;">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div style="display: flex;justify-content: space-around;width: 85%">
+ <el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
+ <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ </el-form-item>
+ <el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ </el-form-item>
+ <el-form-item label="瑙掕壊绫诲瀷" style=" display: flex;">
+ <el-select v-model="form.RoleTypeCode" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in RoleTypeCodeArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <div style="margin-bottom: 20px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-setting" @click="">璁剧疆</el-button>
+ <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ </div>
+ <div style="display: flex;border: 1px solid #eee">
+ <el-table
+ :data="tableData"
+ border
+ highlight-current-row
+ :style="{width: 100+'%',height:tableHeight+'px'}"
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="id"-->
+ <!-- width="50"-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="role_code"
+ label="瑙掕壊缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="role_name"
+ label="瑙掕壊鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="roletype_name"
+ label="瑙掕壊绫诲瀷"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍏宠仈鐢ㄦ埛"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <i class="el-icon-user-solid" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="lm_date"
+ label="鍒嗛厤鏉冮檺"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <i class="el-icon-share" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getRoleSearch"
+ />
+ </div>
+
+ <!-- 鏂板淇敼瀵硅瘽妗�-->
+ <el-dialog
+ :title="operation==='add'?'娣诲姞':'淇敼'"
+ :visible.sync="dialogVisible"
+ width="50%"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
+ <el-radio-group
+ v-model="dialogForm.OrgType"
+ style="display: flex;align-items: end;height: 29px;"
+ @change="changeRadio"
+ >
+ <el-radio
+ v-for="item in OrgTypeArr"
+ :key="item.value"
+ :value="item.value"
+ :label="item.label"
+ />
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ </el-form-item>
+ <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-select
+ v-model="dialogForm.SupUnit"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in SupUnitArr"
+ :label="item.org_name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+ <!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
+
+ <!-- 鍏宠仈鐢ㄦ埛瀵硅瘽妗�-->
+
+ <!-- 鍒嗛厤鍏ㄩ�夊璇濇-->
+ </div>
</template>
<script>
+import Pagination from '@/components/Pagination'
+import {
+ AddUpdateOrganization,
+ DeleteOrganization,
+ OrganizationSearch,
+ PrentOrganization,
+ RoleSearch,
+ RoleTypeDelete
+} from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: "jsqd"
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ RoleCode: '', // 瑙掕壊缂栫爜
+ RoleName: '', // 瑙掕壊鍚嶇О
+ RoleTypeCode: '', // 瑙掕壊绫诲瀷缂栫爜
+ CreateUser: '', // 鍒涘缓浜哄憳
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 10 // 姣忛〉澶氬皯鏉�
+ },
+ RoleTypeCodeArr: [], // 瑙掕壊绫诲瀷缂栫爜鏁扮粍
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrgType: '',
+ OrgCode: '',
+ OrgName: '',
+ SupUnit: ''// 涓婄骇鍗曚綅
+ },
+ SupUnitArr: [],
+ dialogFormOrgTypeSelected: '',
+ operation: '',
+ dialogFormRules: {
+ OrgType: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ OrgCode: [
+ { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ ],
+ OrgName: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ SupUnit: [
+ { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getRoleSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getRoleSearch() {
+ const res = await RoleSearch(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.getRoleSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getRoleSearch()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.RoleCode = ''
+ this.form.RoleName = ''
+ this.form.RoleTypeCode = ''
+ this.form.CreateUser = ''
+ this.getRoleSearch()
+ },
+ // 鍗曢�夋鏀瑰彉鏃�
+ // async changeRadio(val) {
+ // if (val.length > 1) {
+ // this.OrgTypeArr.forEach(item => {
+ // if (item.label === val) {
+ // this.dialogFormOrgTypeSelected = item.value
+ // }
+ // })
+ // this.dialogForm.SupUnit = ''
+ // } else {
+ // this.dialogFormOrgTypeSelected = val
+ // }
+ // if (this.dialogFormOrgTypeSelected !== 'F') {
+ // const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
+ // this.SupUnitArr = res
+ // }
+ // },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.changeRadio(this.dialogForm.OrgType)
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(id) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ // RoleTypeDelete({ RoleTypeCode: id }).then(res => {
+ // if (res.code === '200') {
+ // this.$message.success('鍒犻櫎鎴愬姛!')
+ // this.getRoleSearch()
+ // }
+ // })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrgType = ''
+ this.dialogForm.OrgCode = ''
+ this.dialogForm.OrgName = ''
+ this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganType: this.dialogFormOrgTypeSelected,
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.getRoleSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+
+ this.dialogVisible = false
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 200
+ this.tableHeight = this.mainHeight - 100
+ })
+ }
+ }
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+::v-deep .el-button--info {
+ //background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px
+}
+
+::v-deep .el-table .caret-wrapper {
+ //float: right;
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share ,.el-icon-user-solid{
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+ border-color: $main_color;
+ background: $main_color;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
</style>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index d2bcd76..a237927 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -176,6 +176,7 @@
width="50%"
top="15vh"
@closed="handleClose"
+ @close="handleClose"
>
<el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜" prop="UserCode">
@@ -248,8 +249,11 @@
:visible.sync="dialogVisibleRoles"
width="50%"
top="15vh"
+ class="dialogVisibleRoles"
@closed="handleCloseRoles"
+ @close="handleCloseRoles"
>
+ <!-- @opened="handleOpenedRoles"-->
<div>
<i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
@@ -259,15 +263,26 @@
<div style="margin-bottom:20px">
<i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
</div>
- <el-checkbox-group v-model="dialogFormRoles.rolesArrSelectedArr" @change="dialogCheckboxChange">
- <el-checkbox
+ <div class="myCheckboxGroup">
+ <div
v-for="item in dialogFormRoles.rolesArr"
:key="item.code"
- :label="item.name"
- border
- size="medium"
- />
- </el-checkbox-group>
+ :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ class="myCheckbox"
+ @click="myCheckboxClick(item)"
+ >
+ <input
+ class="myCheckboxInput"
+ type="checkbox"
+ :value="item.code"
+ :name="item.name"
+ :style="{color:item.isSelected2?'#42b983':'#fff'}"
+ @click="myCheckboxInputClick(item)"
+ >{{ item.name }}
+ <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
+ <!-- onClick="event.cancelBubble = true"-->
+ </div>
+ </div>
</div>
<el-divider />
<div>
@@ -281,7 +296,10 @@
node-key="code"
default-expand-all
:props="defaultPropsOfRoleTree"
+ @check="checkBoxClick"
/>
+ <!-- @check-change="checkChange"-->
+
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -297,11 +315,12 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateUser,
- DeleteUser, UserAssociationRole,
+ DeleteUser, SaveUserAssoctRole, UserAssociationRole,
UserOrganization,
UserSearch
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+import $ from 'jquery'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -387,17 +406,16 @@
{ required: true, message: '璇烽�夋嫨宸ヨ祫绫诲瀷', trigger: ['blur', 'change'] }
]
},
- // cascaderKey: 0, // 绾ц仈閫夋嫨鍣╧ey
dialogVisibleRoles: false,
dialogFormRoles: {
username: '', // 鐢ㄦ埛鍚嶇О
+ usercode: '', // 鐢ㄦ埛缂栫爜
rolesArrSelectedArr: [], // 瑙掕壊绫诲瀷鏁扮粍閫変腑
- rolesArrSelected: [], // 瑙掕壊绫诲瀷閫変腑
rolesArr: [], // 瑙掕壊绫诲瀷闆嗗悎
roleTree: [], // 瑙掕壊鏍�
- rolesAll: []// 瑙掕壊鎵�鏈�
+ roleTreeSelectedArr: [] // 瑙掕壊鏍戦�変腑
},
-
+ rolesAll: [], // 瑙掕壊鎵�鏈�
defaultPropsOfRoleTree: {
value: 'code',
label: 'name',
@@ -534,7 +552,7 @@
Password: this.dialogForm.Password,
Enable: this.dialogForm.Enable,
// StuOrg: this.dialogForm.StuOrg,
- StuOrg: this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1].length === 4 ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
+ StuOrg: Array.isArray(this.$refs.dialogCascader.checkedValue) ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
Mobile: this.dialogForm.Mobile,
Email: this.dialogForm.Email,
wagetype: this.dialogForm.wagetype,
@@ -562,32 +580,285 @@
},
// 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
async roleClick({ row }) {
+ this.dialogFormRoles.rolesArrSelectedArr = []
this.dialogFormRoles.rolesArr = []
+ this.dialogFormRoles.roleTreeSelectedArr = []
this.dialogVisibleRoles = true
this.dialogFormRoles.username = row.username
+ this.dialogFormRoles.usercode = row.usercode
const { data: res } = await UserAssociationRole({ usercode: row.usercode })
this.rolesAll = res
- res.forEach(item => {
- this.dialogFormRoles.rolesArr.push({ code: item.code, name: item.name, flag: item.flag })
+
+ const nodeKey = []// 鏍戝舰鍥炴樉key
+ res.forEach((item, index) => {
+ this.dialogFormRoles.rolesArr.push({
+ code: item.code,
+ name: item.name,
+ flag: item.flag,
+ isSelected1: false,
+ isSelected2: false
+ })
+ if (item.flag === 'Y') {
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
+ if (item.children && item.children.length > 0) {
+ const Data = []
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ nodeKey.push(it.code)
+ Data.push(it.code)
+ }
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
+ }
+ }
})
- },
- dialogCheckboxChange(val, aa) {
- // this.dialogFormRoles.rolesArrSelectedArr = ['绠＄悊浜哄憳']
- this.dialogFormRoles.rolesArrSelected = val[val.length - 1]
- this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.name === this.dialogFormRoles.rolesArrSelected)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
+ console.log(this.dialogFormRoles.rolesArr, 888)
+
+ this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
+ // this.dialogFormRoles.rolesArr[0].name = '鍏ㄩ儴'
+
+ this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
+ this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+ // this.dialogFormRoles.rolesArr
+ console.log(nodeKey, 1)
+ this.$refs.roleTree.setCheckedKeys(nodeKey)
},
// 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
handleCloseRoles() {
-
+ this.$refs.roleTree.setCheckedKeys([])
+ this.dialogFormRoles.rolesArrSelectedArr = []
},
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗彇娑堜簨浠�
rolesDialogVisibleCancel() {
this.dialogVisibleRoles = false
},
// 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
- rolesDialogVisibleConfirm() {
- this.dialogVisibleRoles = false
+ async rolesDialogVisibleConfirm() {
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
+ const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ this.dialogVisibleRoles = false
+ }
+ },
+ // 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
+ checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
+ // console.log(obj, checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys, 78787878)
+
+ // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ // 褰揾alfCheckedKeys涓嶇瓑绛夐浂鐨勬椂鍊�
+ // let checkedFatherCode = halfCheckedKeys.length !== 0 ? halfCheckedKeys[0] : checkedKeys[0]
+ let checkedFatherCode = '' // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
+ // if (checkedFatherCode === undefined) {
+ // console.log(this.rolesAll, 66666)
+ this.rolesAll.forEach((item, index) => {
+ if (item.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach((it, ind) => {
+ if (it.code === obj.code) {
+ checkedFatherCode = item.code
+ }
+ })
+ }
+ })
+
+ // }
+ console.log(checkedFatherCode, 8)
+
+ // 1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length !== 0 && checkedKeys.length !== 0) {
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log('1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+ temp.forEach(it => {
+ const a = []
+ it.children.forEach(it => {
+ if (it.code === obj.code) {
+ a.push(it.code)
+ }
+ })
+ // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
+ if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶洿鎺ラ�夌埗code鏃舵墽琛�
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: a
+ })
+ } else {
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // 褰撻�夊瓙code鏃舵墽琛�
+ if (i.Code === checkedFatherCode) {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
+ if (i1 === a[0]) {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
+ } else {
+ this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
+ }
+ })
+ // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// 杩囨护鎺夐�変腑鐩稿悓鐨�
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
+
+ // 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
+ if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log('2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = false
+ this.$nextTick(() => {
+ // console.log($('input:checkbox').eq(1).attr('checked', false), 88888)
+ $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
+ if (it.Code === checkedFatherCode) {
+ console.log(it.Code, 9)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 7)
+ }
+ })
+ this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
+ if (i === checkedFatherCode) {
+ console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
+ }
+ })
+ }
+ })
+ }
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 22)
+
+ // 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�
+ if (halfCheckedKeys.length === 0 && checkedKeys.length !== 0) {
+ // this.dialogFormRoles.roleTreeSelectedArr = []
+ this.dialogFormRoles.rolesArr.forEach((item, index) => {
+ if (item.code === checkedFatherCode) {
+ console.log(' 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�')
+ this.dialogFormRoles.rolesArr[index].isSelected2 = true
+ this.$nextTick(() => {
+ // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+ // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
+ if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶埗绫讳负鍏ㄥ彾鏃�
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ } else { // 褰撶埗绫荤敱鍗婂彾鍙樹负鍏ㄥ彾鏃�
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
+ if (i1.Code === checkedFatherCode) { // i1娌℃壘瀵�
+ console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ }
+ })
+ }
+ }
+ },
+ // myCheckBox鐐瑰嚮浜嬩欢 澶х洅瀛愮偣鍑�
+ myCheckboxClick(item) {
+ console.log(this.dialogFormRoles.rolesArr, 7)
+ this.dialogFormRoles.rolesArr.forEach(it => {
+ it.isSelected1 = it.code === item.code
+ })
+ this.dialogFormRoles.roleTree = this.rolesAll.filter(it => it.code === item.code)
+ this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
+ if (this.dialogFormRoles.roleTree[0].children.length < 1) {
+ this.dialogFormRoles.roleTree = ''
+ }
+ const temp = this.dialogFormRoles.roleTreeSelectedArr.filter(it => it.Code === item.code)
+ console.log(temp, 33)
+ if (temp.length > 0) {
+ this.$refs.roleTree.setCheckedKeys(temp[0].Data)// 鏍戝舰閫変腑鍥炴樉
+ } else {
+ this.$refs.roleTree.setCheckedKeys([])// 褰撻暱搴︿负闆舵椂缃┖
+ }
+ },
+ // myCheckBoxInput鐐瑰嚮浜嬩欢 灏忕洅瀛愮偣鍑�(input)
+ myCheckboxInputClick(item) {
+ item.isSelected2 = !item.isSelected2
+ this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
+ if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
+ console.log('浠庢病閫変腑鍒伴�変腑')
+ this.dialogFormRoles.rolesArr.forEach(it => {
+ if (it.code === item.code && item.isSelected2) {
+ this.dialogFormRoles.rolesArrSelectedArr.push(it.code)
+ }
+ })
+
+ const temp = this.rolesAll.filter(it => it.code === item.code)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
+
+ temp.forEach(it => {
+ this.dialogFormRoles.roleTreeSelectedArr.push({
+ Code: it.code,
+ Name: it.name,
+ Data: it.children.map(i => i.code)
+ })
+ })
+ }
+
+ if (!item.isSelected2) { // 浠庨�変腑鍒版病閫変腑
+ console.log('浠庨�変腑鍒版病閫変腑')
+ this.dialogFormRoles.rolesArr.forEach((it, ind) => {
+ if (it.code === item.code && !item.isSelected2) {
+ console.log('杩涙潵浜�')
+ console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
+ this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
+ if (i === it.code) {
+ console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 6664)
+ }
+ })
+ this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
+ if (i.Code === it.code) {
+ console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
+ }
+ })
+ }
+ })
+ }
+
+ this.$refs.roleTree.setCheckedKeys(this.dialogFormRoles.rolesArrSelectedArr)
+ // this.$refs.roleTree.getCheckedKeys()//鍙兘鑾峰彇鍒扮涓�涓爲褰�
+
+ this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
+ // 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
+ // this.dialogFormRoles.roleTreeSelectedArr = this.dialogFormRoles.roleTreeSelectedArr.filter((currentValue, currentIndex, selfArr) => {
+ // return selfArr.findIndex(item => item.code === currentValue.Code) === currentIndex
+ // })
+ console.log(this.dialogFormRoles.rolesArrSelectedArr, 6666)
+ console.log(this.dialogFormRoles.roleTreeSelectedArr, 6777)
}
+
}
}
</script>
@@ -682,16 +953,100 @@
.el-checkbox.is-bordered.is-checked {
border-color: $main_color;
}
+
::v-deep .el-radio__input.is-checked .el-radio__inner {
border-color: $main_color;
background: $main_color;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: $main_color;
background: $main_color;
}
+
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
color: $main_color !important;
}
+
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin: 10px 30px 0px 0;
+ //cursor: default !important;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+
+.dialogVisibleRoles {
+ //::v-deep .el-checkbox.is-bordered.el-checkbox--medium{
+ // pointer-events: none;
+ //}
+
+ //::v-deep .el-checkbox__label{
+ // pointer-events: none !important;
+ // color: red;
+ //}
+ .myCheckboxGroup {
+ display: flex;
+ flex-wrap: wrap;
+
+ .myCheckbox {
+ //border: 1px solid $main_color;
+ border: 1px solid #eee;
+ display: flex;
+ min-width: 100px;
+ padding: 10px;
+ margin: 10px 30px 0 0;
+ border-radius: 5px;
+ cursor: default;
+
+ .myCheckboxInput {
+ margin: 1px 5px 0 0;
+ cursor: pointer;
+ }
+
+ }
+
+ //.myCheckbox{
+ // border: 1px solid $main_color;
+ //}
+
+ input[type=checkbox] {
+ cursor: pointer;
+ position: relative;
+ width: 14px;
+ height: 14px;
+ font-size: 14px;
+ }
+
+ input[type=checkbox]::after {
+ position: absolute;
+ top: 0;
+ //color: rgb(130, 35, 35);
+ color: $main_color;
+ width: 14px;
+ height: 14px;
+ display: inline-block;
+ visibility: visible;
+ padding-left: 0px;
+ text-align: center;
+ content: ' ';
+ border-radius: 3px
+ }
+
+ input[type=checkbox]:checked::after {
+ content: "鉁�";
+ //content: "鈭�";
+ color: #fff;
+ font-size: 12px;
+ font-weight: bold;
+ background-color: $main_color;
+ }
+ }
+
+}
</style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index cf1f0fb..9ad83fc 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -130,6 +130,7 @@
width="50%"
top="15vh"
@closed="handleClose"
+ @close="handleClose"
>
<el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
diff --git a/src/views/template.vue b/src/views/template.vue
new file mode 100644
index 0000000..9b5e59b
--- /dev/null
+++ b/src/views/template.vue
@@ -0,0 +1,522 @@
+<template>
+ <div>
+ <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
+ <div style="height: 50px;">
+ <el-form
+ ref="form"
+ :model="form"
+ label-width="80px"
+ inline
+ style="display: flex;justify-content: space-between"
+ >
+ <div style="display: flex;justify-content: space-around;width: 85%">
+ <el-form-item label="缁勭粐缂栫爜" style=" display: flex;">
+ <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ </el-form-item>
+ <el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
+ <el-select v-model="form.OrgType" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in OrgTypeArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;align-items: start;margin-top: 5px;">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ </el-form>
+ </div>
+ <div style="margin-bottom: 20px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <!-- <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">淇敼</el-button>-->
+ <!-- <el-button type="primary" icon="el-icon-delete" @click="del">鎵归噺鍒犻櫎</el-button>-->
+ </div>
+
+ <div style="display: flex;border: 1px solid #eee">
+ <el-table
+ :data="tableData"
+ border
+ highlight-current-row
+ :style="{width: 100+'%',height:tableHeight+'px'}"
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChange"
+ >
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ prop="id"
+ width="50"
+ label="搴忓彿"
+ />
+ <el-table-column
+ prop="org_code"
+ label="缁勭粐缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="org_name"
+ label="缁勭粐鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="description"
+ label="缁勭粐绫诲瀷"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.description==='F'">宸ュ巶</div>
+ <div v-if="row.description==='D'">閮ㄩ棬</div>
+ <div v-if="row.description==='W'">杞﹂棿</div>
+ <div v-if="row.description==='K'">绉戝</div>
+ <div v-if="row.description==='L'">鐢熶骇绾�</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="parentorg_name"
+ label="涓婄骇鍗曚綅"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_user"
+ label="鍒涘缓浜哄憳"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="lm_date"
+ label="鍒涘缓鏃堕棿"
+ sortable="custom"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="form.page"
+ :limit.sync="form.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getOrganizationSearch"
+ />
+ </div>
+
+ <el-dialog
+ :title="operation==='add'?'娣诲姞':'淇敼'"
+ :visible.sync="dialogVisible"
+ width="50%"
+ top="15vh"
+ @closed="handleClose"
+ @close="handleClose"
+ >
+ <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
+ <el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
+ <el-radio-group
+ v-model="dialogForm.OrgType"
+ style="display: flex;align-items: end;height: 29px;"
+ @change="changeRadio"
+ >
+ <el-radio
+ v-for="item in OrgTypeArr"
+ :key="item.value"
+ :value="item.value"
+ :label="item.label"
+ />
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="缁勭粐缂栫爜" prop="OrgCode">
+ <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
+ </el-form-item>
+ <el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
+ <el-input v-model="dialogForm.OrgName" style="width: 220px" />
+ </el-form-item>
+ <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-select
+ v-model="dialogForm.SupUnit"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in SupUnitArr"
+ :label="item.org_name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
+import { getCookie } from '@/utils/auth'
+
+const SER_HZ = /^[\u4e00-\u9fa5]+$/
+export default {
+ name: 'Zzjg',
+ components: {
+ Pagination
+ },
+ data() {
+ const validateName = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇疯緭鍏ョ紪鐮�'))
+ } else {
+ if (SER_HZ.test(value)) {
+ return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
+ } else {
+ callback()
+ }
+ }
+ }
+ const validateTypeCode = (rule, value, callback) => {
+ if (!value) {
+ return callback(new Error('璇烽�夋嫨涓婄骇'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ mainHeight: 0,
+ tableHeight: 0,
+ form: {
+ OrgCode: '', // 缁勭粐鏋舵瀯浠ｇ爜
+ OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
+ OrgType: '', // 缁勭粐绫诲瀷
+ UserName: '', // 鍒涘缓浜哄憳
+ prop: 'lm_date', // 鎺掑簭瀛楁
+ order: 'desc', // 鎺掑簭瀛楁
+ page: 1, // 绗嚑椤�
+ rows: 10 // 姣忛〉澶氬皯鏉�
+ },
+ OrgTypeArr: [
+ { label: '宸ュ巶', value: 'F' },
+ { label: '閮ㄩ棬', value: 'D' },
+ { label: '杞﹂棿', value: 'W' },
+ { label: '绉戝', value: 'K' },
+ { label: '鐢熶骇绾�', value: 'L' }
+ ],
+
+ total: 10,
+ tableData: [],
+ dialogVisible: false,
+ dialogForm: {
+ OrgType: '',
+ OrgCode: '',
+ OrgName: '',
+ SupUnit: ''// 涓婄骇鍗曚綅
+ },
+ SupUnitArr: [],
+ dialogFormOrgTypeSelected: '',
+ operation: '',
+ dialogFormRules: {
+ OrgType: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
+ ],
+ OrgCode: [
+ { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ ],
+ OrgName: [
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ SupUnit: [
+ { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
+ ]
+ }
+
+ }
+ },
+ created() {
+ this.getOrganizationSearch()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+ },
+ methods: {
+ async getOrganizationSearch() {
+ const res = await OrganizationSearch(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.getOrganizationSearch()
+ },
+ // 鏌ヨ
+ search() {
+ this.getOrganizationSearch()
+ },
+ // 閲嶇疆
+ reset() {
+ this.form.OrgCode = ''
+ this.form.OrgName = ''
+ this.form.OrgType = ''
+ this.form.UserName = ''
+ this.getOrganizationSearch()
+ },
+ // 鍗曢�夋鏀瑰彉鏃�
+ async changeRadio(val) {
+ if (val.length > 1) {
+ this.OrgTypeArr.forEach(item => {
+ if (item.label === val) {
+ this.dialogFormOrgTypeSelected = item.value
+ }
+ })
+ this.dialogForm.SupUnit = ''
+ } else {
+ this.dialogFormOrgTypeSelected = val
+ }
+ if (this.dialogFormOrgTypeSelected !== 'F') {
+ const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
+ this.SupUnitArr = res
+ }
+ },
+
+ // 鏂板鎸夐挳
+ add(operation) {
+ this.operation = operation
+ this.dialogVisible = true
+ },
+ // 淇敼鎸夐挳
+ edit(operation, row) {
+ this.operation = operation
+ this.dialogVisible = true
+ if (row.description === 'F') {
+ this.dialogForm.OrgType = '宸ュ巶'
+ } else if (row.description === 'D') {
+ this.dialogForm.OrgType = '閮ㄩ棬'
+ } else if (row.description === 'W') {
+ this.dialogForm.OrgType = '杞﹂棿'
+ } else if (row.description === 'K') {
+ this.dialogForm.OrgType = '绉戝'
+ } else if (row.description === 'L') {
+ this.dialogForm.OrgType = '鐢熶骇绾�'
+ }
+ this.$nextTick(() => {
+ this.changeRadio(this.dialogForm.OrgType)
+ this.dialogForm.OrgCode = row.org_code
+ this.dialogForm.OrgName = row.org_name
+ this.dialogForm.SupUnit = row.parent_id
+ })
+ },
+ // 鍒犻櫎鎸夐挳
+ async del(id) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ DeleteOrganization({ orgid: id }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getOrganizationSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 瀵硅瘽妗嗗叧闂簨浠�
+ handleClose() {
+ this.dialogForm.OrgType = ''
+ this.dialogForm.OrgCode = ''
+ this.dialogForm.OrgName = ''
+ this.dialogForm.SupUnit = ''
+ this.$refs.dialogForm.clearValidate()
+ },
+ // 瀵硅瘽妗嗗彇娑�
+ dialogVisibleCancel() {
+ this.dialogVisible = false
+ },
+ // 瀵硅瘽妗嗙‘璁�
+ dialogVisibleConfirm() {
+ this.$refs.dialogForm.validate(valid => {
+ if (valid) {
+ const data = {
+ OrganType: this.dialogFormOrgTypeSelected,
+ OrganCode: this.dialogForm.OrgCode,
+ OrganName: this.dialogForm.OrgName,
+ SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
+ OperType: this.operation === 'add' ? 'Add' : 'Update',
+ Operator: getCookie('admin')
+ }
+ AddUpdateOrganization(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.getOrganizationSearch()
+ } else {
+ this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
+
+ this.dialogVisible = false
+ }
+ })
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 200
+ this.tableHeight = this.mainHeight - 100
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--primary {
+ background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-button--info {
+ //background-color: $main_color !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+ background-color: $main_color !important;
+}
+
+.footerButton {
+ display: flex;
+ justify-content: end;
+}
+
+::v-deep .el-button--default {
+ background-color: #ffffff !important;
+ height: 30px;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-button--default:hover {
+ color: #606266;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+ border-color: $main_color;
+ background-color: $main_color;
+}
+
+::v-deep .el-input__inner {
+ height: 30px
+}
+
+::v-deep .el-table .caret-wrapper {
+ //float: right;
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: space-between !important;
+}
+
+::v-deep .el-button--text {
+ color: $main_color;
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.operationClass {
+ height: 23px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.el-icon-share {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-checkbox.is-bordered.is-checked {
+ border-color: $main_color;
+}
+::v-deep .el-radio__input.is-checked .el-radio__inner {
+ border-color: $main_color;
+ background: $main_color;
+}
+
+::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
+ border-color: $main_color;
+ background: $main_color;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+ color: $main_color !important;
+}
+
+::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
+ margin: 10px 30px 0px 0;
+}
+
+::v-deep .el-radio__input.is-checked + .el-radio__label {
+ color: $main_color;
+}
+
+::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
+ margin: 10px 30px 0px 0;
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 320915d..981d55b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
'use strict'
const path = require('path')
const defaultSettings = require('./src/settings.js')
-
+const webpack = require('webpack')
function resolve(dir) {
return path.join(__dirname, dir)
}
@@ -55,7 +55,13 @@
alias: {
'@': resolve('src')
}
- }
+ },
+ plugins: [
+ new webpack.ProvidePlugin({
+ jQuery: 'jquery',
+ $: 'jquery'
+ })
+ ]
},
chainWebpack(config) {
// it can improve the speed of the first screen, it is recommended to turn on preload
--
Gitblit v1.9.3