diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 023bfac40..c57c1a2da 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -293,5 +293,7 @@ height: 38px; /*margin-top: 2px;*/ } - + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index f6dd229df..e6dddfc5f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -24,7 +24,7 @@ size="middle" :loading="loading" :pagination="false" - :scroll="{x: '100%'}" + :scroll="{x: '100%',y:500}" :data-source="dataSource" :columns="columns" > @@ -104,8 +104,8 @@ mounted() { }, methods: { - edit() { - + edit(row) { + this.$refs.fillTableAddRef.edit(JSON.parse(JSON.stringify(row))) }, getData() { this.visible = true @@ -130,7 +130,7 @@ pageSize: this.pageSize } this.loading = true - getAction('/report/lawsMonthlyReportTitleTemplateEO/list', query).then((res) => { + getAction('/report/lawsMonthlyReportTitleTemplateEO/page', query).then((res) => { if (res.success) { if (res.result.current > 1 && res.result.records.length == 0) { this.pageNo = res.result.current - 1 @@ -151,8 +151,21 @@ moveDownClick() { }, - deleteLib() { - + deleteLib(val) { + let _this = this + this.$confirm({ + content: _this.$t('ConfirmDelete'), + onOk() { + getAction('/report/lawsMonthlyReportTitleTemplateEO/deleteBatch', { ids: val.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) }, newlyAddedClick() { this.$refs.fillTableAddRef.add() @@ -171,4 +184,7 @@ text-align: right; margin-bottom: 16px; } + .text-operation { + margin-right: 8px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index 1ae51d15c..4b682697f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -58,6 +58,8 @@