diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d8ba67780..a5e9d9183 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1770,4 +1770,8 @@ module.exports = { theCurrentlySelectedDataContainsReviewed:'The currently selected data contains reviewed data. Are you sure to return it?', reviewTheReasonForReturn:'Review the reason for return', reasonForTaskRejection:'Reason for task rejection', + theDeliveryProcessCannotBeEmpty:'The delivery type of the design compliance process cannot be empty', + theVerificationComplianceProcessCannotBeEmpty:'The delivery type of the verification compliance process cannot be empty', + deadlineForConfirmationDesignComplianceResponsibility:'Deadline for Confirmation of Design Compliance Responsibility', + deadlineForVerifyingComplianceResponsibilityConfirmation:'Deadline for verifying compliance responsibility confirmation', } \ 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 b2b361f68..cbea2722d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1872,5 +1872,8 @@ module.exports = { theCurrentlySelectedDataContainsReviewed:'当前选择的数据中包含审查通过的数据，确认退回吗？', reviewTheReasonForReturn:'审查退回原因', reasonForTaskRejection:'任务拒绝原因', - + theDeliveryProcessCannotBeEmpty:'设计符合性流程的交付物类型不能为空', + theVerificationComplianceProcessCannotBeEmpty:'验证符合性流程的交付物类型不能为空', + deadlineForConfirmationDesignComplianceResponsibility:'设计符合性责任确认截止日期', + deadlineForVerifyingComplianceResponsibilityConfirmation:'验证符合性责任确认截止日期', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue index 42453ebe8..1456d2bc5 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TreeTable.vue @@ -1,37 +1,41 @@ + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index 19b67451e..6552e4762 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -19,23 +19,23 @@ {{$t('regulationNo')}} - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
- * + * {{$t('engineeringInterfacePerson')}}
- * + * {{$t('closingDate')}}
- * + * {{$t('engineeringInterfacePerson')}}
- * + * {{$t('closingDate')}}
- * + * {{$t('personLiable')}}
{ - this.formInline = {... this.formInline} + this.$nextTick(() => { + this.formInline = { ...this.formInline } this.$refs.ruleForm.clearValidate('serialNumber') }) }, @@ -855,12 +840,12 @@ this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value } - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } } else if (this.engineeringInterfacePersonList.length == 0) { this.formInline.sdt = undefined } this.personnelVisible = false - this.$nextTick(()=>{ + this.$nextTick(() => { this.personnelVisible = true }) } else { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 17576fc02..d3aad6ab5 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -18,9 +18,9 @@ {{ $t('areaOfResponsibility') }}
+ :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')" + :type="'select'" + :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -116,7 +116,13 @@ {{ $t('referenceDeliverables') }}
- + +
+ + {{ $t('addConfiguration') }} +
@@ -494,6 +508,8 @@ import modifyHistory from './components/modifyHistoryList' import TaskListModel from '../TaskListModel' import SelectedBy from '@/components/SelectedBy/index' + import reasonForReturn from './components/reasonForReturn' + import addConfiguration from './components/addConfiguration' import referenceDeliverablesList from './components/referenceDeliverablesList' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' @@ -516,7 +532,9 @@ TaskListModel, referenceDeliverablesList, SelectedBy, - viewFileModel + viewFileModel, + reasonForReturn, + addConfiguration }, data() { return { @@ -818,6 +836,13 @@ }, methods: { ...mapGetters(['userInfo']), + addConfigurationClick() { + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + this.$refs.addConfigurationRef.getData(JSON.parse(JSON.stringify(this.selectedRowKeys))) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } + }, getDeliverableTree() { getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => { if (res.success) { @@ -919,7 +944,7 @@ ...this.queryParamQuery, ...queryParam, projectLibraryId: this.$route.query.id, - roleCode: this.formInlineRoleSwitching.roleSwitchingCode + roleCode: this.roleSwitchingCode } this.loading = true getAction(this.url.list, query).then((res) => { @@ -1358,6 +1383,7 @@ } else { this.roleSwitchingList = [] } + this.$emit('getRoleSwitchingList', this.roleSwitchingList) callback && callback() }) }, @@ -1401,38 +1427,38 @@ this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } }) }, - handleOkRoleSwitching() { - this.$refs.ruleFormRoleSwitching.validate(valid => { - if (valid) { - let query = { - roleCode: this.formInlineRoleSwitching.roleSwitchingCode, - id: this.AndUserId, - projectLibraryId: this.$route.query.id, - modelType: 'Certification inventory' - } - this.confirmLoadingRoleSwitching = true - postAction(this.url.AndUserIdEdit, query).then((res) => { - if (res.success) { - this.isRoleSwitching = true - this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode - this.$message.success(this.$t('OperationSuccessful')) - this.visibleRoleSwitching = false - this.confirmLoadingRoleSwitching = false - this.selectedRowKeysList = [] - this.selectedRowKeys = [] - this.getList() - this.$emit('getRoleSwitch', this.roleSwitchingCode) - } else { - this.confirmLoadingRoleSwitching = false - this.$message.warning(this.$t('operationFailed')) - } - }) + handleOkRoleSwitching(roleSwitchingCode) { + // this.$refs.ruleFormRoleSwitching.validate(valid => { + // if (valid) { + let query = { + roleCode: roleSwitchingCode, + id: this.AndUserId, + projectLibraryId: this.$route.query.id, + modelType: 'Certification inventory' + } + // this.confirmLoadingRoleSwitching = true + postAction(this.url.AndUserIdEdit, query).then((res) => { + if (res.success) { + // this.isRoleSwitching = true + this.roleSwitchingCode = roleSwitchingCode + this.$message.success(this.$t('OperationSuccessful')) + // this.visibleRoleSwitching = false + // this.confirmLoadingRoleSwitching = false + this.selectedRowKeysList = [] + this.selectedRowKeys = [] + this.getList() + this.$emit('getRoleSwitch', this.roleSwitchingCode) + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) } }) + // } + // }) }, - handleCancelRoleSwitching() { - this.visibleRoleSwitching = false - }, + // handleCancelRoleSwitching() { + // this.visibleRoleSwitching = false + // }, //保存 preservationClick(num) { postAction(this.url.saveBatch, { 'dataList': this.dataSource }).then((res) => { @@ -1620,10 +1646,14 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let ids = [] let notConditions = [] + let NAId = [] for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { - if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].sdt) { + if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') { + NAId.push(this.selectedRowKeysList[i].id) + } else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType && + this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) { ids.push(this.selectedRowKeysList[i].id) } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) @@ -1636,8 +1666,8 @@ if (notConditions && notConditions.length > 0) { data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyProcessReturned') } - if (ids && ids.length > 0) { - this.submitTask(value, prompt, ids, notConditions, data) + if ((ids && ids.length > 0) || (NAId && NAId.length > 0)) { + this.submitTask(value, prompt, ids, notConditions, data, NAId) } else { this.failedMessage(data) } @@ -1692,7 +1722,11 @@ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusConfirmedSelected') } if (ids && ids.length > 0) { - this.submitTask(value, prompt, ids, notConditions, data) + if (value == 'zrrjjrw') { + this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForTaskRejection')) + } else { + this.submitTask(value, prompt, ids, notConditions, data) + } } else { this.failedMessage(data) } @@ -1718,7 +1752,11 @@ data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation') } if (ids && ids.length > 0) { - this.submitTask(value, prompt, ids, notConditions, data) + if (value == 'zrrjjrw') { + this.$refs.reasonForReturnRef.getData(value, prompt, ids, notConditions, data, this.$t('reasonForTaskRejection')) + } else { + this.submitTask(value, prompt, ids, notConditions, data) + } } else { this.failedMessage(data) } @@ -1733,8 +1771,8 @@ if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' || this.selectedRowKeysList[i].valueType == 'file') { if (!this.selectedRowKeysList[i].deliveryResult) { - this.$message.warning(this.$t('inspectionItems')+'"'+this.selectedRowKeysList[i].inspectionItem+'"'+this.$t('deliverablesFor')+this.$t('cannotEmpty')) - return + this.$message.warning(this.$t('inspectionItems') + '"' + this.selectedRowKeysList[i].inspectionItem + '"' + this.$t('deliverablesFor') + this.$t('cannotEmpty')) + return } } } @@ -1794,9 +1832,14 @@ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let ids = [] let notConditions = [] + let isTrue = false + let _this = this for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') { ids.push(this.selectedRowKeysList[i].id) + } else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') { + ids.push(this.selectedRowKeysList[i].id) + isTrue = true } else { notConditions.push(this.selectedRowKeysList[i].inspectionItem) } @@ -1806,7 +1849,22 @@ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusResultReviewedCanBeSelected') } if (ids && ids.length > 0) { - this.submitTask(value, prompt, ids, notConditions, data) + let text = '' + if (isTrue) { + text = this.$t('theCurrentlySelectedDataContainsReviewed') + } else { + text = prompt + } + if (value == 'rzgcssc_th') { + this.$confirm({ + content: text, + onOk() { + _this.$refs.reasonForReturnRef.getData(value, text, ids, notConditions, data, _this.$t('reviewTheReasonForReturn')) + } + }) + } else { + this.submitTask(value, text, ids, notConditions, data) + } } else { this.failedMessage(data) } @@ -1814,7 +1872,32 @@ this.$message.warning(this.$t('selectLeastOne')) } }, + reasonForReturnForm(value, text, ids, notConditions, data) { + let _this = this + let query = { + 'nodeKey': value, + 'projectLibraryId': _this.$route.query.id, + 'ids': ids.join(',') + } + postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + _this.selectedRowKeys = [] + _this.selectedRowKeysList = [] + _this.$refs.reasonForReturnRef.visible = false + _this.$refs.reasonForReturnRef.confirmLoading = false + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + } else { + _this.$message.warning(res.message) + _this.$refs.reasonForReturnRef.confirmLoading = false + } + }) + }, + //提示语 failedMessage(data) { let detailedWarningList = [] detailedWarningList.push(data) @@ -1822,39 +1905,73 @@ content: ( < div > { detailedWarningList } < /div>) }) }, + + //提示语 failedMessageOne(data) { let detailedWarningList = data this.$warning({ content: ( < div > { detailedWarningList } < /div>) }) }, - submitTask(value, prompt, ids, notConditions, data) { + + //提交数据 + submitTask(value, prompt, ids, notConditions, data, NAId) { let _this = this this.$confirm({ content: prompt, onOk() { - let query = { - 'nodeKey': value, - 'projectLibraryId': _this.$route.query.id, - 'ids': ids.join(',') + if (NAId && NAId.length > 0) { + this.NASubmitTask(NAId, ids, notConditions, data) } - postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.getList() - _this.selectedRowKeys = [] - _this.selectedRowKeysList = [] - if (notConditions && notConditions.length > 0) { - _this.failedMessage(data) - } - } else { - _this.$message.warning(_this.$t('operationFailed')) + if (ids && ids.length > 0) { + let query = { + 'nodeKey': value, + 'projectLibraryId': _this.$route.query.id, + 'ids': ids.join(',') } - }) + postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + _this.selectedRowKeys = [] + _this.selectedRowKeysList = [] + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + } + }) + }, + NASubmitTask(NAId, ids, notConditions, data) { + let _this = this + let query = { + 'projectLibraryId': _this.$route.query.id, + 'ids': NAId.join(',') + } + postAction('/project/projectCertificationInventoryEO/submitTask', query).then((res) => { + if (res.success) { + if (ids && ids.length > 0) { + } else { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + _this.selectedRowKeys = [] + _this.selectedRowKeysList = [] + if (notConditions && notConditions.length > 0) { + _this.failedMessage(data) + } + } + } else { + if (ids && ids.length > 0) { + } else { + _this.$message.warning(_this.$t('operationFailed')) + } } }) }, - viewFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) }, diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index fe42f0fd7..bb229b6dd 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -63,89 +63,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -221,30 +139,6 @@ - - - - - - - - - - - - - - - - - - - - - - - -
@@ -252,13 +146,6 @@ {{$t('engineeringInterfacePerson')}}
- - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -318,10 +186,15 @@
+ * {{$t('personLiable')}}
- + - - - - - - - - - - - - - - - - - - -
+ * {{$t('cutoffTime')}}
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ * {{$t('typeOfDeliverables')}}
- + - - - - -
@@ -485,171 +289,7 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
 {{$t('verificationAndConformityconfirmation')}}
@@ -657,10 +297,15 @@
+ * {{$t('personLiable')}}
- +
+ * {{$t('cutoffTime')}}
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ * {{$t('typeOfDeliverables')}}
- + - - - - - -
@@ -913,9 +523,43 @@ return { visible: false, confirmLoading: false, - rules: {}, rejectCauseListOne: [], - rulesData: { + rules: { + attestationRank: [ + { + required: true, + message: this.$t('certificationLevel') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + dutyTerritory: [ + { + required: true, + message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + homologationEngineerId: [ + { + required: true, + message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + regulationOwnerId: [ + { + required: true, + message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + engineeringInterfacePerson: [ + { + required: true, + message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], subtitle: [ { max: 300, @@ -964,15 +608,31 @@ message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'), trigger: 'blur' } - ] + ], + designDeliverableType: [ + { + required: true, + message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + verifyDeliverableType: [ + { + required: true, + message: this.$t('typeOfDeliverables') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + }, + formInline: { + verifyDeliverableType: [], + designDeliverableType: [] }, - formInline: {}, regulatoryEngineerList: [], engineeringInterfacePersonList: [], certificationEngineerList: [], designInitiatorList: [], designDutyList: [], - prehomoInitiatorList: [], verifyInitiatorList: [], verifyDutyList: [], prehomoDutyList: [], @@ -981,11 +641,10 @@ designDutyIdDisabled: false, prehomoInitiatorIdDisabled: false, prehomoDutyIdDisabled: false, - verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], userInfoQuery: {}, - rejectCauseList: [] + rejectCauseList: [], } }, mounted() { @@ -1047,11 +706,8 @@ this.formInline.engineeringInterfacePerson = undefined this.formInline.homologationEngineerId = undefined this.formInline.designInitiatorId = undefined - // this.formInline.designDutyId = undefined this.formInline.prehomoInitiatorId = undefined - this.formInline.prehomoDutyId = undefined this.formInline.verifyInitiatorId = undefined - // this.formInline.verifyDutyId = undefined this.queryPersonByProject(event) }, @@ -1078,104 +734,12 @@ } }) }, - getDis(val) { - if (val.taskAffirmStatus != 'Not started') { - this.designInitiatorDisabled = true - } else if (val.roleCode == 0) { - this.designInitiatorDisabled = false - } else { - this.designInitiatorDisabled = true - } - if (val.taskAffirmStatus != 'Not started') { - this.prehomoInitiatorIdDisabled = true - } else if (val.roleCode == 0) { - this.prehomoInitiatorIdDisabled = false - } else { - this.prehomoInitiatorIdDisabled = true - } - - if (val.taskAffirmStatus != 'Not started') { - this.verifyDutyIdDisabled = true - } else if (val.roleCode == 0) { - this.verifyDutyIdDisabled = false - } else { - this.verifyDutyIdDisabled = true - } - - }, getProject(row, res, callback) { - //设计符合性确认-发起人 - // if (row.designInitiator == 1) { - // this.designInitiatorList = res.result.lawEngineerList || [] - // } else if (row.designInitiator == 2) { - // this.designInitiatorList = res.result.certificationEngineerList || [] - // } else if (row.designInitiator == 3) { - // this.designInitiatorList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.designInitiatorList = res.result.studioPersonList || [] - // } else if (!row.designInitiator || row.designInitiator == '') { this.designInitiatorList = res.result.allPersonList || [] - // } - //设计符合性确认-责任人 - // if (row.designDuty == 1) { - // this.designDutyList = res.result.lawEngineerList || [] - // } else if (row.designDuty == 2) { - // this.designDutyList = res.result.certificationEngineerList || [] - // } else if (row.designDuty == 3) { - // this.designDutyList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.designDutyList = res.result.studioPersonList || [] - // } else if (!row.designDuty || row.designDuty == '') { this.designDutyList = res.result.allPersonList || [] - // } - //prehomo确认-发起人 - // if (row.prehomoInitiator == 1) { - // this.prehomoInitiatorList = res.result.lawEngineerList || [] - // } else if (row.prehomoInitiator == 2) { - // this.prehomoInitiatorList = res.result.certificationEngineerList || [] - // } else if (row.prehomoInitiator == 3) { - // this.prehomoInitiatorList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.prehomoInitiatorList = res.result.studioPersonList || [] - // } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { - this.prehomoInitiatorList = res.result.allPersonList || [] - // } - //prehomo确认-责任人 - // if (row.prehomoDuty == 1) { - // this.prehomoDutyList = res.result.lawEngineerList || [] - // } else if (row.prehomoDuty == 2) { - // this.prehomoDutyList = res.result.certificationEngineerList || [] - // } else if (row.prehomoDuty == 3) { - // this.prehomoDutyList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.prehomoDutyList = res.result.studioPersonList || [] - // } else if (!row.prehomoDuty || row.prehomoDuty == '') { this.prehomoDutyList = res.result.allPersonList || [] - // } - //验证符合性确认-发起人 - // if (row.verifyInitiator == 1) { - // this.verifyInitiatorList = res.result.lawEngineerList || [] - // } else if (row.verifyInitiator == 2) { - // this.verifyInitiatorList = res.result.certificationEngineerList || [] - // } else if (row.verifyInitiator == 3) { - // this.verifyInitiatorList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.verifyInitiatorList = res.result.studioPersonList || [] - // } else if (!row.verifyInitiator || row.verifyInitiator == '') { this.verifyInitiatorList = res.result.allPersonList || [] - // } - //验证符合性确认-责任人 - // if (row.verifyDuty == 1) { - // this.verifyDutyList = res.result.lawEngineerList || [] - // } else if (row.verifyDuty == 2) { - // this.verifyDutyList = res.result.certificationEngineerList || [] - // } else if (row.verifyDuty == 3) { - // this.verifyDutyList = res.result.engineeringInterfacePersonList || [] - // } else if (row.designInitiator == 0) { - // this.verifyDutyList = res.result.studioPersonList || [] - // } else if (!row.verifyDuty || row.verifyDuty == '') { this.verifyDutyList = res.result.allPersonList || [] - // } callback() }, getData(row, res) { @@ -1183,21 +747,9 @@ if (!(this.designInitiatorList.some(val => val.value == row.designInitiatorId))) { row.designInitiatorId = undefined } - // if (!(this.designDutyList.some(val => val.value == row.designDutyId))) { - // row.designDutyId = undefined - // } - if (!(this.prehomoInitiatorList.some(val => val.value == row.prehomoInitiatorId))) { - row.prehomoInitiatorId = undefined - } - if (!(this.prehomoDutyList.some(val => val.value == row.prehomoDutyId))) { - row.prehomoDutyId = undefined - } if (!(this.verifyInitiatorList.some(val => val.value == row.verifyInitiatorId))) { row.verifyInitiatorId = undefined } - // if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) { - // row.verifyDutyId = undefined - // } if (!(this.regulatoryEngineerList.some(val => val.value == row.regulationOwnerId))) { row.regulationOwnerId = undefined } @@ -1210,6 +762,9 @@ this.$nextTick(() => { this.formInline = row this.formInline = { ...this.formInline } + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }) }, editModel(item) { @@ -1219,7 +774,6 @@ this.certificationEngineerList = [] this.designInitiatorList = [] this.designDutyList = [] - this.prehomoInitiatorList = [] this.verifyInitiatorList = [] this.verifyDutyList = [] this.prehomoDutyList = [] @@ -1234,97 +788,10 @@ this.formInline = item this.formInline = { ...this.formInline } } - this.getDis(item) this.$nextTick(() => { - this.rules = {} this.$refs.ruleForm.clearValidate() - switch (item.roleCode) { - case '0': - this.studioLogic() - break - case '1': - this.statuteLogic() - break - case '2': - this.authenticationLogic() - break - case '3': - this.engineeringLogic() - break - case '4': - this.authenticationOrengineerLogic() - break - } }) }, - - studioLogic() { - let rules = { - ...this.rulesData, - attestationRank: [ - { - required: true, - message: this.$t('certificationLevel') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - dutyTerritory: [ - { - required: true, - message: this.$t('areaOfResponsibility') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - homologationEngineerId: [ - { - required: true, - message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - regulationOwnerId: [ - { - required: true, - message: this.$t('regulatoryEngineer') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - engineeringInterfacePerson: [ - { - required: true, - message: this.$t('engineeringInterfacePerson') + this.$t('cannotEmpty'), - trigger: 'change' - } - ] - } - this.$set(this, 'rules', rules) - console.log(this.rules) - }, - statuteLogic() { - let rules = { ...this.rulesData } - this.$set(this, 'rules', rules) - }, - authenticationLogic() { - let rules = { - ...this.rulesData, - attestationRank: [ - { - required: true, - message: this.$t('certificationLevel') + this.$t('cannotEmpty'), - trigger: 'change' - } - ] - } - this.$set(this, 'rules', rules) - }, - engineeringLogic() { - let rules = { ...this.rulesData } - this.$set(this, 'rules', rules) - }, - authenticationOrengineerLogic() { - let rules = { ...this.rulesData } - this.$set(this, 'rules', rules) - }, clickButtonToUpload(item) { let isTrue = false if (item == 'designDeliverableTemplate') { @@ -1389,9 +856,6 @@ if (!formInline.prehomoInitiatorId) { formInline.prehomoInitiatorId = '' } - if (!formInline.prehomoDutyId) { - formInline.prehomoDutyId = '' - } if (!formInline.verifyInitiatorId) { formInline.verifyInitiatorId = '' } @@ -1423,6 +887,12 @@ PersonnelSelectionChange(value, id) { this.formInline[value] = id this.formInline = { ...this.formInline } + }, + designDeliverableTypeChange() { + + }, + verifyDeliverableTypeChange() { + } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 5da4a73a0..6983c1bd0 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -378,7 +378,7 @@ - +
@@ -395,7 +395,7 @@ {{ $t('TaskCutOffTime') }}
- + - +
+ + + + +
+
+ * + + {{ $t('deadlineForConfirmationDesignComplianceResponsibility') }} + +
+ + +
+ + + + +
+
+ * + + {{ $t('deadlineForVerifyingComplianceResponsibilityConfirmation') }} + +
+ +
@@ -450,40 +486,40 @@ - - - - -
-
- * - {{ $t('roleSwitching') }} -
- - - - - - {{ item.roleName }} - - - - -
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0){ - res.result.forEach(val=>{ + if (res.result && res.result.length > 0) { + res.result.forEach(val => { regulatoryEngineer.options.push({ value: val.id, key: val.id, @@ -1528,6 +1572,7 @@ } else { this.roleSwitchingList = [] } + this.$emit('getRoleSwitchingList', this.roleSwitchingList) callback && callback() }) }, @@ -1543,9 +1588,9 @@ getAction(this.url.AndUserId, query).then((res) => { if (res.success) { // this.isDisplay = true - if (this.$route.query.roleOpen){ + if (this.$route.query.roleOpen) { this.formInlineRoleSwitching.roleSwitchingCode = this.$route.query.roleOpen - }else{ + } else { this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode } this.AndUserId = res.result.id @@ -1948,38 +1993,38 @@ }, //切换角色的确认事件 - handleOkRoleSwitching() { - this.$refs.ruleFormRoleSwitching.validate(valid => { - if (valid) { - let query = { - roleCode: this.formInlineRoleSwitching.roleSwitchingCode, - id: this.AndUserId, - projectLibraryId: this.$route.query.id, - modelType: 'Laws inventory' - } - this.confirmLoadingRoleSwitching = true - postAction(this.url.AndUserIdEdit, query).then((res) => { - if (res.success) { - this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode - this.$message.success(this.$t('OperationSuccessful')) - this.visibleRoleSwitching = false - this.confirmLoadingRoleSwitching = false - this.$emit('getRoleSwitch', this.formInlineRoleSwitching.roleSwitchingCode) - this.selectedRowKeys = [] - this.getList() - } else { - this.confirmLoadingRoleSwitching = false - this.$message.warning(this.$t('operationFailed')) - } - }) + handleOkRoleSwitching(roleSwitchingCode) { + // this.$refs.ruleFormRoleSwitching.validate(valid => { + // if (valid) { + let query = { + roleCode: roleSwitchingCode, + id: this.AndUserId, + projectLibraryId: this.$route.query.id, + modelType: 'Laws inventory' + } + // this.confirmLoadingRoleSwitching = true + postAction(this.url.AndUserIdEdit, query).then((res) => { + if (res.success) { + this.roleSwitchingCode = roleSwitchingCode + this.$message.success(this.$t('OperationSuccessful')) + // this.visibleRoleSwitching = false + // this.confirmLoadingRoleSwitching = false + this.$emit('getRoleSwitch', roleSwitchingCode) + this.selectedRowKeys = [] + this.getList() + } else { + this.confirmLoadingRoleSwitching = false + this.$message.warning(this.$t('operationFailed')) } }) + // } + // }) }, //切换角色的取消事件 - handleCancelRoleSwitching() { - this.visibleRoleSwitching = false - }, + // handleCancelRoleSwitching() { + // this.visibleRoleSwitching = false + // }, //打开切换角色的弹窗；并判断当前的角色在角色列表中是否存在；如不存在选择角色列表中的第一个 roleSwitchingClick() { this.visibleRoleSwitching = true @@ -2128,9 +2173,9 @@ this.orderByField = 'designDeliverableType' } else if (sorter.columnKey == 'verifyDeliverableTypeName') { this.orderByField = 'verifyDeliverableType' - }else if (sorter.columnKey == 'designDutyIdName') { + } else if (sorter.columnKey == 'designDutyIdName') { this.orderByField = 'designDutyId' - }else if (sorter.columnKey == 'verifyDutyIdName') { + } else if (sorter.columnKey == 'verifyDutyIdName') { this.orderByField = 'verifyDutyId' } else { this.orderByField = sorter.columnKey @@ -2269,11 +2314,12 @@ } else { this.columnsAll = this.column } + let long = localStorage.getItem('language') || 'zh-cn' this.columnsAll.push({ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 260, + width: long == 'zh-cn' ? 180 : 246, scopedSlots: { customRender: 'operation' } }) this.columnsAll.forEach((item) => { @@ -2413,6 +2459,11 @@ this.detailedSuccessList = [] this.detailedWarningList = [] }) + }else{ + this.confirmLoading = true + for (let i = 0; i < this.startProcessList.length; i++) { + this.startProcess(this.startProcessList[i].dataList, this.startProcessList[i].type, this.startProcessList[i].requestsNum) + } } } }) @@ -2437,6 +2488,9 @@ this.confirmLoading = false this.JTextLoading = false this.getList() + if(this.detailedWarningList && this.detailedWarningList.length > 0){ + this.promptInformation(this.detailedWarningList) + } } }).catch((error) => { this.JTextLoading = false @@ -2496,13 +2550,12 @@ } else { this.detailedWarningList.push( < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) - this.dataWarningList.push( - < div > { dataSource[i].serialNumber + this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } } if (idList && idList.length > 0) { if (num == 0) { - this.submitClick(this.rowKeysSuccessList, 1) + this.startProcessList = [] + this.submitClick(this.rowKeysSuccessList) } else { this.visibleComment = true this.formInlineComment = {} @@ -2519,74 +2572,13 @@ }, submitClick(dataList, num) { - let content = [] - let designList = [] - let verifyList = [] - let detailedWarningList = [] - this.completeTaskList = [] - this.detailedWarningList = this.dataWarningList || [] - let _this = this - _this.$destroyAll() - if (num == 1) { - for (let i = 0; i < dataList.length; i++) { - if (!dataList[i].designDeliverableType && !dataList[i].designDutyId && !dataList[i].designDueDate) { - content.push(dataList[i]) - continue - } - if (!dataList[i].verifyDeliverableType && !dataList[i].verifyDutyId && !dataList[i].verifyDueDate) { - content.push(dataList[i]) - continue - } - } - } - if (content && content.length > 0) { - for (let i = 0; i < content.length; i++) { - if (!content[i].designDeliverableType) { - designList.push(content[i].serialNumber) - } - if (!content[i].verifyDeliverableType) { - verifyList.push(content[i].serialNumber) - } - } - if (designList.length > 0 || verifyList.length > 0) { - detailedWarningList.push( - < div > { this.$t('theDataYouSelectedContainsSkip') } < /div>) - } - if (designList.length > 0) { - detailedWarningList.push( - < div > { designList.join(',') + ' ' + this.$t('designComplianceProcessFor') } < /div>) - } - if (verifyList.length > 0) { - detailedWarningList.push( - < div > { verifyList.join(',') + ' ' + this.$t('validationComplianceProcessFor') } < /div>) - } - this.$confirm({ - content: detailedWarningList, - class: 'confirmClass', - onOk() { - _this.submitClick(dataList, 2) - } - }) - return - } - if (num == 1) { - this.$confirm({ - content: _this.$t('confirmLaunchTask'), - onOk() { - _this.submitAdmin(dataList) - } - }) - } else { - _this.submitAdmin(dataList) - } - }, - - submitAdmin(dataList) { let _this = this this.requestsNum = 0 - this.JTextLoading = true + // this.JTextLoading = true for (let i = 0; i < dataList.length; i++) { - if (dataList[i].designDeliverableType) { + if(dataList[i].designDeliverableType == '1645667531513237506'){ + + }else if (dataList[i].designDeliverableType) { if (!dataList[i].designDutyId) { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForDesignCannotBeBlank') } < /div>) @@ -2595,21 +2587,34 @@ _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('theDeadlineForTheDesignCannotBeEmpty') } < /div>) } + } else { + _this.detailedWarningList.push( + < div > { dataList[i].serialNumber + _this.$t('theDeliveryProcessCannotBeEmpty') } < /div>) } - if (dataList[i].verifyDeliverableType) { + if (dataList[i].verifyDeliverableType == '1645667531513237506'){ + + } else if (dataList[i].verifyDeliverableType) { if (!dataList[i].verifyDueDate) { _this.detailedWarningList.push( - < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>) + < div > { dataList[i].serialNumber + _this.$t('theDeadlineComplianceProcessCannotEmpty') } < /div>) } if (!dataList[i].verifyDutyId) { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('thePersonResponsibleForVerifyingEmpty') } < /div>) } + } else { + _this.detailedWarningList.push( + < div > { dataList[i].serialNumber + _this.$t('theVerificationComplianceProcessCannotBeEmpty') } < /div>) } 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) + this.startProcessList.push({ + dataList: dataList[i], + type: 2, + requestsNum: this.requestsNum + }) + // _this.startProcess(dataList[i], 2, this.requestsNum) } } else { _this.detailedWarningList.push( @@ -2618,21 +2623,27 @@ 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) + this.startProcessList.push({ + dataList: dataList[i], + type: 4, + requestsNum: this.requestsNum + }) + // _this.startProcess(dataList[i], 4, this.requestsNum) } } else { _this.detailedWarningList.push( < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>) } - } if (this.requestsNum == 0) { if (_this.detailedWarningList && _this.detailedWarningList.length > 0) { _this.promptInformation(_this.detailedWarningList) - } else { - this.$message.warning(_this.$t('theDataYouInitiate')) } - this.JTextLoading = false + // this.JTextLoading = false + } else { + this.listTitle = this.$t('initiateTask') + this.timeName = '任务' + this.visible = true } }, handleOkComment() { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 7b3f39c18..8d1a8ad90 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -11,6 +11,9 @@ style="height: 100%;overflow: auto;margin-bottom: 436px;"> {{textLoading}} + {{$t('referenceDeliverables')}}
- +
@@ -65,6 +69,7 @@ import footerProcess from '../../../processCenter/components/footerProcess' import reviewedByThePersonInCharge from './reviewedByThePersonInCharge' import circulationHistory from './circulationHistory' + import referenceDeliverablesList from './referenceDeliverablesList' import { getAction, postAction, deleteAction, downloadFile, putAction } from '@/api/manage' import { mapGetters } from 'vuex' @@ -76,7 +81,8 @@ standardContent, reviewedByThePersonInCharge, footerProcess, - circulationHistory + circulationHistory, + referenceDeliverablesList }, data() { return { @@ -152,6 +158,12 @@ ...mapGetters(['userInfo']), handleCancel() { this.visible = false + }, + referenceDeliverablesClick(){ + this.$refs.referenceDeliverablesListRef.transferModel() + }, + referenceDeliverablesListForm(){ + }, confirm(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => {