Merge branch 'master' of https://gitee.com/guochang-hongyun/warm-kingdom-vue3-oa
commit
6667e8b300
|
|
@ -88,7 +88,7 @@ export const useAppStore = defineStore('app', {
|
||||||
// 左侧菜单选中字体颜色
|
// 左侧菜单选中字体颜色
|
||||||
leftMenuTextActiveColor: '#F9AA25',
|
leftMenuTextActiveColor: '#F9AA25',
|
||||||
// logo字体颜色
|
// logo字体颜色
|
||||||
logoTitleTextColor: '#fff',
|
logoTitleTextColor: '#F9AA25',
|
||||||
// logo边框颜色
|
// logo边框颜色
|
||||||
logoBorderColor: 'inherit',
|
logoBorderColor: 'inherit',
|
||||||
// 头部背景颜色
|
// 头部背景颜色
|
||||||
|
|
|
||||||
|
|
@ -259,7 +259,7 @@ onMounted(async () => {
|
||||||
await getApprovalDetail()
|
await getApprovalDetail()
|
||||||
|
|
||||||
// 查询客户列表
|
// 查询客户列表
|
||||||
customerList.value = await CustomerApi.getCustomerSimpleList()
|
customerList.value = await CustomerApi.getSelfCustomerSimpleList()
|
||||||
})
|
})
|
||||||
|
|
||||||
/** 审批相关:预测流程节点会因为输入的参数值而产生新的预测结果值,所以需重新预测一次, formData.value可改成实际业务中的特定字段
|
/** 审批相关:预测流程节点会因为输入的参数值而产生新的预测结果值,所以需重新预测一次, formData.value可改成实际业务中的特定字段
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,7 @@ import * as ProcessInstanceApi from '@/api/bpm/processInstance'
|
||||||
import { CandidateStrategy, NodeId } from '@/components/SimpleProcessDesignerV2/src/consts'
|
import { CandidateStrategy, NodeId } from '@/components/SimpleProcessDesignerV2/src/consts'
|
||||||
import { ApprovalNodeInfo } from '@/api/bpm/processInstance'
|
import { ApprovalNodeInfo } from '@/api/bpm/processInstance'
|
||||||
import {defaultProps, handleTree} from "@/utils/tree";
|
import {defaultProps, handleTree} from "@/utils/tree";
|
||||||
|
import {getSelfCustomerSimpleList} from "@/api/crm/customer";
|
||||||
|
|
||||||
defineOptions({ name: 'CustomerSuggestionCreate' })
|
defineOptions({ name: 'CustomerSuggestionCreate' })
|
||||||
|
|
||||||
|
|
@ -249,7 +250,7 @@ onMounted(async () => {
|
||||||
await getApprovalDetail()
|
await getApprovalDetail()
|
||||||
|
|
||||||
// 查询客户列表
|
// 查询客户列表
|
||||||
customerList.value = await CustomerApi.getCustomerSimpleList()
|
customerList.value = await CustomerApi.getSelfCustomerSimpleList()
|
||||||
// 加载部门树
|
// 加载部门树
|
||||||
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
|
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue