From 1e9fa82cb2fe2c15f46bd1dd73f5c878c74b83b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 04 八月 2022 15:35:50 +0800
Subject: [PATCH] 1.系统多账号登录问题2.采购订单页面样式修改及数据渲染
---
src/views/jcsz/jsqd.vue | 964 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 833 insertions(+), 131 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 21a51d7..dec57fa 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div style="height: 50px;">
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -9,15 +9,22 @@
inline
style="display: flex;justify-content: space-between"
>
- <div style="display: flex;justify-content: space-around;width: 85%">
+ <div class="elForm">
<el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
- <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
- <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: calc(100%-30px)" />
+ <el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊绫诲瀷" style=" display: flex;">
- <el-select v-model="form.RoleTypeCode" style="width: calc(100%-30px)" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="form.RoleTypeCode"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getRoleTypeSearch2"-->
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -27,7 +34,7 @@
</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-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
<div style="display: flex;align-items: start;margin-top: 5px;">
@@ -36,22 +43,26 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex; z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;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="settingButton">璁剧疆</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
- highlight-current-row
+ stripe
+ :height="tableHeight+'px'"
:style="{width: 100+'%',height:tableHeight+'px'}"
+ highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
@@ -60,64 +71,73 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="role_code"
label="瑙掕壊缂栫爜"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="role_name"
label="瑙掕壊鍚嶇О"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="roletype_name"
label="瑙掕壊绫诲瀷"
sortable="custom"
+ min-width="110"
/>
<el-table-column
prop="description"
+ min-width="160"
label="瑙掕壊鎻忚堪"
- show-overflow-tooltip
sortable="custom"
/>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ width="110"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ min-width="160"
sortable="custom"
/>
<el-table-column
- prop="lm_date"
+ prop="is_user"
label="鍏宠仈鐢ㄦ埛"
width="120"
sortable="custom"
>
<template slot-scope="{row}">
- <i class="el-icon-user-solid" @click="userClick(row)" />
+ <i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
+ <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: rgb(180 ,181, 185)" @click="userClick(row)" />
</template>
</el-table-column>
<el-table-column
- prop="lm_date"
+ prop="is_right"
label="鍒嗛厤鏉冮檺"
sortable="custom"
width="120"
>
<template slot-scope="{row}">
- <i class="el-icon-share" @click="rightClick(row)" />
+ <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
+ <i v-if="row.is_right==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="rightClick(row)" />
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
@@ -139,24 +159,27 @@
<!-- 鏂板淇敼瀵硅瘽妗�-->
<el-dialog
- :title="operation==='add'?'娣诲姞':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
<el-form-item label="瑙掕壊缂栫爜" prop="RoleCode">
- <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 220px" />
+ <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" prop="RoleName">
- <el-input v-model="dialogForm.RoleName" style="width: 220px" />
+ <el-input v-model="dialogForm.RoleName" style="width: 200px" />
</el-form-item>
<el-form-item prop="RoleTypeCode" label="瑙掕壊绫诲瀷">
<el-select
v-model="dialogForm.RoleTypeCode"
- style="width: 220px"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -168,7 +191,7 @@
</el-select>
</el-form-item>
<el-form-item label="瑙掕壊鎻忚堪" prop="description">
- <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
+ <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -180,12 +203,12 @@
</el-dialog>
<!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
<el-dialog
- title="瑙掕壊绫诲瀷"
+ title="璁剧疆"
:visible.sync="settingDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
class="settingDialogVisible"
- @closed="handleCloseSetting"
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
@@ -195,12 +218,14 @@
<el-table
:data="RoleTypeCodeArr"
border
+ height="300"
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfSetting"
>
+ <!-- :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
+
<!-- <el-table-column-->
<!-- type="selection"-->
<!-- width="50"-->
@@ -208,7 +233,7 @@
<el-table-column
width="50"
label="搴忓彿"
- type="index"
+ prop="RowNum"
/>
<el-table-column
prop="roletype_code"
@@ -230,8 +255,7 @@
<div v-else> {{ row.roletype_name }}</div>
</template>
</el-table-column>
- <el-table-column>
-
+ <el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
<el-button v-if="row.isVisible===0" type="text" @click="delSetting(row)">鍒犻櫎</el-button>
@@ -239,12 +263,6 @@
<el-button v-if="row.isVisible===1" type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
</div>
</template>
- <!-- <template v-for="item in RoleTypeCodeArr" slot-scope="{row}">-->
- <!-- <div :key="item.roletype_code" class="operationClass">-->
- <!-- <el-button v-if="item.isVisible" type="text" @click="formSettingSave(row)">淇濆瓨</el-button>-->
- <!-- <el-button v-if="item.isVisible" type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>-->
- <!-- </div>-->
- <!-- </template>-->
</el-table-column>
</el-table>
<!--鍒嗛〉-->
@@ -269,8 +287,10 @@
<el-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
- width="90%"
+ width="1500px"
+ :close-on-click-modal="false"
top="15vh"
+ :fullscreen="isFullscreen"
class="userDialogVisible"
@closed="handleCloseUser"
@close="handleCloseUser"
@@ -285,29 +305,33 @@
<div style="display: flex;min-height: 50px">
<el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
<el-form-item label="鐢ㄦ埛缂栫爜">
- <el-input v-model="dialogFormUser.usercode" class="userDialogVisibleInput" style="width: 220px" />
+ <el-input v-model="dialogFormUser.usercode" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О">
- <el-input v-model="dialogFormUser.username" class="userDialogVisibleInput" style="width: 220px" />
+ <el-input v-model="dialogFormUser.username" style="width: 200px" />
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�">
<el-cascader
ref="dialogCascaderUser"
key="cascaderKey"
+ filterable
+ popper-class="elCascader"
+ :append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
- class="userDialogVisibleInput"
- style="width: 220px;"
+ style="width: 200px;"
+
@change="dialogCascaderChange"
/>
-
+ <!-- @focus="getUserOrganization"-->
</el-form-item>
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
v-model="dialogFormUser.isrole"
- style="width: 220px"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
- class="userDialogVisibleInput"
>
<el-option
v-for="item in roleArr"
@@ -318,24 +342,39 @@
</el-select>
</el-form-item>
</el-form>
- <el-button type="primary" icon="el-icon-search" style="margin-top: 5px;margin-left: 30px" @click="getRoleAssociationUser">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" style="margin-top: 5px;margin-left: 10px" @click="setRoleAssociationUser">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ style="margin-top: 5px;margin-left: 30px"
+ @click="getRoleAssociationUser"
+ >鏌ヨ
+ </el-button>
+ <el-button
+ type="info"
+ icon="el-icon-refresh"
+ style="margin-top: 5px;margin-left: 10px"
+ @click="setRoleAssociationUser"
+ >閲嶇疆
+ </el-button>
</div>
<el-table
ref="multipleTable"
:data="dialogFormUserTable"
border
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
+ height="300"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
+ :row-key="getRowKey"
@sort-change="sortChangeOfUser"
@selection-change="handleSelectionChange"
- @select="handleSelect"
>
+ <!-- @select="handleSelect"-->
+
<el-table-column
type="selection"
width="50"
+ :reserve-selection="true"
/>
<el-table-column
prop="RowNum"
@@ -392,8 +431,10 @@
<el-dialog
title="瑙掕壊鍏宠仈鏉冮檺"
:visible.sync="dialogVisibleRight"
- width="50%"
+ width="800px"
top="15vh"
+ :fullscreen="isFullscreen"
+ :close-on-click-modal="false"
class="dialogVisibleRight"
@closed="handleCloseRight"
@close="handleCloseRight"
@@ -406,6 +447,56 @@
<i class="el-icon-s-operation" style="color:#42b983;" /> 鏉冮檺鎿嶄綔绔�
</div>
+ <div class="myCheckboxGroup">
+ <div
+ v-for="item in dialogFormRight.rightOperationArr"
+ :key="item.code"
+ :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>
+ <el-divider />
+ <div style="margin-bottom: 10px">
+ <i class="el-icon-s-operation" style="color:#42b983;" /> 鍔熻兘鏉冮檺
+ </div>
+ <div style="height: 400px;overflow-y: scroll">
+ <el-tree
+ v-if="dialogFormRight.rightCurrentCode==='PC'"
+ ref="rightPCRef"
+ :data="dialogFormRight.rightPCArr"
+ show-checkbox
+ node-key="code"
+ default-expand-all
+ :props="treeDefaultProps"
+ @check="rightTreeCheckBoxClick"
+ />
+ <!-- :default-expanded-keys="['PC']"-->
+
+ <el-tree
+ v-if="dialogFormRight.rightCurrentCode==='APP'"
+ ref="rightAPPRef"
+ :data="dialogFormRight.rightAPPArr"
+ show-checkbox
+ default-expand-all
+ node-key="code"
+ :props="treeDefaultProps"
+ @check="rightTreeCheckBoxClick"
+ />
+ <!-- :default-expanded-keys="['APP']"-->
+
+ </div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
@@ -413,25 +504,32 @@
</div>
</span>
</el-dialog>
+
+ <!--瀵煎叆缁勪欢-->
+ <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
+
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
+import ImportPicker from '@/components/ImportPicker'
import {
AddUpdateRole,
- DeleteRole,
+ DeleteRole, RoleAssociationRight,
RoleAssociationUser,
RoleSearch, RoleTypeAdd,
- RoleTypeDelete, RoleTypeSearch, SaveRoleAssoctUser, UserOrganization
+ RoleTypeDelete, RoleTypeSearch, RoleTypeSelect, SaveRoleAssoctUser, SaveUserAssoctRight, UserOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
+import $ from 'jquery'
+import clearAllChildren from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'JSQD',
components: {
- Pagination
+ Pagination, ImportPicker
},
data() {
const validateName = (rule, value, callback) => {
@@ -445,14 +543,8 @@
}
}
}
- // const validateTypeCode = (rule, value, callback) => {
- // if (!value) {
- // return callback(new Error('璇烽�夋嫨涓婄骇'))
- // } else {
- // callback()
- // }
- // }
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -463,7 +555,7 @@
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
- rows: 10 // 姣忛〉澶氬皯鏉�
+ rows: 20 // 姣忛〉澶氬皯鏉�
},
total: 10,
RoleTypeCodeArr: [], // 瑙掕壊绫诲瀷缂栫爜鏁扮粍
@@ -499,10 +591,11 @@
settingDialogVisible: false,
userDialogVisible: false,
userForm: { // 瑙掕壊娓呭崟甯﹀埌鍏宠仈鐢ㄦ埛鍐呯殑鍊�
- roleName: '',
- roleCode: ''
+ roleName: ''
+ // roleCode: ''
},
dialogFormUser: { // 瀵硅瘽妗嗕腑鎼滅储琛ㄥ崟鍊�
+ rolecode: '',
usercode: '',
username: '',
orgcode: '',
@@ -525,34 +618,64 @@
{ value: 'Y', label: '鏄�' },
{ value: 'N', label: '鍚�' }
], // 鍏宠仈瑙掕壊鏁扮粍
- userMultipleArr: [],
- userSingleCode: '',
- userSingleCodeFlag: false,
+ userMultipleArr: [], // 鍏宠仈鐢ㄦ埛閫変腑鐨勬暟缁�
dialogVisibleRight: false,
rightFrom: {
username: '',
usercode: ''
},
dialogFormRight: {
+ rightCurrentCode: '', // 鏉冮檺鎿嶄綔绔綋鍓嶉�変腑鐨凜ode
+ // rightArr: [], // 鏉冮檺鎵�鏈�
+ rightPCArr: [], // PC鏉冮檺鎵�鏈�
+ rightPCArrSelected: [], // PC鏉冮檺閫変腑鏁扮粍
+ rightAPPArr: [], // APP鏉冮檺鎵�鏈�
+ rightAPPArrSelected: [], // APP鏉冮檺閫変腑鏁扮粍
+ rightOperationArr: []// 鏉冮檺鎿嶄綔娈垫墍鏈�
+ },
+ treeDataOfPC: [],
+ treeDefaultProps: {
+ children: 'children',
+ label: 'name',
+ value: 'code'
+ },
+ PCTrue: false, // 鏄惁灞曠ず
+ APPTrue: false, // 鏄惁灞曠ず
+ title_value: '鏁版嵁瀵煎叆 / 瑙掕壊娓呭崟',
+ code: '1',
+ shows: false
+ }
+ },
+ watch: {
+ shows() {
+ if (!this.shows) {
+ this.getRoleSearch()
}
}
},
created() {
- this.getRoleSearch()
- this.getRoleTypeSearch2()
- this.getUserOrganization()
+ this.handleRequest()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ handleRequest() {
+ this.getRoleSearch().then(res => {
+ if (res.code === '200') {
+ this.getRoleTypeSearch2()
+ this.getUserOrganization()
+ }
+ })
+ },
// 鑾峰彇瑙掕壊娓呭崟
async getRoleSearch() {
const res = await RoleSearch(this.form)
this.tableData = res.data
this.total = res.count
+ return { code: res.code }
},
// 鑾峰彇鐢ㄦ埛绫诲瀷
async getRoleTypeSearch() {
@@ -564,13 +687,7 @@
})
},
async getRoleTypeSearch2() { // 鎼滅储灞曠ず鐨勫唴瀹�
- const data = {
- page: 1,
- rows: 1000000,
- prop: 'roletype_code',
- order: 'desc'
- }
- const res = await RoleTypeSearch(data)
+ const res = await RoleTypeSelect()
this.RoleTypeCodeArr2 = res.data
},
settingButton() {
@@ -580,7 +697,7 @@
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
const { data: res } = await UserOrganization()
- this.StuOrgArr = res
+ this.StuOrgArr = clearAllChildren(res)
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -606,10 +723,6 @@
this.formSetting.order = order
this.formSetting.prop = prop
this.getRoleTypeSearch()
- },
-
- upload() {
-
},
// 鏌ヨ
search() {
@@ -688,21 +801,23 @@
AddUpdateRole(data).then(res => {
if (res.code === '200') {
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
this.getRoleSearch()
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
})
-
- this.dialogVisible = false
}
})
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 200
+ console.log(window.innerHeight)
+ console.log(window.innerHeight)
+ this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ // this.isFullscreen = window.innerHeight < 800
})
},
/* 璁剧疆妯″潡*/
@@ -713,6 +828,7 @@
this.RoleTypeCodeArr.splice(index, 1)
}
})
+ this.getRoleTypeSearch2()
},
// 璁剧疆瀵硅瘽妗嗗彇娑堜簨浠�
settingDialogVisibleCancel() {
@@ -723,7 +839,9 @@
},
// 娣诲姞鎸夐挳
addSetting() {
- const data = { roletype_code: '', roletype_name: '', isVisible: 1 }
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
this.RoleTypeCodeArr.unshift(data)
},
// 鍒犻櫎鎸夐挳
@@ -757,14 +875,14 @@
}
const res = await RoleTypeAdd([data])
if (res.code === '200') {
- this.$message.success('娣诲姞鎴愬姛锛�')
+ this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getRoleTypeSearch()
}
},
// 璁剧疆琛ㄥ崟鍙栨秷浜嬩欢
formSettingCancel(row) {
this.RoleTypeCodeArr.forEach((item, index) => {
- if (item.isVisible === 1) {
+ if (item.isVisible === 1 && item.number === row.number) {
this.RoleTypeCodeArr.splice(index, 1)
}
})
@@ -774,14 +892,14 @@
userClick(row) {
this.userDialogVisible = true
this.userForm.roleName = row.role_name
- this.userForm.roleCode = row.role_code
+ this.dialogFormUser.rolecode = row.role_code
this.getRoleAssociationUser()
},
+ // 鑾峰彇瑙掕壊娓呭崟鍏宠仈鐢ㄦ埛
async getRoleAssociationUser() {
const res = await RoleAssociationUser(this.dialogFormUser)
this.dialogFormUserTable = res.data
this.dialogFormUserTableLength = res.count
-
this.$nextTick(() => {
this.dialogFormUserTable.forEach((item, index) => {
if (item.flag === 'Y') {
@@ -790,29 +908,28 @@
})
})
},
- // 澶勭悊澶氶�� 鏄庡ぉ浣跨敤涓嬫媺澶氶�夊洖鏄捐瘯璇曠湅
- handleSelectionChange(val) {
- val.forEach((item, index) => {
- this.userMultipleArr.push({ code: item.usercode, name: item.username })
- })
- this.userMultipleArr.forEach((item, index) => {
- if (item.code === this.userSingleCode && this.userSingleCodeFlag) {
- this.userMultipleArr.splice(index, 1)
- }
- })
- console.log(this.userMultipleArr, 2)
+ // 澶勭悊澶氶��
+ handleSelectionChange(rows) {
+ this.userMultipleArr = rows
},
- handleSelect(selection, row) {
- this.userMultipleArr.forEach((item, index) => {
- if (item.code === row.usercode) {
- this.userSingleCodeFlag = true
- // this.userMultipleArr.splice(index, 1)
- }
- })
- // console.log(selection, row, 111)
- this.userSingleCode = row.usercode
- console.log(this.userMultipleArr, 1)
+ // 澶勭悊閫夋嫨鍗曢�� 锛堝凡娉ㄩ噴锛�
+ handleSelect(list, row) {
+ if (list.includes(row)) {
+ // 鍕鹃�夋椂鍋氱殑浜�
+ this.userMultipleArr.push({
+ usercode: list[list.length - 1].usercode,
+ username: list[list.length - 1].username
+ })
+ } else {
+ // 鍙栨秷鍕鹃�夋椂鍋氱殑浜嬶紝arguments[1]鏄綋鍓嶅彇娑堝嬀閫夌殑椤�
+ this.userMultipleArr = this.userMultipleArr.filter((val) => val.usercode !== arguments[1].usercode)
+ }
},
+ // 鑾峰彇琛屽叧閿瓧
+ getRowKey(row) {
+ return row.usercode
+ },
+ // 鍏宠仈鐢ㄦ埛鎺掑簭
sortChangeOfUser({ column, prop, order }) {
if (order === 'descending') {
order = 'desc'
@@ -825,26 +942,33 @@
this.dialogFormUser.prop = prop
this.getRoleAssociationUser()
},
+ // 鍏宠仈鐢ㄦ埛鍏抽棴浜嬩欢
handleCloseUser() {
this.dialogFormUser.usercode = ''
this.dialogFormUser.username = ''
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
+ this.$refs.multipleTable.clearSelection()
},
+ // 鍏宠仈鐢ㄦ埛瀵硅瘽妗嗗叧闂�
userDialogVisibleCancel() {
this.userDialogVisible = false
},
- async userDialogVisibleConfirm() {
- this.userMultipleArr = this.userMultipleArr.filter((currentValue, currentIndex, selfArr) => {
- return selfArr.findIndex(item => item.code === currentValue.code) === currentIndex
+ // 鍏宠仈鐢ㄦ埛瀵硅瘽妗嗙‘璁�
+ async userDialogVisibleConfirm() {
+ const userMultipleArr = []
+ this.userMultipleArr.forEach(item => {
+ userMultipleArr.push({ code: item.usercode, name: item.username })
})
- console.log(this.userMultipleArr, 111)
- // const res = await SaveRoleAssoctUser(this.userMultipleArr, this.userForm.roleCode)
- // if (res.code === '200') {
- // this.$message.success('淇濆瓨鎴愬姛锛�')
- // }
+ const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
+ this.userDialogVisible = false
+ }
},
+ // 绾ц仈閫夋嫨鍣�
dialogCascaderChange(val) {
this.dialogFormUser.orgcode = val[val.length - 1]
},
@@ -855,23 +979,479 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
+ this.getRoleAssociationUser()
},
+
/* 瑙掕壊鍏宠仈鏉冮檺瀵硅瘽妗嗛儴鍒�*/
- rightClick(row) {
- console.log(row)
+ // 鍒嗛厤鏉冮檺鐐瑰嚮
+ async rightClick(row) {
this.dialogVisibleRight = true
this.rightFrom.usercode = row.role_code
this.rightFrom.username = row.role_name
+
+ const data = {
+ rolecode: this.rightFrom.usercode,
+ type: ''
+ }
+ const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
+
+ this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
+ this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []
+
+ this.PCTrue = res[0][0].is_delete === '0'
+ this.APPTrue = res[1][0].is_delete === '0'
+ // '0'鏄剧ず '1' 涓嶆樉绀� 杩囨护鍑虹浉瀵瑰簲鐨勮彍鍗�
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0')
+ })
+ }
+
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0')
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ item.children = item.children.filter(it => it.is_delete === '0')
+ })
+ }
+
+ // 鍒ゆ柇鍝釜鏄珮浜�
+ let pcIsSelected1 = false
+ let pcIsSelected2 = false
+ let appIsSelected1 = false
+ let appIsSelected2 = false
+ let rightPCArrFlag
+ let rightAPPArrFlag
+
+ if (this.PCTrue) {
+ rightPCArrFlag = this.dialogFormRight.rightPCArr[0].flag
+ }
+ if (this.APPTrue) {
+ rightAPPArrFlag = this.dialogFormRight.rightAPPArr[0].flag
+ }
+
+ let waitFlag = false// 鍥炴樉绛夊緟鏄惁鏀捐
+
+ if (this.PCTrue && this.APPTrue) {
+ // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆￠兘娌￠�変腑鏃� PC鏈�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ // 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
+ if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
+ appIsSelected1 = true
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='APP']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+ }
+ // 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
+ if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+ appIsSelected1 = false
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ }
+
+ if (this.PCTrue && !this.APPTrue) {
+ if (rightPCArrFlag === 'Y') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
+ }
+ }
+
+ if (!this.PCTrue && this.APPTrue) {
+ if (rightAPPArrFlag === 'Y') {
+ appIsSelected1 = true
+ appIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='APP']").length > 0) {
+ waitFlag = true
+ }
+ if (waitFlag) {
+ clearInterval(interval)
+ this.$nextTick(() => {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ }, 100)
+
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
+ }
+ }
+
+ if (this.PCTrue) {
+ this.dialogFormRight.rightOperationArr.push({
+ isSelected1: pcIsSelected1,
+ isSelected2: pcIsSelected2,
+ code: this.dialogFormRight.rightPCArr[0].code,
+ flag: rightPCArrFlag,
+ name: this.dialogFormRight.rightPCArr[0].name
+ })
+ }
+ if (this.APPTrue) {
+ this.dialogFormRight.rightOperationArr.push({
+ isSelected1: appIsSelected1,
+ isSelected2: appIsSelected2,
+ code: this.dialogFormRight.rightAPPArr[0].code,
+ flag: rightAPPArrFlag,
+ name: this.dialogFormRight.rightAPPArr[0].name
+ })
+ }
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
+ }
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
+ }
+
+ // 鏍戝舰鍥炴樉閮ㄥ垎
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0 && item.flag === 'Y') {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormRight.rightPCArrSelected.push(it.code)
+ }
+ })
+ } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+ this.dialogFormRight.rightPCArrSelected.push(item.code)
+ }
+ })
+ }
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0 && item.flag === 'Y') {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormRight.rightAPPArrSelected.push(it.code)
+ }
+ })
+ } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
+ this.dialogFormRight.rightAPPArrSelected.push(item.code)
+ }
+ })
+ }
+ this.$nextTick(() => {
+ if (this.$refs.rightPCRef) {
+ this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
+ }
+ if (this.$refs.rightAPPRef) {
+ this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+ }
+ })
},
+ // 鍒嗛厤鏉冮檺鍏抽棴浜嬩欢
handleCloseRight() {
-
+ this.dialogFormRight.rightPCArr = []
+ this.dialogFormRight.rightPCArrSelected = []
+ this.dialogFormRight.rightAPPArr = []
+ this.dialogFormRight.rightAPPArrSelected = []
+ this.dialogFormRight.rightOperationArr = []
+ if (this.$refs.rightPCRef) {
+ this.$refs.rightPCRef.setCheckedKeys([])
+ }
+ if (this.$refs.rightAPPRef) {
+ this.$refs.rightAPPRef.setCheckedKeys([])
+ }
+ this.PCTrue = false
+ this.APPTrue = false
},
+ // 鏉冮檺瀵硅瘽妗嗗彇娑堜簨浠�
rightDialogVisibleCancel() {
-
+ this.dialogVisibleRight = false
},
- rightDialogVisibleConfirm() {
+ // 鏉冮檺瀵硅瘽妗嗙‘璁や簨浠�
+ async rightDialogVisibleConfirm() {
+ const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
+ const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
+ if (this.PCTrue) {
+ this.dialogFormRight.rightPCArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0) {
+ const children = []
+ let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
+ item.children.forEach(it => {
+ if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
+ flag = true
+ children.push(
+ { code: it.code, name: it.name, flag: 'Y' }
+ )
+ }
+ })
+ if (flag) {
+ rightPCArrSelected.push({
+ code: item.code, name: item.name, flag: 'Y', children: children
+ })
+ }
+ }
+ })
+ }
+ if (this.APPTrue) {
+ this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
+ if (item.children && item.children.length > 0) {
+ const children = []
+ let flag = false // 琛ㄧずchildren閲屾湁鍊紁ush杩涘幓浜�
+ item.children.forEach(it => {
+ if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
+ flag = true
+ children.push(
+ { code: it.code, name: it.name, flag: 'Y' }
+ )
+ }
+ })
+ if (flag) {
+ rightAPPArrSelected.push({
+ code: item.code, name: item.name, flag: 'Y', children: children
+ })
+ }
+ }
+ })
+ }
+ // 鏈�缁堣鎻愪氦鐨勬暟鎹�
+ let rightSubmit = []
+
+ if (rightPCArrSelected.length > 0 && rightAPPArrSelected.length > 0) {
+ rightSubmit = [
+ { code: 'PC', name: 'PC', flag: 'Y', children: rightPCArrSelected },
+ { code: 'APP', name: 'APP', flag: 'Y', children: rightAPPArrSelected }
+ ]
+ }
+
+ if (rightPCArrSelected.length > 0 && rightAPPArrSelected.length === 0) {
+ rightSubmit = [
+ { code: 'PC', name: 'PC', flag: 'Y', children: rightPCArrSelected }
+ ]
+ }
+ if (rightPCArrSelected.length === 0 && rightAPPArrSelected.length > 0) {
+ rightSubmit = [
+ { code: 'APP', name: 'APP', flag: 'Y', children: rightAPPArrSelected }
+ ]
+ }
+ if (rightPCArrSelected.length === 0 && rightAPPArrSelected.length === 0) {
+ rightSubmit = []
+ }
+ const rolecode = this.rightFrom.usercode
+ const usercode = getCookie('navTabId')
+ const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
+ this.dialogVisibleRight = false
+ }
+ },
+ // 澶х洅瀛愮偣鍑讳簨浠�
+ myCheckboxClick(val) {
+ this.dialogFormRight.rightOperationArr.forEach(item => {
+ item.isSelected1 = item.code === val.code
+ })
+ this.dialogFormRight.rightCurrentCode = val.code
+ if (val.code === 'PC') {
+ this.$nextTick(() => {
+ this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
+ })
+ }
+ if (val.code === 'APP') {
+ this.$nextTick(() => {
+ this.$refs.rightAPPRef.setCheckedKeys(this.dialogFormRight.rightAPPArrSelected)
+ })
+ }
+ },
+ // 灏忕洅瀛愮偣鍑讳簨浠�
+ myCheckboxInputClick(val) {
+ // console.log(val)
+ val.isSelected2 = !val.isSelected2
+ this.dialogFormRight.rightCurrentCode = val.code
+
+ // 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
+ if (val.isSelected2) {
+ console.log('1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑')
+ if (val.code === 'PC') {
+ this.dialogFormRight.rightPCArrSelected = ['PC']
+ this.$nextTick(() => {
+ this.$refs.rightPCRef.setCheckedKeys(['PC'])
+ })
+ }
+ if (val.code === 'APP') {
+ this.dialogFormRight.rightAPPArrSelected = ['APP']
+ this.$nextTick(() => {
+ this.$refs.rightAPPRef.setCheckedKeys(['APP'])
+ })
+ }
+ }
+
+ // 2.绗簩绉嶆儏鍐� 灏忕洅瀛愪粠閫変腑鍒版病閫変腑
+ if (!val.isSelected2) {
+ console.log('2.绗簩绉嶆儏鍐� 灏忕洅瀛愪粠閫変腑鍒版病閫変腑')
+ if (val.code === 'PC') {
+ this.dialogFormRight.rightPCArrSelected = []
+ this.$nextTick(() => {
+ this.$refs.rightPCRef.setCheckedKeys([])
+ })
+ }
+ if (val.code === 'APP') {
+ this.dialogFormRight.rightAPPArrSelected = []
+ this.$nextTick(() => {
+ this.$refs.rightAPPRef.setCheckedKeys([])
+ })
+ }
+ }
+ },
+ // 鏍戠偣鍑讳簨浠�
+ rightTreeCheckBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
+ console.log(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys })
+ // console.log(obj, checkedNodes, checkedKeys.length, halfCheckedNodes, halfCheckedKeys.length)
+ const currentCode = this.dialogFormRight.rightCurrentCode// 鏉冮檺鎿嶄綔绔痗ode
+ // 1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂
+ if (checkedKeys.length === 0 && halfCheckedKeys.length === 0) {
+ console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂1111')
+ this.dialogFormRight.rightOperationArr.forEach((item, index) => {
+ if (item.code === currentCode) {
+ item.isSelected2 = false
+
+ this.$nextTick(() => {
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ // $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+ if (currentCode === 'PC') {
+ this.dialogFormRight.rightPCArrSelected = []
+ }
+ if (currentCode === 'APP') {
+ this.dialogFormRight.rightAPPArrSelected = []
+ }
+ }
+
+ // 2.绗簩绉嶆儏鍐� 鍗婂彾涓嶄负闆� 鍏ㄥ彾涓嶄负闆�
+ if (checkedKeys.length !== 0 && halfCheckedKeys.length !== 0) {
+ console.log('2.绗簩绉嶆儏鍐� 鍗婂彾涓嶄负闆� 鍏ㄥ彾涓嶄负闆�')
+ this.dialogFormRight.rightOperationArr.forEach((item, index) => {
+ if (item.code === currentCode) {
+ item.isSelected2 = true
+ this.$nextTick(() => {
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ if (halfCheckedKeys[0] === 'PC') {
+ this.dialogFormRight.rightPCArrSelected = checkedKeys
+ }
+ if (halfCheckedKeys[0] === 'APP') {
+ this.dialogFormRight.rightAPPArrSelected = checkedKeys
+ }
+ }
+
+ // 3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�
+ if (checkedKeys.length !== 0 && halfCheckedKeys.length === 0) {
+ console.log('3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�')
+ this.dialogFormRight.rightOperationArr.forEach((item, index) => {
+ if (item.code === currentCode) {
+ item.isSelected2 = true
+ this.$nextTick(() => {
+ if (item.name === 'PC') {
+ $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ if (item.name === 'APP') {
+ $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ }
+ // $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ })
+
+ if (currentCode === 'PC') {
+ this.dialogFormRight.rightPCArrSelected = ['PC']
+ }
+ if (currentCode === 'APP') {
+ this.dialogFormRight.rightAPPArrSelected = ['APP']
+ }
+ }
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
}
+
}
}
</script>
@@ -883,6 +1463,13 @@
height: 30px;
display: flex;
align-items: center;
+ //border: 1px solid $main_color;
+ border: none;
+ padding: 0 20px;
+}
+
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info {
@@ -890,10 +1477,16 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: $main_color !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
.footerButton {
@@ -906,6 +1499,7 @@
height: 30px;
display: flex;
align-items: center;
+ padding: 0 20px;
}
::v-deep .el-button--default:hover {
@@ -916,18 +1510,70 @@
padding: 20px 100px !important;
}
-.settingDialogVisible, .userDialogVisible {
+.settingDialogVisible, .userDialogVisible, .dialogVisibleRight {
::v-deep .el-dialog__body {
padding: 10px 20px !important;
}
}
-.userDialogVisible{
- ::v-deep .userDialogVisibleInput {
- //width:calc(100% - 30px) !important;
+
+.dialogVisibleRight {
+ .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;
+ }
}
- //::v-deep .el-form-item {
- // width:calc(100% - 30px) !important;
- //}
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
@@ -945,7 +1591,12 @@
}
::v-deep .el-input__inner {
- height: 30px
+ height: 30px;
+ line-height: 30px;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::v-deep .el-table .caret-wrapper {
@@ -1006,4 +1657,55 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected {
+ color: $main_color;
+}
+
+::v-deep .el-textarea__inner:focus {
+ border-color: $main_color;
+}
+
+</style>
+<style lang="scss">
+.elCascader {
+ //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
+ // color: #42b983 ;
+ //}
+ .el-cascader-node.is-selectable.in-checked-path {
+ color: #42b983;
+ }
+
+ .el-radio__input.is-checked .el-radio__inner {
+ background-color: #42b983;
+ border-color: #42b983;
+ }
+
+ .el-radio__input.is-checked .el-radio__inner:hover {
+ border-color: #42b983;
+ }
+
+ .el-input__inner {
+ border-color: #42b983 !important;
+ }
+
+}
</style>
--
Gitblit v1.9.3