[update] 修改bug80453
This commit is contained in:
@@ -108,7 +108,7 @@
|
|||||||
<!-- 人员信息 -->
|
<!-- 人员信息 -->
|
||||||
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
|
<div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
|
||||||
<process-detail-list :processKey="ProcessKey.ES_EDIT.value">
|
<process-detail-list :processKey="ProcessKey.ES_EDIT.value">
|
||||||
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId" :notPermissField="notPermissField"></personnel-info>
|
<personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeId"></personnel-info>
|
||||||
</process-detail-list>
|
</process-detail-list>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -209,13 +209,6 @@ export default {
|
|||||||
computed: {
|
computed: {
|
||||||
pageTitle () {
|
pageTitle () {
|
||||||
return this.$t('flowCenter') + this.$route.meta.title + '(' + this.currentNodeName + ')'
|
return this.$t('flowCenter') + this.$route.meta.title + '(' + this.currentNodeName + ')'
|
||||||
},
|
|
||||||
notPermissField () {
|
|
||||||
if (this.currentNode === 7) {
|
|
||||||
return []
|
|
||||||
} else {
|
|
||||||
return ['adviceUserList']
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
@@ -375,38 +368,6 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 待办中进入时需要初始化人员信息数据
|
|
||||||
// 混入中方法重写,部所联络人下发节点,如果有征求意见对象填写意见节点,需要能选人
|
|
||||||
initPersonInfoData (isFirstNode) {
|
|
||||||
console.log('-----------isFirstNode------------', isFirstNode)
|
|
||||||
if (isFirstNode) {
|
|
||||||
// 是第一个节点,回显数据
|
|
||||||
this.personnelInfoData = this.personnelInfoData.map(item => {
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
userList: item.linkUserIds_dictText
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
// 不是第一个节点,回显数据,都不可选人,
|
|
||||||
// 部所联络人下发节点,征求意见对象填写意见节点,需要能选征求意见对象,并且不回显同一节点别人选的数据
|
|
||||||
this.personnelInfoData = this.personnelInfoData.map(item => {
|
|
||||||
if (item.variableName === 'adviceUserList' && this.currentNode === 7) {
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
linkUserIds: '',
|
|
||||||
linkUserIds_dictText: ''
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return {
|
|
||||||
...item,
|
|
||||||
userList: item.linkUserIds_dictText,
|
|
||||||
canChoose: 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// 根据流程id获取数据并回显
|
// 根据流程id获取数据并回显
|
||||||
getProcessData (type, param) {
|
getProcessData (type, param) {
|
||||||
let func
|
let func
|
||||||
@@ -438,7 +399,7 @@ export default {
|
|||||||
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
|
||||||
this.model.data = (JSON.parse(this.model.infoJsonStr)).data
|
this.model.data = (JSON.parse(this.model.infoJsonStr)).data
|
||||||
// 如果是节点1的保存回显人员信息
|
// 如果是节点1的保存回显人员信息
|
||||||
if (this.currentNode === 1 || this.currentNode === 7) {
|
if (this.currentNode === 1) {
|
||||||
console.log(JSON.parse(this.model.infoJsonStr).personnelObj)
|
console.log(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||||
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
|
||||||
}
|
}
|
||||||
@@ -633,15 +594,6 @@ export default {
|
|||||||
// 提交
|
// 提交
|
||||||
handleSubmit () {
|
handleSubmit () {
|
||||||
if (this.loading) return
|
if (this.loading) return
|
||||||
let personnelObj = {}
|
|
||||||
if (this.currentNode === 7) {
|
|
||||||
// 说明是部所联络人下发节点,需要传人员信息
|
|
||||||
personnelObj = this.$refs.personnelInfo.getDataObjVerify()
|
|
||||||
if (!personnelObj) {
|
|
||||||
this.switchValue = 'user'
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => {
|
this.approvalInfoForm.validateFields(async (approvalErr, approvalValues) => {
|
||||||
const data = await this.$refs.baseInfoRef.getDataValidate()
|
const data = await this.$refs.baseInfoRef.getDataValidate()
|
||||||
if (!approvalErr && data) {
|
if (!approvalErr && data) {
|
||||||
@@ -649,9 +601,6 @@ export default {
|
|||||||
param.common = Object.assign({}, approvalValues)
|
param.common = Object.assign({}, approvalValues)
|
||||||
param.common.taskId = this.$route.query.taskId
|
param.common.taskId = this.$route.query.taskId
|
||||||
param.data = data
|
param.data = data
|
||||||
if (this.currentNode === 7) {
|
|
||||||
param.flowUser = personnelObj
|
|
||||||
}
|
|
||||||
this.loading = true
|
this.loading = true
|
||||||
enStandardEditAgree(param).then(res => {
|
enStandardEditAgree(param).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
Reference in New Issue
Block a user