diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 5a189621..4efcc3aa 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -390,6 +390,10 @@ module.exports = {
responsibleUnitContactPerson: '责任单位联络人',
pleaseSelectDeleteData: '请选择要删除的数据',
moduleOwner: '模块责任人',
- projectAppraisal: '项目评估'
+ projectAppraisal: '项目评估',
+ stronglyRelatedVehicleType: '是否与车型强关联',
+ doesNotFitModel: '不符合车型系列',
+ projectApproval: '项目审批',
+ projectFiling: '项目归档'
}
}
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 8e3a1ac8..9d23b554 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -400,7 +400,7 @@ export const StandardComplianceNodes = new EsEnums({
moduleOwnerIssue: { text: '模块责任人分发', value: '3', btn: ['return', 'save', 'submit'] },
designEngineerAssess: { text: '设计工程师评估', value: '4', btn: ['return', 'save', 'submit'] },
moduleOwnerReview: { text: '模块责任人审批', value: '5', btn: ['return', 'save', 'agree', 'reject'] },
- departLeaderApprove: { text: '部所主管级领导审批', value: '6', btn: [] },
- regulatoryEngineerApprove: { text: '法规工程师审批', value: '7', btn: [] },
- designEngineerWriteProject: { text: '设计工程师补充立项项目号', value: '8', btn: [] }
+ departLeaderApprove: { text: '部所主管级领导审批', value: '6', btn: ['return', 'save', 'agree', 'reject'] },
+ regulatoryEngineerApprove: { text: '法规工程师审批', value: '7', btn: ['return', 'save', 'agree', 'reject'] },
+ designEngineerWriteProject: { text: '设计工程师补充立项项目号', value: '8', btn: ['submit'] }
})
diff --git a/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue b/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue
index f9c45b9d..5110e804 100644
--- a/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue
+++ b/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue
@@ -80,6 +80,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('processApprovalInformation') }}
@@ -144,6 +156,10 @@ import InitialAssignTable from './components/InitialAssignTable'
import DepartLeaderIssueTable from './components/DepartLeaderIssueTable'
import ModuleOwnerIssueTable from './components/ModuleOwnerIssueTable'
import DesignEngineerAssess from './components/DesignEngineerAssess'
+import ModuleOwnerApproveTable from './components/ModuleOwnerApproveTable'
+import DepartLeaderApproveTable from './components/DepartLeaderApproveTable'
+import RegulatoryEngineerApproval from './components/RegulatoryEngineerApproval'
+import DesignEngineerWriteProject from './components/DesignEngineerWriteProject'
export default {
name: 'StandardComplianceProcess',
@@ -155,7 +171,11 @@ export default {
InitialAssignTable,
DepartLeaderIssueTable,
ModuleOwnerIssueTable,
- DesignEngineerAssess
+ DesignEngineerAssess,
+ ModuleOwnerApproveTable,
+ DepartLeaderApproveTable,
+ RegulatoryEngineerApproval,
+ DesignEngineerWriteProject
},
mixins: [WorkCenterMixin],
data () {
@@ -169,7 +189,7 @@ export default {
// 审批信息的表单
approvalInfoForm: this.$form.createForm(this),
approvalInfo: {},
- currentNode: '4',
+ currentNode: null,
labelCol: {
xs: { span: 24 },
sm: { span: 4 }
@@ -216,14 +236,30 @@ export default {
// 是否设计工程师评估节点
isDesignEngineerAssess () {
return this.currentNode === StandardComplianceNodes.designEngineerAssess.value
+ },
+ // 是否模块责任人评审节点
+ isModuleOwnerApprove () {
+ return this.currentNode === StandardComplianceNodes.moduleOwnerReview.value
+ },
+ // 是否部所主管级领导审批
+ isDepartLeaderApprove () {
+ return this.currentNode === StandardComplianceNodes.departLeaderApprove.value
+ },
+ // 是否法规工程师审批
+ isRegulatoryEngineerApproval () {
+ return this.currentNode === StandardComplianceNodes.regulatoryEngineerApprove.value
+ },
+ // 是否设计工程师补充立项项目号
+ isDesignEngineerWriteProject () {
+ return this.currentNode === StandardComplianceNodes.designEngineerWriteProject.value
}
},
created () {
- // if (this.$route.query.processInstanceId || this.$route.query.draftId) {
- // this.currentNode = this.$route.query.nodeId
- // } else {
- // this.currentNode = StandardComplianceNodes.initial.value
- // }
+ if (this.$route.query.processInstanceId || this.$route.query.draftId) {
+ this.currentNode = this.$route.query.nodeId
+ } else {
+ this.currentNode = StandardComplianceNodes.initial.value
+ }
this.btnList = StandardComplianceNodes.propertyOfValue('btn', this.currentNode)
this.getPersonInfoStructure(ProcessKey.NO_MATCH_TRACKING.value, () => {
this.initPersonInfoData()
@@ -243,6 +279,21 @@ export default {
*/
handleStandardChange (standard) {
this.selectedStandard = Object.assign({}, standard)
+ },
+ handleTurnTo () {
+
+ },
+ handleSave () {
+
+ },
+ handleSubmit () {
+
+ },
+ handleAgree () {
+
+ },
+ handleReject () {
+
}
}
}
diff --git a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderApproveTable.vue b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderApproveTable.vue
new file mode 100644
index 00000000..f8edf357
--- /dev/null
+++ b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderApproveTable.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
{{ $t('workCenter.standardCompliance.projectApproval') }}
+
+
+
+
+
+
+
+
+ {{ $t('view') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerAssess.vue b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerAssess.vue
index d65387c3..d9ac1407 100644
--- a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerAssess.vue
+++ b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerAssess.vue
@@ -10,12 +10,201 @@
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text || text === 0 ? text : global.emptyLine }}
+
+
+
+
+
+ handleEvaluationResultChange(value, record, index)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.projectName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 校验
@@ -25,8 +214,10 @@ export default {
.process-part-title:first-child {
margin-top: 32px;
}
+
.info-form-item {
display: flex;
+ margin-bottom: 20px;
&-text {
flex: 1;
diff --git a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue
new file mode 100644
index 00000000..8d82a2db
--- /dev/null
+++ b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue
@@ -0,0 +1,110 @@
+
+
+
+
{{ $t('workCenter.standardCompliance.projectFiling') }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue
index f49a6910..365a796a 100644
--- a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue
+++ b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue
@@ -13,7 +13,7 @@
-
+
+
+
+
+
{{ $t('workCenter.standardCompliance.projectApproval') }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue
new file mode 100644
index 00000000..8771b1b3
--- /dev/null
+++ b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue
@@ -0,0 +1,191 @@
+
+
+
+
{{ $t('workCenter.standardCompliance.projectFiling') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/standardComplianceProcess/modules/DepartLeaderDetailModal.vue b/src/views/workCenter/standardComplianceProcess/modules/DepartLeaderDetailModal.vue
new file mode 100644
index 00000000..f5ce94cd
--- /dev/null
+++ b/src/views/workCenter/standardComplianceProcess/modules/DepartLeaderDetailModal.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue b/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue
new file mode 100644
index 00000000..ad3ffb35
--- /dev/null
+++ b/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ :maxLength="50"
+ v-decorator="['listName']" />
+
+
+
+ event.target.value = event.target.value.trim()"
+ :maxLength="50"
+ v-decorator="['listName']" />
+
+
+
+
+
+
+
+
\ No newline at end of file