diff --git a/src/api/wallet/wallet-foreign.ts b/src/api/wallet/wallet-foreign.ts index b0314b2..b77934f 100644 --- a/src/api/wallet/wallet-foreign.ts +++ b/src/api/wallet/wallet-foreign.ts @@ -1,5 +1,21 @@ import request from "/@/utils/request" +export function codeList(query?: Object) { + return request({ + url: '/wallet/wallet-foreign/code-list', + method: 'get', + params: query + }) +} + +export function pageJoin(query?: Object) { + return request({ + url: '/wallet/wallet-foreign/page-join', + method: 'get', + params: query + }) +} + export function fetchList(query?: Object) { return request({ url: '/wallet/wallet-foreign/page', diff --git a/src/api/wallet/wallet-stride.ts b/src/api/wallet/wallet-stride.ts index 1121b4b..1238a46 100644 --- a/src/api/wallet/wallet-stride.ts +++ b/src/api/wallet/wallet-stride.ts @@ -1,8 +1,24 @@ import request from "/@/utils/request" +export function codeList(query?: Object) { + return request({ + url: '/wallet/wallet-stride/code-list', + method: 'get', + params: query + }) +} + +export function pageJoin(query?: Object) { + return request({ + url: '/wallet/wallet-stride/page-join', + method: 'get', + params: query + }) +} + export function fetchList(query?: Object) { return request({ - url: '/wallet/walletStride/page', + url: '/wallet/wallet-stride/page', method: 'get', params: query }) @@ -18,14 +34,14 @@ export function addObj(obj?: Object) { export function getObj(id?: string) { return request({ - url: '/wallet/walletStride/' + id, + url: '/wallet/wallet-stride/' + id, method: 'get' }) } export function delObjs(ids?: Object) { return request({ - url: '/wallet/walletStride', + url: '/wallet/wallet-stride', method: 'delete', data: ids }) @@ -33,7 +49,7 @@ export function delObjs(ids?: Object) { export function putObj(obj?: Object) { return request({ - url: '/wallet/walletStride', + url: '/wallet/wallet-stride', method: 'put', data: obj }) diff --git a/src/views/flow/form/tools/startFlow.vue b/src/views/flow/form/tools/startFlow.vue index 6443a10..723adee 100644 --- a/src/views/flow/form/tools/startFlow.vue +++ b/src/views/flow/form/tools/startFlow.vue @@ -4,12 +4,8 @@ - +
@@ -18,12 +14,8 @@
- +
diff --git a/src/views/flow/task/handler/agree.vue b/src/views/flow/task/handler/agree.vue index 0fdc2c7..ae231cf 100644 --- a/src/views/flow/task/handler/agree.vue +++ b/src/views/flow/task/handler/agree.vue @@ -24,13 +24,13 @@ const submit = async () => { if (!currentData.value || !currentOpenFlowForm.value) return const formData: Record = {} - + for (const item of currentOpenFlowForm.value) { formData[item.id] = item.props.value if (item.type === 'Layout') { const subList = item.props.value as FlowFormItem[][] - const processedData = subList.map(array => + const processedData = subList.map(array => array.reduce((acc, subItem) => ({ ...acc, [subItem.id]: subItem.props.value @@ -62,35 +62,16 @@ const submit = async () => {