From f5a9177f5bd981104a53ef48517dfc47d33902b2 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 26 Oct 2023 18:05:45 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E7=94=BB=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 3 - src/common/lang/workCenter/en.js | 9 + src/common/lang/workCenter/zh.js | 9 + src/enums/commonEnums.js | 8 + .../EnterpriseStandardChangeFlow.vue | 6 +- .../modules/BaseInfoForm.vue | 81 ++- .../modules/MainDrafterInitBaseInfo.vue | 6 +- .../PlanApprovalChangeFlow.vue | 51 +- .../EnterpriseStandardRecheckFlow.vue | 466 ++++++++++++++++++ .../modules/ContactInitBaseInfo.vue | 179 +++++++ .../modules/DrafterEnterOptionBaseInfo.vue | 193 ++++++++ .../modules/StandardizationInitBaseInfo.vue | 124 +++++ 12 files changed, 1108 insertions(+), 27 deletions(-) create mode 100644 src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue create mode 100644 src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue create mode 100644 src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue create mode 100644 src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 19afa4b2..445611d2 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -20,8 +20,6 @@ const enterprisePlanApprovalReject = (params) => postAction('/process/es/initCha const enterprisePlanApprovalDetermine = (params) => postAction('', params) // 节点一的提交————发起流程 const enterprisePlanApproval = (params) => postAction('/process/es/initChange/start', params) -// 其他节点的提交 -const enterprisePlanApprovalSubmit = (params) => postAction('', params) // 保存 const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) // 根据三个编号和年代号获取企标编号 @@ -99,7 +97,6 @@ export { enterprisePlanApprovalReject, enterprisePlanApprovalDetermine, enterprisePlanApproval, - enterprisePlanApprovalSubmit, enterprisePlanApprovalSave, getEnStandardNo, getProcessDataById, diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index f0b051e5..cdcb58a6 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -165,6 +165,15 @@ module.exports = { proposingDepartment: '提出部门', introducer: '提出人' }, + // 企标复审流程 + enStandardRecheck: { + recheckDate: '复审日期', + recheck: '复审', + standGood: '继续有效', + revise: '修订', + annul: '废止', + sealSave: '封存' + }, // 流程配置 processConfig: { processType: '流程类型', diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 942c97bd..7ba24c19 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -165,6 +165,15 @@ module.exports = { proposingDepartment: '提出部门', introducer: '提出人' }, + // 企标复审流程 + enStandardRecheck: { + recheckDate: '复审日期', + recheck: '复审', + standGood: '继续有效', + revise: '修订', + annul: '废止', + sealSave: '封存' + }, // 流程配置 processConfig: { processType: '流程类型', diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index b38100e3..0ce5a182 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -103,3 +103,11 @@ export const TypeOfClauseItem = { TABLE: { text: '表格', value: 'TABLE' }, IMG: { text: '图片', value: 'IMG' } } + +// 企标复审-复审 +export const Recheck = { + STAND_GOOD: { text: '继续有效', value: '1' }, + REVISE: { text: '修订', value: '2' }, + ANNUL: { text: '废止', value: '1' }, + SEAL_SAVE: { text: '封存', value: '1' } +} diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index bbe5063e..96c0bcfc 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -53,7 +53,7 @@
{{ $t('basicServiceInformation') }}
- + @@ -122,7 +122,7 @@ import { enStandardChangeAgree, enStandardChangeReject, enStandardChangeTurnTo, - getProcessDataById + enStandardChangeGetDataById } from '@/api/workCenter' import MainDrafterInitBaseInfo from './modules/MainDrafterInitBaseInfo' import ApproveBaseInfo from './modules/ApproveBaseInfo' @@ -257,7 +257,7 @@ export default { methods: { // 根据流程id获取数据并回显 getProcessData (processId) { - getProcessDataById({ processInstanceId: processId }).then(res => { + enStandardChangeGetDataById({ processInstanceId: processId }).then(res => { if (res.success) { this.model = res.result this.$nextTick(() => { diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue index 9599698a..258fd99d 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue @@ -347,12 +347,72 @@ export default { default: false } }, + watch: { + // 企标编号监视 + 'formInline.enStandardNo' (value) { + this.$emit('processNameChange', (value || '') + '-' + (this.formInline.enStandardName || '') + '-' + '企标更改') + }, + // 企标名称监视 + 'formInline.enStandardName' (value) { + this.$emit('processNameChange', (this.formInline.enStandardNo || '') + '-' + (value || '') + '-' + '企标更改') + } + }, data () { return { StandardSource, standardSystemOptions: [], // 标准体系下拉框数据 partNameOptions: [], // 零部件名称下拉框数据 - formInline: {} + formInline: {}, + rules: { + // 企标编号 + enStandardNo: [ + { + required: true, + message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + // 标准等级分类 + enStandardClassification: [ + { + required: true, + message: this.$t('workCenter.enterpriseInitChangePlan.standardGradeClassification') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + // 标准体系 + enStandardSystem: [ + { + required: true, + message: this.$t('workCenter.enterpriseInitChangePlan.standardSystem') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + // 发布日期 + releaseDate: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.releaseDate') + this.$t('cannotEmpty'), + trigger: ['change', 'blur'] + } + ], + // 实施日期 + materialDate: [ + { + required: true, + message: this.$t('workCenter.enStandardChange.materialDate') + this.$t('cannotEmpty'), + trigger: ['change', 'blur'] + } + ], + // 零部件名称 + componentName: [ + { + required: true, + message: this.$t('workCenter.enterpriseInitChangePlan.partName') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + } } }, mounted () { @@ -381,6 +441,25 @@ export default { // 选完企标编号了,需要回显内容 listChange (value) { console.log(value) + // 企标名称 + this.formInline.enStandardName = value[0].standardName + // 标准等级分类 + // this.formInline.enStandardClassification = value[0]. + // 标准体系 + // 标准英文名称 + // 发布日期 + // 实施日期 + // 是否试行 + // 试行周期 + // 零部件名称 + // 主起草人 + // 主起草单位 + // 标准适用范围 + // 代替标准号 + // 引用标准 + // 关联文件 + // 采标程度 + // 采用国际标准号 }, // 选择用户得到用户名 userSelectNameChange (value, fieldName) { diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 7de778c4..c27f3cdf 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -1,6 +1,6 @@