diff --git a/src/api/sys/WFSchemeInfo.ts b/src/api/sys/WFSchemeInfo.ts new file mode 100644 index 0000000..f324845 --- /dev/null +++ b/src/api/sys/WFSchemeInfo.ts @@ -0,0 +1,51 @@ +// WFSchemeInfo 流程模版基本信息 +import { defHttp } from '@/utils/http/axios'; +import {SchemeListParams,GetSchemeModel,AddParams, + DeleteParams,UpdateParams,StateParams,HistoryParams,GetHistoryModel} from './model/wfSchemeInfoModel' +enum Api { + // 流程模板基本信息 + LoadPage = '/api/WFSchemeInfo/LoadPage', + Add = '/api/WFSchemeInfo/Add', + Update = '/api/WFSchemeInfo/Update', + Delete = '/api/WFSchemeInfo/Delete', + UpDateState = '/api/WFSchemeInfo/UpDateState', + // 流程模板详细信息 + loadHistoryPage= '/api/WFScheme/LoadPage' +} + +/** + * @description: getLoadPage 模板列表 + */ +export function getLoadPage(params?: SchemeListParams) { + return defHttp.get({ url: Api.LoadPage, params }); +} +/** + * @description: postAdd + */ +export function postAdd( params?:AddParams) { + return defHttp.post( + { + url: Api.Add, + params, + }, + ); +} + +export function update(params:UpdateParams) { + return defHttp.post({ + url: Api.Update, + params + }); +} + +export function del(params:DeleteParams) { + return defHttp.post({ url: Api.Delete + "?id=" + params.id }); +} + +export function updateState(params:StateParams){ + return defHttp.post({ url: Api.UpDateState + "?id=" + params.id +"&state="+params.state}); +} + +export function getLoadHistoryPage(params?:HistoryParams){ + return defHttp.get({url:Api.loadHistoryPage,params}) +} diff --git a/src/api/sys/model/sysDataItemDetailModel.ts b/src/api/sys/model/sysDataItemDetailModel.ts new file mode 100644 index 0000000..b187b98 --- /dev/null +++ b/src/api/sys/model/sysDataItemDetailModel.ts @@ -0,0 +1,61 @@ +/** + * @description: 字典明细接口区分参数 + */ +export interface CodeParams { + code: string; +} + +/** + * @description: 字典明细添加参数 + */ +export interface AddParams { + itemName: string; + itemValue: string; + sortCode: number; + enabledMark: number; + description: string; +} + +/** + * @description: 字典明细更新参数 + */ + export interface UpdateParams { + itemDetailId:string; + itemName: string; + itemValue: string; + sortCode: number; + enabledMark: number; + description: string; +} + + +/** + * @description: 分类明细删除参数 + */ +export interface DeleteParams { + id: string ; +} + +/** + * @description: 获取分类明细返回值 + */ +export interface GetSysDataItemDetailModel { + itemDetailId: string; + itemId: string; + parentId: string; + itemCode: string; + itemName: string; + itemValue: string; + quickQuery: string; + simpleSpelling: string; + isDefault: string; + sortCode: number; + deleteMark: number; + enabledMark: number; + description: string; + createDate: string; + createUserName: string; + modifyDate: string; + modifyUserId: string; + modifyUserName: string; +} diff --git a/src/api/sys/model/wfSchemeInfoModel.ts b/src/api/sys/model/wfSchemeInfoModel.ts new file mode 100644 index 0000000..ed8fb46 --- /dev/null +++ b/src/api/sys/model/wfSchemeInfoModel.ts @@ -0,0 +1,153 @@ +/** + * @description: 流程模板基本信息参数 + */ +export interface SchemeListParams { + key: string; + page: number; + limit: number; + category: string; + ids?: string; +} + +/** + * @description: 流程模板添加参数 + */ +export interface AddParams { + schemeinfo: { + id: string, + code: string, + name: string, + category: string, + color: string, + icon: string, + schemeId: string, + enabledMark: 0, + mark: 0, + isInApp: 0, + authType: 0, + description: string, + type: 0, + createDate: string, + createUserId: string, + createUserName: string + }, + schemeAuthList: [ + { + id: string, + schemeInfoId: string, + objName: string, + objId: string, + objType: 0 + } + ], + scheme: { + id: string, + schemeInfoId: string, + type: 0, + createDate: string, + createUserId: string, + createUserName: string, + content: string + } +} + +/** + * @description: 字典明细更新参数 + */ +export interface UpdateParams { + schemeinfo: { + id: string, + code: string, + name: string, + category: string, + color: string, + icon: string, + schemeId: string, + enabledMark: 0, + mark: 0, + isInApp: 0, + authType: 0, + description: string, + type: 0, + createDate: string, + createUserId: string, + createUserName: string + }, + schemeAuthList: [ + { + id: string, + schemeInfoId: string, + objName: string, + objId: string, + objType: 0 + } + ], + scheme: { + id: string, + schemeInfoId: string, + type: 0, + createDate: string, + createUserId: string, + createUserName: string, + content: string + } +} + + +/** + * @description: 分类明细删除参数 + */ +export interface DeleteParams { + id: string; +} + +export interface StateParams{ + id:string; + state:number; +} + +/** + * @description: 获取分类明细返回值 + */ +export interface GetSchemeModel { + itemDetailId: string; + itemId: string; + parentId: string; + itemCode: string; + itemName: string; + itemValue: string; + quickQuery: string; + simpleSpelling: string; + isDefault: string; + sortCode: number; + deleteMark: number; + enabledMark: number; + description: string; + createDate: string; + createUserName: string; + modifyDate: string; + modifyUserId: string; + modifyUserName: string; +} + +/** + * @description: 历史记录查询参数 + */ +export interface HistoryParams{ + key: string; + page: number; + limit: number; + id?: string; +} +/** + * @description: 历史记录返回值 + */ +export interface GetHistoryModel{ + id: string, + schemeInfoId: string, + type: number, + createDate: string, + createUserId: string, + createUserName: string, + content: string +} diff --git a/src/api/sys/sysDataItemDetail.ts b/src/api/sys/sysDataItemDetail.ts new file mode 100644 index 0000000..b002912 --- /dev/null +++ b/src/api/sys/sysDataItemDetail.ts @@ -0,0 +1,42 @@ +// sysDataItemDetail 字典明细接口api +import { defHttp } from '@/utils/http/axios'; +import {CodeParams,AddParams,UpdateParams ,DeleteParams,GetSysDataItemDetailModel} from './model/sysDataItemDetailModel' +enum Api { + Load = '/api/SysDataItemDetail/Load', + Add = '/api/SysDataItemDetail/Add', + Update = '/api/SysDataItemDetail/Update', + Delete = '/api/SysDataItemDetail/Delete', +} + +/** + * @description: postAdd + */ +export function postAdd(code:CodeParams, params:AddParams) { + return defHttp.post( + { + url: Api.Add + "?code=" + code, + params, + }, + ); +} + +/** + * @description: getLoad + */ +export function getLoad(params: CodeParams) { + return defHttp.get({ url: Api.Load, params }); +} + +export function update(params?:UpdateParams) { + console.log(params) + return defHttp.post({ + url: Api.Update, + params + }); +} + +export function del(params:DeleteParams) { + return defHttp.post({ url: Api.Delete + "?id=" + params.id }); +} + + diff --git a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue index 969b083..0da466f 100644 --- a/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue +++ b/src/components/ProcessDesigner/package/penal/PropertiesPanel.vue @@ -13,9 +13,12 @@ - + + + + - - - - - \ No newline at end of file diff --git a/src/components/ProcessDesigner/package/penal/config/subprocess.vue b/src/components/ProcessDesigner/package/penal/config/subprocess.vue deleted file mode 100644 index d955f44..0000000 --- a/src/components/ProcessDesigner/package/penal/config/subprocess.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/components/ProcessDesigner/package/penal/endEvent/index.vue b/src/components/ProcessDesigner/package/penal/endEvent/index.vue new file mode 100644 index 0000000..d7a6be7 --- /dev/null +++ b/src/components/ProcessDesigner/package/penal/endEvent/index.vue @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/src/components/ProcessDesigner/package/penal/subprocess/index.vue b/src/components/ProcessDesigner/package/penal/subprocess/index.vue new file mode 100644 index 0000000..ff808d9 --- /dev/null +++ b/src/components/ProcessDesigner/package/penal/subprocess/index.vue @@ -0,0 +1,44 @@ + + + + + + \ No newline at end of file diff --git a/src/views/demo/system/menu/index.vue b/src/views/demo/system/menu/index.vue index 21bb974..2f31a51 100644 --- a/src/views/demo/system/menu/index.vue +++ b/src/views/demo/system/menu/index.vue @@ -73,7 +73,7 @@ isUpdate: true, }); } - async function editMenu(node: Recordable) { + async function editMenu(node) { var query = { id: node.id } diff --git a/src/views/demo/workflow/scheme/HistoryDrawer.vue b/src/views/demo/workflow/scheme/HistoryDrawer.vue new file mode 100644 index 0000000..528edab --- /dev/null +++ b/src/views/demo/workflow/scheme/HistoryDrawer.vue @@ -0,0 +1,81 @@ + + diff --git a/src/views/demo/workflow/scheme/SchemeDrawer.vue b/src/views/demo/workflow/scheme/SchemeDrawer.vue index f96c2f5..4bbbe37 100644 --- a/src/views/demo/workflow/scheme/SchemeDrawer.vue +++ b/src/views/demo/workflow/scheme/SchemeDrawer.vue @@ -9,14 +9,14 @@ import { formSchema } from './scheme.data'; import { BasicDrawer, useDrawerInner } from '@/components/Drawer'; - import { getMenuList, addMenu, editMenu, addButton, editButton } from '@/api/demo/system'; + import { postAdd, update } from '@/api/sys/sysDataItemDetail'; defineOptions({ name: 'SchemeDrawer' }); const emit = defineEmits(['success', 'register']); const isUpdate = ref(true); - + const detail = ref({}) const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = useForm({ labelWidth: 90, baseColProps: { span: 24 }, @@ -25,24 +25,17 @@ }); const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { + console.log(data) resetFields(); setDrawerProps({ confirmLoading: false }); isUpdate.value = !!data?.isUpdate; if (unref(isUpdate)) { + detail.value = data.record setFieldsValue({ ...data.record, }); } - const treeData = await getMenuList(); - updateSchema({ - field: 'parentId', - componentProps: { treeData }, - }); - updateSchema({ - field: 'moduleId', - componentProps: { treeData }, - }); }); const getTitle = computed(() => (!unref(isUpdate) ? '新增' : '编辑')); @@ -51,28 +44,20 @@ try { const values = await validate(); setDrawerProps({ confirmLoading: true }); - // TODO custom api - console.log(values) - if (values.type == '1') { - console.log("新增菜单") - delete values.type - // 新增菜单 - if (!unref(isUpdate)) { - const data = await addMenu(values); - } else { - const data = await editMenu(values); - } + if (isUpdate.value) { + console.log(values) + console.log(detail.value) + var querys = detail.value + querys.description = values.description + querys.enabledMark = values.enabledMark + querys.itemName = values.itemName + querys.itemValue = values.itemValue + querys.sortCode = values.sortCode + const data = await update(querys); closeDrawer(); emit('success'); } else { - console.log("新增按钮") - // 新增按钮 - delete values.type - if (!unref(isUpdate)) { - const data = await addButton(values); - } else { - const data = await editButton(values); - } + const data = await postAdd('FlowSort', values); closeDrawer(); emit('success'); } diff --git a/src/views/demo/workflow/scheme/SchemeTree.vue b/src/views/demo/workflow/scheme/SchemeTree.vue index 52f5158..8e74afb 100644 --- a/src/views/demo/workflow/scheme/SchemeTree.vue +++ b/src/views/demo/workflow/scheme/SchemeTree.vue @@ -1,41 +1,43 @@