From 8e571a57e553c29f55ae85cd939a386258ecf748 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 14 Jun 2024 15:08:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E5=88=87=E6=8D=A2API=E5=9F=BA=E7=A1=80URL=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- helper.json | 8 +++ src/api/financial_transfers.ts | 26 ++++++++ src/views/fnancial_transfers/index.vue | 92 ++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 helper.json create mode 100644 src/api/financial_transfers.ts create mode 100644 src/views/fnancial_transfers/index.vue diff --git a/.env.development b/.env.development index 9a547cc1a..5cf9da4f1 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ NODE_ENV = 'development' VITE_NOW_TYPE = 'dist' # Base API -VITE_APP_BASE_URL='http://192.168.1.22:8545' -# VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn' +# VITE_APP_BASE_URL='http://192.168.1.22:8545' +VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn' diff --git a/helper.json b/helper.json new file mode 100644 index 000000000..44d4a2481 --- /dev/null +++ b/helper.json @@ -0,0 +1,8 @@ +{ + "path": { + "root": "@=src", + "api": "src/api", + "request": "../utils/request" + }, + "api": [] +} \ No newline at end of file diff --git a/src/api/financial_transfers.ts b/src/api/financial_transfers.ts new file mode 100644 index 000000000..01fbcf9b1 --- /dev/null +++ b/src/api/financial_transfers.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 财务转账表列表 +export function apiFinancialTransfersLists(params: any) { + return request.get({ url: '/financial_transfers/financialtransfers/lists', params }) +} + +// 添加财务转账表 +export function apiFinancialTransfersAdd(params: any) { + return request.post({ url: '/financial_transfers/financialtransfers/add', params }) +} + +// 编辑财务转账表 +export function apiFinancialTransfersEdit(params: any) { + return request.post({ url: '/financial_transfers/financialtransfers/edit', params }) +} + +// 删除财务转账表 +export function apiFinancialTransfersDelete(params: any) { + return request.post({ url: '/financial_transfers/financialtransfers/delete', params }) +} + +// 财务转账表详情 +export function apiFinancialTransfersDetail(params: any) { + return request.get({ url: '/financial_transfers/financialtransfers/detail', params }) +} \ No newline at end of file diff --git a/src/views/fnancial_transfers/index.vue b/src/views/fnancial_transfers/index.vue new file mode 100644 index 000000000..fd57d3023 --- /dev/null +++ b/src/views/fnancial_transfers/index.vue @@ -0,0 +1,92 @@ + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + 起飞 + + + + + + + + + + + + + + From c57b420838fed68806fd7d8413552fb379883640 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Fri, 14 Jun 2024 18:08:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E8=BD=AC=E8=B4=A6=E8=A1=A8API=EF=BC=8C=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=95=86=E5=BA=97=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/financial_transfers.ts | 21 ++----- src/views/fnancial_transfers/index.vue | 78 +++++++++++++++++++++----- src/views/system_store/edit.vue | 44 ++++++++++----- 3 files changed, 100 insertions(+), 43 deletions(-) diff --git a/src/api/financial_transfers.ts b/src/api/financial_transfers.ts index 01fbcf9b1..d8a7d5eb5 100644 --- a/src/api/financial_transfers.ts +++ b/src/api/financial_transfers.ts @@ -5,22 +5,11 @@ export function apiFinancialTransfersLists(params: any) { return request.get({ url: '/financial_transfers/financialtransfers/lists', params }) } -// 添加财务转账表 -export function apiFinancialTransfersAdd(params: any) { - return request.post({ url: '/financial_transfers/financialtransfers/add', params }) +// 发送 +export function apiFinancialTransfersSend(params: any) { + return request.post({ url: '/financial_transfers/FinancialTransfers/send_transfers', params }) } -// 编辑财务转账表 -export function apiFinancialTransfersEdit(params: any) { - return request.post({ url: '/financial_transfers/financialtransfers/edit', params }) +export function apiFinancialTransfersConfirm(params: any) { + return request.post({ url: '/financial_transfers/FinancialTransfers/success_send', params }) } - -// 删除财务转账表 -export function apiFinancialTransfersDelete(params: any) { - return request.post({ url: '/financial_transfers/financialtransfers/delete', params }) -} - -// 财务转账表详情 -export function apiFinancialTransfersDetail(params: any) { - return request.get({ url: '/financial_transfers/financialtransfers/detail', params }) -} \ No newline at end of file diff --git a/src/views/fnancial_transfers/index.vue b/src/views/fnancial_transfers/index.vue index fd57d3023..31a77047e 100644 --- a/src/views/fnancial_transfers/index.vue +++ b/src/views/fnancial_transfers/index.vue @@ -1,6 +1,6 @@ - + @@ -19,11 +19,18 @@ - + + + {{ timeFormat(row.initiation_time, 'yyyy-mm-dd') }} + + - - 起飞 + + 发送 + + + 确认 @@ -33,22 +40,42 @@ + + + {{ rowDate.store_realName }} + {{ rowDate.store_bank_code }} + {{ rowDate.store_bank }} + {{ rowDate.store_bank_address }} + + + 通过 + 不通过 + + + + + + + + + + + + 确定 + 取消 + + + diff --git a/src/views/system_store/edit.vue b/src/views/system_store/edit.vue index cb4794c21..a46b0e1a6 100644 --- a/src/views/system_store/edit.vue +++ b/src/views/system_store/edit.vue @@ -1,7 +1,6 @@ - + @@ -10,8 +9,8 @@ - + @@ -21,13 +20,25 @@ :readonly="mode == 'edit'" /> 输入的手机号将作为管理员账户登录 - + 不修改请留空 + + + + + + + + + + + + @@ -38,12 +49,11 @@ start-placeholder="开始时间" end-placeholder="结束时间" /> - + - + ) => { const handleSubmit = async () => { await formRef.value?.validate() Object.keys(formData).forEach((key: string) => { - if (formDataInfo[key]!==''&&formDataInfo[key]!==null&&formDataInfo[key]!==undefined) formData[key] = formDataInfo[key]; + if (formDataInfo[key] !== '' && formDataInfo[key] !== null && formDataInfo[key] !== undefined) formData[key] = formDataInfo[key]; }) const data = { ...formData }; - if(mode.value=='edit' && !data.password) data.password = ''; + if (mode.value == 'edit' && !data.password) data.password = ''; const test = /^[+-]?\d*(\.\d+)?$/; let latlng = formDataInfo.coord.split(','); if (latlng.length < 2 || !test.test(latlng[0]) || !test.test(latlng[1])) return ElMessage.error('请输入正确的坐标');