diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 0b3940a8d..523a29c4f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1298,10 +1298,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl \ No newline at end of file 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/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/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 41ad6963e..43e6eba1e 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -53,10 +53,11 @@ :data-source="dataSource" :columns="columns" > +
- {{result.serialNumber}}dsf jdslfkj dsflkdsjfdslkfjds fldskfjdsklfds - {{result.title}}sdfdsfdsfdsfjds lfdjsfdslfjsflkdsfjdsklfdjsfklsd + {{result.serialNumber}} + {{result.title}}
@@ -414,7 +415,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..0346415ed 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}} + + +
@@ -184,6 +226,12 @@ {{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 +1966,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') + }, } } @@ -1986,14 +2056,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;