From 6b8cadab4e0c38a0dd631ea395e09080bed31bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 20 Mar 2023 18:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 10 +- .../components/dealtWith.vue | 9 +- .../components/designCompliance.vue | 99 ++++----- .../components/projectInformation.vue | 159 ++++++++++++++ .../reviewedByThePersonInCharge.vue | 119 ++++++----- .../components/standardContent.vue | 201 ++++++++++++++++++ 6 files changed, 469 insertions(+), 128 deletions(-) create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue create mode 100644 jero-web/src/views/toDoCenter/projectRegulationTasks/components/standardContent.vue diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 624d71225..22873d08a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -138,13 +138,13 @@ .box-text { display: flex; justify-content: space-between; - height: 80px; - line-height: 80px; + height: 40px; + line-height: 24px; .header-text { - font-size: 18px; - font-weight: 400; - color: #000F16; + font-size: 16px; + font-weight: bold; + color: #000; } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index ed956af09..c90c0026e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -45,7 +45,7 @@ @showSizeChange="SizeChange" /> - + @@ -96,14 +96,14 @@ { title: this.$t('Tasknode'), align: 'left', - dataIndex: '', + dataIndex: 'taskDefinitionKeyName', ellipsis: true, width: 170 }, { title: this.$t('typeOfDeliverables'), align: 'left', - dataIndex: '', + dataIndex: 'deliverableTypeName', ellipsis: true, width: 170 }, @@ -198,6 +198,9 @@ this.selectedRowKeys = value console.log(this.selectedRowKeys) }, + designComplianceList(){ + this.getList() + }, RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 5510957e8..214b844e4 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -3,12 +3,13 @@ + style="height: 100%;overflow: auto;margin-bottom: 436px;"> + {{textLoading}} - +
+ +
+ + +
+ +
-
@@ -54,8 +57,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 24939325e..8d45acc9a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -9,45 +9,48 @@
- +
* {{$t('resultofhandling')}}
- - - - {{$t('accept')}} - - - {{$t('refuse')}} - - - {{$t('sendBack')}} - - - {{$t('accord')}} - - - {{$t('nonConformity')}} - - - {{$t('Tracked')}} - - - {{$t('notInvolved')}} - - - {{$t('turnToDo')}} - - -
+ + + + {{$t('accept')}} + + + {{$t('refuse')}} + + + {{$t('adopt')}} + + + {{$t('sendBack')}} + + + {{$t('accord')}} + + + {{$t('nonConformity')}} + + + {{$t('Tracked')}} + + + {{$t('notInvolved')}} + + + {{$t('turnToDo')}} + + +
@@ -57,29 +60,29 @@ * {{$t('feedbackMessage')}} - - - + + + - +
{{$t('enclosure')}}
- - - {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || - formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') - }} - -
+ + + {{ (formInline.approvalFile === 'null' || formInline.approvalFile === '' || + formInline.approvalFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + +
@@ -242,32 +245,32 @@ \ No newline at end of file