[update] 企标计划立项变更流程联调
This commit is contained in:
@@ -48,8 +48,8 @@
|
||||
<template v-slot:approvalOpinion="{text, record}">
|
||||
<a-tooltip overlay-class-name="tooltip-style">
|
||||
<template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
|
||||
<div class="table-text" :class="{'agree-color': record.approval === '1', 'reject-color': record.approval === '2'}">
|
||||
{{ text || text === 0 ? text : global.emptyLine }}
|
||||
<div class="table-text" :class="{'agree-color': record.commitFlag + '' === '1', 'reject-color': record.commitFlag + '' === '2'}">
|
||||
{{ text || text === 0 ? record.commitFlag_dictText : global.emptyLine }}
|
||||
</div>
|
||||
</a-tooltip>
|
||||
</template>
|
||||
@@ -81,7 +81,7 @@ import { JeroListMixin } from '../mixins/JeroListMixin.js'
|
||||
import JTable from './jero/JTable.vue'
|
||||
import Vue from 'vue'
|
||||
import { ACCESS_TOKEN } from '../store/mutation-types.js'
|
||||
import { downloadFile, getFileAccessHttpUrl } from '../api/manage.js'
|
||||
import { downloadFile, getFileAccessHttpUrl, getAction } from '../api/manage.js'
|
||||
import { previewPdf } from '../utils/previewPdf.js'
|
||||
import { Base64 } from 'js-base64'
|
||||
import FlowChartModal from './FlowChartModal.vue'
|
||||
@@ -101,7 +101,9 @@ export default {
|
||||
type: Object,
|
||||
required: false,
|
||||
default: () => {
|
||||
return {}
|
||||
return {
|
||||
list: '/workCenter/getApprovalRecordList'
|
||||
}
|
||||
}
|
||||
},
|
||||
// 是否可以催办,自己不能催自己
|
||||
@@ -128,25 +130,25 @@ export default {
|
||||
columns: [
|
||||
// 任务节点
|
||||
{
|
||||
dataIndex: 'projectSource_dictText',
|
||||
dataIndex: 'taskName',
|
||||
title: this.$t('workCenter.processDetail.taskNode'),
|
||||
width: 150
|
||||
},
|
||||
// 任务受理人
|
||||
{
|
||||
dataIndex: 'projectName1',
|
||||
dataIndex: 'taskAcceptor',
|
||||
title: this.$t('workCenter.processDetail.taskHandler'),
|
||||
width: 120
|
||||
},
|
||||
// 创建时间
|
||||
{
|
||||
dataIndex: 'workNumber',
|
||||
dataIndex: 'createTime',
|
||||
title: this.$t('createTime'),
|
||||
width: 150
|
||||
},
|
||||
// 完成时间
|
||||
{
|
||||
dataIndex: 'nameWorkNo1',
|
||||
dataIndex: 'endTime',
|
||||
title: this.$t('workCenter.processDetail.completionTime'),
|
||||
width: 150
|
||||
},
|
||||
@@ -158,21 +160,21 @@ export default {
|
||||
},
|
||||
// 审批意见
|
||||
{
|
||||
dataIndex: 'approval_dictText',
|
||||
dataIndex: 'commitFlag',
|
||||
title: this.$t('workCenter.processDetail.approvalOpinion'),
|
||||
width: 100,
|
||||
scopedSlots: { customRender: 'approvalOpinion' }
|
||||
},
|
||||
// 意见内容
|
||||
{
|
||||
dataIndex: 'projectName',
|
||||
dataIndex: 'commitText',
|
||||
title: this.$t('workCenter.processDetail.opinionContent'),
|
||||
width: 120,
|
||||
scopedSlots: { customRender: 'projectName' }
|
||||
},
|
||||
// 附件
|
||||
{
|
||||
dataIndex: 'file',
|
||||
dataIndex: 'commitFile',
|
||||
title: this.$t('businessSupport.questionAnswer.attach'),
|
||||
width: 160,
|
||||
scopedSlots: { customRender: 'file' }
|
||||
@@ -189,6 +191,37 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
loadData (arg) {
|
||||
if (!this.url.list) {
|
||||
this.$message.warning('请设置url.list属性!')
|
||||
return
|
||||
}
|
||||
// 加载数据 若传入参数1则加载第一页的内容
|
||||
if (arg === 1) {
|
||||
this.ipagination.current = 1
|
||||
}
|
||||
const params = this.getQueryParams()// 查询条件
|
||||
if (this.$route.query.processInstanceId) {
|
||||
params.processInstanceId = this.$route.query.processInstanceId
|
||||
}
|
||||
this.loading = true
|
||||
getAction(this.url.list, params).then((res) => {
|
||||
if (res.success) {
|
||||
// update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
|
||||
this.dataSource = res.result.records || res.result
|
||||
if (res.result.total) {
|
||||
this.ipagination.total = res.result.total
|
||||
} else {
|
||||
this.ipagination.total = 0
|
||||
}
|
||||
// update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
}).finally(() => {
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
handleUrge () {
|
||||
},
|
||||
/**
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
</div>
|
||||
<!-- 人员信息 -->
|
||||
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
|
||||
<process-detail-list :url="url">
|
||||
<process-detail-list>
|
||||
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNode + ''"></personnel-info>
|
||||
</process-detail-list>
|
||||
</div>
|
||||
@@ -297,7 +297,8 @@ const approvalPersonalInfo = [ // 人员信息的数据
|
||||
canChoose: true,
|
||||
chooseType: 'checkbox',
|
||||
chooseSource: 'workGroup',
|
||||
fieldName: 'standardExpert'
|
||||
fieldName: 'standardExpert',
|
||||
minLength: 2
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
@@ -828,6 +829,10 @@ export default {
|
||||
this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
|
||||
return
|
||||
}
|
||||
// 专家审批至少需要选两个专家
|
||||
if (personnelObj.standardExpert.split(',').length < 2) {
|
||||
this.$message.warning(this.$t('workCenter.enterpriseInitChangePlan.pleaseSelectLeastTwoExpert'))
|
||||
}
|
||||
console.log(this.formInline)
|
||||
this.processInfoForm.validateFields((err, values) => {
|
||||
this.$refs.ruleForm.validate(valid => {
|
||||
|
||||
@@ -717,7 +717,7 @@ export default {
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('workCenter.enterpriseInitChangePlan.yearNumber') + this.$t('cannotEmpty'),
|
||||
trigger: ['change', 'blur']
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
// 新企标号
|
||||
@@ -765,7 +765,7 @@ export default {
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('workCenter.enterpriseInitChangePlan.draftPlanFinishDate') + this.$t('cannotEmpty'),
|
||||
trigger: ['change', 'blur']
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
// 征求意见稿计划完成日期
|
||||
@@ -773,7 +773,7 @@ export default {
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('workCenter.enterpriseInitChangePlan.exposureDraftPlanFinishDate') + this.$t('cannotEmpty'),
|
||||
trigger: ['change', 'blur']
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
// 计划报批日期
|
||||
@@ -781,7 +781,7 @@ export default {
|
||||
{
|
||||
required: true,
|
||||
message: this.$t('workCenter.enterpriseInitChangePlan.planSubmissionDate') + this.$t('cannotEmpty'),
|
||||
trigger: ['change', 'blur']
|
||||
trigger: 'change'
|
||||
}
|
||||
],
|
||||
// 授权部门
|
||||
@@ -892,6 +892,7 @@ export default {
|
||||
getEnStandardNo(param).then(res => {
|
||||
if (res.success) {
|
||||
this.$set(this.formInline, 'newEnStandardNo', res.message)
|
||||
this.$refs.ruleForm.clearValidate('newEnStandardNo')
|
||||
this.$forceUpdate()
|
||||
// 返回流程名称
|
||||
this.returnProcessName()
|
||||
@@ -902,6 +903,7 @@ export default {
|
||||
if (this.formInline.originEnStandardNo && this.formInline.decadeCode) {
|
||||
const standardNo = this.formInline.originEnStandardNo.split('-')[0] + '-' + this.formInline.decadeCode
|
||||
this.$set(this.formInline, 'newEnStandardNo', standardNo)
|
||||
this.$refs.ruleForm.clearValidate('newEnStandardNo')
|
||||
this.$forceUpdate()
|
||||
// 返回流程名称
|
||||
this.returnProcessName()
|
||||
|
||||
@@ -149,7 +149,8 @@ export default {
|
||||
query: {
|
||||
taskName: record.taskName,
|
||||
processId: record.id, // 流程id
|
||||
taskId: record.taskId // 任务id
|
||||
taskId: record.taskId, // 任务id
|
||||
processInstanceId: record.processInstanceId // 流程实例id,必须传人员信息右侧表格查询需要用
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user