From 499aa5f45af281c68532dae11d8c62ae9bf528a5 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 2 Nov 2021 10:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF-=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/components/editResi.vue | 24 +++- .../src/views/components/resiForm.vue | 3 +- .../src/views/modules/base/resi.vue | 109 ++++++++---------- 3 files changed, 66 insertions(+), 70 deletions(-) diff --git a/epmet-oper-web/src/views/components/editResi.vue b/epmet-oper-web/src/views/components/editResi.vue index 933f805..6b7d007 100644 --- a/epmet-oper-web/src/views/components/editResi.vue +++ b/epmet-oper-web/src/views/components/editResi.vue @@ -18,7 +18,7 @@
- -->
- -->
- -->
- @@ -256,6 +264,10 @@ export default { supportAdd: { // 单表多条数据 type: Boolean, default: false + }, + disabled: { // 单表多条数据 + type: Boolean, + default: false } }, data () { diff --git a/epmet-oper-web/src/views/components/resiForm.vue b/epmet-oper-web/src/views/components/resiForm.vue index c9326d6..1eaaa33 100644 --- a/epmet-oper-web/src/views/components/resiForm.vue +++ b/epmet-oper-web/src/views/components/resiForm.vue @@ -315,6 +315,7 @@ export default { } let form = initForm(this.formInfo, this.formList) let rules = initRules(this.formList) + console.log('rulessss', rules) let tempFormList = [ ...this.formList ] let constForm = { ...form, @@ -556,7 +557,7 @@ export default { newForm.push({ tableName: item.tableName, supportAdd: this.supportAdd, - list: [{ ..._form }] + list: Object.keys(_form).length > 0 ? [{ ..._form }] : [] }) }) return newForm diff --git a/epmet-oper-web/src/views/modules/base/resi.vue b/epmet-oper-web/src/views/modules/base/resi.vue index 2fca1a5..95a85d4 100644 --- a/epmet-oper-web/src/views/modules/base/resi.vue +++ b/epmet-oper-web/src/views/modules/base/resi.vue @@ -34,9 +34,14 @@ align="center" width="120"> @@ -86,7 +91,7 @@ append-to-body :close-on-click-modal="false" :before-close="handlerEditCancle"> - +
其他
@@ -94,14 +99,14 @@ + :form-id="item.columnName" :muti-list="item.mutiList" :form-list=" item.itemList" :disabled="disabled" />
取消 - 提交 + 提交
@@ -120,6 +125,7 @@ export default { }, data () { return { + disabled: false, pageLoading: false, dialogEditVisible: false, dialogVisible: false, @@ -224,7 +230,13 @@ export default { handleClick (tab, event) { console.log(tab, event) }, + async handleLook (row) { + this.disabled = true + await this.getFormList() + this.getrowInfo(row.icResiUserId) + }, async handleEdit (row) { + this.disabled = false await this.getFormList() this.getrowInfo(row.icResiUserId) }, @@ -262,18 +274,15 @@ export default { if (hasT) this.tabsList.splice(i, 1) } }, - handleEditSUbmit () { + formetForm () { const _baseForm = this.$refs.baseForm.handleForm() let arr = [] - // let arr1 = [] if (_baseForm.length === 0) return false arr.push([ ..._baseForm ]) this.tabsList.forEach(item => { - // console.log('groupInfo', this.$refs['group' + item.groupId][0].handleForm()) arr.push([ ...this.$refs['group' + item.groupId][0].handleForm() ]) }) let arr2 = arr.reduce(function (a, b) { return a.concat(b) }) - // console.log('arrr555-----sub', arr2) let noChange = true arr2.forEach(item => { if (item.list.length !== 0) noChange = false @@ -285,11 +294,9 @@ export default { let res = [] let finalArr = [] arr2.forEach(function (item) { - // console.log('arrr666-----sub', item) let name = item.tableName if (hash[name]) { res[hash[name] - 1].list.push(...item.list) - // console.log('hash[name]---', hash[name], res, res[hash[name] - 1], item) } else { hash[name] = ++i res.push({ @@ -297,12 +304,10 @@ export default { supportAdd: item.supportAdd, tableName: name }) - // console.log('hash[name]0000---', hash[name], res) } }) // 多个list合并成一个list子集 res.forEach(item => { - // console.log('arrr777-----sub', item) let _form = {} item.list.forEach(n => { _form = { ..._form, ...n } @@ -312,57 +317,34 @@ export default { list: item.supportAdd ? [...item.list] : [{ ..._form }] }) }) - // console.log('editInfo---', res, finalArr) - this.submitEdit(finalArr) + return finalArr }, - handleSUbmit () { - console.log('baseform', this.$refs.baseForm.handleForm()) - const _baseForm = this.$refs.baseForm.handleForm() - let arr = [] - // let arr1 = [] - if (_baseForm.length === 0) return false - arr.push([ ..._baseForm ]) - this.tabsList.forEach(item => { - // console.log('groupInfo', this.$refs['group' + item.groupId][0].handleForm()) - arr.push([ ...this.$refs['group' + item.groupId][0].handleForm() ]) - }) - let arr2 = arr.reduce(function (a, b) { return a.concat(b) }) - // console.log('arrr555-----sub', arr2) - // 合并相同tableName的多个数组 - let hash = {} - let i = 0 - let res = [] - let finalArr = [] - arr2.forEach(function (item) { - // console.log('arrr666-----sub', item) - let name = item.tableName - if (hash[name]) { - res[hash[name] - 1].list.push(...item.list) - // console.log('hash[name]---', hash[name], res, res[hash[name] - 1], item) - } else { - hash[name] = ++i - res.push({ - list: [...item.list], - supportAdd: item.supportAdd, - tableName: name - }) - // console.log('hash[name]0000---', hash[name], res) - } - }) - // 多个list合并成一个list子集 - res.forEach(item => { - // console.log('arrr777-----sub', item) - let _form = {} - item.list.forEach(n => { - _form = { ..._form, ...n } + async handleEditSUbmit () { + const arr = await this.formetForm() + this.submitEdit(arr) + }, + async handleSUbmit () { + const arr = await this.formetForm() + this.submitAdd(arr) + }, + handleDel (row) { + let params = { + formCode: 'resi_base_info', + icResiUserId: row.icResiUserId + } + this.$http + .post('/epmetuser/icresiuser/delete', params) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + this.$message.success('删除成功') + this.getTableData() + } }) - finalArr.push({ - tableName: item.tableName, - list: item.supportAdd ? [...item.list] : [{ ..._form }] + .catch(() => { + return this.$message.error('网络错误') }) - }) - // console.log('arrr999-----sub', finalArr) - this.submitAdd(finalArr) }, handleFormatUrl (url) { return url.includes('?') @@ -445,7 +427,7 @@ export default { conditions: this.conditions } this.$http - .post('/data/aggregator/icresiuser/listresi', params) + .post('/epmetuser/icresiuser/listresi', params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -464,7 +446,7 @@ export default { icResiUserId: id } this.$http - .post('/data/aggregator/icresiuser/detail', params) + .post('/epmetuser/icresiuser/detail', params) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -633,6 +615,7 @@ export default { } .resi-card-table { .btn-color-del { + margin-left: 10px; color: rgba(213, 16, 16, 1); } .btn-color-edit {