提交 ccd9acc9 编写于 作者: 刘英杰's avatar 刘英杰

V20240123 1.0.1 更新权限分配人员选择器

上级 bda13df1
流水线 #23854 已通过 ,包含阶段
in 29 second
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.mainDiv[data-v-159b2d98]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-159b2d98],.mainDiv .smallCard[data-v-159b2d98]{margin-bottom:16px}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-159b2d98]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-159b2d98]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-159b2d98] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-159b2d98] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.mainDiv[data-v-159b2d98]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-159b2d98],.mainDiv .smallCard[data-v-159b2d98]{margin-bottom:16px}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-159b2d98] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-159b2d98] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-159b2d98]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-159b2d98]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-159b2d98] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-159b2d98] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-159b2d98] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-6d449fff]{color:#515a6e}.cyrIcon[data-v-6d449fff]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-6d449fff]:active{color:#3f485c} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.cyrIcon[data-v-6d449fff]{color:#515a6e}.cyrIcon[data-v-6d449fff]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-6d449fff]:active{color:#3f485c}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.demo-split[data-v-6f29bbfa]{height:calc(100vh - 112px)}.demo-split .demo-split-pane-L[data-v-6f29bbfa]{padding:10px;height:100%;background-color:#fff}.demo-split .demo-split-pane-R[data-v-6f29bbfa]{padding-left:24px} .ivu-form-item[data-v-2a65a7bf]{padding-right:15px}.fileRow[data-v-2a65a7bf]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-2a65a7bf]{color:#ed4014}.fileRow .delIcon[data-v-2a65a7bf]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}.demo-split[data-v-6f29bbfa]{height:calc(100vh - 112px)}.demo-split .demo-split-pane-L[data-v-6f29bbfa]{padding:10px;height:100%;background-color:#fff}.demo-split .demo-split-pane-R[data-v-6f29bbfa]{padding-left:24px}
\ No newline at end of file \ No newline at end of file
.ivu-form-item[data-v-d67e7ba0]{padding-right:15px}.fileRow[data-v-d67e7ba0]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-d67e7ba0]{color:#ed4014}.fileRow .delIcon[data-v-d67e7ba0]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-7f239dd6]{margin-bottom:12px}.searchDiv .buttonCol[data-v-7f239dd6]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-7f239dd6]{margin-left:8px}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.11051dae.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>场地管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 场地管理。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.0c4f1a00.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -207,6 +207,8 @@ export default { ...@@ -207,6 +207,8 @@ export default {
// 详情显示 true.显示详情 false.新增/编辑 // 详情显示 true.显示详情 false.新增/编辑
isDetails: false, isDetails: false,
peopleKey:'',//select 搜索文字
} }
}, },
computed: {}, computed: {},
...@@ -215,7 +217,8 @@ export default { ...@@ -215,7 +217,8 @@ export default {
methods: { methods: {
onQueryChange(query){ onQueryChange(query){
//select 搜索文字 改变触发 //select 搜索文字 改变触发
console.log("🚀🚀query🚀,",query) this.peopleKey = query
this.$emit('getPeopleList',query)
}, },
/** /**
* Modal打开初始化(新增编辑用) * Modal打开初始化(新增编辑用)
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</template> </template>
<div style="position: absolute ;bottom: 10px;width: 100%;"> <div style="position: absolute ;bottom: 10px;width: 100%;">
<div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;"> <div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;">
<span style="font-size: 12px;">v1.0.0</span> <span style="font-size: 12px;">v1.0.1</span>
</div> </div>
</div> </div>
</Menu> </Menu>
......
...@@ -24,10 +24,15 @@ ...@@ -24,10 +24,15 @@
@rowEdit="rowEdit" @rowEdit="rowEdit"
@rowDelete="rowDelete" @rowDelete="rowDelete"
@onPageChange="onPageChange" @onPageChange="onPageChange"
@onPageSizeChange="onPageSizeChange"></CTable> @onPageSizeChange="onPageSizeChange">
<template #place_name="{row}">
<Ellipsis :transfer="true" :text="row.place_name" :height="80" tooltip/>
</template>
</CTable>
<!-- 新增修改Modal --> <!-- 新增修改Modal -->
<CEditModal <CEditModal
ref="ceditmodal" ref="ceditmodal"
v-model="editModalshow" v-model="editModalshow"
:formItem="formItem" :formItem="formItem"
...@@ -35,6 +40,7 @@ ...@@ -35,6 +40,7 @@
:formLabelWidth="100" :formLabelWidth="100"
:width="800" :width="800"
@onClose="editModalshow = false" @onClose="editModalshow = false"
@getPeopleList="getPeopleList"
@onSubmit="modalSubmit"> @onSubmit="modalSubmit">
</CEditModal> </CEditModal>
</Card> </Card>
...@@ -46,7 +52,8 @@ import CTable from '@/components/CTable.vue' ...@@ -46,7 +52,8 @@ import CTable from '@/components/CTable.vue'
import CEditModal from '@/components/CEditModal.vue' import CEditModal from '@/components/CEditModal.vue'
import SearchCondForm from '@/components/SearchCondForm.vue' import SearchCondForm from '@/components/SearchCondForm.vue'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import * as api from '@/api/interface/index'
import {getApiCommonGetPersonByCondiction} from "@api/controller/Common/getApiCommonGetPersonByCondiction";
export default { export default {
name: 'list', name: 'list',
components: { components: {
...@@ -72,7 +79,7 @@ export default { ...@@ -72,7 +79,7 @@ export default {
{ key: 'name', title: '名称', align: 'center', minWidth: 150, show: true }, { key: 'name', title: '名称', align: 'center', minWidth: 150, show: true },
{ key: 'role_name', title: '角色', align: 'center', minWidth: 150, show: true }, { key: 'role_name', title: '角色', align: 'center', minWidth: 150, show: true },
{ key: 'place_id', title: '场地id', align: 'center', minWidth: 150, show: false }, { key: 'place_id', title: '场地id', align: 'center', minWidth: 150, show: false },
{ key: 'place_name', title: '场地名称', align: 'center', minWidth: 150, show: true }, { slot: 'place_name', title: '场地名称', align: 'center', minWidth: 150, show: true },
// { key: 'is_enable', title: '启用', align: 'center', minWidth: 150, show: true }, // { key: 'is_enable', title: '启用', align: 'center', minWidth: 150, show: true },
{ slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 80, show: true }, { slot: 'generalSwitch', title: '启用', align: 'center', minWidth: 80, show: true },
{ slot: 'action', title: '操作', align: 'center', minWidth: 150, show: true, fixed: 'right' }, { slot: 'action', title: '操作', align: 'center', minWidth: 150, show: true, fixed: 'right' },
...@@ -113,6 +120,7 @@ export default { ...@@ -113,6 +120,7 @@ export default {
// 角色 // 角色
roleList: [], roleList: [],
} }
}, },
computed: { computed: {
...@@ -124,20 +132,7 @@ export default { ...@@ -124,20 +132,7 @@ export default {
}, },
created(){}, created(){},
mounted(){ mounted(){
// 获取用戶信息 this.getPeopleList()
this.asc.getApiCommonGetPersonByCondiction({user_type: 1}).then(res => {
// console.log('场地', res)
let arr = res.response.map(a => {
return {
...a,
label: a.name+ '-'+a.card,
value:a.name+ '-'+a.card,
// value:a.name+','+a.card,
}
})
this.formItem[this.formItem.findIndex(a => a.id == 'cardName')].optList = arr
})
// 获取场地 // 获取场地
this.asc.getApiCommonGetPlaceSelect({id: ''}).then(res => { this.asc.getApiCommonGetPlaceSelect({id: ''}).then(res => {
// console.log('场地', res) // console.log('场地', res)
...@@ -166,6 +161,22 @@ export default { ...@@ -166,6 +161,22 @@ export default {
this.getData() this.getData()
}, },
methods: { methods: {
getPeopleList(keyword=''){
// 获取用戶信息
this.asc.getApiCommonGetPersonByCondiction({user_type: 1,keyword:keyword}).then(res => {
// console.log('场地', res)
let arr = res.response.map(a => {
return {
...a,
label: a.name+ '-'+a.card,
value:a.name+ '-'+a.card,
// value:a.name+','+a.card,
}
})
this.formItem[this.formItem.findIndex(a => a.id === 'cardName')].optList = arr
})
},
// 搜索 // 搜索
search(val) { search(val) {
Object.keys(val).forEach(a => { Object.keys(val).forEach(a => {
...@@ -218,20 +229,41 @@ export default { ...@@ -218,20 +229,41 @@ export default {
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增用户权限') this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增用户权限')
}, },
// 编辑 // 编辑
rowEdit(row){ async rowEdit(row){
// console.log('编辑行', row) // console.log('编辑行', row)
this.editModalshow = true this.editModalshow = true
this.editModalLoading = true this.editModalLoading = true
this.formItem.find(a => a.id == 'cardName').disabled = true
let obj = cloneDeep(row)
if (obj.place_id) { await new Promise((resolve, reject)=>{
obj.place_id = obj.place_id.split(',') this.asc.getApiCommonGetPersonByCondiction({user_type: 1,keyword:row.card}).then(res => {
} // console.log('场地', res)
obj.cardName = obj.name+ '-'+obj.card let arr = res.response.map(a => {
this.$refs.ceditmodal.modalInit('edit', obj) return {
this.editModalLoading = false ...a,
label: a.name+ '-'+a.card,
value:a.name+ '-'+a.card,
// value:a.name+','+a.card,
}
})
this.formItem[this.formItem.findIndex(a => a.id === 'cardName')].optList = arr
resolve()
})
})
this.formItem.find(a => a.id === 'cardName').disabled = true
let obj = cloneDeep(row)
if (obj.place_id) {
obj.place_id = obj.place_id.split(',')
}
obj.cardName = obj.name+ '-'+obj.card
this.$refs.ceditmodal.modalInit('edit', obj)
this.editModalLoading = false
}, },
// 新增编辑提交 // 新增编辑提交
modalSubmit(val) { modalSubmit(val) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或