From 3cd074536600cd312bddfc4a3b5f71ef41c5819f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Fri, 8 Sep 2023 18:04:32 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=87=86=E6=8B=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95=EF=BC=88=E9=83=A8=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StandardResolutionSheet.vue | 71 ++++++++++ src/components/selection/UserSelection.vue | 6 +- src/mixins/ConfigurableTableMixin.js | 2 +- .../commonPage/StandardDetailPage.vue | 134 ++++++++++++------ .../modules/StandardResolutionSheetModal.vue | 56 ++++++++ .../modules/SubmitQuestionModal.vue | 2 +- 6 files changed, 222 insertions(+), 49 deletions(-) create mode 100644 src/components/StandardResolutionSheet.vue create mode 100644 src/views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal.vue diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue new file mode 100644 index 00000000..a5f54fcc --- /dev/null +++ b/src/components/StandardResolutionSheet.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/components/selection/UserSelection.vue b/src/components/selection/UserSelection.vue index 7da5125b..53fe13a6 100644 --- a/src/components/selection/UserSelection.vue +++ b/src/components/selection/UserSelection.vue @@ -94,6 +94,9 @@ export default { .user-organ-wrap { width: 100%; position: relative; + display: flex; + align-items: center; + height: 39.98px; .user-input { resize: none; @@ -102,10 +105,7 @@ export default { } .button-box { - height: 38px; margin-left: 5px; - position: absolute; - top: 0; } } diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index bf751063..ac58fe86 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -54,7 +54,7 @@ export const ConfigurableTableMixin = { }, mounted () { this.getTableHeader() - this.loadData() + // this.loadData() // 过滤没有权限的按钮 // if (this.needFilterTableBtn) { // this.operationList = this.operationList.filter(item => isHasPermission(item.has)) diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue index 143e1cac..0985fa23 100644 --- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue @@ -1,74 +1,88 @@ + + diff --git a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue index e6aafe82..f998b721 100644 --- a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue +++ b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue @@ -146,7 +146,7 @@ export default { }, handleCancel () { - + this.close() }, close () { this.visible = false