From 7bba0b1bb694218defa63e620d9d33680e63f991 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 18 Oct 2023 18:19:44 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=BB=E5=B9=B4=E5=BA=A6=E5=88=B6?=
=?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=EF=BC=88=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/workCenter.js | 12 +
src/assets/less/common.less | 32 +-
src/common/lang/en-us.js | 3 +
src/common/lang/workCenter/en.js | 11 +-
src/common/lang/workCenter/zh.js | 11 +-
src/common/lang/zh-cn.js | 3 +
.../selection/EnterprisePlanSelection.vue | 4 +-
.../selection/StandardSelection.vue | 6 +-
src/views/workCenter/NewProcess.vue | 2 +-
.../RevisionPlanActivelyReportFlow.vue | 15 +-
.../modules/ContactEnterSendTaskForm.vue | 326 +------
.../modules/ContactEnterSendTaskModal.vue | 66 +-
.../modules/ContactEnterStandardForm.vue | 326 +------
.../modules/OnlyTableForm.vue | 47 +-
.../RevisionPlanStandardizationInitFlow.vue | 382 ++++++++
.../modules/BaseInfoTableModal.vue | 887 ++++++++++++++++++
.../modules/ContactSelectApproverBaseInfo.vue | 243 +++++
.../modules/EngineerInitBaseInfo.vue | 420 +++++++++
.../modules/LeaderApproveSentBaseInfo.vue | 235 +++++
.../modules/TableBaseInfo.vue | 250 +++++
.../PlanApprovalChangeFlow.vue | 4 +-
.../modules/ApprovalBaseInfo.vue | 2 -
.../modules/DutyDepartChangeBaseInfo.vue | 2 +
.../modules/FinishTimeChangeBaseInfo.vue | 7 +-
.../modules/JobEndBaseInfo.vue | 7 +-
.../modules/MergeBaseInfo.vue | 5 +
26 files changed, 2615 insertions(+), 693 deletions(-)
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
create mode 100644 src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index 389feb8d..586f3292 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -29,6 +29,14 @@ const getEnStandardNo = (params) => postAction('/process/es/initChange/getStanda
// 根据流程id获取流程信息
const getProcessDataById = (params) => getAction('/process/center/handle', params)
+// 年度制修订计划(标准化发起)
+// 批量设置联络人
+const standardizationInitBatchSetContact = (params) => getAction('', params)
+// 批量设置审批人
+const standardizationInitBatchSetApprover = (params) => getAction('', params)
+// 批量设置主起草人
+const standardizationInitBatchSetDrafter = (params) => getAction('', params)
+
// 流程中心
// 待办-转办
const toDoTurnTo = (params) => postAction('', params)
@@ -50,6 +58,10 @@ export {
getEnStandardNo,
getProcessDataById,
+ standardizationInitBatchSetContact,
+ standardizationInitBatchSetApprover,
+ standardizationInitBatchSetDrafter,
+
toDoTurnTo,
compulsoryWithdrawal
}
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index ddd2a72d..b9065026 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -813,24 +813,26 @@
/*流程表单样式end*/
-/* 按钮中使用自定义图标的样式 */
-/deep/ .ant-btn {
- .iconfont {
- margin-right: 8px;
- font-size: 14px;
+/* 流程底部按钮中使用自定义图标的样式 */
+.detail-page-bottom-operate-box {
+ /deep/ .ant-btn {
+ .iconfont {
+ margin-right: 8px;
+ font-size: 14px;
+ }
+ }
+
+ /deep/ .ant-btn-loading {
+ .iconfont {
+ display: none;
+ }
+ span {
+ margin-left: 8px;
+ }
}
}
-/deep/ .ant-btn-loading {
- .iconfont {
- display: none;
- }
- span {
- margin-left: 8px;
- }
-}
-
-/* 按钮中使用自定义图标的样式 end */
+/* 流程底部按钮中使用自定义图标的样式 end */
.detail-page-bottom-operate-box {
height: 52px;
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index c5cd3d98..5030d795 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -158,6 +158,9 @@ module.exports = {
mergeStandardInformation: '合并标准信息',
pleaseEnterPersonnelInfo: '请完整填写人员信息',
pleaseEnterRemarks: '请填写备注',
+ lookDetail: '查看详情',
+ batchReject: '批量驳回',
+ pleaseSelectDistributeData: '请选择要分发的数据',
// 树右键
treeRight: {
addFolder: 'Create New Folder',
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 2ce35fe6..325ca20a 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -84,14 +84,21 @@ module.exports = {
scopeOfApplication: '标准适用范围',
pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
},
- // 年度制修订计划(各部门主动上报)
+ // 年度制修订计划
revisionPlanActivelyReport: {
revisionPlanDesc: '制修订计划说明',
whetherToSendAContact: '是否下发联络人',
workingGroupContactPerson: '工作组/所联络人',
contactSupervisorSuperiorLeader: '联络人主管级上一级领导',
affiliatedWorkingGroup: '隶属工作组',
- contactsSupervisorLevelLeaders: '收集联络人主管级领导'
+ contactsSupervisorLevelLeaders: '收集联络人主管级领导',
+ templateExport: '年度制修订计划(各部门上报)导入模板',
+ batchSetContact: '批量设置联络人',
+ contactPerson: '联络人',
+ batchSetApprover: '批量设置审批人',
+ approver: '审批人',
+ batchSetDrafter: '批量设置主起草人',
+ drafter: '主起草人'
},
// 流程配置
processConfig: {
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 1b664914..7aa1a424 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -84,14 +84,21 @@ module.exports = {
scopeOfApplication: '标准适用范围',
pleaseSelectTwoSameProjectTypePlan: '请选择两个制修订类型一样的企标计划'
},
- // 年度制修订计划(各部门主动上报)
+ // 年度制修订计划
revisionPlanActivelyReport: {
revisionPlanDesc: '制修订计划说明',
whetherToSendAContact: '是否下发联络人',
workingGroupContactPerson: '工作组/所联络人',
contactSupervisorSuperiorLeader: '联络人主管级上一级领导',
affiliatedWorkingGroup: '隶属工作组',
- contactsSupervisorLevelLeaders: '收集联络人主管级领导'
+ contactsSupervisorLevelLeaders: '收集联络人主管级领导',
+ templateExport: '年度制修订计划(各部门上报)导入模板',
+ batchSetContact: '批量设置联络人',
+ contactPerson: '联络人',
+ batchSetApprover: '批量设置审批人',
+ approver: '审批人',
+ batchSetDrafter: '批量设置主起草人',
+ drafter: '主起草人'
},
// 流程配置
processConfig: {
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index c85765ec..b03c5c90 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -161,6 +161,9 @@ module.exports = {
mergeStandardInformation: '合并标准信息',
pleaseEnterPersonnelInfo: '请完整填写人员信息',
pleaseEnterRemarks: '请填写备注',
+ lookDetail: '查看详情',
+ batchReject: '批量驳回',
+ pleaseSelectDistributeData: '请选择要分发的数据',
// 树右键
treeRight: {
addFolder: '新增文件夹',
diff --git a/src/components/selection/EnterprisePlanSelection.vue b/src/components/selection/EnterprisePlanSelection.vue
index f063112c..f403ce5f 100644
--- a/src/components/selection/EnterprisePlanSelection.vue
+++ b/src/components/selection/EnterprisePlanSelection.vue
@@ -3,7 +3,7 @@
-
+
{{this.$t('enterprisePlanSelect.title')}}
@@ -25,7 +25,7 @@ export default {
type: String,
default: ''
},
- isDisabled: {
+ disabled: {
type: Boolean,
default: false
},
diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue
index ff0e77c1..bc4301cd 100644
--- a/src/components/selection/StandardSelection.vue
+++ b/src/components/selection/StandardSelection.vue
@@ -2,9 +2,9 @@
-
+
{{this.$t('standardSelect.standardSelection')}}
@@ -27,7 +27,7 @@ export default {
type: String,
default: ''
},
- isDisabled: {
+ disabled: {
type: Boolean,
default: false
}
diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue
index 0be4afad..ffdb91b5 100644
--- a/src/views/workCenter/NewProcess.vue
+++ b/src/views/workCenter/NewProcess.vue
@@ -59,7 +59,7 @@ export default {
},
{ // 年度制修订计划审批流程(标准化发起)
title: this.$t('workCenter.newProcess.annualRevisionPlanStandardizationInit'),
- path: ''
+ path: '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow'
},
{ // 企标制修订流程
title: this.$t('workCenter.newProcess.enterpriseStandardSystemRevisionProcess'),
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
index 23bf1d0f..4e3d9066 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -71,9 +71,13 @@
-
+
+
+
+
+
{{ $t('processApprovalInformation') }}
@@ -151,7 +155,7 @@ import UserSelectModal from '@/components/selection/UserSelectModal'
const personData = [
{
id: 1,
- nodeName: '主起草人发起',
+ nodeName: '标准化工程师发起',
nodeRoleName: '发起人',
canChoose: false
},
@@ -166,8 +170,7 @@ const personData = [
id: 3,
nodeName: '工作组/所联络人填写企标',
nodeRoleName: '工作组/所联络人',
- canChoose: false,
- chooseType: 'checkbox'
+ canChoose: false
},
{
id: 4,
@@ -262,6 +265,7 @@ export default {
],
validateTrigger: 'blur'
},
+ // 备注
remarks: {
rules: [
{
@@ -272,11 +276,10 @@ export default {
validateTrigger: 'blur'
}
},
- currentNode: 1,
+ currentNode: 3,
approvalInfoForm: this.$form.createForm(this), // 审批信息表单
personnelInfoData: [], // 人员信息数据
url: {
- importExcelUrl: '',
list: '' // 人员信息右侧表的分页查询接口
}
}
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue
index 726df9a1..9c38066f 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskForm.vue
@@ -66,72 +66,18 @@
-
-
-
-
- {{ $t('newlyAdded') }}
-
-
-
- {{ $t('import') }}
-
-
-
- {{ $t('batchDelete') }}
-
-
-
-
-
-
-
-
-
- {{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
- {{ global.emptyLine }}
-
-
-
-
-
-
-
-
+
-
-
+
+
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
new file mode 100644
index 00000000..be02638e
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -0,0 +1,887 @@
+
+
+
+
+
{{ $t('cancel') }}
+
{{ $t('submit') }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
new file mode 100644
index 00000000..53907ed5
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+ {{ $t('batchReject') }}
+
+
+
+ {{ $t('workCenter.revisionPlanActivelyReport.batchSetApprover') }}
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
new file mode 100644
index 00000000..482db383
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
@@ -0,0 +1,420 @@
+
+
+
+
+
+
+ {{ $t('newlyAdded') }}
+
+
+
+ {{ $t('import') }}
+
+
+
+ {{ $t('templateDownload') }}
+
+
+
+ {{ $t('batchDelete') }}
+
+
+
+ {{ $t('workCenter.revisionPlanActivelyReport.batchSetContact') }}
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
new file mode 100644
index 00000000..59c4c671
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+ {{ $t('workCenter.revisionPlanActivelyReport.batchSetDrafter') }}
+
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
new file mode 100644
index 00000000..7cbcc40d
--- /dev/null
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
@@ -0,0 +1,250 @@
+
+
+
+
+
+
+
+
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 497434d0..f3f381d4 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -628,7 +628,9 @@ export default {
this.$nextTick(() => {
this.$nextTick(() => {
const param = this.model[0]
- param.enStandardSystem = param.enStandardSystem.split(',').map(item => { return { value: item } })
+ if (param.enStandardSystem) {
+ param.enStandardSystem = param.enStandardSystem.split(',').map(item => { return { value: item } })
+ }
this.$refs.changeBaseInfo.formInline = param
})
})
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index 24d53f3a..b9dfa9df 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -868,7 +868,6 @@ export default {
// 返回流程名称
returnProcessName () {
const processName = (this.formInline.newEnStandardNo || '') + '-' + (this.formInline.newEnStandardName || '') + '-' + '立项'
- console.log(processName)
this.$emit('processNameChange', processName)
},
// 根据三个代号和一个年代号获取企标编号
@@ -885,7 +884,6 @@ export default {
param.standardCategoryCode = this.formInline.standardCategoryCode
param.decadeCode = this.formInline.decadeCode
getEnStandardNo(param).then(res => {
- console.log(res)
if (res.success) {
this.$set(this.formInline, 'newEnStandardNo', res.message)
this.$forceUpdate()
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
index e080dd58..ac539111 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
@@ -18,6 +18,7 @@
:standard-number="formInline.originEnStandardNo"
@standardNumberChange="standardNumberChange"
:searchParam="{ projectType: projectType }"
+ :disabled="disabled"
@listChange="listChange"/>
@@ -142,6 +143,7 @@
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
index 33524d35..cae08608 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
@@ -1,7 +1,7 @@
-
+
{{ $t('newlyAdded') }}
@@ -166,6 +166,11 @@ export default {
modalType: '' // 是在新增还是在编辑,编辑的时候放正在编辑的下标
}
},
+ mounted () {
+ if (this.disabled) {
+ this.columns.pop()
+ }
+ },
methods: {
// 企标编号,企标名称跳转详情
handleGoDetail (record) {
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfo.vue
index 3634eb5a..887569f5 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/JobEndBaseInfo.vue
@@ -1,7 +1,7 @@
-
+
{{ $t('newlyAdded') }}
@@ -130,6 +130,11 @@ export default {
modalType: '' // 是在新增还是在编辑,编辑的时候放正在编辑的下标
}
},
+ mounted () {
+ if (this.disabled) {
+ this.columns.pop()
+ }
+ },
methods: {
// 企标编号,企标名称跳转详情
handleGoDetail (record) {
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
index 7146d299..61015dd4 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
@@ -739,6 +739,11 @@ export default {
userSelectNameChange (value, fieldName) {
this.formInline[fieldName + '_dictText'] = value
},
+ // 点击文件上传
+ clickButtonToUpload (fieldName) {
+ this.$refs.uploadFile.open(this.formInline[fieldName])
+ this.uploadName = fieldName
+ },
// 文件上传改变后的回调
uploadFileChange (data) {
const attIdList = []