diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ae4016e82..0fcd49413 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -729,4 +729,5 @@ module.exports = { taskConfirmationProcess:'Task confirmation process', notFinished:'not finished', Finished:'Finished', + theRequirementst:'The engineering interface person confirms the compliance requirements' } \ 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 95af1cc85..10450f996 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -734,4 +734,5 @@ module.exports = { taskConfirmationProcess:'任务确认流程', notFinished:'未完成', Finished:'已完成', + theRequirementst:'工程接口人确认符合性要求' } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c76cad659..84462a0fe 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -1,7 +1,7 @@ + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index aa09a219b..7cacafafb 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -264,325 +264,6 @@ import moment from 'moment' import {mapGetters} from 'vuex' import {Base64} from 'js-base64' -export default { - name: 'listOfRegulations', - components: { - ImportFile, - listAddModel, - listEditModel, - batSetting, - transferList, - globalAdvancedQuery - }, - data() { - return { - columns: [ - { - title: this.$t('standard'), - align: 'center', - dataIndex: 'serialNumber', - width: 180, - fixed: 'left', - scopedSlots: {customRender: 'titleName'} - }, - { - title: this.$t('title'), - align: 'center', - dataIndex: 'title', - width: 180, - fixed: 'left', - scopedSlots: {customRender: 'titleName'} - }, - { - title: this.$t('subtitle'), - align: 'center', - dataIndex: 'subtitle', - width: 180, - fixed: 'left', - scopedSlots: {customRender: 'titleName'} - }, - { - title: this.$t('listConfirmationStatus'), - align: 'center', - ellipsis: true, - dataIndex: 'inventoryAffirmStatusName' - }, - { - title: this.$t('taskAffirmStatus'), - align: 'center', - ellipsis: true, - dataIndex: 'taskAffirmStatusName' - }, - // { - // title: this.$t('taskReleaseStatus'), - // align: 'center', - // dataIndex: 'taskReleaseStatus' - // }, - { - title: this.$t('correspondingStandard'), - align: 'center', - ellipsis: true, - dataIndex: 'correspondingStandard' - }, - { - title: this.$t('implementationCategory'), - align: 'center', - ellipsis: true, - dataIndex: 'implementType_dictText' - }, - { - title: this.$t('ImplementationDate'), - align: 'center', - ellipsis: true, - dataIndex: 'xin1Che1Xing2Shi2Shi1Ri4Qi1' - }, - { - title: this.$t('vehicleInProductionDate'), - align: 'center', - ellipsis: true, - dataIndex: 'implementTime' - }, - { - title: 'WVTA ID', - align: 'center', - dataIndex: 'wvtaId', - ellipsis: true - }, - { - title: this.$t('certificationType'), - align: 'center', - ellipsis: true, - dataIndex: 'attestationType_dictText' - }, - { - title: this.$t('certificationLevel'), - align: 'center', - ellipsis: true, - dataIndex: 'attestationRank_dictText' - }, - // - { - title: this.$t('areaOfResponsibility'), - align: 'center', - ellipsis: true, - dataIndex: 'dutyTerritory_dictText' - }, - { - title: this.$t('regulatoryEngineer'), - align: 'center', - ellipsis: true, - dataIndex: 'regulationOwnerName' - }, - { - title: this.$t('certifiedEngineer'), - align: 'center', - ellipsis: true, - dataIndex: 'homologationEngineerName' - }, - { - title: this.$t('engineeringInterfacePerson'), - align: 'center', - ellipsis: true, - dataIndex: 'engineeringInterfacePersonName' - }, - { - title: this.$t('remarks'), - align: 'center', - ellipsis: true, - dataIndex: 'remark' - }, - { - title: this.$t('confirmationOfDesignConformity'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'designDeliverableTemplateName', - align: 'center', - scopedSlots: {customRender: 'designDeliverableTemplateName'} - }, - { - title: this.$t('Sponsor'), - dataIndex: 'designInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'designDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'designDueDate', - align: 'center' - } - ] - }, - { - title: this.$t('PrehomoConfirmation'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'prehomoDeliverableTemplateName', - align: 'center', - scopedSlots: {customRender: 'prehomoDeliverableTemplateName'} - }, - { - title: this.$t('Sponsor'), - dataIndex: 'prehomoInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'prehomoDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'prehomoDueDate', - align: 'center' - } - ] - }, - { - title: this.$t('verificationAndConformityconfirmation'), - children: [ - { - title: this.$t('Deliverables'), - dataIndex: 'verifyDeliverableTemplateName', - align: 'center', - scopedSlots: {customRender: 'verifyDeliverableTemplateName'} - }, - { - title: this.$t('Sponsor'), - dataIndex: 'verifyInitiatorName', - align: 'center' - }, - { - title: this.$t('personLiable'), - dataIndex: 'verifyDutyName', - align: 'center' - }, - { - title: this.$t('TaskCutOffTime'), - dataIndex: 'verifyDueDate', - align: 'center' - } - ] - }, - { - title: this.$t('operation'), - align: 'center', - fixed: 'right', - width: 140, - scopedSlots: {customRender: 'operation'} - } - ], - columnsFile: [ - { - title: this.$t('deliverableTemplate'), - dataIndex: 'fileName', - align: 'center', - width: 260, - ellipsis: true - }, - { - title: this.$t('operation'), - align: 'center', - width: 130, - scopedSlots: {customRender: 'fileOperation'} - } - ], - visibleFile: false, - timeName: '', - dataSourceFile: [], - confirmLoading: false, - queryParamQuery: {}, - isDisplay: true, - selectedRowKeys: [], - visible: false, - formInline: {}, - rules: { - inventoryAffirmDueDate: [ - { - required: true, - message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'), - trigger: 'change' - } - ], - taskAffirmDueDate: [ - { - required: true, - message: this.$t('TaskCutOffTime') + this.$t('cannotEmpty'), - trigger: 'change' - } - ] - }, - queryParam: {}, - url: { - addModelList: '/project/projectLawsInventoryEO/queryPageInfoBussDocument', - list: '/project/projectLawsInventoryEO/list', - addModel: 'project/projectLawsInventoryEO/add', - editModel: '/project/projectLawsInventoryEO/edit', - deleteBatch: '/project/projectLawsInventoryEO/deleteBatch', - deleteOne: '/project/projectLawsInventoryEO/delete', - updateStatusBatch: '/project/projectLawsInventoryEO/updateStatusBatch', - matchRelevantPeople: '/project/projectLawsInventoryEO/matchRelevantPeople', - queryPersonByProject: '/project/projectRelatedPersonnel/queryPersonByProjectId', - setBatch: '',//批量设置 - copyUrl: '',//复制 - transferUrl: ''//调取 - }, - loading: false, - dataSource: [], - // fieldList | array |✔| 需要查询的列集合示例如下,type类型有:date/datetime/string/int/number - fieldList: [ - { - type: 'string', - value: 'correspondingStandard', - text: this.$t('correspondingStandard') - }, - { - type: '', - value: 'implementType', - text: this.$t('implementationCategory'), - dictCode: 'implement_type'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: 'date', - value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - text: this.$t('ImplementationDate') - }, - { - type: 'date', - value: 'implementTime', - text: this.$t('vehicleInProductionDate') - }, - { - type: 'string', - value: 'wvtaId', - text: 'WVTA ID' - }, - { - type: '', - value: 'attestationType', - text: this.$t('certificationType'), - dictCode: 'attestation_type'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: '', - value: 'attestationRank', - text: this.$t('certificationLevel'), - dictCode: 'attestation_rank'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: '', - value: 'dutyTerritory', - text: this.$t('areaOfResponsibility'), - dictCode: 'duty_territory'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - } - ] - } - }, export default { name: 'listOfRegulations', components: {