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] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=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 00000000..636db61e
--- /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 00000000..83b6b2c3
--- /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 00000000..995cfe24
--- /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 5ad8f04a..90ca2123 100644
--- a/src/components/daterange-picker/index.vue
+++ b/src/components/daterange-picker/index.vue
@@ -1,12 +1,13 @@
 <template>
     <el-date-picker
         v-model="content"
-        type="datetimerange"
+        :type="type"
         range-separator="-"
         start-placeholder="开始时间"
         end-placeholder="结束时间"
         value-format="YYYY-MM-DD HH:mm:ss"
         clearable
+        @change="change"
     ></el-date-picker>
 </template>
 
@@ -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<any>({
     get: () => {
diff --git a/src/views/finance/store_finance_flow/index.vue b/src/views/finance/store_finance_flow/index.vue
index 24347af6..98f73479 100644
--- a/src/views/finance/store_finance_flow/index.vue
+++ b/src/views/finance/store_finance_flow/index.vue
@@ -15,7 +15,7 @@
                     <el-select v-model="queryParams.user_id" filterable remote reserve-keyword placeholder="输入用户名称搜索"
                         remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
                         @change="resetPage">
-                        <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
+                        <el-option v-for="item in userList" :key="item.id" :label="`${item.nickname}  (ID:${item.id})`" :value="item.id" />
                     </el-select>
                 </el-form-item>
                 <!-- <el-form-item label="创建时间" prop="create_time">
@@ -168,18 +168,18 @@ const remoteMethod = (e: string = '') => {
 const userloading = ref(false);
 const userList = ref([]);
 const remoteMethodUser = (e: string = '') => {
-    storeloading.value = true;
+    userloading.value = true;
     apiUserLists({
         nickname: e,
         page_size: 50
     }).then(res => {
         userList.value = res.lists;
         setTimeout(() => {
-            storeloading.value = false;
+            userloading.value = false;
         }, 300)
     }).catch(err => {
         setTimeout(() => {
-            storeloading.value = false;
+            userloading.value = false;
         }, 300)
     })
 }
diff --git a/src/views/store_order/components/deliverTable.vue b/src/views/order/store_order/components/deliverTable.vue
similarity index 100%
rename from src/views/store_order/components/deliverTable.vue
rename to src/views/order/store_order/components/deliverTable.vue
diff --git a/src/views/store_order/components/orderInfo.vue b/src/views/order/store_order/components/orderInfo.vue
similarity index 100%
rename from src/views/store_order/components/orderInfo.vue
rename to src/views/order/store_order/components/orderInfo.vue
diff --git a/src/views/store_order/components/orderTable.vue b/src/views/order/store_order/components/orderTable.vue
similarity index 100%
rename from src/views/store_order/components/orderTable.vue
rename to src/views/order/store_order/components/orderTable.vue
diff --git a/src/views/store_order/components/storeTable.vue b/src/views/order/store_order/components/storeTable.vue
similarity index 100%
rename from src/views/store_order/components/storeTable.vue
rename to src/views/order/store_order/components/storeTable.vue
diff --git a/src/views/store_order/details.vue b/src/views/order/store_order/details.vue
similarity index 100%
rename from src/views/store_order/details.vue
rename to src/views/order/store_order/details.vue
diff --git a/src/views/store_order/edit.vue b/src/views/order/store_order/edit.vue
similarity index 100%
rename from src/views/store_order/edit.vue
rename to src/views/order/store_order/edit.vue
diff --git a/src/views/store_order/index.vue b/src/views/order/store_order/index.vue
similarity index 100%
rename from src/views/store_order/index.vue
rename to src/views/order/store_order/index.vue
diff --git a/src/views/store_order/refund.vue b/src/views/order/store_order/refund.vue
similarity index 100%
rename from src/views/store_order/refund.vue
rename to src/views/order/store_order/refund.vue
diff --git a/src/views/store_order_transshipment/components/deliverTable.vue b/src/views/order/store_order_transshipment/components/deliverTable.vue
similarity index 100%
rename from src/views/store_order_transshipment/components/deliverTable.vue
rename to src/views/order/store_order_transshipment/components/deliverTable.vue
diff --git a/src/views/store_order_transshipment/components/orderInfo.vue b/src/views/order/store_order_transshipment/components/orderInfo.vue
similarity index 100%
rename from src/views/store_order_transshipment/components/orderInfo.vue
rename to src/views/order/store_order_transshipment/components/orderInfo.vue
diff --git a/src/views/store_order_transshipment/components/orderTable.vue b/src/views/order/store_order_transshipment/components/orderTable.vue
similarity index 100%
rename from src/views/store_order_transshipment/components/orderTable.vue
rename to src/views/order/store_order_transshipment/components/orderTable.vue
diff --git a/src/views/store_order_transshipment/components/storeTable.vue b/src/views/order/store_order_transshipment/components/storeTable.vue
similarity index 100%
rename from src/views/store_order_transshipment/components/storeTable.vue
rename to src/views/order/store_order_transshipment/components/storeTable.vue
diff --git a/src/views/store_order_transshipment/details.vue b/src/views/order/store_order_transshipment/details.vue
similarity index 100%
rename from src/views/store_order_transshipment/details.vue
rename to src/views/order/store_order_transshipment/details.vue
diff --git a/src/views/store_order_transshipment/edit.vue b/src/views/order/store_order_transshipment/edit.vue
similarity index 100%
rename from src/views/store_order_transshipment/edit.vue
rename to src/views/order/store_order_transshipment/edit.vue
diff --git a/src/views/store_order_transshipment/index.vue b/src/views/order/store_order_transshipment/index.vue
similarity index 100%
rename from src/views/store_order_transshipment/index.vue
rename to src/views/order/store_order_transshipment/index.vue
diff --git a/src/views/order/user_product_storage/details.vue b/src/views/order/user_product_storage/details.vue
new file mode 100644
index 00000000..67b4f18d
--- /dev/null
+++ b/src/views/order/user_product_storage/details.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            title="详情"
+            :async="true"
+            width="550px"
+            :cancelButtonText="false"
+            :confirmButtonText="false"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageDETAILS">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiUserProductStorageAdd, apiUserProductStorageEdit, apiUserProductStorageDetail } from '@/api/user_product_storage'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiUserProductStorageDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/order/user_product_storage/edit.vue b/src/views/order/user_product_storage/edit.vue
new file mode 100644
index 00000000..440cab68
--- /dev/null
+++ b/src/views/order/user_product_storage/edit.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiUserProductStorageAdd, apiUserProductStorageEdit, apiUserProductStorageDetail } from '@/api/user_product_storage'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑用户商品储存' : '新增用户商品储存'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiUserProductStorageDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiUserProductStorageEdit(data) 
+        : await apiUserProductStorageAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/order/user_product_storage/index.vue b/src/views/order/user_product_storage/index.vue
new file mode 100644
index 00000000..d44d94f4
--- /dev/null
+++ b/src/views/order/user_product_storage/index.vue
@@ -0,0 +1,188 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="用户" prop="uid">
+                    <!-- <el-input class="w-[280px]" v-model="queryParams.uid" clearable placeholder="请输入用户" /> -->
+                    <el-select v-model="queryParams.uid" filterable remote reserve-keyword placeholder="输入用户名称搜索"
+                        remote-show-suffix :remote-method="remoteMethodUser" :loading="userloading" style="width: 240px"
+                        @change="resetPage">
+                        <el-option v-for="item in userList" :key="item.id" :label="`${item.nickname}  (ID:${item.id})`" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="订单id" prop="oid">
+                    <el-input class="w-[280px]" v-model="queryParams.oid" clearable placeholder="请输入订单id" @keydown.enter="resetPage" @clear="resetPage" />
+                </el-form-item>
+                <!-- <el-form-item label="商品" prop="product_id">
+                    <el-input class="w-[280px]" v-model="queryParams.product_id" clearable placeholder="请输入商品" />
+                </el-form-item> -->
+                <el-form-item label="" prop="create_time">
+                    <daterange-picker
+                        v-model:startTime="queryParams.start_time"
+                        v-model:endTime="queryParams.end_time"
+                        type="daterange"
+                        @change="resetPage"
+                    />
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <!-- <el-button v-perms="['user_product_storage.user_product_storage/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['user_product_storage.user_product_storage/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button> -->
+            <div>
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <!-- <el-table-column type="selection" width="55" /> -->
+                    <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
+                    <el-table-column label="订单id" prop="oid" show-overflow-tooltip />
+                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_name" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                                <router-link :to="{
+                                    path: 'user_product_storage_log',
+                                    query:{
+                                        oid: row.oid,
+                                        product_id: row.product_id
+                                    }
+                                }" class="ml-4" v-perms="['user_product_storage.user_product_storage/edit']">
+                                    <el-button type="primary" link>
+                                        详情
+                                    </el-button>
+                                </router-link>
+                             <!-- <el-button
+                                v-perms="['user_product_storage.user_product_storage/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['user_product_storage.user_product_storage/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button> -->
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiUserProductStorageLists, apiUserProductStorageDelete } from '@/api/user_product_storage'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { apiUserLists } from '@/api/user'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    uid: '',
+    oid: '',
+    product_id: '',
+    create_time: '',
+    start_time: '',
+    end_time: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiUserProductStorageLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiUserProductStorageDelete({ id })
+    getLists()
+}
+
+getLists()
+
+const userloading = ref(false);
+const userList = ref([]);
+const remoteMethodUser = (e: string = '') => {
+    userloading.value = true;
+    apiUserLists({
+        nickname: e,
+        page_size: 50
+    }).then(res => {
+        userList.value = res.lists;
+        setTimeout(() => {
+            userloading.value = false;
+        }, 300)
+    }).catch(err => {
+        setTimeout(() => {
+            userloading.value = false;
+        }, 300)
+    })
+}
+</script>
+
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 00000000..3d0316fc
--- /dev/null
+++ b/src/views/order/user_product_storage_log/details.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            title="详情"
+            :async="true"
+            width="550px"
+            :cancelButtonText="false"
+            :confirmButtonText="false"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageLogDETAILS">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiUserProductStorageLogAdd, apiUserProductStorageLogEdit, apiUserProductStorageLogDetail } from '@/api/user_product_storage_log'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiUserProductStorageLogDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
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 00000000..daaf7d87
--- /dev/null
+++ b/src/views/order/user_product_storage_log/edit.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageLogEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiUserProductStorageLogAdd, apiUserProductStorageLogEdit, apiUserProductStorageLogDetail } from '@/api/user_product_storage_log'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑用户商品储存操作日志' : '新增用户商品储存操作日志'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiUserProductStorageLogDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiUserProductStorageLogEdit(data) 
+        : await apiUserProductStorageLogAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
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 00000000..2408ebd1
--- /dev/null
+++ b/src/views/order/user_product_storage_log/index.vue
@@ -0,0 +1,112 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="" prop="create_time">
+                    <daterange-picker
+                        v-model:startTime="queryParams.start_time"
+                        v-model:endTime="queryParams.end_time"
+                    />
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div>
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="订单id" prop="oid" show-overflow-tooltip />
+                    <el-table-column label="用户" prop="nickname" show-overflow-tooltip />
+                    <el-table-column label="商品" prop="store_name" show-overflow-tooltip />
+                    <el-table-column label="门店" prop="system_store_name" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="financial_pm" show-overflow-tooltip />
+                    <el-table-column label="数量" prop="nums" show-overflow-tooltip />
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="userProductStorageLogLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiUserProductStorageLogLists, apiUserProductStorageLogDelete } from '@/api/user_product_storage_log'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { useRoute } from "vue-router"
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    create_time: '',
+    start_time: '',
+    end_time: '',
+    oid: '',
+    product_id: '',
+})
+
+const route = useRoute();
+if(route.query?.oid){
+    queryParams.oid = route.query.oid;
+    queryParams.product_id = route.query.product_id;
+}
+
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiUserProductStorageLogLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiUserProductStorageLogDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/setting/log/details.vue b/src/views/setting/log/details.vue
new file mode 100644
index 00000000..16974bf2
--- /dev/null
+++ b/src/views/setting/log/details.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            title="详情"
+            :async="true"
+            width="550px"
+            :cancelButtonText="false"
+            :confirmButtonText="false"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="logDETAILS">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiLogAdd, apiLogEdit, apiLogDetail } from '@/api/log'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiLogDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/setting/log/edit.vue b/src/views/setting/log/edit.vue
new file mode 100644
index 00000000..bd2cc38c
--- /dev/null
+++ b/src/views/setting/log/edit.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="logEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiLogAdd, apiLogEdit, apiLogDetail } from '@/api/log'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑系统日志表' : '新增系统日志表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    //@ts-ignore
+    formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss') 
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiLogDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiLogEdit(data) 
+        : await apiLogAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/setting/log/index.vue b/src/views/setting/log/index.vue
new file mode 100644
index 00000000..121bfa94
--- /dev/null
+++ b/src/views/setting/log/index.vue
@@ -0,0 +1,118 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="管理员ID" prop="admin_id">
+                    <el-input class="w-[280px]" v-model="queryParams.admin_id" clearable placeholder="请输入管理员ID" />
+                </el-form-item>
+                <el-form-item label="管理员名称" prop="admin_name">
+                    <el-input class="w-[280px]" v-model="queryParams.admin_name" clearable placeholder="请输入管理员名称" />
+                </el-form-item>
+                <el-form-item label="访问链接" prop="url">
+                    <el-input class="w-[280px]" v-model="queryParams.url" clearable placeholder="请输入访问链接" />
+                </el-form-item>
+                <el-form-item label="创建时间" prop="create_time">
+                    <daterange-picker
+                        v-model:startTime="queryParams.start_time"
+                        v-model:endTime="queryParams.end_time"
+                    />
+                </el-form-item>
+                
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div>
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
+                    <el-table-column label="管理员ID" prop="admin_id" show-overflow-tooltip />
+                    <el-table-column label="管理员名称" prop="admin_name" show-overflow-tooltip />
+                    <!-- <el-table-column label="管理员账号" prop="account" show-overflow-tooltip /> -->
+                    <el-table-column label="操作名称" prop="action" show-overflow-tooltip />
+                    <el-table-column label="请求方式" prop="type" show-overflow-tooltip />
+                    <el-table-column label="访问链接" prop="url" show-overflow-tooltip />
+                    <el-table-column label="请求数据" prop="params" show-overflow-tooltip />
+                    <el-table-column label="请求结果" prop="result" show-overflow-tooltip />
+                    <el-table-column label="ip地址" prop="ip" show-overflow-tooltip />
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="logLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiLogLists, apiLogDelete } from '@/api/log'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    admin_id: '',
+    admin_name: '',
+    url: '',
+    create_time: '',
+    start_time: '',
+    end_time: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiLogLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiLogDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/store/statistics/index.vue b/src/views/store/statistics/index.vue
index d9d4224e..05df97d1 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 731f560d..18132466 100644
--- a/src/views/user/details.vue
+++ b/src/views/user/details.vue
@@ -33,7 +33,7 @@
                         <el-descriptions-item label="采购款">{{ formData.purchase_funds }}</el-descriptions-item>
                         <el-descriptions-item label="用户余额">{{ formData.now_money }}</el-descriptions-item>
                         <el-descriptions-item label="累计充值金额">{{ formData.total_recharge_amount }}</el-descriptions-item>
-                        <el-descriptions-item label="用户地址" :span="2">{{ formData.user_address }}</el-descriptions-item>
+                        <el-descriptions-item label="用户地址" :span="2">{{ formData.format_address }}</el-descriptions-item>
                         <el-descriptions-item label="创建时间" :span="2">{{ formData.create_time }}</el-descriptions-item>
                     </el-descriptions>
                 </el-tab-pane>
@@ -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 de6e0e0c..b6171cd4 100644
--- a/src/views/user/indexList.vue
+++ b/src/views/user/indexList.vue
@@ -61,7 +61,7 @@
                     <el-table-column label="采购款" prop="purchase_funds" />
                     <el-table-column label="用户余额" prop="now_money" />
                     <el-table-column label="累计充值" prop="total_recharge_amount" />
-                    <el-table-column label="地址" prop="user_address" />
+                    <el-table-column label="地址" prop="format_address" width="150" />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['user.user/edit']" type="primary" link @click="handleEdit(row)">