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

V20241020 优化placeholder等

上级 18422041
流水线 #23798 已通过 ,包含阶段
in 26 second
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]: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
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{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
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}
\ No newline at end of file
.ivu-form-item[data-v-c723d14e]{padding-right:15px}.fileRow[data-v-c723d14e]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-c723d14e]{color:#ed4014}.fileRow .delIcon[data-v-c723d14e]:hover{color:#f16643;cursor:pointer}.searchDiv .ivu-form-item[data-v-06817bf2]{margin-bottom:12px}.searchDiv .buttonCol[data-v-06817bf2]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-06817bf2]{margin-left:8px}.cyrIcon[data-v-17476894]{color:#515a6e}.cyrIcon[data-v-17476894]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-17476894]:active{color:#3f485c}
\ 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.665344dc.js></script></body></html>
\ 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.dc107f90.js></script></body></html>
\ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -26,7 +26,7 @@
v-if="item.type == 'input'"
v-model="formData[item.id]"
clearable
:placeholder="placeholder"
:placeholder="'请输入'+item.name"
:disabled="item.disabled"/>
<Input
......@@ -34,7 +34,7 @@
v-model="formData[item.id]"
clearable
type="textarea"
placeholder="请输入"
:placeholder="'请输入'+item.name"
:rows="item.rows"
:disabled="item.disabled"/>
......@@ -42,6 +42,8 @@
v-else-if="item.type == 'select'"
v-model="formData[item.id]"
clearable
:placeholder="'请选择'+item.name"
filterable
:disabled="item.disabled">
<Option
v-for="it in item.optList"
......@@ -55,6 +57,7 @@
clearable
multiple
filterable
:placeholder="'请选择'+item.name"
:disabled="item.disabled">
<Option
v-for="it in item.optList"
......@@ -75,7 +78,8 @@
format="HH:mm"
type="timerange"
placement="bottom-end"
placeholder="请选择时间"/>
:placeholder="'请选择'+item.name"
/>
</FormItem>
</Col>
<!-- 文件类型 -->
......@@ -166,7 +170,6 @@ export default {
formItem: { type: Array, require: true },
formRule: { type: Object, default: () => {} },
formLabelWidth: { type: Number, default: 80 },
placeholder:{type:String,default:'请输入'},
// Modal显示value
value: { type: Boolean, require: true },
// Modal宽度
......@@ -221,6 +224,7 @@ export default {
this.formData = row ? cloneDeep(row) : {}
} else if (addOrEdit == 'edit') {
this.modalTitle = '编辑'
this.formData = cloneDeep(row)
// 时间范围处理
......@@ -285,7 +289,6 @@ export default {
this.$refs.form.validate((valid) => {
if (valid) {
let obj = cloneDeep(this.formData)
// 时间范围处理
let tri = this.formItem.findIndex(a => a.type == 'timerange')
if (tri != -1) {
......
......@@ -14,13 +14,15 @@
style="width: 100%;"
v-model="searchCondObj[item.id]"
clearable
placeholder="请输入"></Input>
:placeholder="'请输入'+item.name"></Input>
<Select
v-else-if="item.type == 'select'"
style="width: 100%;"
v-model="searchCondObj[item.id]"
clearable>
clearable
:placeholder="'请选择'+item.name"
>
<Option
v-for="it in item.optList"
:key="it.value"
......@@ -32,7 +34,7 @@
v-model="searchCondObj[item['id']]"
type="datetime"
format="yyyy-MM-dd HH:mm"
placeholder="请选择时间"
:placeholder="'请选择'+item.name"
@on-change="(val1, val2) => datetimeChange(val1, val2, item.id)"/>
</FormItem>
</Col>
......
......@@ -30,7 +30,11 @@
</Tooltip>
<i-menu-side-collapse v-else :menu="item" :key="index" top-level />
</template>
<!-- <div style="margin-top: auto">版本号:1.0.0</div>-->
<div style="position: absolute ;bottom: 10px;width: 100%;">
<div style="display: flex;width:100%;height: 50px; justify-content: center;align-items: center;">
<span style="font-size: 12px;">V2401221.0.0</span>
</div>
</div>
</Menu>
......
......@@ -90,8 +90,9 @@ export default {
editModalLoading: false,
// 新增编辑表单项
formItem: [
{ id: 'card', name: '卡号', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'name', name: '名称', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'card', name: '卡号', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'name', name: '名称', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'cardName', name: '用戶', type: 'select', disabled: false, require: false, optList: [] },
{ id: 'role_id', name: '角色', type: 'select', disabled: false, require: false, optList: [] },
{ id: 'place_id', name: '场地', type: 'multipleselect', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
......@@ -101,6 +102,7 @@ export default {
role_id: "",
card: "",
name: "",
cardName:'',
place_id: "",
is_enable: 0,
is_del: 0,
......@@ -122,6 +124,20 @@ export default {
},
created(){},
mounted(){
// 获取用戶信息
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 => {
// console.log('场地', res)
......@@ -197,8 +213,8 @@ export default {
// 新增
add(){
this.editModalshow = true
this.formItem.find(a => a.id == 'card').disabled = false
this.formItem.find(a => a.id == 'name').disabled = false
this.formItem.find(a => a.id == 'cardName').disabled = false
// this.formItem.find(a => a.id == 'name').disabled = false
this.$refs.ceditmodal.modalInit('add', this.defaultFormData, '新增用户权限')
},
// 编辑
......@@ -206,12 +222,14 @@ export default {
// console.log('编辑行', row)
this.editModalshow = true
this.editModalLoading = true
this.formItem.find(a => a.id == 'card').disabled = true
this.formItem.find(a => a.id == 'name').disabled = true
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
},
......@@ -221,11 +239,15 @@ export default {
if (val.place_id) {
val.place_id = val.place_id.join(',')
}
val.name = val.cardName.split('-')[0]
val.card = val.cardName.split('-')[1]
delete val.cardName
this.$Modal.confirm({
title: '提示',
content: '是否确定提交?',
loading: true,
onOk: () => {
this.asc.postApiRoleRolePowerSave(val).then(res => {
// console.log('保存信息', res)
if (res.code == 1) {
......
......@@ -11,12 +11,11 @@
<div style="display: flex;">
<Button type="primary" class="ivu-ml-8" @click="add"><Icon type="md-add"/>新增</Button>
<Button type="primary" class="ivu-ml-8" @click="downloadPlaceModal"><Icon type="ios-cloud-download-outline"/>下载场地模版</Button>
<Button type="primary" class="ivu-ml-8" @click="downloadPlaceModal"><Icon type="ios-cloud-download-outline"/>下载模板</Button>
<Upload class="ivu-ml-8"
:before-upload="placeBatAdd"
action="">
<Button type="primary" ><Icon type="ios-cloud-upload-outline"/>导入场地数据</Button>
<Button type="primary" ><Icon type="ios-cloud-upload-outline"/>批量导入</Button>
</Upload>
</div>
<!-- 数据table -->
......@@ -213,10 +212,10 @@ export default {
editModalLoading: false,
// 新增编辑表单项
formItem: [
{ id: 'place_code', name: '编号', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_code', name: '编号', type: 'input', disabled: false, require: false, optList: []},
{ id: 'place_name', name: '场地名称', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'place_type_id', name: '场地类型', type: 'select', disabled: false, require: false, optList: [] },
{ id: 'place_address', name: '场地地址', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'place_address', name: '场地地址', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'building', name: '楼栋', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'floor', name: '楼层', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'room', name: '房间', type: 'input', disabled: false, require: false, optList: [] },
......@@ -224,16 +223,16 @@ export default {
{ id: 'capacity', name: '容纳人数', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'threshold', name: '最低申请人数', type: 'input', disabled: false, require: false, optList: [] },
{ id: 'sex', name: '性别', type: 'select', disabled: false, require: false, optList: [] },
{ id: 'key_num', name: '钥匙库存数', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'key_lend_num', name: '钥匙已借出数', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'key_loanable_num', name: '钥匙可借出数', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'description', name: '场地描述', type: 'input', disabled: false, require: false, optList: [] },
// { id: 'key_num', name: '钥匙库存数', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'key_lend_num', name: '钥匙已借出数', type: 'input', disabled: true, require: false, optList: [] },
// { id: 'key_loanable_num', name: '钥匙可借出数', type: 'input', disabled: true, require: false, optList: [] },
{ id: 'description', name: '场地描述', type: 'textarea', disabled: false, require: false, optList: [] },
// { id: 'file_id', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'file_list', name: '附件', type: 'file', disabled: false, require: false, optList: [] },
{ id: 'is_enable', name: '启用', type: 'switch', disabled: false, require: false, optList: [] },
],
formRule: {
place_code: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
// place_code: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
place_name: [{ required: true, message: '场地名称不能为空', trigger: 'blur' }],
place_type_id: [{ required: true, message: '场地类型不能为空', trigger: 'change' }],
},
......@@ -247,11 +246,11 @@ export default {
floor: "",
room: "",
acreage: "",
capacity: "",
threshold: "",
capacity: 1,
threshold: 0,
sex: "",
description: "",
is_enable: 0,
is_enable: 1,
is_del: "",
createby: "",
createtime: "",
......@@ -353,6 +352,7 @@ export default {
// 查询条件初始化
created(){},
mounted(){
// 获取性别
this.asc.getApiCommonGetSexSelect().then(res => {
// console.log('性别', res)
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或