From 341a360565ebee8e0c351759b0a39c6b8edf6629 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 7 Jul 2022 10:14:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= 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 + .../components/globalAdvancedQuery/index.vue | 1 + .../projectManagement/components/TaskList.vue | 13 +++++- .../components/listOfRegulations.vue | 42 ++++++++++++++++--- 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 276fdf7a4..f2ed6cd8b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1090,4 +1090,6 @@ module.exports = { newRequestCommentListTemplate:'New request for comment list template', NewReleasedStandardTemplate:'New released standard template', pleaseSelectStandard:'Please select a standard', + theResponsiblePersonEmpty:'The responsible person of cannot be empty', + theDeadlineEmpty:'The deadline of cannot be empty', } \ 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 2dc448ef7..490efd7a3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1094,4 +1094,6 @@ module.exports = { newRequestCommentListTemplate:'新征求意见清单模板', NewReleasedStandardTemplate:'新发布标准模板', pleaseSelectStandard:'请选择标准', + theResponsiblePersonEmpty:'的责任人不能为空', + theDeadlineEmpty:'的截止时间不能为空', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index 45dbc9e1b..90a5dda09 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -413,6 +413,7 @@ } } console.debug('---高级查询参数--->', { params, matchType }) + this.visible = false this.$emit(this.callback, params, matchType) }, handleCancel() { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 785f780ab..b8e4b3852 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -55,7 +55,7 @@ >
- {{result.serialNumber}} + {{result.serialNumber}} {{result.title}}
@@ -414,7 +414,16 @@ }, TaskListModelList() { this.getList() - } + }, + standardClick(row){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id:row.id + } + }) + window.open(newUrl.href, '_blank') + }, } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1a0963aaa..362fb22e9 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -184,6 +184,11 @@ {{text}} + + + {{text}} + + {{ record.designDeliverableTypeName }}
{ dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue + }else if(!dataSource[i].designDutyId){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theResponsiblePersonEmpty') } < /div>) + continue + }else if(!dataSource[i].designDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) + continue } } if((dataSource[i].prehomoInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].prehomoInitiatorId == this.userInfo().id) || (dataSource[i].prehomoInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].prehomoInitiatorId == this.userInfo().id)){ - if(!dataSource[i].prehomoDutyId || !dataSource[i].prehomoDueDate){ + if(!dataSource[i].prehomoDutyId && !dataSource[i].prehomoDueDate){ this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue + }else if(!dataSource[i].prehomoDutyId){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) + continue + }else if(!dataSource[i].prehomoDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) + continue } } if((dataSource[i].verifyInitiatorId == dataSource[i].regulationOwnerId && dataSource[i].verifyInitiatorId == this.userInfo().id) || (dataSource[i].verifyInitiatorId == dataSource[i].homologationEngineerId && dataSource[i].verifyInitiatorId == this.userInfo().id)){ - if(!dataSource[i].verifyDutyId || !dataSource[i].verifyDueDate){ + if(!dataSource[i].verifyDutyId && !dataSource[i].verifyDueDate){ this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonAndDeadlineClank') } < /div>) continue + }else if(!dataSource[i].verifyDutyId){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theResponsiblePersonEmpty') } < /div>) + continue + }else if(!dataSource[i].verifyDueDate){ + this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber+this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) + continue } } } @@ -1905,7 +1928,16 @@ this.$message.warning(this.$t('reportNotUploaded')) } } - } + }, + standardClick(row){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id:row.id + } + }) + window.open(newUrl.href, '_blank') + }, } } From f90fe16a43d1402457694de0d98fa302b1829dc0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 7 Jul 2022 11:10:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 3 + .../components/engineeringConfirmation.vue | 17 +- .../components/listOfRegulations.vue | 149 +++++++++++------- 3 files changed, 105 insertions(+), 64 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 862267a30..b9ecf2551 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -142,4 +142,7 @@ .itemModel-multi .ant-form-explain, .ant-form-extra { margin-top: -10px; } + .anticon-exclamation-circle{ + display: none!important; + } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 39898a7ed..bc666817e 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -95,13 +95,13 @@ {{$t('engineer')}} - + + v-model="formInline.userIdName"/> @@ -385,7 +385,7 @@ trigger: 'change' } ], - userName: [ + userIdName: [ { required: true, message: this.$t('engineer') + this.$t('cannotEmpty'), @@ -623,8 +623,9 @@ }) } this.formInline.userId = userId.join(',') - this.formInline.userName = userName.join(',') + this.formInline.userIdName = userName.join(',') this.formInline = { ...this.formInline } + console.log(this.formInline) } this.loadingTable = false } else { @@ -682,7 +683,7 @@ this.formInline[value] = id this.distributionEngineerList = [] if (id) { - this.formInline.userName.split(',').forEach((res, index) => { + this.formInline.userIdName.split(',').forEach((res, index) => { this.distributionEngineerList.push({ deliveryInstructions: '', name: res, @@ -713,9 +714,9 @@ }) _this.distributionEngineerList.splice(num, 1) _this.distributionEngineerList = [..._this.distributionEngineerList] - _this.formInline.userName = _this.formInline.userName.split(',') - _this.formInline.userName.splice(num, 1) - _this.formInline.userName = _this.formInline.userName.join(',') + _this.formInline.userIdName = _this.formInline.userIdName.split(',') + _this.formInline.userIdName.splice(num, 1) + _this.formInline.userIdName = _this.formInline.userIdName.join(',') _this.formInline.userId = _this.formInline.userId.split(',') _this.formInline.userId.splice(num, 1) _this.formInline.userId = _this.formInline.userId.join(',') diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 362fb22e9..bcb75b872 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -26,11 +26,53 @@
-
- {{ $t('subtitle') }} +
+ {{ $t('areaOfResponsibility') }}
- + +
+ + +
+
+ {{ $t('listConfirmationStatus') }} +
+ + + + {{ item.label}} + + + +
+ + +
+
+ {{ $t('taskAffirmStatus') }} +
+ + + + {{ item.label}} + + +
@@ -774,6 +816,11 @@ value: 'correspondingStandard', text: this.$t('correspondingStandard') }, + { + type: 'string', + value: 'subtitle', + text: this.$t('subtitle') + }, { type: '', value: 'implementType', @@ -837,59 +884,49 @@ valueName: 'engineeringInterfacePersonName', text: this.$t('engineeringInterfacePerson') }, + ], + listOptions:[ { - type: '', - value: 'inventoryAffirmStatus', - text: this.$t('listConfirmationStatus'), - options:[ - { - value:'Not started', - key:'Not started', - label:this.$t('notLaunch'), - }, - { - value:'List to confirm', - key:'List to confirm', - label:this.$t('toBeConfirmed'), - }, - { - value:'Accepted', - key:'Accepted', - label:this.$t('accept'), - }, - { - value:'Rejected', - key:'Rejected', - label:this.$t('refuse'), - }, - ], + value:'Not started', + key:'Not started', + label:this.$t('notLaunch'), }, { - type: '', - value: 'taskAffirmStatus', - text: this.$t('taskAffirmStatus'), - options:[ - { - value:'Not started', - key:'Not started', - label:this.$t('notLaunch'), - }, - { - value:'List to confirm', - key:'List to confirm', - label:this.$t('toBeConfirmed'), - }, - { - value:'Accepted', - key:'Accepted', - label:this.$t('accept'), - }, - { - value:'Rejected', - key:'Rejected', - label:this.$t('refuse'), - }, - ], + value:'List to confirm', + key:'List to confirm', + label:this.$t('toBeConfirmed'), + }, + { + value:'Accepted', + key:'Accepted', + label:this.$t('accept'), + }, + { + value:'Rejected', + key:'Rejected', + label:this.$t('refuse'), + }, + ], + taskOptions:[ + { + value:'Not started', + key:'Not started', + label:this.$t('notLaunch'), + }, + { + value:'List to confirm', + key:'List to confirm', + label:this.$t('toBeConfirmed'), + }, + { + value:'Accepted', + key:'Accepted', + label:this.$t('accept'), + }, + { + value:'Rejected', + key:'Rejected', + label:this.$t('refuse'), }, ], visibleRoleSwitching: false, @@ -2018,14 +2055,14 @@ } .title-text { - width: 32px; + width: 92px; color: #000F16; display: inline-block; font-weight: 500; font-size: 14px; margin-right: 16px; margin-top: 3px; - text-align: left; + text-align: right; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; From cbc87868d14c71e58b2d172dc06b631d7aa10f1a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 7 Jul 2022 11:41:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/TaskList.vue | 3 ++- .../views/projectManagement/components/listOfRegulations.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index b8e4b3852..43e6eba1e 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -53,9 +53,10 @@ :data-source="dataSource" :columns="columns" > +
- {{result.serialNumber}} + {{result.serialNumber}} {{result.title}}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index bcb75b872..0346415ed 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -226,8 +226,9 @@ {{text}} + - + {{text}} From 65757473105e2b6830e010579a982ea3f5268c7a Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 7 Jul 2022 12:04:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 0736144aa..f0ff3e598 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -2082,7 +2082,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl