ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 企标流程联调

Browse Source
This commit is contained in:
lideqin
2023-10-31 18:33:53 +08:00
parent 55d10c8899
commit 763284d5bd
7 changed files with 163 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+4
View File
@@ -239,7 +239,11 @@ export default {
},
mounted () {
if (this.$route.query.taskId) {
// 有流程id说明是从流程中心来的，需要初始化数据
this.getProcessData(this.$route.query.taskId)
} else {
// 没有taskId说明是新建进来的，初始化人员信息
this.personnelInfoData = personData
}
// 如果是查看进入的，不可编辑，不可操作
if (this.$route.query.onlyLook) {
src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+55 -30
View File
@@ -148,6 +148,7 @@
ref="changeBaseInfo"
:disabled="disabled"
@processNameChange="processNameChange"
:currentNode="currentNode"
:projectType="formInline.projectType"
>
</duty-depart-change-base-info>
@@ -164,18 +165,18 @@
<!-- 部分节点需要选人 -->
<a-form v-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && [6, 7].includes(currentNode)" class="user-form" :form="userForm">
<a-row :gutter="24">
<a-col :span="12">
<!-- 所长，节点6需要选所长 -->
<a-form-item v-if="currentNode === 6" :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.superintendent')">
<!-- 所长，节点6需要选所长 -->
<a-col :span="12" v-if="currentNode === 6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.superintendent')">
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.enterpriseInitChangePlan.superintendent')"
type="radio"
v-decorator="['newMainDraftUserLeaderLeader', validatorRules.newMainDraftUserLeaderLeader]"
v-decorator="['newMainDraftUserLeader', validatorRules.newMainDraftUserLeader]"
input-type="textarea" />
</a-form-item>
</a-col>
<a-col :span="12">
<!-- 相关人员，节点7需要选相关人员 -->
<a-form-item v-if="currentNode === 7" :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.relatedPersonnel')">
<!-- 相关人员，节点7需要选相关人员 -->
<a-col :span="12" v-if="currentNode === 7">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.relatedPersonnel')">
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.enterpriseInitChangePlan.relatedPersonnel')"
type="checkbox"
v-decorator="['relatedUser', validatorRules.relatedUser]"
@@ -502,13 +503,20 @@ export default {
],
validateTrigger: 'blur'
},
// 所长
// 新起草部门主管级上级领导
newMainDraftUserLeaderLeader: {
rules: [
{ required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.enterpriseInitChangePlan.superintendent') }
],
validateTrigger: 'change'
},
// 所长
newMainDraftUserLeader: {
rules: [
{ required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.enterpriseInitChangePlan.superintendent') }
],
validateTrigger: 'change'
},
// 相关人员
relatedUser: {
rules: [
@@ -556,6 +564,12 @@ export default {
// 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
})
// 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
const baseInfoForm = {}
baseInfoForm.applicationCategory = this.model.dataList[0].applicationCategory
this.formInline = Object.assign({}, baseInfoForm)
baseInfoForm.projectType = this.model.dataList[0].projectType
this.formInline = Object.assign({}, baseInfoForm)
// 初始化流程节点，此流程因为节点名称有重复，需要在此处根据applicationCatsegory做一些判断
const taskName = this.$route.query.taskName
if (taskName) {
@@ -565,11 +579,11 @@ export default {
this.currentNode = 2
} else if (taskName === '专家审批' || taskName === '主起草人主管级领导审批') {
this.currentNode = 3
} else if (taskName === '发起人主管级领导审批' || taskName === '主起草人主管级上一级领导审批') {
} else if (taskName === '发起人主管级领导审批' || taskName === '主起草人主管级上级领导审批') {
this.currentNode = 4
} else if (taskName === '发起人主管级上级领导审批' || (taskName === '标准化审批' && this.formInline.applicationCategory === this.ApplicationCategory.CHANGE.value)) {
this.currentNode = 5
} else if ((taskName === '标准化审批' && this.formInline.applicationCategory === this.ApplicationCategory.INITIATION.value) || taskName === '新起草部门主管级上一级领导下发') {
} else if ((taskName === '标准化审批' && this.formInline.applicationCategory === this.ApplicationCategory.INITIATION.value) || taskName === '新起草部门主管级上一级领导下发主管级领导') {
this.currentNode = 6
} else if (taskName === '新起草部门主管级领导确认') {
this.currentNode = 7
@@ -579,18 +593,13 @@ export default {
this.currentNode = 9
}
}
console.log(this.currentNode)
// 根据流程节点初始化是否可以编辑
if (this.currentNode === 1) {
this.disabled = false
} else {
this.disabled = true
}
// 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
const baseInfoForm = {}
baseInfoForm.applicationCategory = this.model.dataList[0].applicationCategory
this.formInline = Object.assign({}, baseInfoForm)
baseInfoForm.projectType = this.model.dataList[0].projectType
this.formInline = Object.assign({}, baseInfoForm)
// 初始化人员信息
if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value && this.currentNode === 1) {
// 立项的节点1
@@ -824,6 +833,7 @@ export default {
personnelObj.createUser = Vue.ls.get(USER_INFO).id
// 后端需要单独传主起草人
personnelObj.mainDraftUser = Vue.ls.get(USER_INFO).id
console.log(personnelObj)
// 校验是否填了所有能填的人员信息
if (!Object.values(personnelObj).every(v => !!v)) {
this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
@@ -947,8 +957,10 @@ export default {
this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
if (!err && !approvalErr) {
this.loading = true
const param = Object.assign({}, values, approvalValues)
param.taskId = this.$route.query.taskId
const param = {}
param.common = Object.assign({}, approvalValues)
param.common.taskId = this.$route.query.taskId
param.flowUser = Object.assign({}, values)
enterprisePlanApprovalAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -991,22 +1003,35 @@ export default {
// 同意
handleAgree () {
if (this.loading) return
const param = {} // 需要传给后端的数据
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enterprisePlanApprovalAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
} else {
this.$message.warning(res.message)
if (this.formInline.projectType === this.ProjectType.RESPONSIBLE_DEPT_CHANGE.value && this.currentNode === 5) {
// 责任部门变更，节点5需要校验业务基本信息的必填，新起草单位负责人就是新起草部门主管级上一级领导
this.$refs.changeBaseInfo.$refs.ruleForm.validate(valid => {
if (!err && valid) {
// 校验完成
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
param.dataList = [this.$refs.changeBaseInfo.formInline]
param.flowUser = { newMainDraftUserLeaderLeader: this.$refs.changeBaseInfo.formInline.newMainDraftingUnitResponsiblePerson }
}
}).finally(() => {
this.loading = false
})
} else {
if (!err) {
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
}
}
this.loading = true
enterprisePlanApprovalAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.loading = false
})
})
},
// 驳回
src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
+61 -18
View File
@@ -86,47 +86,50 @@
type="radio" />
</a-form-model-item>
</div>
<!-- 主起草人 -->
<!-- 新主起草人 -->
<div class="box-title-text form-flex-item">
<div class="title-text">
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.principalDrafter')">
{{ $t('workCenter.enterpriseInitChangePlan.principalDrafter') }}
</span>
<span v-if="rules.newMainDraftingUser[0].required" class="required">*</span>
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newPrincipalDrafter')">
{{ $t('workCenter.enterpriseInitChangePlan.newPrincipalDrafter') }}
</span>
</div>
<a-form-model-item class="item-model" prop="newMainDraftingUser">
<user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.principalDrafter')"
<user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.newPrincipalDrafter')"
v-model="formInline.newMainDraftingUser"
:disabled="disabled"
:disabled="disabled && !newMainDrafterCanUpdate"
filedName="newMainDraftingUser"
@nameChange="userSelectNameChange"
:nameStr="formInline.newMainDraftingUser_dictText"
type="radio" />
</a-form-model-item>
</div>
<!-- 主起草单位 -->
<!-- 新主起草单位 -->
<div class="box-title-text form-flex-item">
<div class="title-text">
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.mainDraftUnit')">
{{ $t('workCenter.enterpriseInitChangePlan.mainDraftUnit') }}
</span>
<span v-if="rules.newMainDraftingUnit[0].required" class="required">*</span>
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newMainDraftUnit')">
{{ $t('workCenter.enterpriseInitChangePlan.newMainDraftUnit') }}
</span>
</div>
<a-form-model-item class="item-model" prop="newMainDraftingUnit">
<j-select-depart v-model="formInline.newMainDraftingUnit"
:disabled="disabled"
:disabled="disabled && !newMainDrafterCanUpdate"
:backDepart="true" />
</a-form-model-item>
</div>
<!-- 起草单位负责人 -->
<!-- 新起草单位负责人 -->
<div class="box-title-text form-flex-item">
<div class="title-text">
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit')">
{{ $t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit') }}
</span>
<span v-if="rules.newMainDraftingUnitResponsiblePerson[0].required" class="required">*</span>
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newHeadOfMainDraftingUnit')">
{{ $t('workCenter.enterpriseInitChangePlan.newHeadOfMainDraftingUnit') }}
</span>
</div>
<a-form-model-item class="item-model" prop="newMainDraftingUnitResponsiblePerson">
<user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.headOfMainDraftingUnit')"
<user-selection :placeholder="$t('pleaseSelect')+$t('workCenter.enterpriseInitChangePlan.newHeadOfMainDraftingUnit')"
v-model="formInline.newMainDraftingUnitResponsiblePerson"
:disabled="disabled"
:disabled="disabled && !newMainDrafterCanUpdate"
filedName="newMainDraftingUnitResponsiblePerson"
@nameChange="userSelectNameChange"
:nameStr="formInline.newMainDraftingUnitResponsiblePerson_dictText"
@@ -170,6 +173,21 @@ export default {
type: [Number, String],
required: false,
default: 1
},
currentNode: {
type: Number,
required: false,
default: 1
}
},
mounted () {
if (this.currentNode === 5) {
this.rules.newMainDraftingUser[0].required = true
this.rules.newMainDraftingUnit[0].required = true
this.rules.newMainDraftingUnitResponsiblePerson[0].required = true
this.newMainDrafterCanUpdate = true
} else if (this.currentNode === 1) {
this.newMainDrafterCanUpdate = true
}
},
watch: {
@@ -196,6 +214,30 @@ export default {
trigger: 'change'
}
],
// 新主起草人（节点5的时候必填）
newMainDraftingUser: [
{
required: false,
message: this.$t('workCenter.enterpriseInitChangePlan.newPrincipalDrafter') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
// 新主起草单位（节点5的时候必填）
newMainDraftingUnit: [
{
required: false,
message: this.$t('workCenter.enterpriseInitChangePlan.newMainDraftUnit') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
// 新主起草单位负责人（节点5的时候必填）
newMainDraftingUnitResponsiblePerson: [
{
required: false,
message: this.$t('workCenter.enterpriseInitChangePlan.newHeadOfMainDraftingUnit') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
// 变更原因
changeReason: [
{
@@ -204,7 +246,8 @@ export default {
trigger: 'blur'
}
]
}
},
newMainDrafterCanUpdate: false // 新主起草的三个字段是否可以修改
}
},
methods: {
src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
+2 -6
View File
@@ -28,7 +28,6 @@
v-model="formInline.espId"
:standard-number="formInline.originEnStandardNo"
:searchParam="{ projectType: projectType }"
@standardNumberChange="standardNumberChange"
@listChange="listChange"/>
</a-form-model-item>
</div>
@@ -45,7 +44,6 @@
disabled
v-model="formInline.originEnStandardName"
:maxLength="50"
@change="event => event.target.value = event.target.value.trim()"
:placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
</a-form-model-item>
</div>
@@ -274,10 +272,6 @@ export default {
this.model = Object.assign({}, record)
this.formInline = Object.assign({}, record)
},
// 企标计划选择完成的企标编号回调
standardNumberChange (value) {
this.formInline.originEnStandardNo = value
},
// 企标选编号选择完成的回调
listChange (value) {
// todo: 三个有校验的日期验证不会消失
@@ -285,6 +279,8 @@ export default {
if (value && value.length > 0) {
// this.$refs.ruleForm.clearValidate()
const formInline = {}
// 企标编号
formInline.originEnStandardNo = value[0].originEnStandardNo
// 企标名称
formInline.originEnStandardName = value[0].originEnStandardName
// 主起草人
src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
+1
View File
@@ -125,6 +125,7 @@
<a-input class="box-input"
v-model="formInline.newEnStandardNo"
:maxLength="50"
:disabled="disabled"
@change="event => event.target.value = event.target.value.trim()"
:placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />
</a-form-model-item>