diff --git a/.vscode/settings.json b/.vscode/settings.json index 9a2b0e6a..571f5982 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -221,5 +221,6 @@ "commentTranslate.multiLineMerge": true, "vue.server.hybridMode": true, "typescript.tsdk": "node_modules/typescript/lib", - "svn.ignoreMissingSvnWarning": true + "svn.ignoreMissingSvnWarning": true, + "vue3snippets.enable-compile-vue-file-on-did-save-code": true } diff --git a/README.md b/README.md index e69de29b..f31db442 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,4 @@ + +```shell +generate-api --swagger_url=http://127.0.0.1:4523/export/openapi/2?version=3.0 --template ./resource/apiDefinitions.ejs --output_dir ./resource --type path --prefix_to_filter / +``` diff --git a/apps/web-contract/src/api/index.ts b/apps/web-contract/src/api/index.ts index c7d39156..2ee0a980 100644 --- a/apps/web-contract/src/api/index.ts +++ b/apps/web-contract/src/api/index.ts @@ -1,4 +1,3 @@ -// import type { BodyOptions, QueryOptions } from './global.d'; import { http } from './request/index'; @@ -19,6 +18,9 @@ export default { get_export: (data?: QueryOptions) => http.get('/app/meeting/list/export', data), }, + /** 协同办公/会议管理 门户获取会议数据 */ + get_getFundingSource: (data?: QueryOptions) => + http.get('/app/meeting/getFundingSource', data), }, tysq: { zzjg: { @@ -37,11 +39,11 @@ export default { /** 协同办公/字典表 字典类型保存 */ post_save: (data?: BodyOptions) => http.post('/app/dictType/save', data), /** 协同办公/字典表 字典类型删除 */ - post_delete: (data?: BodyOptions) => + post_deletes: (data?: BodyOptions) => http.post('/app/dictType/deletes', data), }, uaa: { - /** 用户中心 用户登陆 Copy */ + /** 用户中心 用户登陆 */ post_validateAccount: (data?: BodyOptions) => http.post('/uc/uaa/validateAccount', data), }, @@ -147,23 +149,24 @@ export default { post_save: (data?: BodyOptions) => http.post('/app/ccsq/save', data), /** 协同办公/出差申请 申请单删除 */ post_deletes: (data?: BodyOptions) => http.post('/app/ccsq/deletes', data), - /** 协同办公/出差申请 出差送审、审核 */ - post_audit: (data?: BodyOptions) => http.post('/app/ccsq/audit', data), /** 协同办公/出差申请 退回 */ - post_turnTask: (data?: BodyOptions) => - http.post('/app/ccsq/turnTask', data), + post_rollback: (data?: BodyOptions) => + http.post('/app/ccsq/rollback', data), /** 协同办公/出差申请 启动流程 */ post_startWorkFlow: (data?: BodyOptions) => http.post('/app/ccsq/startWorkFlow', data), - /** 协同办公/出差申请 送审 */ + /** 协同办公/出差申请 审核 */ post_submit: (data?: BodyOptions) => http.post('/app/ccsq/submit', data), /** 协同办公/出差申请 待办 */ get_toDoPage: (data?: QueryOptions) => http.get('/app/ccsq/toDoPage', data), /** 协同办公/出差申请 已办 */ get_donePage: (data?: QueryOptions) => http.get('/app/ccsq/donePage', data), - /** 协同办公/出差申请 获取可退回节点信息 */ - get_getBackNode: (data?: QueryOptions) => - http.get('/app/ccsq/getBackNode', data), + /** 协同办公/出差申请 查询流程节点 */ + get_getFlowNodeUserConfig: (data?: QueryOptions) => + http.get('/app/ccsq/getFlowNodeUserConfig', data), + /** 协同办公/出差申请 下一审核节点 */ + post_getNextNodeUserConfig: (data?: BodyOptions) => + http.post('/app/ccsq/getNextNodeUserConfig', data), }, orderfood: { /** 协同办公/订餐管理/订餐 订餐加载接口 */ @@ -179,7 +182,7 @@ export default { http.post('/app/orderfood/assistCancel', data), }, orderfoods: { - /** 协同办公/订餐管理/汇总 部门结算汇总 */ + /** 协同办公/订餐管理/汇总 单位订餐汇总 */ get_departmentSummary: (data?: QueryOptions) => http.get('/app/orderfoods/departmentSummary', data), /** 协同办公/订餐管理/汇总 订餐汇总 */ @@ -199,7 +202,7 @@ export default { http.get('/app/orderfoods/personalSummary/export', data), }, departmentSummary: { - /** 协同办公/订餐管理/汇总 部门结算汇总导出 */ + /** 协同办公/订餐管理/汇总 单位订餐汇总导出 */ get_export: (data?: QueryOptions) => http.get('/app/orderfoods/departmentSummary/export', data), }, @@ -288,6 +291,7 @@ export default { http.post('/app/addressor/saveBatch', data), /** 协同办公/会议管理/发言人 发言人保存 */ post_save: (data?: BodyOptions) => http.post('/app/addressor/save', data), + /** 协同办公/会议管理/发言人 删除 */ post_deletes: (data?: BodyOptions) => http.post('/app/addressor/deletes', data), }, @@ -298,6 +302,7 @@ export default { /** 协同办公/办公用品/办公用品清单 批量保存 */ post_saveBatch: (data?: BodyOptions) => http.post('/app/officeSuppliesList/saveBatch', data), + /** 协同办公/办公用品/办公用品清单 删除 */ post_deletes: (data?: BodyOptions) => http.post('/app/officeSuppliesList/deletes', data), }, @@ -305,6 +310,20 @@ export default { /** 协同办公/办公用品 采购汇总 */ get_list: (data?: QueryOptions) => http.get('/app/officeSuppliesApplySum/list', data), + /** 协同办公/办公用品 结算清单 */ + get_finalStatement: (data?: QueryOptions) => + http.get('/app/officeSuppliesApplySum/finalStatement', data), + /** 协同办公/办公用品 单位结算清单 */ + get_unitFinalStatement: (data?: QueryOptions) => + http.get('/app/officeSuppliesApplySum/unitFinalStatement', data), + finalStatement: { + /** 协同办公/办公用品 结算清单导出 */ + get_export: (data?: QueryOptions) => + http.get('/app/officeSuppliesApplySum/finalStatement/export', data), + }, + /** 协同办公/办公用品 结算清单结算操作 */ + post_balance: (data?: BodyOptions) => + http.post('/app/officeSuppliesApplySum/balance', data), }, autoOrderfoodPeoples: { /** 协同办公/订餐管理/自动订餐人员管理 分页查询 */ @@ -313,6 +332,7 @@ export default { /** 协同办公/订餐管理/自动订餐人员管理 批量保存 */ post_saveBatch: (data?: BodyOptions) => http.post('/app/autoOrderfoodPeoples/saveBatch', data), + /** 协同办公/订餐管理/自动订餐人员管理 删除 */ post_deletes: (data?: BodyOptions) => http.post('/app/autoOrderfoodPeoples/deletes', data), }, @@ -350,11 +370,17 @@ export default { /** 合同系统/申报 合同申报基本信息保存 */ post_save: (data?: BodyOptions) => http.post('/app/sbCtrBasePt/save', data), /** 合同系统/申报 合同申报基本信息删除 */ - get_deletes: (data?: QueryOptions) => - http.get('/app/sbCtrBasePt/deletes', data), + post_deletes: (data?: BodyOptions) => + http.post('/app/sbCtrBasePt/deletes', data), /** 合同系统/申报 获取资金渠道 */ get_getFundingSource: (data?: QueryOptions) => http.get('/app/sbCtrBasePt/getFundingSource', data), + /** 合同系统/申报 提交 */ + post_submit: (data?: BodyOptions) => + http.post('/app/sbCtrBasePt/submit', data), + /** 合同系统/申报 退回 */ + post_rollback: (data?: BodyOptions) => + http.post('/app/sbCtrBasePt/rollback', data), }, contractBaseInfo: { /** 合同系统/立项 合同立项保存 */ @@ -447,6 +473,24 @@ export default { /** 合同系统/履行/履行提示/合同付款 保存付款申请 */ post_save: (data?: BodyOptions) => http.post('/app/contractPayment/save', data), + /** 合同系统/履行/履行提示/合同付款 查询流程未配置人员节点 */ + get_getFlowNodeUserConfig: (data?: QueryOptions) => + http.get('/app/contractPayment/getFlowNodeUserConfig', data), + /** 合同系统/履行/履行提示/合同付款 送审 */ + post_startWorkFlow: (data?: BodyOptions) => + http.post('/app/contractPayment/startWorkFlow', data), + /** 合同系统/履行/履行提示/合同付款 审核通过 */ + post_submit: (data?: BodyOptions) => + http.post('/app/contractPayment/submit', data), + /** 合同系统/履行/履行提示/合同付款 退回 */ + post_rollback: (data?: BodyOptions) => + http.post('/app/contractPayment/rollback', data), + /** 合同系统/履行/履行提示/合同付款 待审核 */ + get_toDoPage: (data?: QueryOptions) => + http.get('/app/contractPayment/toDoPage', data), + /** 合同系统/履行/履行提示/合同付款 已审核 */ + get_donePage: (data?: QueryOptions) => + http.get('/app/contractPayment/donePage', data), }, selectMerchantsBasicInfo: { /** 合同系统/选商 分页查询 */ @@ -467,6 +511,18 @@ export default { /** 合同系统/选商 退回 */ post_rollback: (data?: BodyOptions) => http.post('/app/selectMerchantsBasicInfo/rollback', data), + /** 合同系统/选商废除 选商废除(弃用) */ + post_abolish: (data?: BodyOptions) => + http.post('/app/selectMerchantsBasicInfo/abolish', data), + /** 合同系统/选商废除 选商废除(开始节点提交,非待办提交) */ + post_abolishFlowStart: (data?: BodyOptions) => + http.post('/app/selectMerchantsBasicInfo/abolishFlowStart', data), + /** 合同系统/选商废除 提交 */ + post_abolishSubmit: (data?: BodyOptions) => + http.post('/app/selectMerchantsBasicInfo/abolishSubmit', data), + /** 合同系统/选商废除 退回 */ + post_abolishRollback: (data?: BodyOptions) => + http.post('/app/selectMerchantsBasicInfo/abolishRollback', data), }, lvxChange: { /** 合同系统/履行/履行提示/合同变更 保存合同变更申请 */ @@ -476,10 +532,10 @@ export default { http.get('/app/lvxChange/getContractChangeInfo', data), }, contractRelieve: { - /** 合同系统/履行/履行提示/合同终止(解除) 获取合同终止(解除)信息 */ + /** 合同系统/履行/履行提示/合同解除 获取合同解除信息 */ get_getContractRelieveInfo: (data?: QueryOptions) => http.get('/app/contractRelieve/getContractRelieveInfo', data), - /** 合同系统/履行/履行提示/合同终止(解除) 保存合同终止信息 */ + /** 合同系统/履行/履行提示/合同解除 保存合同解除信息 */ post_save: (data?: BodyOptions) => http.post('/app/contractRelieve/save', data), }, @@ -490,6 +546,18 @@ export default { /** 合同系统/履行/履行提示/合同违约情况 获取合同违约信息 */ get_getContractBreachInfo: (data?: QueryOptions) => http.get('/app/contractBreach/getContractBreachInfo', data), + /** 合同系统/履行/履行提示/合同违约情况 查询流程未配置人员节点 */ + get_getFlowNodeUserConfig: (data?: QueryOptions) => + http.get('/app/contractBreach/getFlowNodeUserConfig', data), + /** 合同系统/履行/履行提示/合同违约情况 启动流程 */ + post_startWorkFlow: (data?: BodyOptions) => + http.post('/app/contractBreach/startWorkFlow', data), + /** 合同系统/履行/履行提示/合同违约情况 审核 */ + post_submit: (data?: BodyOptions) => + http.post('/app/contractBreach/submit', data), + /** 合同系统/履行/履行提示/合同违约情况 退回 */ + post_rollback: (data?: BodyOptions) => + http.post('/app/contractBreach/rollback', data), }, lvxResult: { /** 合同系统/履行/履行结果 履行结果保存 */ @@ -611,6 +679,12 @@ export default { /** 流程中心 获取流程节点人员配置信息 */ post_getFlowNodeUserConfig: (data?: BodyOptions) => http.post('/app/flowCenter/getFlowNodeUserConfig', data), + /** 流程中心 获取流程变量配置 */ + get_getFlowVariablesConfig: (data?: QueryOptions) => + http.get('/app/flowCenter/getFlowVariablesConfig', data), + /** 流程中心 获取流程所有人员配置信息 */ + get_getFlowUserConfig: (data?: QueryOptions) => + http.get('/app/flowCenter/getFlowUserConfig', data), }, rl: { moduleParameter: { @@ -627,6 +701,11 @@ export default { get_getNextNodeUser: (data?: QueryOptions) => http.get('/app/rl/moduleParameter/getNextNodeUser', data), }, + workFlow: { + /** 合同系统 流程待办 */ + get_queryMyTodoTask: (data?: QueryOptions) => + http.get('/app/rl/workFlow/queryMyTodoTask', data), + }, }, dutyCount: { /** 协同办公/订餐管理/值班天数 分页查询 */ @@ -672,4 +751,30 @@ export default { post_deletes: (data?: BodyOptions) => http.post('/app/lxBasisSale/deletes', data), }, + workFlow: { + /** 合同系统 查询下一节点id */ + get_getNextNodeUserConfig: (data?: QueryOptions) => + http.get('/app/workFlow/getNextNodeUserConfig', data), + /** 合同系统 获取可退回节点 */ + get_getBackNode: (data?: QueryOptions) => + http.get('/app/workFlow/getBackNode', data), + /** 合同系统 审核记录 */ + get_history: (data?: QueryOptions) => + http.get('/app/workFlow/history', data), + /** 合同系统 流程已办 */ + get_getDoneTaskByUserID: (data?: QueryOptions) => + http.get('/app/workFlow/getDoneTaskByUserID', data), + }, + biddingResult: { + /** 合同系统/选商/选商结果 分页查询 */ + get_page: (data?: QueryOptions) => + http.get('/app/biddingResult/page', data), + /** 合同系统/选商/选商结果 保存 */ + post_save: (data?: BodyOptions) => + http.post('/app/biddingResult/save', data), + }, + home: { + /** 合同系统/首页待办/已办 待办 */ + get_todo: (data?: QueryOptions) => http.get('/app/home/todo', data), + }, }; diff --git a/apps/web-contract/src/global.d.ts b/apps/web-contract/src/globals.d.ts similarity index 100% rename from apps/web-contract/src/global.d.ts rename to apps/web-contract/src/globals.d.ts diff --git a/apps/web-contract/src/shims-global.d.ts b/apps/web-contract/src/shims-global.d.ts deleted file mode 100644 index dc9a1baa..00000000 --- a/apps/web-contract/src/shims-global.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export {}; - -declare interface PageVo { - code: number; - data: any; - message: string; -} diff --git a/apps/web-contract/src/views/_core/authentication/login.vue b/apps/web-contract/src/views/_core/authentication/login.vue index f0074fe4..cfe7d854 100644 --- a/apps/web-contract/src/views/_core/authentication/login.vue +++ b/apps/web-contract/src/views/_core/authentication/login.vue @@ -93,9 +93,9 @@ function mockLogin(username: string, password: string, isSkip: boolean = true) { 超级管理员 zxs zp - rlqym + + rlqym + diff --git a/apps/web-contract/src/views/contract/approval/edit/curd.tsx b/apps/web-contract/src/views/contract/approval/edit/curd.tsx index 4f1632b8..91adc12f 100644 --- a/apps/web-contract/src/views/contract/approval/edit/curd.tsx +++ b/apps/web-contract/src/views/contract/approval/edit/curd.tsx @@ -177,9 +177,6 @@ export function getFormSchema(params: any = {}) { valueChange: { immediate: true, // 是否立即执行一次 handle({ form }) { - debugger; - - console.log(form); form.fundAllocationName = getDictObj( DICT_TYPE.contract_fund_flow, form.fundAllocation, diff --git a/apps/web-contract/src/views/contract/approval/edit/index.vue b/apps/web-contract/src/views/contract/approval/edit/index.vue index 0dbf65a4..1b853ae9 100644 --- a/apps/web-contract/src/views/contract/approval/edit/index.vue +++ b/apps/web-contract/src/views/contract/approval/edit/index.vue @@ -116,8 +116,14 @@ function handleOpenSignBasisChooseModal() { const tableFullData = xGridRef.value?.getTableData().fullData; if (tableFullData && tableFullData.length > 0) { chooseSigningBasisModalApi.setData({ + title: '选择签约依据', guids: tableFullData.map((item) => item.guid) || [], }); + } else { + chooseSigningBasisModalApi.setData({ + title: '选择签约依据', + guids: [], + }); } chooseSigningBasisModalApi.open(); @@ -204,8 +210,6 @@ async function handleSave() { isLoading.value = true; try { - const form = formRef.value.form; - await formRef.value.submit(); let newForm: any = {}; @@ -264,7 +268,7 @@ async function handleSave() { result = await Apis.contractBaseInfo.post_apply({ data: newForm }); - currData.value.taskId = result.taskId; + id.value = result.value; message.success('保存成功'); Modal.confirm({ @@ -368,19 +372,11 @@ onMounted(async () => {