WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改法规清单校核任务，从待办中心办理链接进来，自动匹配法规工程师角色

Browse Source
This commit is contained in:
范强强
2023-04-07 10:56:23 +08:00
parent a5fbcdd36e
commit 8374af52f7
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+2 -1
View File
@@ -1117,7 +1117,7 @@ module.exports = {
theProjectContactEmpty: 'The project contact person of cannot be empty',
pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published',
TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List to Be Checked or whose verification compliance confirmation process status is List to Be Checked',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
bringInTheProjectInterface: 'Assign to Owner',
theCurrentListSaved: 'The current list data has been submitted and cannot be temporarily saved',
@@ -1766,4 +1766,5 @@ module.exports = {
andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation',
andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
deliverablesFor:'Deliverables for',
dutyPersonRejected:'Duty Person Rejected',
}
jero-web/src/common/lang/zh-cn.js
+2 -1
View File
@@ -711,7 +711,7 @@ module.exports = {
ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据',
pleaseSelectTheDataverificationVerified:'请选择设计符合性确认流程状态为清单待校核或验证符合性确认流程状态为清单待校核的数据',
pleaseSelectTheDataverificationVerified:'请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
TheEngineerAndCertification: '的法规工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
theProjectContactEmpty: '的工程接口人不能为空',
@@ -1868,4 +1868,5 @@ module.exports = {
andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认',
andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回',
deliverablesFor:'的交付结果',
dutyPersonRejected:'责任人拒绝',
}
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+20 -6
View File
@@ -1142,6 +1142,11 @@
key: 'List to be released',
label: this.$t('listToBeReleased')
},
{
value: 'Duty Person Rejected',
key: 'Duty Person Rejected',
label: this.$t('dutyPersonRejected')
},
{
value: 'List to be checked',
key: 'List to be checked',
@@ -1193,6 +1198,11 @@
key: 'List to be released',
label: this.$t('listToBeReleased')
},
{
value: 'Duty Person Rejected',
key: 'Duty Person Rejected',
label: this.$t('dutyPersonRejected')
},
{
value: 'List to be checked',
key: 'List to be checked',
@@ -1392,7 +1402,7 @@
let query = {}
let TaskKey = ''
if (name == this.$t('designComplianceReview')) {
if (row.designFlowStatus == 'Task to be confirmed') {
if (row.designFlowStatus == 'Task to be confirmed' || row.designFlowStatus == 'Duty Person Rejected') {
TaskKey = 'zrrqr'
} else if (row.designFlowStatus == 'Results to be submitted') {
TaskKey = 'zrrtjjfw'
@@ -1422,7 +1432,7 @@
primaryKeyId: row.primaryKeyId
}
} else {
if (row.verifyFlowStatus == 'Task to be confirmed') {
if (row.verifyFlowStatus == 'Task to be confirmed' || row.verifyFlowStatus == 'Duty Person Rejected') {
TaskKey = 'zrrqr'
} else if (row.verifyFlowStatus == 'Results to be submitted') {
TaskKey = 'zrrtjjfw'
@@ -1641,7 +1651,9 @@
//判断当前流程状态是否为清单待校核的数据
for (let i = 0; i < contentList.length; i++) {
if (contentList[i].verifyFlowStatus == 'List to be checked' ||
contentList[i].designFlowStatus == 'List to be checked') {
contentList[i].designFlowStatus == 'List to be checked' ||
contentList[i].verifyFlowStatus == 'Duty Person Rejected' ||
contentList[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(contentList[i].id)
} else {
detailedWarningList.push(
@@ -2429,7 +2441,9 @@
}
for (let i = 0; i < dataSource.length; i++) {
if (dataSource[i].verifyFlowStatus == 'List to be checked' ||
dataSource[i].designFlowStatus == 'List to be checked') {
dataSource[i].designFlowStatus == 'List to be checked' ||
dataSource[i].verifyFlowStatus == 'Duty Person Rejected' ||
dataSource[i].designFlowStatus == 'Duty Person Rejected') {
idList.push(dataSource[i].id)
this.rowKeysSuccessList.push(dataSource[i])
} else {
@@ -2545,7 +2559,7 @@
< div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>)
}
}
if (dataList[i].designFlowStatus == 'List to be checked') {
if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') {
if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
this.requestsNum++
_this.startProcess(dataList[i], 2, this.requestsNum)
@@ -2554,7 +2568,7 @@
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
}
if (dataList[i].verifyFlowStatus == 'List to be checked') {
if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
this.requestsNum++
_this.startProcess(dataList[i], 4, this.requestsNum)