From 41b3de58fda7ce01d1f0cbd54bc1e7698b6701b8 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Fri, 28 Jun 2024 18:13:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/log.ts | 26 +++ src/api/user_product_storage.ts | 26 +++ src/api/user_product_storage_log.ts | 26 +++ src/components/daterange-picker/index.vue | 13 +- .../finance/store_finance_flow/index.vue | 8 +- .../store_order/components/deliverTable.vue | 0 .../store_order/components/orderInfo.vue | 0 .../store_order/components/orderTable.vue | 0 .../store_order/components/storeTable.vue | 0 src/views/{ => order}/store_order/details.vue | 0 src/views/{ => order}/store_order/edit.vue | 0 src/views/{ => order}/store_order/index.vue | 0 src/views/{ => order}/store_order/refund.vue | 0 .../components/deliverTable.vue | 0 .../components/orderInfo.vue | 0 .../components/orderTable.vue | 0 .../components/storeTable.vue | 0 .../store_order_transshipment/details.vue | 0 .../store_order_transshipment/edit.vue | 0 .../store_order_transshipment/index.vue | 0 .../order/user_product_storage/details.vue | 82 ++++++++ src/views/order/user_product_storage/edit.vue | 104 ++++++++++ .../order/user_product_storage/index.vue | 188 ++++++++++++++++++ .../user_product_storage_log/details.vue | 82 ++++++++ .../order/user_product_storage_log/edit.vue | 104 ++++++++++ .../order/user_product_storage_log/index.vue | 112 +++++++++++ src/views/setting/log/details.vue | 82 ++++++++ src/views/setting/log/edit.vue | 104 ++++++++++ src/views/setting/log/index.vue | 118 +++++++++++ src/views/store/statistics/index.vue | 6 + src/views/user/details.vue | 3 +- src/views/user/indexList.vue | 2 +- 32 files changed, 1077 insertions(+), 9 deletions(-) create mode 100644 src/api/log.ts create mode 100644 src/api/user_product_storage.ts create mode 100644 src/api/user_product_storage_log.ts rename src/views/{ => order}/store_order/components/deliverTable.vue (100%) rename src/views/{ => order}/store_order/components/orderInfo.vue (100%) rename src/views/{ => order}/store_order/components/orderTable.vue (100%) rename src/views/{ => order}/store_order/components/storeTable.vue (100%) rename src/views/{ => order}/store_order/details.vue (100%) rename src/views/{ => order}/store_order/edit.vue (100%) rename src/views/{ => order}/store_order/index.vue (100%) rename src/views/{ => order}/store_order/refund.vue (100%) rename src/views/{ => order}/store_order_transshipment/components/deliverTable.vue (100%) rename src/views/{ => order}/store_order_transshipment/components/orderInfo.vue (100%) rename src/views/{ => order}/store_order_transshipment/components/orderTable.vue (100%) rename src/views/{ => order}/store_order_transshipment/components/storeTable.vue (100%) rename src/views/{ => order}/store_order_transshipment/details.vue (100%) rename src/views/{ => order}/store_order_transshipment/edit.vue (100%) rename src/views/{ => order}/store_order_transshipment/index.vue (100%) create mode 100644 src/views/order/user_product_storage/details.vue create mode 100644 src/views/order/user_product_storage/edit.vue create mode 100644 src/views/order/user_product_storage/index.vue create mode 100644 src/views/order/user_product_storage_log/details.vue create mode 100644 src/views/order/user_product_storage_log/edit.vue create mode 100644 src/views/order/user_product_storage_log/index.vue create mode 100644 src/views/setting/log/details.vue create mode 100644 src/views/setting/log/edit.vue create mode 100644 src/views/setting/log/index.vue diff --git a/src/api/log.ts b/src/api/log.ts new file mode 100644 index 000000000..636db61ef --- /dev/null +++ b/src/api/log.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 系统日志表列表 +export function apiLogLists(params: any) { + return request.get({ url: '/setting/system/log/lists', params }) +} + +// 添加系统日志表 +export function apiLogAdd(params: any) { + return request.post({ url: '/setting/system/log/add', params }) +} + +// 编辑系统日志表 +export function apiLogEdit(params: any) { + return request.post({ url: '/setting/system/log/edit', params }) +} + +// 删除系统日志表 +export function apiLogDelete(params: any) { + return request.post({ url: '/setting/system/log/delete', params }) +} + +// 系统日志表详情 +export function apiLogDetail(params: any) { + return request.get({ url: '/setting/system/log/detail', params }) +} \ No newline at end of file diff --git a/src/api/user_product_storage.ts b/src/api/user_product_storage.ts new file mode 100644 index 000000000..83b6b2c3b --- /dev/null +++ b/src/api/user_product_storage.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 用户商品储存列表 +export function apiUserProductStorageLists(params: any) { + return request.get({ url: '/user_product_storage/userproductstorage/lists', params }) +} + +// 添加用户商品储存 +export function apiUserProductStorageAdd(params: any) { + return request.post({ url: '/user_product_storage/userproductstorage/add', params }) +} + +// 编辑用户商品储存 +export function apiUserProductStorageEdit(params: any) { + return request.post({ url: '/user_product_storage/userproductstorage/edit', params }) +} + +// 删除用户商品储存 +export function apiUserProductStorageDelete(params: any) { + return request.post({ url: '/user_product_storage/userproductstorage/delete', params }) +} + +// 用户商品储存详情 +export function apiUserProductStorageDetail(params: any) { + return request.get({ url: '/user_product_storage/userproductstorage/detail', params }) +} \ No newline at end of file diff --git a/src/api/user_product_storage_log.ts b/src/api/user_product_storage_log.ts new file mode 100644 index 000000000..995cfe247 --- /dev/null +++ b/src/api/user_product_storage_log.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 用户商品储存操作日志列表 +export function apiUserProductStorageLogLists(params: any) { + return request.get({ url: '/user_product_storage_log/userproductstoragelog/lists', params }) +} + +// 添加用户商品储存操作日志 +export function apiUserProductStorageLogAdd(params: any) { + return request.post({ url: '/user_product_storage_log/userproductstoragelog/add', params }) +} + +// 编辑用户商品储存操作日志 +export function apiUserProductStorageLogEdit(params: any) { + return request.post({ url: '/user_product_storage_log/userproductstoragelog/edit', params }) +} + +// 删除用户商品储存操作日志 +export function apiUserProductStorageLogDelete(params: any) { + return request.post({ url: '/user_product_storage_log/userproductstoragelog/delete', params }) +} + +// 用户商品储存操作日志详情 +export function apiUserProductStorageLogDetail(params: any) { + return request.get({ url: '/user_product_storage_log/userproductstoragelog/detail', params }) +} \ No newline at end of file diff --git a/src/components/daterange-picker/index.vue b/src/components/daterange-picker/index.vue index 5ad8f04a6..90ca21239 100644 --- a/src/components/daterange-picker/index.vue +++ b/src/components/daterange-picker/index.vue @@ -1,12 +1,13 @@ @@ -18,13 +19,19 @@ const props = withDefaults( defineProps<{ startTime?: string endTime?: string + type?: string }>(), { startTime: '', - endTime: '' + endTime: '', + type: 'datetimerange' } ) -const emit = defineEmits(['update:startTime', 'update:endTime']) +const emit = defineEmits(['update:startTime', 'update:endTime', 'change']) + +const change = (e: any)=>{ + emit('change', e) +} const content = computed({ get: () => { diff --git a/src/views/finance/store_finance_flow/index.vue b/src/views/finance/store_finance_flow/index.vue index 24347af6b..98f734796 100644 --- a/src/views/finance/store_finance_flow/index.vue +++ b/src/views/finance/store_finance_flow/index.vue @@ -15,7 +15,7 @@ - + + + + + + + + + + + + + + + 查询 + 重置 + + + + + +
+ + + + + + + + + + + + +
+
+ +
+
+ + + + + + diff --git a/src/views/order/user_product_storage_log/details.vue b/src/views/order/user_product_storage_log/details.vue new file mode 100644 index 000000000..3d0316fc0 --- /dev/null +++ b/src/views/order/user_product_storage_log/details.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/order/user_product_storage_log/edit.vue b/src/views/order/user_product_storage_log/edit.vue new file mode 100644 index 000000000..daaf7d879 --- /dev/null +++ b/src/views/order/user_product_storage_log/edit.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/views/order/user_product_storage_log/index.vue b/src/views/order/user_product_storage_log/index.vue new file mode 100644 index 000000000..2408ebd13 --- /dev/null +++ b/src/views/order/user_product_storage_log/index.vue @@ -0,0 +1,112 @@ + + + + diff --git a/src/views/setting/log/details.vue b/src/views/setting/log/details.vue new file mode 100644 index 000000000..16974bf28 --- /dev/null +++ b/src/views/setting/log/details.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/setting/log/edit.vue b/src/views/setting/log/edit.vue new file mode 100644 index 000000000..bd2cc38c9 --- /dev/null +++ b/src/views/setting/log/edit.vue @@ -0,0 +1,104 @@ + + + diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue new file mode 100644 index 000000000..121bfa941 --- /dev/null +++ b/src/views/setting/log/index.vue @@ -0,0 +1,118 @@ + + + + diff --git a/src/views/store/statistics/index.vue b/src/views/store/statistics/index.vue index d9d4224e6..05df97d1b 100644 --- a/src/views/store/statistics/index.vue +++ b/src/views/store/statistics/index.vue @@ -277,6 +277,12 @@ const basicList = reactive([ icon: 'RectangleCopy32', num: 0, }, + { + name: '可用消耗资金', + type: 'attrition_amount', + icon: 'RectangleCopy61', + num: 0, + }, ]) const startEndTime = ref([new Date(), new Date()]); const store_id = ref(''); diff --git a/src/views/user/details.vue b/src/views/user/details.vue index 731f560de..181324668 100644 --- a/src/views/user/details.vue +++ b/src/views/user/details.vue @@ -33,7 +33,7 @@ {{ formData.purchase_funds }} {{ formData.now_money }} {{ formData.total_recharge_amount }} - {{ formData.user_address }} + {{ formData.format_address }} {{ formData.create_time }} @@ -101,6 +101,7 @@ const formData = reactive({ "channel": "", "create_time": "", "purchase_funds": "", + "format_address": "", "label_id": 0, "integral": "", "vip_name": "", diff --git a/src/views/user/indexList.vue b/src/views/user/indexList.vue index de6e0e0c8..b6171cd4f 100644 --- a/src/views/user/indexList.vue +++ b/src/views/user/indexList.vue @@ -61,7 +61,7 @@ - +