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

修改任务清单发起的逻辑

Browse Source
This commit is contained in:
qq787203167
2022-05-11 17:22:53 +08:00
parent 02d2a8812b
commit aff9a33634
3 changed files with 147 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+3
View File
@@ -796,4 +796,7 @@ module.exports = {
preHomeConfirmation:'Pre home confirmation',
verificationComplianceReview:'Verification compliance review',
Deployment:'Deployment',
pleaseDesignConformityConfirmation:'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo:'Please complete the data confirmed by prehomo',
pleaseConformityVerification:'Please complete the data of Conformity verification',
}
jero-web/src/common/lang/zh-cn.js
+114 -111
View File
@@ -483,7 +483,7 @@ module.exports = {
nonConformity: '不符合',
Tracked: '待追踪',
notInvolved: '不涉及',
toBeConfirmed:'待确认',
toBeConfirmed: '待确认',
Operator: '操作人',
role: '角色',
operationContent: '操作内容',
@@ -493,7 +493,7 @@ module.exports = {
sentProcess: '已发流程',
monitoringProcess: '监控流程',
ConfirmDeployment: '确认部署？',
Deployment:'部署',
Deployment: '部署',
ConfirmReplication: '确认复制？',
ProcessName: '流程名称',
ProcessType: '流程类型',
@@ -581,7 +581,7 @@ module.exports = {
selectDisplayList: '请选择是否列表展示',
documentSplitDisplay: '文档拆分模块展示',
VirtualListName: '虚拟清单名称',
VirtualList:'虚拟清单',
VirtualList: '虚拟清单',
listStatus: '清单状态',
creater: '创建人',
withdraw: '撤回',
@@ -664,55 +664,55 @@ module.exports = {
DocumentStandard: '文档标准',
standardName: '标准名称',
initiateListConfirmation: '发起清单确认',
initiateTaskConfirmation:'发起任务确认',
alteration:'变更',
fixedPlate:'定版',
taskAffirmStatus:'任务确认状态',
listConfirmationStatus:'清单确认状态',
ListConfirmationDeadline:'清单确认截止时间',
dataConfirmation:'请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
taskDataConfirmation:'请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
pleaseSelectPersonFirst:'请先选择人员',
onlyOnePersonCanBeSelected:'只能选择一个人员',
overrule:'驳回',
confirmSubmit:'确认提交？',
confirmOverrule:'确认驳回？',
The:'第',
submitted:'条数据已提交不能重复提交',
incorrectsubmitted:'条数据状态有误；只能提交状态为待确认的数据',
basicInformationOfParameters:'参数基本信息',
regulatoryCertificationTaskPlan:'法规/认证任务计划',
bringInRelevantPersonnel:'带入相关人员',
confirmBringInRelevantPersonnel:'确认带入相关人员？',
problemType:'问题类型',
projectDetails:'项目详情',
listOfRegulations:'法规清单',
taskList:'任务清单',
TaskParameterCollection:'认证参数收集',
nonConformance:'未符合项',
deadlineForConfirmationOfDesignCompliance:'设计符合性确认截止时间',
prehomoConfirmationDeadline:'PreHomo确认截止时间',
verificationComplianceConfirmationDeadline:'验证符合性确认截止时间',
pleaseEnterTheCorrectWebAddress:'请输入正确的网址',
updateTime:'更新时间',
comment:'评论',
historicalVersion:'历史版本',
versionName:'版本名称',
finalizationTime:'定版时间',
setting:'设定',
date:'日期',
time:'时间',
uploadMaximumATime:'一次最多上传二十张图片',
initiateTaskConfirmation: '发起任务确认',
alteration: '变更',
fixedPlate: '定版',
taskAffirmStatus: '任务确认状态',
listConfirmationStatus: '清单确认状态',
ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
pleaseSelectPersonFirst: '请先选择人员',
onlyOnePersonCanBeSelected: '只能选择一个人员',
overrule: '驳回',
confirmSubmit: '确认提交？',
confirmOverrule: '确认驳回？',
The: '第',
submitted: '条数据已提交不能重复提交',
incorrectsubmitted: '条数据状态有误；只能提交状态为待确认的数据',
basicInformationOfParameters: '参数基本信息',
regulatoryCertificationTaskPlan: '法规/认证任务计划',
bringInRelevantPersonnel: '带入相关人员',
confirmBringInRelevantPersonnel: '确认带入相关人员？',
problemType: '问题类型',
projectDetails: '项目详情',
listOfRegulations: '法规清单',
taskList: '任务清单',
TaskParameterCollection: '认证参数收集',
nonConformance: '未符合项',
deadlineForConfirmationOfDesignCompliance: '设计符合性确认截止时间',
prehomoConfirmationDeadline: 'PreHomo确认截止时间',
verificationComplianceConfirmationDeadline: '验证符合性确认截止时间',
pleaseEnterTheCorrectWebAddress: '请输入正确的网址',
updateTime: '更新时间',
comment: '评论',
historicalVersion: '历史版本',
versionName: '版本名称',
finalizationTime: '定版时间',
setting: '设定',
date: '日期',
time: '时间',
uploadMaximumATime: '一次最多上传二十张图片',
time:'时间',
confirmationOfRegulationsList:'法规清单确认',
regulatoryTaskConfirmation:'法规任务确认',
certificationStart:'认证开始',
certificationEnd:'认证结束',
directoryName:'目录名称',
batch:'批次',
uploadTime:'上传时间',
enclosure:'附件',
time: '时间',
confirmationOfRegulationsList: '法规清单确认',
regulatoryTaskConfirmation: '法规任务确认',
certificationStart: '认证开始',
certificationEnd: '认证结束',
directoryName: '目录名称',
batch: '批次',
uploadTime: '上传时间',
enclosure: '附件',
// 认证
deleteConfiguration: '删除配置',
addConfiguration: '添加配置',
@@ -741,64 +741,67 @@ module.exports = {
releaseVersion: '发布版本',
parameterTemplate: '参数模板',
contentDescription: '内容说明',
circulationInformation:'流转信息',
circulationHistory:'流转历史',
agree:'同意',
disagree:'不同意',
feedbackMessage:'反馈意见',
result:'结果',
opinion:'意见',
operationNode:'操作节点',
selectIssuer:'选择下发人',
sendBack:'退回',
taskConfirmationProcess:'任务确认流程',
notFinished:'未完成',
Finished:'已完成',
theRequirementst:'工程接口人确认符合性要求',
dataLoading:'数据加载中...',
Submitting:'提交中...',
Returning:'退回中',
terminationProcessing:'终止流程中',
publishComment:'发表评论',
record:'记录',
replyToComments:'回复评论',
noComment:'暂无评论',
theReceived:'所有数据的清单确认状态和任务确认状态都为接受才可以定版',
notEvaluated:'未评估',
cannotExceed:'不能超出',
Characters:'个字符',
standardInformation:'标准信息',
importTemplate:'导入模板',
verificationConfirmationDeadline:'验证符合性确认截止时间',
technicalEvaluationResults:'技术评估结果',
engineeringConfirmation:'工程确认',
feedbackFromTheEngineer:'工程师反馈意见',
completedBy:'填写人',
completedTime:'填写时间',
replyFromProjectContactPerson:'工程接口人回复',
answer:'回复',
distributionEngineer:'分发工程师',
reminderHandling:'提醒办理',
addFeedback:'添加反馈',
engineer:'工程师',
engineeringConfirmationDetails:'工程确认详情',
reminder:'提醒',
adopt:'通过',
reviewedByThePersonInCharge:'负责人审核',
onlyDeleted:'只能删除清单确认状态为未发起或拒绝的数据',
experimentPassed:'实验通过',
experimentFailed:'实验失败',
toBeStarted:'待开始',
inProgress:'进行中',
green:'绿',
red:'红',
blue:'蓝',
yellow:'黄',
resultReported:'结果报告',
TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加',
number:'序号',
Deadline:'截止时间',
designComplianceReview:'设计符合性审查',
preHomeConfirmation:'Pre-Home确认',
verificationComplianceReview:'验证符合性审查',
circulationInformation: '流转信息',
circulationHistory: '流转历史',
agree: '同意',
disagree: '不同意',
feedbackMessage: '反馈意见',
result: '结果',
opinion: '意见',
operationNode: '操作节点',
selectIssuer: '选择下发人',
sendBack: '退回',
taskConfirmationProcess: '任务确认流程',
notFinished: '未完成',
Finished: '已完成',
theRequirementst: '工程接口人确认符合性要求',
dataLoading: '数据加载中...',
Submitting: '提交中...',
Returning: '退回中',
terminationProcessing: '终止流程中',
publishComment: '发表评论',
record: '记录',
replyToComments: '回复评论',
noComment: '暂无评论',
theReceived: '所有数据的清单确认状态和任务确认状态都为接受才可以定版',
notEvaluated: '未评估',
cannotExceed: '不能超出',
Characters: '个字符',
standardInformation: '标准信息',
importTemplate: '导入模板',
verificationConfirmationDeadline: '验证符合性确认截止时间',
technicalEvaluationResults: '技术评估结果',
engineeringConfirmation: '工程确认',
feedbackFromTheEngineer: '工程师反馈意见',
completedBy: '填写人',
completedTime: '填写时间',
replyFromProjectContactPerson: '工程接口人回复',
answer: '回复',
distributionEngineer: '分发工程师',
reminderHandling: '提醒办理',
addFeedback: '添加反馈',
engineer: '工程师',
engineeringConfirmationDetails: '工程确认详情',
reminder: '提醒',
adopt: '通过',
reviewedByThePersonInCharge: '负责人审核',
onlyDeleted: '只能删除清单确认状态为未发起或拒绝的数据',
experimentPassed: '实验通过',
experimentFailed: '实验失败',
toBeStarted: '待开始',
inProgress: '进行中',
green: '绿',
red: '红',
blue: '蓝',
yellow: '黄',
resultReported: '结果报告',
TheDoesNotContainData: '该虚拟清单的维护清单中没有数据,是否需要添加',
number: '序号',
Deadline: '截止时间',
designComplianceReview: '设计符合性审查',
preHomeConfirmation: 'Pre-Home确认',
verificationComplianceReview: '验证符合性审查',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据'
}
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+30 -4
View File
@@ -873,10 +873,36 @@
if (this.dataSource[i].id == selectedRowKeys[j]) {
if ((this.dataSource[i].taskAffirmStatus == 'Not started' || this.dataSource[i].taskAffirmStatus == 'rejected') &&
this.dataSource[i].engineeringInterfacePerson && this.dataSource[i].inventoryAffirmStatus == 'accepted') {
isTrue = true
// if (this.dataSource[i]){
//
// }
if ((this.dataSource[i].verifyDueDate && this.dataSource[i].verifyDutyId
&& this.dataSource[i].verifyInitiatorId && this.dataSource[i].verifyDeliverableType) ||
(!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId
&& !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) {
isTrue = true
}else{
isTrue = false
this.$message.warning(this.$t('pleaseConformityVerification'))
return
}
if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId
&& this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) ||
(!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId
&& !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)){
isTrue = true
}else{
isTrue = false
this.$message.warning(this.$t('pleaseConfirmedByPrehomo'))
return
}
if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId
&& this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) ||
(!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId
&& !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)){
isTrue = true
}else{
isTrue = false
this.$message.warning(this.$t('pleaseDesignConformityConfirmation'))
return
}
} else {
isTrue = false
this.$message.warning(this.$t('taskDataConfirmation'))