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 @@
>
@@ -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')
+ },
}
}