From de4e3191c12f7d46c156e7b39264eca01fbda866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 17:45:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/listOfRegulations.vue | 51 +++++++++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b5d1ddb5f..4b1d8cb60 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1743,4 +1743,5 @@ module.exports = { marketCertificationList:'Market Certification List', uploadedfilelarger:'The uploaded file is larger than', marketCertificationListDetails:'Market Certification List Details', + andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 08346013d..787226665 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1846,4 +1846,5 @@ module.exports = { uploadedfilelarger:'文件大于50M', marketCertificationList:'市场认证清单', marketCertificationListDetails:'市场认证清单详情', + andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 673ce2d8c..4aa42f3e2 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1600,25 +1600,44 @@ } } for (let i = 0; i < content.length > 0; i++) { - if (content[i].verifyFlowStatus == 'List to be checked' || - content[i].designFlowStatus == 'List to be checked' || - content[i].verifyFlowStatus == 'Task to be confirmed' || - content[i].designFlowStatus == 'Task to be confirmed' || - content[i].verifyFlowStatus == 'Results to be submitted' || - content[i].designFlowStatus == 'Results to be submitted' || - content[i].verifyFlowStatus == 'Results to be reviewed' || - content[i].designFlowStatus == 'Results to be reviewed') { - this.questionIdList.push(content[i].id) - } else { - detailedWarningList.push(content[i].serialNumber) + if (this.roleSwitchingCode == 0) { + if (content[i].verifyFlowStatus == 'List to be checked' || + content[i].designFlowStatus == 'List to be checked' || + content[i].verifyFlowStatus == 'Task to be confirmed' || + content[i].designFlowStatus == 'Task to be confirmed' || + content[i].verifyFlowStatus == 'Results to be submitted' || + content[i].designFlowStatus == 'Results to be submitted' || + content[i].verifyFlowStatus == 'Results to be reviewed' || + content[i].designFlowStatus == 'Results to be reviewed') { + this.questionIdList.push(content[i].id) + } else { + detailedWarningList.push(content[i].serialNumber) + } + } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) { + if (content[i].verifyFlowStatus == 'Task to be confirmed' || + content[i].designFlowStatus == 'Task to be confirmed' || + content[i].verifyFlowStatus == 'Results to be submitted' || + content[i].designFlowStatus == 'Results to be submitted' || + content[i].verifyFlowStatus == 'Results to be reviewed' || + content[i].designFlowStatus == 'Results to be reviewed') { + this.questionIdList.push(content[i].id) + } else { + detailedWarningList.push(content[i].serialNumber) + } } } if (detailedWarningList && detailedWarningList.length > 0) { - this.questionWarning.push( - < div > { - detailedWarningList - .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') - } < /div>) + if (this.roleSwitchingCode == 0){ + this.questionWarning.push( + < div > { + detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + } < /div>) + }else if(this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30){ + this.questionWarning.push( + < div > { + detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')+this.$t('andTheProcessStatusTheList') + } < /div>) + } } if (this.questionIdList && this.questionIdList.length > 0) { this.visibleQuestion = true From 5733cdccaa8ca89ac758c78eefcb3d7a4692f1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 18:03:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93-=E8=AF=A6=E6=83=85=E9=A1=B5-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/docDetail/index.vue | 390 ++++++++++++------ 1 file changed, 263 insertions(+), 127 deletions(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index b6c149e5a..574b31938 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -12,7 +12,7 @@ v-html="serial_number"> - {{$t('StandardDetails')}} + @@ -47,13 +47,14 @@
-
+
{{val}}
- {{ol.db_field_txt}} + {{ol.db_field_txt}} + {{ol.db_field_txt}} {{ol.value ? ol.value : '--'}} @@ -64,85 +65,52 @@ -- - - {{ol.value ? ol.value : '--'}} + + + {{valItem.title}} + + -- {{ol.value ? ol.value : '--'}}
+
- - - - - - - -
- {{ol.db_field_txt}} - - - {{ol.value ? ol.value.fileName : '--'}} - - {{$t('StandardBreakdown')}} - - - {{$t('download')}} - - - {{ol.value}} - -- - - {{ol.value ? ol.value : '--'}} - {{ol.value ? ol.value:'--'}} -
-
-
- - - - - - - -
- {{ol.db_field_txt}} - - - {{ol.value ? ol.value.fileName : '--'}} - - {{$t('StandardBreakdown')}} - - - {{$t('download')}} - - - {{ol.value}} - -- - - {{ol.value ? ol.value : '--'}} - {{ol.value ? ol.value:'--'}} -
+
+
+ {{ol.db_field_txt}} +
+
+
+ {{valItem.fileName}} + + +
+
+
+
- {{ol.db_field_txt}} + {{ol.db_field_txt}} + {{ol.db_field_txt}} {{ol.value ? ol.value : '--'}} @@ -153,9 +121,16 @@ -- - - {{ol.value ? ol.value : '--'}} + + + {{valItem.title}} + + -- {{ol.value ? ol.value : '--'}}
@@ -164,7 +139,7 @@
-
+
{{$t('DetailsPhasedImplementation')}}
+
+
+ {{item.name}} +
+
{ if (res.success) { this.detailList = res.result + this.$nextTick(() => { + let detailContentRightText = document.getElementsByClassName('detail-content-right-text') + detailContentRightText[0].classList.add('detail-content-right-text-color') + }) this.loading = false } else { this.detailList = [] } }) }, - getPage(){ + getPage() { let tablequery = { pageNo: this.tablepageNo, pageSize: this.tablepageSize, @@ -510,7 +501,7 @@ getAction(this.url.getPage, tablequery).then((res) => { if (res.success) { this.dataGrad = res.result.records - this.tabletotal=res.result.total + this.tabletotal = res.result.total this.loading = false } else { this.dataGrad = [] @@ -635,16 +626,11 @@ window.open(newUrl.href, '_blank') }, relatedClick(val) { - if (val.list && val.list.length == 1) { - let newUrl = this.$router.resolve({ - path: '/docManage/library/detail', - query: val.list[0] - }) - window.open(newUrl.href, '_blank') - } else { - this.visibleRelated = true - this.dataSourceRelated = val.list - } + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: val + }) + window.open(newUrl.href, '_blank') }, breakdown(item) { let newUrl = this.$router.resolve({ @@ -654,6 +640,41 @@ } }) window.open(newUrl.href, '_blank') + }, + detailTextClick(num, name) { + let detailContentRightTextColor = document.getElementsByClassName('detail-content-right-text-color') + if (detailContentRightTextColor && detailContentRightTextColor.length > 0) { + detailContentRightTextColor[0].classList.remove('detail-content-right-text-color') + } + let detailContentRightText = document.getElementsByClassName('detail-content-right-text') + detailContentRightText[num].classList.add('detail-content-right-text-color') + + let fixedPosition = document.getElementsByClassName('fixedPosition') + if (fixedPosition && fixedPosition.length > 0) { + for (let i = 0; i < fixedPosition.length; i++) { + if (fixedPosition[i].innerText == name) { + let offsetTop = fixedPosition[i].offsetTop + let body = document.documentElement || document.body + body.scrollTop = offsetTop - 68 + } + } + } + }, + getRightTitle() { + let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId + let query = { + id: _id + } + getAction(this.url.getMenuList, query).then((res) => { + if (res.success) { + this.rightTitleList = res.result + this.rightTitleList.push({ + name:this.$t('DetailsPhasedImplementation'), + }) + } else { + this.rightTitleList = [] + } + }) } } } @@ -671,17 +692,27 @@ color: #333; background-color: #fff !important; } + .tooltipColor .ant-tooltip-arrow::before { background-color: #fff; } \ No newline at end of file From 69a99136c8726026929ebb46f3ac76c69f86f275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 18:10:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModel.vue | 73 ++++++++++++++++++- .../components/editModel.vue | 72 +++++++++++++++++- .../certificationListMaintenance.vue | 29 +++++++- 3 files changed, 167 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index fe909f061..c6e0407ae 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -145,6 +145,25 @@
+ + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === '' + || + item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ +
@@ -154,12 +173,14 @@
+ @@ -366,4 +426,13 @@ export default { font-size: 16px; margin-right: 4px; } + +.button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 907e6582d..fb2cdaa5a 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -127,6 +127,25 @@ + + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' + || + formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ +
@@ -135,18 +154,21 @@
+ @@ -333,4 +392,13 @@ export default { background: #fff; border-radius: 0 0 2px 2px; } + +.button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index d6f76858b..d20b3415a 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -206,9 +206,17 @@ @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"> - - {{text}} + + + {{$t('viewFile')}} + + -- + + + + @@ -250,6 +259,7 @@ import addModel from '../components/addModel' import editModel from '../components/editModel' import batSetting from '../components/batSetting' + import viewFileModel from '@/components/viewFileModel/index' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { @@ -261,7 +271,8 @@ transferList, addModel, editModel, - batSetting + batSetting, + viewFileModel }, mixins: [ResizeHeader, ResizeColumnProvide], data() { @@ -340,6 +351,14 @@ width: 330, ellipsis: true }, + { + title: this.$t('deliverableTemplate'), + align: 'left', + dataIndex: 'deliverableTemplate', + width: 330, + ellipsis: true, + scopedSlots: { customRender: 'deliverableTemplate' } + }, { title: this.$t('operation'), align: 'left', @@ -536,6 +555,10 @@ }) } }) + }, + // 交付物模板 + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } }