yudao-team/oa-ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
XaoLi717 2024-11-18 15:43:37 +08:00
commit 5fd58376fe
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/bpm/knows/knowledge/KnowledgeCreate.vue
View File

@ -8,7 +8,7 @@
> >
<el-row> <el-row>
<el-col :span="24"> <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-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -166,7 +166,7 @@ const submitForm = async () => {
if (startUserSelectTasks.value?.length > 0) { if (startUserSelectTasks.value?.length > 0) {
data.startUserSelectAssignees = startUserSelectAssignees.value data.startUserSelectAssignees = startUserSelectAssignees.value
} }
if ( processDefineKey != "") { if ( processDefineKey) {
data.processDefinitionKey = processDefineKey data.processDefinitionKey = processDefineKey
} }
await KnowledgeApi.createKnowledge(data) await KnowledgeApi.createKnowledge(data)

7
src/views/bpm/knows/knowledge/KnowledgeForm.vue
View File

@ -9,7 +9,7 @@
> >
<el-row> <el-row>
<el-col :span="24"> <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-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -319,7 +319,7 @@ const star = async () => {
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
//flow begin++++++++++++++++++++ //flow begin++++++++++++++++++++
// 指定审批人 // 指定审批人
const processDefineKey = 'my-test-flow03' // 流程定义 Key const processDefineKey = 'pch-qjgl-001' // 流程定义 Key
const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表 const startUserSelectTasks = ref([]) // 发起人需要选择审批人的用户任务列表
const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据 const startUserSelectAssignees = ref({}) // 发起人选择审批人的数据
const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表单 Ref
@ -354,6 +354,9 @@ const submitForm = async () => {
// 拼接子表的数据 // 拼接子表的数据
data.comments = commentFormRef.value.getData() data.comments = commentFormRef.value.getData()
if ( processDefineKey) {
data.processDefinitionKey = processDefineKey
}
if (formType.value === 'create') { if (formType.value === 'create') {
await KnowledgeApi.createKnowledge(data) await KnowledgeApi.createKnowledge(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))