From d3bfa1e4630f8069344455a1fa8d6868b7c0e195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 22 Dec 2023 10:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E6=B8=85=E5=8D=95=E7=9A=84=E5=82=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../ParameterItemCollectionList.vue | 4695 +++++++++-------- .../moudles/addModel.vue | 17 +- .../moudles/detilModel.vue | 19 +- .../projectNonConformance/moudles/viewImg.vue | 131 +- 6 files changed, 2514 insertions(+), 2352 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c07f2063a..602a59322 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -2036,4 +2036,6 @@ module.exports = { regulationEngineerInitiateProcess: 'Regulation Engineer Initiate Process', parameterCollectionDescription:'In the extension parameter collection list, the data highlighted in red represents the deleted parameters after template update, the data highlighted in yellow represents the changed parameters after template update, and for the newly added parameters after template update, homo engineer should find in "More-Add" and add them to the parameter collection list.', experienceReference:'Experience reference', + onlyTheDataFilledUrged:'Only the data whose status is to be filled in or To be processed by eng. interface can be urged', + onlyTheDataWhoseStatusUrged:'Only the data whose status is to be filled in can be urged', } \ 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 eb71f41de..2277c5c8f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3770,4 +3770,6 @@ module.exports = { regulationEngineerInitiateProcess:'法规工程师发起流程', parameterCollectionDescription:'变更扩展参数收集清单中,标红数据为模板更新后被删除参数,标黄数据为模板更新后变更参数,模板更新新增参数请认证工程师在“更多-添加”中查阅并添加至参数收集清单中。', experienceReference:'经验参考', + onlyTheDataFilledUrged:'只能催办状态为待填写或待工程接口人处理的数据', + onlyTheDataWhoseStatusUrged:'只能催办状态为待填写的数据', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 630d05229..17011326f 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -22,7 +22,7 @@
- + {{ rolename }}
@@ -99,7 +99,7 @@ + :triggerChange="false" :dictCode="'cert_category'"/> @@ -148,7 +148,7 @@ {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + {{ $t('reset') }} @@ -156,7 +156,7 @@ @click="searchQuery">{{ $t('query') }} + :fieldList="fieldList"/> @@ -175,7 +175,7 @@ @@ -256,68 +256,75 @@ ...{{ $t('more') }} + + +
+ + {{ $t('question') }} +
- + {{ $t('distributionAndCollection') }}
- + {{ $t('Assignedby') }}
- + {{ $t('dataExport') }}
- + {{ $t('Derivedlist') }}
- + {{ $t('referenceparameter') }}
- + {{ $t('tempSave') }}
- + {{ $t('submit') }}
- + {{ $t('sendBack') }}
+ @getList="getList"/>
- + {{ $t('export') }}
- + {{ $t('CompulsoryWithdrawal') }}
@@ -349,7 +356,7 @@
- + {{ $t('customize') }}
@@ -367,13 +374,13 @@
- + {{ $t('dataExport') }}
- + {{ $t('Derivedlist') }}
@@ -386,7 +393,7 @@ @handlePreservation="handlePreservation" @value="value" @getcustomizeList="getcustomizeList" - @listReset="listReset" @LoginUserType="LoginUserType" /> + @listReset="listReset" @LoginUserType="LoginUserType"/> @@ -395,7 +402,7 @@ + @GetgetTableList="GetgetTableList"/> @@ -442,7 +449,7 @@ @GetgetTableList="GetgetTableList" @GetgetLoginUserType="GetgetLoginUserType" @areaVisibleAssignedbyflag="areaVisibleAssignedbyflag" - @areaVisible="areaVisibleAssignedby = false" /> + @areaVisible="areaVisibleAssignedby = false"/> @@ -450,39 +457,39 @@ @GetgetTableList="GetgetTableList" @GetgetLoginUserType="GetgetLoginUserType" @areaVisibleAssignedbyflaghomo="areaVisibleAssignedbyflaghomo" - @areaVisible="areaVisibleAssignedbyhomo = false" /> + @areaVisible="areaVisibleAssignedbyhomo = false"/> + @areaVisibleTaskCutOffTimeflag="areaVisibleTaskCutOffTimeflag"/> + @areaVisibleTaskCutOffTimeAll="areaVisibleTaskCutOffTimeAll"/> + @AdjustareasofresponAll="AdjustareasofresponAll"/> + :selectedRowKeysArray="selectedRowKeysArray"/> + @areaVisibsynchronous="areaVisibsynchronous = false"/> {{ this.$t('pleaseWaitWhileRunning') }} - + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 0a95a7847..071006a9e 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -457,6 +457,7 @@ +
{{$t('cancel')}} {{$t('submit')}} @@ -1057,14 +1058,14 @@ }, progressTrackingOpenClick(e) { if (e.target.localName == 'img') { - ImagePreview( - { - images: [ - e.target.currentSrc - ], - closeable: true - }) - // this.$refs.viewImgRef.getData(e.target.currentSrc) + // ImagePreview( + // { + // images: [ + // e.target.currentSrc + // ], + // closeable: true + // }) + this.$refs.viewImgRef.getData(e.target.currentSrc) } } } diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 1c86b30b9..c8b073c25 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -229,11 +229,12 @@ +
{{$t('close')}}
- +
@@ -427,14 +428,14 @@ }, progressTrackingOpenClick(e) { if (e.target.localName == 'img') { - ImagePreview( - { - images: [ - e.target.currentSrc - ], - closeable: true - }) - // this.$refs.viewImgRef.getData(e.target.currentSrc) + // ImagePreview( + // { + // images: [ + // e.target.currentSrc + // ], + // closeable: true + // }) + this.$refs.viewImgRef.getData(e.target.currentSrc) } }, openClick(item) { diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/viewImg.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/viewImg.vue index f11011a60..ea0a65795 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/viewImg.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/viewImg.vue @@ -1,17 +1,17 @@