diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue index 6909034a..0170b276 100644 --- a/src/views/components/editResi.vue +++ b/src/views/components/editResi.vue @@ -569,6 +569,7 @@ export default { // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm()) arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ]) }) + if (arr.length === 0) return arr let arr2 = arr.reduce(function (a, b) { return a.concat(b) }) let hash = {} let i = 0 diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 2a0bf6aa..f4c5b830 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -516,6 +516,7 @@ export default { margin-bottom: 20px; } .resi-search { + padding-right: 140px; .el-col { text-align: right; } diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 7793c065..55b0e6df 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -85,7 +85,7 @@
取消 - 提交 + 提交
@@ -111,7 +111,7 @@
取消 - 提交 + 提交
@@ -130,6 +130,7 @@ export default { }, data () { return { + btnLoading: false, disabled: false, pageLoading: false, dialogEditVisible: false, @@ -400,8 +401,9 @@ export default { }) this.dialogVisible = false }, - submitAdd (arr) { - this.$http + async submitAdd (arr) { + this.btnLoading = true + await this.$http .post('/epmetuser/icresiuser/add', arr) .then(({ data: res }) => { if (res.code !== 0) { @@ -420,12 +422,15 @@ export default { .catch(() => { return this.$message.error('网络错误') }) + this.btnLoading = false }, - submitEdit (arr) { - this.$http + async submitEdit (arr) { + this.btnLoading = true + await this.$http .post('/epmetuser/icresiuser/edit', arr) .then(({ data: res }) => { if (res.code !== 0) { + return this.$message.error(res.msg) } else { this.$message.success('提交成功') @@ -441,6 +446,7 @@ export default { .catch(() => { return this.$message.error('网络错误') }) + this.btnLoading = false }, getTableHeader () { this.$http