@@ -164,6 +164,10 @@ export default {
}
})
},
+ // 企标编号和名称修改触发流程名称的修改
+ processNameChange (value) {
+ this.$emit('processNameChange', value)
+ },
// 新增修改单
handleAdd () {
// 不知道左侧要预览哪个文件
diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index d00940f2..5b31ceb8 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -257,8 +257,7 @@ import {
enterprisePlanApprovalDetermine,
enterprisePlanApprovalSave,
enterprisePlanApproval,
- getProcessDataById,
- enterprisePlanApprovalSubmit
+ getProcessDataById
} from '@/api/workCenter'
import ApprovalBaseInfo from './modules/ApprovalBaseInfo'
import FinishTimeChangeBaseInfo from './modules/FinishTimeChangeBaseInfo'
@@ -278,7 +277,8 @@ const approvalPersonalInfo = [ // 人员信息的数据
nodeName: '主起草人发起',
nodeRoleName: '发起人',
canChoose: false,
- userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')'
+ userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')',
+ fieldName: 'createUser'
},
{
id: 2,
@@ -592,7 +592,7 @@ export default {
if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
this.personnelInfoData = approvalPersonalInfo.map(item => {
if (item.fieldName) {
- return { ...item, userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
+ return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
} else {
return item
}
@@ -601,14 +601,14 @@ export default {
this.personnelInfoData = changePersonalInfo.map(item => {
console.log(item)
if (item.fieldName) {
- return { ...item, userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
+ return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
} else {
return item
}
})
}
// 初始化业务基本信息中组件内容
- if (this.model[0].applicationCategory === ApplicationCategory.INITIATION.value) {
+ if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
// 是立项
this.$nextTick(() => {
this.$nextTick(() => {
@@ -617,16 +617,16 @@ export default {
this.$refs.approvalBaseInfo.formInline = param
})
})
- } else if (this.model[0].applicationCategory === ApplicationCategory.CHANGE.value &&
- (this.model[0].projectType === ProjectType.COMPLETE_TIME_CHANGE.value ||
- this.model[0].projectType === ProjectType.WORK_TERMINATE.value)) {
+ } else if (this.formInline.applicationCategory === ApplicationCategory.CHANGE.value &&
+ (this.formInline.projectType === ProjectType.COMPLETE_TIME_CHANGE.value ||
+ this.formInline.projectType === ProjectType.WORK_TERMINATE.value)) {
// 是完成时间变更或工作终止的变更
this.$nextTick(() => {
this.$refs.changeBaseInfo.dataSource = this.model.dataList
})
- } else if (this.model[0].applicationCategory === ApplicationCategory.CHANGE.value &&
- (this.model[0].projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value ||
- this.model[0].projectType === ProjectType.MERGE.value)) {
+ } else if (this.formInline.applicationCategory === ApplicationCategory.CHANGE.value &&
+ (this.formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value ||
+ this.formInline.projectType === ProjectType.MERGE.value)) {
// 是责任部门变更或合并变更
this.$nextTick(() => {
this.$nextTick(() => {
@@ -673,6 +673,8 @@ export default {
personnelObj[item.fieldName] = item.user
}
}
+ // 发起人设置为当前登录人
+ personnelObj.createUser = Vue.ls.get(USER_INFO).id
// 业务基础信息组件中的数据
let arr = []
// 业务基本信息-立项表单
@@ -759,7 +761,7 @@ export default {
this.loading = false
})
},
- // 节点一时候的提交,发起立项变更申请
+ // 节点一时候的提交,发起立项变更申请,有taskId就是驳回后的提交
handleStart () {
if (this.loading) return
// 人员信息的数据, 处理成对象
@@ -770,6 +772,8 @@ export default {
personnelObj[item.fieldName] = item.user
}
}
+ // 发起人设置为当前登录人
+ personnelObj.createUser = Vue.ls.get(USER_INFO).id
// 校验是否填了所有能填的人员信息
if (!Object.values(personnelObj).every(v => !!v)) {
this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
@@ -859,7 +863,14 @@ export default {
param.commonVO = { ...values, ...approvalValues } // 流程信息和流程审批信息
param.dataList = arr
param.flowUserInfoVO = personnelObj
- enterprisePlanApproval(param).then(res => {
+ let func
+ if (this.$route.query.taskId) {
+ // 有taskId说明是驳回的提交
+ func = enterprisePlanApprovalAgree
+ } else {
+ func = enterprisePlanApproval
+ }
+ func(param).then(res => {
if (res.success) {
this.$message.success(res.message)
} else {
@@ -881,7 +892,7 @@ export default {
this.loading = true
const param = Object.assign({}, values, approvalValues)
param.taskId = this.$route.query.taskId
- enterprisePlanApprovalSubmit(param).then(res => {
+ enterprisePlanApprovalAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
} else {
@@ -927,8 +938,9 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.taskId
+ const param = {}
+ param.commonVO = Object.assign({}, values)
+ param.commonVO.taskId = this.$route.query.taskId
enterprisePlanApprovalAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -952,8 +964,9 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.id
+ const param = {}
+ param.commonVO = Object.assign({}, values)
+ param.commonVO.taskId = this.$route.query.taskId
enterprisePlanApprovalReject(param).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
new file mode 100644
index 00000000..470caaa4
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -0,0 +1,466 @@
+
+
+
+
+
+
+
+
+
+
{{ $t('processInformation') }}
+
+
+
+
+
+ event.target.value = event.target.value.trim()"
+ disabled
+ :maxLength="50"
+ v-decorator="['processName', validatorRules.processName]" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('basicServiceInformation') }}
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('processApprovalInformation') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('preservation') }}
+
+ {{ $t('submit') }}
+
+
+
+
+ {{ $t('turnTo') }}
+
+ {{ $t('preservation') }}
+
+ {{ $t('submit') }}
+
+
+
+ {{ $t('turnTo') }}
+
+ {{ $t('preservation') }}
+
+ {{ $t('agree') }}
+
+ {{ $t('reject') }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
new file mode 100644
index 00000000..e0ae09c6
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
new file mode 100644
index 00000000..71bb25c3
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
new file mode 100644
index 00000000..8865d743
--- /dev/null
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+