From 64bf3e05daff4b1e73cbdbad8e3447f3660432bf Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 12 Oct 2023 18:54:39 +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?= =?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/workCenter.js | 9 + src/assets/less/common.less | 6 + src/common/lang/en-us.js | 4 + src/common/lang/zh-cn.js | 4 + .../EnterprisePlanSelectionModal.vue | 12 +- src/enums/commonEnums.js | 15 + src/views/dashboard/Analysis.vue | 263 +-------------- .../PlanApprovalChangeFlow.vue | 233 +++++++++---- .../modules/ApprovalBaseInfo.vue | 307 +++++++++++------- .../modules/FinishTimeChangeBaseInfo.vue | 17 +- .../FinishTimeChangeBaseInfoDrawer.vue | 78 ++--- .../modules/JobEndBaseInfo.vue | 13 +- .../modules/JobEndBaseInfoDrawer.vue | 34 +- 13 files changed, 483 insertions(+), 512 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 997e056f..88584cc5 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -18,6 +18,12 @@ const enterprisePlanApprovalAgree = (params) => postAction('', params) const enterprisePlanApprovalReject = (params) => postAction('', params) // 确定 const enterprisePlanApprovalDetermine = (params) => postAction('', params) +// 节点一的提交————发起流程 +const enterprisePlanApproval = (params) => postAction('/process/es/initChange/start', params) +// 保存 +const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) +// 根据三个编号和年代号获取企标编号 +const getEnStandardNo = (params) => postAction('/process/es/initChange/getStandardNo', params) // 流程中心 // 待办-转办 @@ -34,6 +40,9 @@ export { enterprisePlanApprovalAgree, enterprisePlanApprovalReject, enterprisePlanApprovalDetermine, + enterprisePlanApproval, + enterprisePlanApprovalSave, + getEnStandardNo, toDoTurnTo, compulsoryWithdrawal diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 4e6fb11f..b872c4c9 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -821,6 +821,12 @@ } } +/deep/ .ant-btn-loading { + .iconfont { + display: none; + } +} + /* 按钮中发那个自定义图标的样式 end */ .detail-page-bottom-operate-box { diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 0786d7b8..0baa411a 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -151,6 +151,10 @@ module.exports = { reject: 'Reject', basicInformation: 'Basic Information', personalInformation: 'Personnel Information', + finishDate: 'Finish Date', + projectStatement: 'Project Statement', + pleaseFillInAtLeastOneItem: 'Please Fill In At Least One Item', + addAtLeastOneRowOfData: 'Please Add At Least One Row Of Data', // 树右键 treeRight: { addFolder: 'Create New Folder', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 2bd10bef..32a8afab 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -154,6 +154,10 @@ module.exports = { rangeOfApplication: '适用范围', transact: '办理', compulsoryWithdrawal: '强制撤回', + finishDate: '完成日期', + projectStatement: '立项说明', + pleaseFillInAtLeastOneItem: '请至少填写一项', + addAtLeastOneRowOfData: '请至少添加一行数据', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue index fb63b070..4e012565 100644 --- a/src/components/selection/EnterprisePlanSelectionModal.vue +++ b/src/components/selection/EnterprisePlanSelectionModal.vue @@ -105,6 +105,13 @@ export default { type: String, required: false, default: 'checkbox' + }, + searchParam: { + type: Object, + required: false, + default () { + return {} + } } }, data () { @@ -262,10 +269,9 @@ export default { replacePage () { const query = { ...this.queryParam, + ...this.searchParam, pageNo: this.ipagination.current, - pageSize: this.ipagination.pageSize, - // 搜索项目状态为未开始和进行中的数据 - projectStatus: '1,2' + pageSize: this.ipagination.pageSize } this.selectedRowKeys = [] this.loading = true diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index fbec5008..bcd22b3e 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -76,6 +76,21 @@ export const OperationType = { CHANGE: { text: '标准法规变更', value: '2' } } +// 企标计划立项/变更流程-申请类型 +export const ApplicationCategory = { + INITIATION: { text: '立项', value: '1' }, + CHANGE: { text: '变更', value: '2' } +} +// 企标计划立项/变更流程-项目类别 +export const ProjectType = { + ENACT: { text: '制定', value: '5' }, + MODIFY: { text: '修订', value: '6' }, + COMPLETE_TIME_CHANGE: { text: '完成时间变更', value: '1' }, + WORK_TERMINATE: { text: '工作中止', value: '2' }, + RESPONSIBLE_DEPT_CHANGE: { text: '责任部门变更', value: '3' }, + MERGE: { text: '合并', value: '4' } +} + // 文档拆分-拆分状态 export const SplitStatus = { EDITING: { text: '编辑中', value: '1' }, diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index de5e1265..9629f32d 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -1,277 +1,20 @@ diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index c0e30bca..84ee50db 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -12,7 +12,7 @@ -
+
{{ $t('processInformation') }}
@@ -34,7 +34,7 @@ style="width: 100%" :disabled="disabled" value-format="YYYY-MM-DD" - v-decorator="['expirationDate']" /> + v-decorator="['deadlineDate']" /> @@ -44,7 +44,7 @@ :maxLength="500" :rows="4" :disabled="disabled" - v-decorator="['processExplain']" /> + v-decorator="['processDescription']" /> @@ -64,12 +64,12 @@ {{ $t('workCenter.enterpriseInitChangePlan.applicationType') }}
- - + - {{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }} - {{ $t('workCenter.enterpriseInitChangePlan.change') }} + {{ $t('workCenter.enterpriseInitChangePlan.standardProjectEstablishment') }} + {{ $t('workCenter.enterpriseInitChangePlan.change') }}
@@ -81,23 +81,22 @@ {{ $t('workCenter.enterpriseInitChangePlan.itemCategory') }} - - + - {{ $t('workCenter.enterpriseInitChangePlan.formulate') }} - {{ $t('workCenter.enterpriseInitChangePlan.revise') }} + {{ $t('workCenter.enterpriseInitChangePlan.formulate') }} + {{ $t('workCenter.enterpriseInitChangePlan.revise') }} - {{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }} - {{ $t('workCenter.enterpriseInitChangePlan.terminationOfWork') }} - {{ $t('workCenter.enterpriseInitChangePlan.dutyDepartChange') }} - {{ $t('workCenter.enterpriseInitChangePlan.merge') }} + {{ $t('workCenter.enterpriseInitChangePlan.completionTimeChange') }} + {{ $t('workCenter.enterpriseInitChangePlan.terminationOfWork') }} + {{ $t('workCenter.enterpriseInitChangePlan.dutyDepartChange') }} + {{ $t('workCenter.enterpriseInitChangePlan.merge') }} @@ -106,15 +105,15 @@ + :projectType="formInline.projectType"> - + @@ -179,14 +178,14 @@ - + -
+
- +
@@ -196,18 +195,18 @@ {{ $t('preservation') }} - {{ $t('agree') }} + {{ $t('submit') }} -