Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5fd58376fe
@ -8,7 +8,7 @@
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="知识标题" prop="knowTitle">
|
||||
<el-form-item label="知识标题1" prop="knowTitle">
|
||||
<el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -166,7 +166,7 @@ const submitForm = async () => {
|
||||
if (startUserSelectTasks.value?.length > 0) {
|
||||
data.startUserSelectAssignees = startUserSelectAssignees.value
|
||||
}
|
||||
if ( processDefineKey != "") {
|
||||
if ( processDefineKey) {
|
||||
data.processDefinitionKey = processDefineKey
|
||||
}
|
||||
await KnowledgeApi.createKnowledge(data)
|
||||
|
@ -9,7 +9,7 @@
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="知识标题" prop="knowTitle">
|
||||
<el-form-item label="知识标题2" prop="knowTitle">
|
||||
<el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -319,7 +319,7 @@ const star = async () => {
|
||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||
//flow begin++++++++++++++++++++
|
||||
// 指定审批人
|
||||
const processDefineKey = 'my-test-flow03' // 流程定义 Key
|
||||
const processDefineKey = 'pch-qjgl-001' // 流程定义 Key
|
||||
const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
|
||||
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
|
||||
const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
|
||||
@ -354,6 +354,9 @@ const submitForm = async () => {
|
||||
// 拼接子表的数据
|
||||
data.comments = commentFormRef.value.getData()
|
||||
|
||||
if ( processDefineKey) {
|
||||
data.processDefinitionKey = processDefineKey
|
||||
}
|
||||
if (formType.value === 'create') {
|
||||
await KnowledgeApi.createKnowledge(data)
|
||||
message.success(t('common.createSuccess'))
|
||||
|
Loading…
Reference in New Issue
Block a user