From 432b5046d07835569972ce17de989ef9baaae9b3 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Fri, 22 Mar 2024 17:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/meeting/EquipmentList.vue | 4 +-- .../admin/meeting/modules/EquipmentModal.vue | 3 +++ .../meeting/modules/RoomContentModal.vue | 3 +++ .../admin/meeting/modules/RoomItemModal.vue | 26 +++---------------- .../admin/meeting/modules/RoomServeModal.vue | 19 +++++++++----- .../meeting/modules/VisitorPersonModal.vue | 2 +- src/views/system/modules/UserModal.vue | 13 +++++++--- 7 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/views/admin/meeting/EquipmentList.vue b/src/views/admin/meeting/EquipmentList.vue index d4df612..b546bf1 100644 --- a/src/views/admin/meeting/EquipmentList.vue +++ b/src/views/admin/meeting/EquipmentList.vue @@ -54,7 +54,7 @@ 离线 - {{ 1 }} + {{ record.personCount }} 编辑 @@ -205,7 +205,7 @@ export default { }, { title: '授权人员', - dataIndex: 'persons', + dataIndex: 'personCount', scopedSlots: { customRender: 'persons' } }, { diff --git a/src/views/admin/meeting/modules/EquipmentModal.vue b/src/views/admin/meeting/modules/EquipmentModal.vue index 49e69e5..986d22b 100644 --- a/src/views/admin/meeting/modules/EquipmentModal.vue +++ b/src/views/admin/meeting/modules/EquipmentModal.vue @@ -257,6 +257,9 @@ export default { this.mdl = Object.assign(record) + if (this.mdl.pic) { + this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.pic + } this.visible = true this.$nextTick(() => { this.form.setFieldsValue(pick(this.mdl, 'id', 'type', 'equipmentName', 'status', 'createDate', 'equipmentNum', 'pic', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime')) diff --git a/src/views/admin/meeting/modules/RoomContentModal.vue b/src/views/admin/meeting/modules/RoomContentModal.vue index 0529860..43206df 100644 --- a/src/views/admin/meeting/modules/RoomContentModal.vue +++ b/src/views/admin/meeting/modules/RoomContentModal.vue @@ -376,6 +376,9 @@ export default { } this.mdl = Object.assign(record) + if (this.mdl.indoorPicUrl) { + this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.indoorPicUrl + } this.visible = true this.$nextTick(() => { this.form.setFieldsValue( diff --git a/src/views/admin/meeting/modules/RoomItemModal.vue b/src/views/admin/meeting/modules/RoomItemModal.vue index 74196a9..649699e 100644 --- a/src/views/admin/meeting/modules/RoomItemModal.vue +++ b/src/views/admin/meeting/modules/RoomItemModal.vue @@ -122,34 +122,16 @@ export default { }) } }, - handleChange1 (info) { - if (info.file.status === 'uploading') { - this.loading1 = true - return - } - if (info.file.status === 'done') { - const { form: { setFieldsValue } } = this - const result = info.file.response - // 设置值 - this.$nextTick(() => { - setFieldsValue({ - // 设置相对路径 - fileUrl: result.fileName - }) - }) - // Get this url from response in real world. - getBase64(info.file.originFileObj, imageUrl => { - this.imageUrl1 = imageUrl - this.loading1 = false - }) - } - }, + add () { this.form.resetFields() this.edit({ id: 0 }) }, edit (record) { this.mdl = Object.assign(record) + if (this.mdl.picUrl) { + this.imageUrl = process.env.VUE_APP_API_BASE_URL + this.mdl.picUrl + } this.visible = true this.$nextTick(() => { this.form.setFieldsValue(pick(this.mdl, 'id', 'name', 'brand', 'specification', 'picUrl', 'fileUrl', 'remark', 'delFlag', 'createBy', 'createTime', 'updateBy', 'updateTime')) diff --git a/src/views/admin/meeting/modules/RoomServeModal.vue b/src/views/admin/meeting/modules/RoomServeModal.vue index 6169e87..4b6299a 100644 --- a/src/views/admin/meeting/modules/RoomServeModal.vue +++ b/src/views/admin/meeting/modules/RoomServeModal.vue @@ -19,14 +19,14 @@ - 免费服务 - 增值服务 + 免费服务 + 增值服务 - + - + { - this.form.setFieldsValue(pick(this.mdl, 'id', 'serveName', 'serveType', 'serveTime', 'remake', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag')) + this.form.setFieldsValue(pick(this.mdl, 'id', 'serveName', 'serveType', 'serveTime', 'remake','type', 'createBy', 'createTime', 'updateBy', 'updateTime', 'version', 'deleteFlag')) }) }, handleSubmit (e) { diff --git a/src/views/admin/meeting/modules/VisitorPersonModal.vue b/src/views/admin/meeting/modules/VisitorPersonModal.vue index 826881a..215ba4e 100644 --- a/src/views/admin/meeting/modules/VisitorPersonModal.vue +++ b/src/views/admin/meeting/modules/VisitorPersonModal.vue @@ -24,7 +24,7 @@ - diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 0de1946..7ddb703 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -64,7 +64,7 @@ - {{ item.name }} + {{ item.text }} @@ -122,7 +122,9 @@ export default { }, created () { getCustomerList().then(res =>{ - this.customerList = res.rows + res.rows.forEach(r => { + this.customerList.push({ value: r.id, text: r.name }) + }) }) // 租户 @@ -149,19 +151,22 @@ export default { this.mdl = Object.assign({}, { id: 0, deptId: '' }) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.mdl, 'id', 'username', 'nickname', 'status', 'mobile', 'roleIds', 'remark', 'deptId', 'parkId', 'tenantId')) + this.form.setFieldsValue(pick(this.mdl, 'id', 'username', 'nickname', 'status', 'mobile', 'roleIds','customerId', 'remark', 'deptId', 'parkId', 'tenantId')) }) }, edit (record) { if (record.id > 0) { this.spinning = true getUser(record.id).then(res => { + + this.mdl = Object.assign({}, res) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.mdl, 'id', 'username', 'nickname', 'status', 'mobile', 'roleIds', 'remark', 'deptId', 'parkId', 'tenantId')) + this.form.setFieldsValue(pick(this.mdl, 'id', 'username', 'nickname', 'status', 'mobile', 'roleIds','customerId', 'remark', 'deptId', 'parkId', 'tenantId')) this.spinning = false // this.form.setFieldsValue({ ...record }) + }) }) }