diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 292a84b55..dbccc4ddc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1976,4 +1976,5 @@ module.exports = { associatedItem:'There are multiple matching items in the platform item. Please select the associated item', unpublishedregulationsselected:'Only unpublished regulations can be selected', PlatformInformation:'Platform Information', + Processdetails:'Process Details', } \ 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 69b3c0887..888611cac 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -2536,7 +2536,7 @@ module.exports = { areaOfResponsibility: '责任领域', confirmationOfDesignConformity: '设计符合性确认', Deliverables: '交付物', - personLiable: '责任人', + personable: '责任人', PrehomoConfirmation: 'Pre-Homo确认', verificationAndConformityconfirmation: '验证符合性确认', StandardImplementationDate: '标准实施日期', @@ -3932,4 +3932,5 @@ module.exports = { associatedItem:'在平台件项目中包含多条匹配内容,请选择关联项', unpublishedregulationsselected:'仅能选择未发布的法规', PlatformInformation:'平台件信息', + Processdetails:'流程详情', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/flowstatusdetial.vue b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue new file mode 100644 index 000000000..714d9c6c5 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/flowstatusdetial.vue @@ -0,0 +1,334 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 5978a03ed..39498ce70 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -638,10 +638,9 @@ columns: [ { title: this.$t('entryName'), - dataIndex: 'projectNameId', + dataIndex: 'projectName', align: 'left', ellipsis: true, - sorter:true, width: 120 }, { @@ -649,31 +648,27 @@ dataIndex: 'designDeliverableTypeName', align: 'left', ellipsis: true, - sorter:true, width: 180 }, { title: this.$t('design')+ this.$t('deliverableTemplate'), align: 'left', width: 180, - sorter:true, ellipsis: true, - dataIndex: 'designDeliverableTemplate' + dataIndex: 'designDeliverableTemplateName' }, { title: this.$t('verify')+ this.$t('typeOfDeliverables'), dataIndex: 'verifyDeliverableTypeName', align: 'left', ellipsis: true, - sorter:true, width: 180 }, { title: this.$t('verify')+ this.$t('deliverableTemplate'), - dataIndex: 'verifyDeliverableTemplate', + dataIndex: 'verifyDeliverableTemplateName', align: 'left', ellipsis: true, - sorter:true, width: 180 }, { diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 9b804c8d6..5be71b891 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -273,6 +273,12 @@ {{ $t('Associatedplatform') }} +
+ + {{ $t('Associatedplatform1') }} +
@@ -695,6 +701,7 @@ + @@ -705,6 +712,7 @@ import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance' import listAddModel from './listAddModel' import listEditModel from './listEditModel' + import flowstatusdetial from './flowstatusdetial' import batSetting from './batSetting' import transferList from './transferList' import associatedplat from './associatedplat' @@ -733,6 +741,7 @@ ImportFile, listAddModel, listEditModel, + flowstatusdetial, batSetting, transferList, associatedplat, @@ -1824,6 +1833,11 @@ } } this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) + + + }, + a(){ + this.$refs.flowstatusdetialRef.addModel() }, //查看列表页面