update 人员信息调整
This commit is contained in:
@@ -28,9 +28,21 @@
|
|||||||
<div class="personnel-container-content">
|
<div class="personnel-container-content">
|
||||||
<div class="personnel-container-content-text">
|
<div class="personnel-container-content-text">
|
||||||
<template v-if="step.canChoose && index >= currentNodeIndex">
|
<template v-if="step.canChoose && index >= currentNodeIndex">
|
||||||
<user-select-by-work-group v-if="step.chooseSource === 'workGroup'" v-model="step.linkUserIds" :type="step.chooseType" :name-str="step.linkUserIds_dictText" input-type="textarea"/>
|
<user-select-by-work-group v-if="step.chooseSource === 'workGroup'"
|
||||||
<user-select-by-contact v-else-if="step.chooseSource === 'contactManage'" v-model="step.linkUserIds" :type="step.chooseType" :name-str="step.linkUserIds_dictText" input-type="textarea"/>
|
v-model="step.linkUserIds"
|
||||||
<user-selection v-else-if="step.chooseSource === 'user'" :type="step.chooseType" v-model="step.linkUserIds" :name-str="step.linkUserIds_dictText" input-type="textarea" />
|
:type="step.chooseType"
|
||||||
|
:name-str="step.linkUserIds_dictText"
|
||||||
|
input-type="textarea" />
|
||||||
|
<user-select-by-contact v-else-if="step.chooseSource === 'contactManage'"
|
||||||
|
v-model="step.linkUserIds"
|
||||||
|
:type="step.chooseType"
|
||||||
|
:name-str="step.linkUserIds_dictText"
|
||||||
|
input-type="textarea" />
|
||||||
|
<user-selection v-else-if="step.chooseSource === 'user'"
|
||||||
|
:type="step.chooseType"
|
||||||
|
v-model="step.linkUserIds"
|
||||||
|
:name-str="step.linkUserIds_dictText"
|
||||||
|
input-type="textarea" />
|
||||||
</template>
|
</template>
|
||||||
<div class="personnel-container-content-echo-text" v-else>{{ step.userList }}</div>
|
<div class="personnel-container-content-echo-text" v-else>{{ step.userList }}</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -69,20 +81,32 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
required: false,
|
required: false,
|
||||||
default: null
|
default: null
|
||||||
|
},
|
||||||
|
// 特殊流程需要用indexOf判断的前缀
|
||||||
|
specialProcessNodePrefix: {
|
||||||
|
type: String,
|
||||||
|
required: false,
|
||||||
|
default: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
stepsData: [],
|
stepsData: []
|
||||||
currentNodeIndex: 0 // 当前节点的位置
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
// 当前节点的位置
|
||||||
|
currentNodeIndex () {
|
||||||
|
if (this.specialProcessNodePrefix) {
|
||||||
|
return this.stepsData.findIndex(tt => tt.xmlNodeId.indexOf(this.specialProcessNodePrefix) === 0)
|
||||||
|
}
|
||||||
|
return this.stepsData.findIndex(tt => tt.xmlNodeId === this.currentNode)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
data: {
|
data: {
|
||||||
handler () {
|
handler () {
|
||||||
this.stepsData = JSON.parse(JSON.stringify(this.data))
|
this.stepsData = JSON.parse(JSON.stringify(this.data))
|
||||||
console.log(this.stepsData)
|
|
||||||
this.currentNodeIndex = this.stepsData.findIndex(tt => tt.nodeName === this.currentNode)
|
|
||||||
},
|
},
|
||||||
deep: true,
|
deep: true,
|
||||||
immediate: true
|
immediate: true
|
||||||
|
|||||||
@@ -253,7 +253,7 @@
|
|||||||
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
||||||
<process-detail-list :process-key="processKey">
|
<process-detail-list :process-key="processKey">
|
||||||
<template #personnelInfo>
|
<template #personnelInfo>
|
||||||
<personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode"/>
|
<personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode" :special-process-node-prefix="currentNodePrefix"/>
|
||||||
</template>
|
</template>
|
||||||
</process-detail-list>
|
</process-detail-list>
|
||||||
</div>
|
</div>
|
||||||
@@ -732,7 +732,8 @@ export default {
|
|||||||
scopedSlots: { customRender: 'text' }
|
scopedSlots: { customRender: 'text' }
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
businessId: null
|
businessId: null,
|
||||||
|
currentNodePrefix: null // 当前节点的固定前缀,用于人员信息组件处理
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -809,6 +810,7 @@ export default {
|
|||||||
})
|
})
|
||||||
// 找不到这个节点默认使用审批节点页面及按钮,发起除外
|
// 找不到这个节点默认使用审批节点页面及按钮,发起除外
|
||||||
this.nodeEnumsKey = this.currentNode ? ConsultationProcess.keyOfValueByLike(this.currentNode) || 'regulatoryEngineerApproval' : 'initiate'
|
this.nodeEnumsKey = this.currentNode ? ConsultationProcess.keyOfValueByLike(this.currentNode) || 'regulatoryEngineerApproval' : 'initiate'
|
||||||
|
this.currentNodePrefix = ConsultationProcess[this.nodeEnumsKey].value
|
||||||
this.btnList = ConsultationProcess[this.nodeEnumsKey].btn
|
this.btnList = ConsultationProcess[this.nodeEnumsKey].btn
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
Reference in New Issue
Block a user