From d33eacc1f85ac3a736b33ba4713a19aae466d711 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 05 八月 2022 16:42:53 +0800
Subject: [PATCH] 1.做适应平板显示的内容大小
---
src/views/jcsz/jsqd.vue | 563 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 358 insertions(+), 205 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index a3325dc..206278f 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -24,6 +24,7 @@
style="width: 200px"
placeholder="璇烽�夋嫨"
>
+ <!-- @focus="getRoleTypeSearch2"-->
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -54,8 +55,8 @@
:data="tableData"
border
stripe
- :height="tableHeight"
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :height="tableHeight+'px'"
+ :style="{width: 100+'%',height: tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -70,65 +71,74 @@
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"
- show-overflow-tooltip
/>
<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"
+ width="120"
>
<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>
@@ -150,26 +160,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"
filterable
:popper-append-to-body="false"
- style="width: 220px"
+ style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -181,7 +192,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">
@@ -193,10 +204,11 @@
</el-dialog>
<!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
<el-dialog
- title="瑙掕壊绫诲瀷"
+ title="璁剧疆"
:visible.sync="settingDialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
class="settingDialogVisible"
@close="handleCloseSetting"
>
@@ -207,12 +219,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"-->
@@ -274,8 +288,10 @@
<el-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
- width="80%"
+ width="900px"
+ :close-on-click-modal="false"
top="15vh"
+ :fullscreen="isIpad"
class="userDialogVisible"
@closed="handleCloseUser"
@close="handleCloseUser"
@@ -290,10 +306,16 @@
<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:isIpad? '180px':'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:isIpad? '180px':'200px'}"
+ />
</el-form-item>
<el-form-item label="鎵�灞炵粍缁�">
<el-cascader
@@ -304,20 +326,19 @@
:append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
- class="userDialogVisibleInput"
- style="width: 220px;"
+ :style="{width:isIpad? '180px':'200px'}"
+
@change="dialogCascaderChange"
/>
-
+ <!-- @focus="getUserOrganization"-->
</el-form-item>
<el-form-item label="鍏宠仈瑙掕壊">
<el-select
v-model="dialogFormUser.isrole"
filterable
:popper-append-to-body="false"
- style="width: 220px"
+ :style="{width:isIpad? '180px':'200px'}"
placeholder="璇烽�夋嫨"
- class="userDialogVisibleInput"
>
<el-option
v-for="item in roleArr"
@@ -348,7 +369,7 @@
:data="dialogFormUserTable"
border
highlight-current-row
- :style="{width: 100+'%',height:tableHeight-300+'px'}"
+ height="370"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
:row-key="getRowKey"
@@ -417,8 +438,10 @@
<el-dialog
title="瑙掕壊鍏宠仈鏉冮檺"
:visible.sync="dialogVisibleRight"
- width="50%"
+ width="800px"
top="15vh"
+ :fullscreen="isIpad"
+ :close-on-click-modal="false"
class="dialogVisibleRight"
@closed="handleCloseRight"
@close="handleCloseRight"
@@ -488,11 +511,16 @@
</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, RoleAssociationRight,
@@ -502,12 +530,13 @@
} 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) => {
@@ -521,14 +550,8 @@
}
}
}
- // const validateTypeCode = (rule, value, callback) => {
- // if (!value) {
- // return callback(new Error('璇烽�夋嫨涓婄骇'))
- // } else {
- // callback()
- // }
- // }
return {
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -622,24 +645,44 @@
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() {
@@ -661,7 +704,7 @@
// 鑾峰彇鎵�灞炵粍缁�
async getUserOrganization() {
const { data: res } = await UserOrganization()
- this.StuOrgArr = res
+ this.StuOrgArr = clearAllChildren(res)
},
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -687,10 +730,6 @@
this.formSetting.order = order
this.formSetting.prop = prop
this.getRoleTypeSearch()
- },
-
- upload() {
-
},
// 鏌ヨ
search() {
@@ -782,7 +821,12 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.tableHeight = this.mainHeight - 50
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 50
+ }
+
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
/* 璁剧疆妯″潡*/
@@ -804,7 +848,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)
},
// 鍒犻櫎鎸夐挳
@@ -845,7 +891,7 @@
// 璁剧疆琛ㄥ崟鍙栨秷浜嬩欢
formSettingCancel(row) {
this.RoleTypeCodeArr.forEach((item, index) => {
- if (item.isVisible === 1 && item.roletype_code === row.roletype_code) {
+ if (item.isVisible === 1 && item.number === row.number) {
this.RoleTypeCodeArr.splice(index, 1)
}
})
@@ -927,6 +973,7 @@
const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
this.userDialogVisible = false
}
},
@@ -941,6 +988,7 @@
this.dialogFormUser.orgcode = ''
this.dialogFormUser.isrole = ''
this.$refs.dialogCascaderUser.checkedValue = ''
+ this.getRoleAssociationUser()
},
/* 瑙掕壊鍏宠仈鏉冮檺瀵硅瘽妗嗛儴鍒�*/
@@ -955,125 +1003,206 @@
type: ''
}
const { data: res } = await RoleAssociationRight(data)// 鎺ュ彛鑾峰彇鏁版嵁
- this.dialogFormRight.rightPCArr = res[0]
- this.dialogFormRight.rightAPPArr = res[1]
+
+ 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
- const rightPCArrFlag = res[0][0].flag
- const rightAPPArrFlag = res[1][0].flag
+ 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// 鍥炴樉绛夊緟鏄惁鏀捐
- // 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:checkbox').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:checkbox').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:checkbox').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
- }
- this.dialogFormRight.rightOperationArr.push({
- isSelected1: pcIsSelected1,
- isSelected2: pcIsSelected2,
- code: this.dialogFormRight.rightPCArr[0].code,
- flag: rightPCArrFlag,
- name: this.dialogFormRight.rightPCArr[0].name
- }, {
- isSelected1: appIsSelected1,
- isSelected2: appIsSelected2,
- code: this.dialogFormRight.rightAPPArr[0].code,
- flag: rightAPPArrFlag,
- name: this.dialogFormRight.rightAPPArr[0].name
- })
-
- this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
- this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
-
- 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.PCTrue && this.APPTrue) {
+ // 1.绗竴绉嶆儏鍐礟C鍜孉PP閮戒竴娆￠兘娌￠�変腑鏃� PC鏈�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
- })
- 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)
+ // 2.绗簩绉嶆儏鍐礟C宸查�変腑锛孉PP鏈�変腑
+ if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
+ pcIsSelected1 = true
+ pcIsSelected2 = true
+
+ const interval = setInterval(() => {
+ if ($("input[name='PC']").length > 0) {
+ waitFlag = true
}
- })
- } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
- this.dialogFormRight.rightAPPArrSelected.push(item.code)
+ 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)
@@ -1096,6 +1225,8 @@
if (this.$refs.rightAPPRef) {
this.$refs.rightAPPRef.setCheckedKeys([])
}
+ this.PCTrue = false
+ this.APPTrue = false
},
// 鏉冮檺瀵硅瘽妗嗗彇娑堜簨浠�
rightDialogVisibleCancel() {
@@ -1105,46 +1236,49 @@
async rightDialogVisibleConfirm() {
const rightPCArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 PC
const rightAPPArrSelected = []// 淇濆瓨鎻愪氦鏍戦�変腑 APP
-
- 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.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' }
+ )
+ }
})
- }
- }
- })
- 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) {
+ rightPCArrSelected.push({
+ code: item.code, name: item.name, flag: 'Y', children: children
+ })
}
- })
- if (flag) {
- rightAPPArrSelected.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 = []
@@ -1173,6 +1307,7 @@
const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getRoleSearch()
this.dialogVisibleRight = false
}
},
@@ -1240,12 +1375,20 @@
const currentCode = this.dialogFormRight.rightCurrentCode// 鏉冮檺鎿嶄綔绔痗ode
// 1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂
if (checkedKeys.length === 0 && halfCheckedKeys.length === 0) {
- console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂')
+ console.log('1.绗竴绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓洪浂1111')
this.dialogFormRight.rightOperationArr.forEach((item, index) => {
if (item.code === currentCode) {
item.isSelected2 = false
+
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ 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)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
@@ -1264,7 +1407,13 @@
if (item.code === currentCode) {
item.isSelected2 = true
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ 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)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
@@ -1284,7 +1433,13 @@
if (item.code === currentCode) {
item.isSelected2 = true
this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ 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)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
})
@@ -1296,6 +1451,14 @@
this.dialogFormRight.rightAPPArrSelected = ['APP']
}
}
+ },
+ // 瀵煎叆鎸夐挳
+ upload() {
+ this.shows = true
+ this.$refs.importPickerFunc.newDataFunc()
+ },
+ colos() {
+ this.shows = false
}
}
@@ -1420,16 +1583,6 @@
background-color: $main_color;
}
}
-}
-
-.userDialogVisible {
- ::v-deep .userDialogVisibleInput {
- //width:calc(100% - 30px) !important;
- }
-
- //::v-deep .el-form-item {
- // width:calc(100% - 30px) !important;
- //}
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
--
Gitblit v1.9.3