From a88fd94df67ea99588df106ac6af73d9ce0dbd3d Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 6 Dec 2023 13:47:33 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E4=BC=81=E6=A0=87=E5=BA=9F=E6=AD=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 17 +- src/common/lang/en-us.js | 9 + src/common/lang/zh-cn.js | 9 + src/components/ProcessCommonLayout.vue | 1 + src/router/workCenter/index.js | 10 + src/views/Home.vue | 11 + .../EnterpriseStandardAnnul.vue | 318 ++++++++++++++++++ .../EnterpriseStandardInitChange.vue | 82 ++--- 8 files changed, 407 insertions(+), 50 deletions(-) create mode 100644 src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue diff --git a/src/api/api.js b/src/api/api.js index b2e89c1..983336e 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -62,6 +62,16 @@ const enterprisePlanApprovalTurnTo = (params) => postAction('/process/es/initCha // 保存 const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) +// 企标废止流程 +// 根据id查询流程数据--办理 +const enStandardAnnulGetDataById = (taskId, params) => getAction(`/process/es/abolish/handle/${taskId}`, params) +// 转办 +const enStandardAnnulTurnTo = (params) => postAction('/process/es/abolish/transfer', params) +// 同意 +const enStandardAnnulAgree = (params) => postAction('/process/es/abolish/agree', params) +// 驳回 +const enStandardAnnulReject = (params) => postAction('/process/es/abolish/reject', params) + export { queryPermissionsByUser, getFormDictTreeList, @@ -86,5 +96,10 @@ export { enterprisePlanApprovalAgree, enterprisePlanApprovalReject, enterprisePlanApprovalTurnTo, - enterprisePlanApprovalSave + enterprisePlanApprovalSave, + + enStandardAnnulGetDataById, + enStandardAnnulTurnTo, + enStandardAnnulAgree, + enStandardAnnulReject } diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 4290851..b769a35 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -97,6 +97,15 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 企标废止流程 + esAnnul: { + standardType: '标准类型', + substituteStandardNumber: '代替企标编号', + replacedByEnStandardNumber: '被代替企标编号', + releaseDate: '发布日期', + materialDate: '实施日期', + annulReason: '废止理由' + }, // 标准征求意见流程 standardConsultation: { standardText: '标准文本', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 31a813e..e747abd 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -97,6 +97,15 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 企标废止流程 + esAnnul: { + standardType: '标准类型', + substituteStandardNumber: '代替企标编号', + replacedByEnStandardNumber: '被代替企标编号', + releaseDate: '发布日期', + materialDate: '实施日期', + annulReason: '废止理由' + }, // 标准征求意见流程 standardConsultation: { standardText: '标准文本', diff --git a/src/components/ProcessCommonLayout.vue b/src/components/ProcessCommonLayout.vue index df41341..f21b934 100644 --- a/src/components/ProcessCommonLayout.vue +++ b/src/components/ProcessCommonLayout.vue @@ -168,6 +168,7 @@ export default { height: calc(100% - 1.11rem - 1.28rem); overflow: auto; padding-top: 0.16rem; + background: #F8F9FB; } .operate-box { diff --git a/src/router/workCenter/index.js b/src/router/workCenter/index.js index cf82e4d..b8abd70 100644 --- a/src/router/workCenter/index.js +++ b/src/router/workCenter/index.js @@ -9,6 +9,16 @@ export default [ hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } }, + { + path: '/workCenter/enterpriseStandardAnnul', + name: 'EnterpriseStandardAnnul', + component: (resolve) => require(['@/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue'], resolve), + meta: { + title: '企标废止流程', + hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 + hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 + } + }, // 标准法规入库/变更流程 { path: '/workCenter/standardEntryOrChangeProcess', diff --git a/src/views/Home.vue b/src/views/Home.vue index e094bf4..d7610b1 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -3,6 +3,7 @@ 首页 退出登录 跳转企标计划立项、变更流程审批 + 跳转企标废止流程 @@ -31,6 +32,16 @@ export default { } }) }, + goESAnnul () { + this.$router.push({ + path: '/workCenter/enterpriseStandardAnnul', + query: { + processInstanceId: '447681', + taskId: '467520', + nodeId: 'sid-B4157F9F-73E5-48F5-855D-AF87C0DB91C6' + } + }) + }, ...mapActions(['Logout']), logout () { const that = this diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue new file mode 100644 index 0000000..53acca9 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue @@ -0,0 +1,318 @@ + + + + + diff --git a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue index 8cf6680..098beb2 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue @@ -16,7 +16,7 @@ :placeholder="$t('pleaseEnter') + $t('processName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="processInfoForm.prcName" /> @@ -75,7 +75,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardNum')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardNo" /> @@ -84,7 +84,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardName" /> @@ -117,7 +117,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardNum')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].originEnStandardNo" /> @@ -126,7 +126,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].originEnStandardName" /> @@ -135,7 +135,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.newEnterpriseStandardNum')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardNo" /> @@ -144,7 +144,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.newEnterpriseStandardName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardName" /> @@ -154,8 +154,8 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.yearNumber')" readonly type="textarea" - row="1" - autosize + rows="1" + autosize v-model="baseInfoForm[0].decadeCode" /> @@ -478,7 +478,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardName') + '1'" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].standardNameOne" /> @@ -487,7 +487,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.typeOfRevision') + '1'" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].projectTypeOne" /> @@ -496,7 +496,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardNum') + '2'" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].standardIdTwo" /> @@ -505,7 +505,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.enterpriseStandardName') + '2'" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].standardNameTwo" /> @@ -514,7 +514,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.typeOfRevision') + '2'" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].projectTypeTwo" /> @@ -523,7 +523,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.newEnterpriseStandardNum')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardNo" /> @@ -532,7 +532,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.newEnterpriseStandardName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].newEnStandardName" /> @@ -541,7 +541,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.standardEnglishName')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].enStandardEnglishName" /> @@ -577,7 +577,7 @@ :placeholder="$t('pleaseEnter') + $t('esInitChange.yearNumber')" readonly type="textarea" - row="1" + rows="1" autosize v-model="baseInfoForm[0].decadeCode" /> @@ -817,7 +817,7 @@ export default { ProcessKey, ApplicationCategory, ProjectType, - readonly: false, + readonly: true, loading: false, // 申请类型 applicationCategoryData: [ @@ -1034,8 +1034,7 @@ export default { ], // 业务基本信息 newMainDrafterCanUpdate: false, // 新主起草的三个字段是否可修改 onlyNewMainDrafterCanUpdate: false, // 新主起草人字段是否可修改 - currentNode: 1, - isValidatePass: false // 是否通过了校验 + currentNode: 1 } }, created () { @@ -1270,12 +1269,6 @@ export default { console.log(errorInfo) }) }, - selectUserFinish (value) { - console.log(value) - }, - selectUser () { - this.$refs.selectUserRef.open() - }, goBack () { this.$router.go(-1) } @@ -1285,13 +1278,4 @@ export default {