diff --git a/.env.local-dev b/.env.local similarity index 100% rename from .env.local-dev rename to .env.local diff --git a/package.json b/package.json index 5cdca2af..c521cafe 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "private": false, "scripts": { "i": "pnpm install", - "local-dev": "vite --mode local-dev", - "dev": "vite --mode dev", + "dev": "vite --mode local-dev", + "dev-server": "vite --mode dev", "ts:check": "vue-tsc --noEmit", "build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev", - "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev", + "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev", "build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test", "build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage", "build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod", diff --git a/src/api/bpm/processInstance/index.ts b/src/api/bpm/processInstance/index.ts index 10cd3bc8..a937eae2 100644 --- a/src/api/bpm/processInstance/index.ts +++ b/src/api/bpm/processInstance/index.ts @@ -20,6 +20,17 @@ export type ProcessInstanceVO = { endTime: string } +export type ProcessInstanceCCVO = { + type: number, + taskName: string, + taskKey: string, + processInstanceName: string, + processInstanceKey: string, + startUserId: string, + options:string [], + reason: string +} + export const getMyProcessInstancePage = async (params) => { return await request.get({ url: '/bpm/process-instance/my-page', params }) } @@ -39,3 +50,21 @@ export const cancelProcessInstance = async (id: number, reason: string) => { export const getProcessInstance = async (id: number) => { return await request.get({ url: '/bpm/process-instance/get?id=' + id }) } + +/** + * 抄送 + * @param data 抄送数据 + * @returns 是否抄送成功 + */ +export const createProcessInstanceCC = async (data) => { + return await request.post({ url: '/bpm/process-instance/cc/create', data: data }) +} + +/** + * 抄送列表 + * @param params + * @returns + */ +export const getProcessInstanceCCPage = async (params) => { + return await request.get({ url: '/bpm/process-instance/cc/my-page', params }) +} \ No newline at end of file diff --git a/src/api/mall/promotion/combination/combinationRecord.ts b/src/api/mall/promotion/combination/combinationRecord.ts index 90e8937e..b2b7d75f 100644 --- a/src/api/mall/promotion/combination/combinationRecord.ts +++ b/src/api/mall/promotion/combination/combinationRecord.ts @@ -18,15 +18,10 @@ export interface CombinationRecordVO { } // 查询拼团记录列表 -export const getCombinationRecordPage = async (params) => { +export const getCombinationRecordPage = async (params: any) => { return await request.get({ url: '/promotion/combination-record/page', params }) } -// 查询一个拼团的完整拼团记录 -export const getCombinationRecordPageByHeadId = async (params) => { - return await request.get({ url: '/promotion/combination-record/page-by-headId', params }) -} - // 获得拼团记录的概要信息 export const getCombinationRecordSummary = async () => { return await request.get({ url: '/promotion/combination-record/get-summary' }) diff --git a/src/utils/constants.ts b/src/utils/constants.ts index d3d0fd45..47714945 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -133,6 +133,10 @@ export const PayChannelEnum = { code: 'alipay_bar', name: '支付宝条码支付' }, + WALLET: { + code: 'wallet', + name: '钱包支付' + }, MOCK: { code: 'mock', name: '模拟支付' diff --git a/src/views/bpm/model/ModelForm.vue b/src/views/bpm/model/ModelForm.vue index 0bd54091..15935e18 100644 --- a/src/views/bpm/model/ModelForm.vue +++ b/src/views/bpm/model/ModelForm.vue @@ -96,17 +96,17 @@ diff --git a/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue b/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue new file mode 100644 index 00000000..bdfecadb --- /dev/null +++ b/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue @@ -0,0 +1,242 @@ + + + diff --git a/src/views/bpm/task/cc/index.vue b/src/views/bpm/task/cc/index.vue new file mode 100644 index 00000000..50ddf889 --- /dev/null +++ b/src/views/bpm/task/cc/index.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue index c8876887..b281d949 100644 --- a/src/views/bpm/task/todo/index.vue +++ b/src/views/bpm/task/todo/index.vue @@ -64,6 +64,7 @@ @@ -74,12 +75,14 @@ :total="total" @pagination="getList" /> + diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue index ec06a0b7..8f569a29 100644 --- a/src/views/mall/promotion/combination/record/index.vue +++ b/src/views/mall/promotion/combination/record/index.vue @@ -242,9 +242,11 @@ const getSummary = async () => { recordSummary.value = await CombinationRecordApi.getCombinationRecordSummary() } +/** 查看拼团详情 */ const openRecordListDialog = (row: CombinationRecordApi.CombinationRecordVO) => { - combinationRecordListRef.value?.open(row.headId) + combinationRecordListRef.value?.open(row.headId || row.id) // 多表达式的原因,团长的 headId 为空,就是自身的情况 } + /** 搜索按钮操作 */ const handleQuery = () => { queryParams.value.pageNo = 1 diff --git a/src/views/pay/app/components/channel/WalletChannelForm.vue b/src/views/pay/app/components/channel/WalletChannelForm.vue new file mode 100644 index 00000000..cbdb542a --- /dev/null +++ b/src/views/pay/app/components/channel/WalletChannelForm.vue @@ -0,0 +1,122 @@ + + diff --git a/src/views/pay/app/index.vue b/src/views/pay/app/index.vue index 3531633f..2f4a9c1e 100644 --- a/src/views/pay/app/index.vue +++ b/src/views/pay/app/index.vue @@ -232,6 +232,48 @@ + + + + + + + + @@ -290,16 +332,17 @@ +