diff --git a/.env.development b/.env.development
index 27907cc..72a4624 100644
--- a/.env.development
+++ b/.env.development
@@ -12,7 +12,7 @@ ENV = 'development'
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.159:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.174:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
 
 # 图片访问基础地址
@@ -20,7 +20,7 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.159:9999/ # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.159:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://192.168.101.174:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
 
 # 代码生成服务地址
diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts
index 46e748a..b3240dc 100644
--- a/src/api/admin/user.ts
+++ b/src/api/admin/user.ts
@@ -17,11 +17,15 @@ export const list = () => {
 	})
 }
 
-export const pageList = (params?: Object) => {
+export const pageList = (query: any) => {
 	return request({
 		url: "/admin/user/page",
-		method: "get",
-		params,
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
 	})
 }
 
diff --git a/src/api/hard/hard-order.ts b/src/api/hard/hard-order.ts
index e912c21..f977546 100644
--- a/src/api/hard/hard-order.ts
+++ b/src/api/hard/hard-order.ts
@@ -11,11 +11,15 @@ export function offlinePay(data: any) {
 	})
 }
 
-export function pageJoin(query?: Object) {
+export function pageJoin(query: any) {
 	return request({
 		url: "/hard/hard-order/page-join",
-		method: "get",
-		params: query,
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
 	})
 }
 
diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts
index e564982..446b620 100644
--- a/src/api/hard/hard-total.ts
+++ b/src/api/hard/hard-total.ts
@@ -1,5 +1,20 @@
 import request from "/@/utils/request"
 
+/**
+ * 根据部门 食堂菜品购买统计
+ */
+export function productTotalByDept(query: any) {
+	return request({
+		url: "/hard/hard-canteen-total-log/proudct-total-by-dept",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 /**
  * 食堂统计
  */
diff --git a/src/api/wallet/wallet-recharge-invoice.ts b/src/api/wallet/wallet-recharge-invoice.ts
index 039d751..f329481 100644
--- a/src/api/wallet/wallet-recharge-invoice.ts
+++ b/src/api/wallet/wallet-recharge-invoice.ts
@@ -8,6 +8,18 @@ export function invoiceBack(query: any) {
 	})
 }
 
+
+/**
+ * 重新生成发票
+ */
+export function refreshInvoice(data: any) {
+	return request({
+		url: "/wallet/walletRechargeInvoice/refreshInvoice",
+		method: "post",
+		data: data,
+	})
+}
+
 /**
  * 发票申请
  * @param id 发票id
diff --git a/src/components/Select/SelectRole.vue b/src/components/Select/SelectRole.vue
index 3a30668..5d47be1 100644
--- a/src/components/Select/SelectRole.vue
+++ b/src/components/Select/SelectRole.vue
@@ -1,17 +1,7 @@
 <template>
-	<el-select
-		style="width: 100%"
-		v-model="state.selectId"
-		:placeholder="props.placeholder"
-		clearable
-		remote-show-suffix
-		filterable
-		remote
-		:disabled="props.disabled"
-		:remote-method="remoteSearch"
-		:loading="state.loading"
-		@visible-change="(e: boolean) => e && getOptions()"
-	>
+	<el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder" multiple clearable
+		remote-show-suffix filterable remote :disabled="props.disabled" :remote-method="remoteSearch"
+		:loading="state.loading" @visible-change="(e: boolean) => e && getOptions()">
 		<el-option v-for="v in state.options" :key="v.roleId" :label="`${v.roleName}`" :value="v.roleId">
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.roleName }}</div>
diff --git a/src/hooks/smProcessFormAction.ts b/src/hooks/smProcessFormAction.ts
index c532850..0257964 100644
--- a/src/hooks/smProcessFormAction.ts
+++ b/src/hooks/smProcessFormAction.ts
@@ -25,7 +25,7 @@ export function useSmProcessFormAction() {
 	}
 
 	// 提交数据 成功返回 true 失败返回 false
-	const submitData = async (baseDataForm: any, vxeTableItems: Ref<any[]>, loading: Ref<boolean>, putObj: any, addObj: any) => {
+	const submitData = async (baseDataForm: any, vxeTableItems: any, loading: Ref<boolean>, putObj: any, addObj: any) => {
 		try {
 			loading.value = true
 
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 9cb39be..d020cf7 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -167,13 +167,13 @@ export const openWindow = (url: string, title: string, w: number, h: number) =>
 	const width = window.innerWidth
 		? window.innerWidth
 		: document.documentElement.clientWidth
-		? document.documentElement.clientWidth
-		: screen.width
+			? document.documentElement.clientWidth
+			: screen.width
 	const height = window.innerHeight
 		? window.innerHeight
 		: document.documentElement.clientHeight
-		? document.documentElement.clientHeight
-		: screen.height
+			? document.documentElement.clientHeight
+			: screen.height
 
 	const left = width / 2 - w / 2 + dualScreenLeft
 	const top = height / 2 - h / 2 + dualScreenTop
@@ -181,13 +181,13 @@ export const openWindow = (url: string, title: string, w: number, h: number) =>
 		url,
 		title,
 		"toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=" +
-			w +
-			", height=" +
-			h +
-			", top=" +
-			top +
-			", left=" +
-			left,
+		w +
+		", height=" +
+		h +
+		", top=" +
+		top +
+		", left=" +
+		left,
 	)
 }
 
@@ -274,6 +274,8 @@ export function postDownBlobFile(url: any, data: any, fileName: string) {
 		params: {
 			current: data?.current ?? 1,
 			size: data?.size ?? 99999,
+			ascs: data?.ascs ?? [],
+			descs: data?.descs ?? [],
 		},
 		data,
 	}).then((response) => {
diff --git a/src/views/hard/canteen-dept-total/components/dept-total-table.vue b/src/views/hard/canteen-dept-total/components/dept-total-table.vue
new file mode 100644
index 0000000..d71e71d
--- /dev/null
+++ b/src/views/hard/canteen-dept-total/components/dept-total-table.vue
@@ -0,0 +1,87 @@
+<template>
+    <el-dialog title="菜品统计" width="70%" v-model="visible" :close-on-click-modal="false" draggable>
+        <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> </el-form>
+        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+            :header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" :show-summary="true"
+            @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+        </el-table>
+        <el-table-column label="用餐时间" align="center" prop="createTime">
+            <template #default="{ row }">
+                <span>{{ parseTime(row.createTime, "{y}-{m}-{d}") }}</span>
+            </template>
+        </el-table-column>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="dept-total-table">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+import { parseTime } from "/@/utils/formatTime"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 定义变量内容
+const visible = ref(false)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: hardTotalApi.canteenProudctQuery,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, tableStyle } = useTable(state)
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id)
+    multiple.value = !objs.length
+}
+
+const openDialog = (createTimeStr: any, hourType: any) => {
+    visible.value = true
+    state.queryForm.createTimeStr = createTimeStr
+    state.queryForm.hourType = hourType
+    getDataList()
+}
+
+const updateQueryParams = (params: any) => {
+    if (!params) return
+    state.queryForm.merchantId = params.merchantId ?? null
+    getDataList()
+}
+
+const getSummaries = (param: any) => {
+    const { columns, data } = param
+    const totalColumns = ["count", "totalPrice"]
+    const totalRow = Array.from({ length: columns.length })
+    totalRow[0] = "合计"
+    columns.forEach((i: any, index: number) => {
+        if (totalColumns.includes(i.property)) {
+            const total = data
+                .filter((v: any) => v[i.property] != null)
+                .map((v: any) => Number(v[i.property]))
+                .reduce((pren: number, next: number) => pren + next, 0)
+            if (i.property.includes("Price")) {
+                totalRow[index] = displayPrice(total)
+            } else {
+                totalRow[index] = total
+            }
+        }
+    })
+    return totalRow
+}
+
+// 暴露变量
+defineExpose({
+    openDialog,
+    updateQueryParams,
+})
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/hard/canteen-dept-total/index.vue b/src/views/hard/canteen-dept-total/index.vue
new file mode 100644
index 0000000..da15848
--- /dev/null
+++ b/src/views/hard/canteen-dept-total/index.vue
@@ -0,0 +1,105 @@
+<template>
+    <div class="layout-padding">
+        <div class="layout-padding-auto layout-padding-view">
+            <DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+                @getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+                :defaultTreeWidth="20" :nodeClickable="false">
+                <el-row>
+                    <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+                        <el-form-item style="width: 250px" label="用餐时间段" prop="hourType">
+                            <dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+                        </el-form-item>
+                        <el-form-item style="width: 250px" label="食堂" prop="merchantId">
+                            <select-mch v-model="state.queryForm.merchantId"
+                                :apiParams="{ parentIsNull: false, types: '1' }" />
+                        </el-form-item>
+                        <el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
+                            <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
+                                type="daterange" />
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button icon="Search" type="primary" @click="doSearch">
+                                {{ $t("common.queryBtn") }}
+                            </el-button>
+                            <el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-row>
+                <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+                    :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+                    @sort-change="sortChangeHandle" @expand-change="tableExpandChange">
+                </el-table>
+                <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+                    v-bind="state.pagination" />
+            </DraggableDepTree>
+        </div>
+    </div>
+</template>
+
+
+<script setup lang="ts" name="canteen-dept-total">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+const productTotalTableRef = ref()
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    queryForm: {},
+    pageList: hardTotalApi.canteenProudctTotal,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+    // 清空搜索条件
+    queryRef.value?.resetFields()
+    // 清空多选
+    selectObjs.value = []
+    state.queryForm.deptId = ""
+    state.queryForm.userDeptIds = []
+    draggableDepTreeRef.value.resetData()
+    getDataList()
+}
+
+// 点击table展开行
+const tableExpandChange = async (e: any) => {
+    try {
+        console.log(e);
+    } catch (error: any) {
+        console.error(error);
+    }
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id)
+    multiple.value = !objs.length
+}
+
+// 搜索
+const doSearch = () => {
+    productTotalTableRef.value.updateQueryParams(state.queryForm)
+    getDataList()
+}
+
+// 树节点选择时
+const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
+    state.queryForm.deptId = curClickedNode.id
+    state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
+    state.queryForm.isInclude = !isDeepTree
+    getDataList()
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/hard/canteen-product-total/components/product-total-table.vue b/src/views/hard/canteen-product-total/components/product-total-table.vue
index ee73000..0ca8a7b 100644
--- a/src/views/hard/canteen-product-total/components/product-total-table.vue
+++ b/src/views/hard/canteen-product-total/components/product-total-table.vue
@@ -1,17 +1,9 @@
 <template>
 	<el-dialog title="菜品统计" width="70%" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> </el-form>
-		<el-table
-			:data="state.dataList"
-			v-loading="state.loading"
-			border
-			:cell-style="tableStyle.cellStyle"
-			:header-cell-style="tableStyle.headerCellStyle"
-			:summary-method="getSummaries"
-			:show-summary="true"
-			@selection-change="selectionChangHandle"
-			@sort-change="sortChangeHandle"
-		>
+		<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" :show-summary="true"
+			@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
 			<el-table-column label="用餐时间" align="center" prop="createTime">
 				<template #default="{ row }">
 					<span>{{ parseTime(row.createTime, "{y}-{m}-{d}") }}</span>
@@ -62,7 +54,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, tableStyle } = useTable(state)
 
 const getSummaries = (param: any) => {
 	const { columns, data } = param
diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 8f3708a..ae65468 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -34,30 +34,75 @@
 					</el-row>
 					<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
 						:header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries"
-						:show-summary="true" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="80" align="center" />
+						:show-summary="true" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"
+						@expand-change="tableExpandChange">
+						<el-table-column v-if="false" type="selection" width="80" align="center" />
+
+						<el-table-column type="expand" width="50">
+							<template #default="{ row }">
+								<div class="ml-[50px] my-2">
+									<el-table :data="getTableChildrenMap(row.uniqueCode)" border
+										:cell-style="tableStyle.cellStyle"
+										:header-cell-style="tableStyle.headerCellStyle">
+										<el-table-column type="index" label="#" width="50" />
+										<el-table-column prop="userDeptName" align="center" label="部门" width="150" />
+										<el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
+											<template #default="{ row }">
+												<dict-tag :options="daily_menu" :value="row.hourType" />
+											</template>
+										</el-table-column>
+										<el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+											<template #default="{ row }">
+												<span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+											</template>
+										</el-table-column>
+										<el-table-column label="交易次数" width="150" align="center" prop="timeCount">
+											<template #default="{ row }">
+												<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+											</template>
+										</el-table-column>
+										<el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
+											<template #default="{ row }">
+												<span class="color-success"> {{ row.payCount || 0 }}份 </span>
+											</template>
+										</el-table-column>
+										<el-table-column label="总价" width="150" prop="totalPrice" align="center">
+											<template #default="{ row }">
+												<span>{{ displayPrice(row.totalPrice) }}</span>
+											</template>
+										</el-table-column>
+									</el-table>
+								</div>
+							</template>
+						</el-table-column>
+
 						<el-table-column type="index" label="#" width="50" />
-						<el-table-column label="用餐时间" align="center" prop="createTime">
+						<el-table-column label="用餐时间" align="center" width="150" prop="createTime">
 							<template #default="{ row }">
 								<span>{{ parseTime(row.createTime, "{y}-{m}-{d}") }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="用餐时间段" align="center" prop="hourType">
+						<el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
 							<template #default="{ row }">
 								<dict-tag :options="daily_menu" :value="row.hourType" />
 							</template>
 						</el-table-column>
-						<el-table-column label="购买次数" align="center" prop="payCount">
+						<el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+							<template #default="{ row }">
+								<span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+							</template>
+						</el-table-column>
+						<el-table-column label="交易次数" width="150" align="center" prop="timeCount">
 							<template #default="{ row }">
 								<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
 							</template>
 						</el-table-column>
-						<el-table-column label="售出商品数量" align="center" prop="payCount">
+						<el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
 							<template #default="{ row }">
 								<span class="color-success"> {{ row.payCount || 0 }}份 </span>
 							</template>
 						</el-table-column>
-						<el-table-column label="总价" prop="totalPrice" align="center">
+						<el-table-column label="总价" width="150" prop="totalPrice" align="center">
 							<template #default="{ row }">
 								<span>{{ displayPrice(row.totalPrice) }}</span>
 							</template>
@@ -83,22 +128,26 @@
 
 <script setup lang="ts" name="hard-sb">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import * as hardTotalApi from "/@/api/hard/hard-total"
 import { displayPrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 import { parseTime } from "/@/utils/formatTime"
 
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
 const ProductTotalTable = defineAsyncComponent(() => import("./components/product-total-table.vue"))
 
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
 const productTotalTableRef = ref()
+
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 const draggableDepTreeRef = ref() // 树组件ref引用
 
+const tableChildrenMap = ref(new Map<string, any>())
+
 // 定义查询字典
 const { daily_menu } = useDict("daily_menu")
 
@@ -115,9 +164,28 @@ const exportExcel = () => {
 	postDownBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
 }
 
+// 点击table展开行
+const tableExpandChange = async (e: any) => {
+	try {
+		const { data } = await hardTotalApi.productTotalByDept({
+			hourType: e.hourType,
+			createTimeStr: parseTime(e.createTime, '{y}-{m}-{d}'),
+		})
+		if (data && data.length) {
+			tableChildrenMap.value.set(e.uniqueCode, data)
+		}
+	} catch (error: any) {
+		console.error(error);
+	}
+}
+
+const getTableChildrenMap = (key: string) => {
+	return tableChildrenMap.value.get(key)
+}
+
 const getSummaries = (param: any) => {
 	const { columns, data } = param
-	const totalColumns = ["payCount", "totalPrice"]
+	const totalColumns = ["payUserCount", "timeCount", "payCount", "totalPrice"]
 	const totalRow = Array.from({ length: columns.length })
 	totalRow[0] = "合计"
 	columns.forEach((i: any, index: number) => {
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 1e66110..00e9077 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
@@ -20,14 +13,14 @@
 							<el-form-item style="width: 300px" label="商户类型" prop="merchantType">
 								<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
 							</el-form-item>
-							<el-form-item style="width: 300px" label="商户" prop="mchIds">
-								<select-mch v-model="state.queryForm.mchIds" :apiParams="{ parentIsNull: false }" />
+							<el-form-item style="width: 300px" label="商户" prop="merchantId">
+								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false }" />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="设备类型" prop="hardTypeCode">
 								<dict-select v-model="state.queryForm.hardTypeCode" dict-code="hard_type" />
 							</el-form-item>
-							<el-form-item style="width: 300px" label="用户部门" prop="deptId">
-								<select-dept v-model="state.queryForm.deptId" />
+							<el-form-item style="width: 300px" label="用户部门" prop="userDeptId">
+								<select-dept v-model="state.queryForm.userDeptId" />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="用餐时间段" prop="hourType">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
@@ -36,49 +29,41 @@
 								<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_order_status" />
 							</el-form-item>
 							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
-								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+									type="datetimerange" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+								}}</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
 					</el-form>
 					<div class="flex justify-between items-center">
-						<el-tabs class="flex-1" v-if="tabList && tabList.length" v-model="activeName" @tab-click="handleClick">
+						<el-tabs class="flex-1" v-if="tabList && tabList.length" v-model="activeName"
+							@tab-click="handleClick">
 							<div v-for="v in tabList" :key="v.value">
 								<el-tab-pane :label="v.label" :name="v.value">
 									<div></div>
 								</el-tab-pane>
 							</div>
 						</el-tabs>
-						<right-toolbar
-							v-model:showSearch="showSearch"
-							:export="'sys_audit_export'"
-							@exportExcel="exportExcel"
-							class="ml10"
-							style="float: right; margin-right: 20px"
-							@queryTable="getDataList"
-						/>
+						<right-toolbar v-model:showSearch="showSearch" :export="'sys_audit_export'"
+							@exportExcel="exportExcel" class="ml10" style="float: right; margin-right: 20px"
+							@queryTable="getDataList" />
 					</div>
-					<el-table
-						:data="state.dataList"
-						v-loading="state.loading"
-						border
-						:cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle"
-						:show-summary="false"
-						:summary-method="getSummaries"
-					>
+					<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle" :show-summary="false" :summary-method="getSummaries">
 						<el-table-column type="selection" width="60" align="center" />
 						<el-table-column type="index" label="#" width="50" />
 						<el-table-column width="200" label="用户">
 							<template #default="{ row }">
-								<div v-if="row.userId && row.userId != -1" class="flex flex-row items-center justify-center">
+								<div v-if="row.userId && row.userId != -1"
+									class="flex flex-row items-center justify-center">
 									<preview-image width="50px" height="50px" :src="row.userAvatar" />
-									<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+									<div
+										class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
 										<span> {{ row.username }}</span>
 										<span> {{ row.userMobile }}</span>
 									</div>
@@ -209,78 +194,42 @@
 						<el-table-column fixed="right" label="操作" width="200">
 							<template #default="{ row }">
 								<div class="grid grid-cols-2 justify-evenly">
-									<el-button
-										v-if="row.orderType !== '5'"
-										icon="Printer"
-										text
-										type="primary"
-										@click="print(row)"
-										v-auth="'hard_hardInvoice_admin_print'"
-									>
+									<el-button v-if="row.orderType !== '5'" icon="Printer" text type="primary"
+										@click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
 										打印发票
 									</el-button>
-									<el-button
-										v-if="row.orderType !== '5'"
-										icon="ShoppingCartFull"
-										text
-										type="primary"
-										@click="shopCarDialogRef.openDialog(row.id)"
-									>
+									<el-button v-if="row.orderType !== '5'" icon="ShoppingCartFull" text type="primary"
+										@click="shopCarDialogRef.openDialog(row.id)">
 										购物车
 									</el-button>
-									<el-button
-										icon="Money"
-										link
-										type="primary"
-										v-if="row.userId && row.userId != '-1'"
-										@click="transactionListRef.openDialog(row.walletId)"
-									>
+									<el-button icon="Money" link type="primary" v-if="row.userId && row.userId != '-1'"
+										@click="transactionListRef.openDialog(row.walletId)">
 										钱包明细
 									</el-button>
-									<el-button
-										icon="InfoFilled"
-										link
-										type="primary"
-										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="doRefund(row)"
-									>
+									<el-button icon="InfoFilled" link type="primary"
+										v-auth="'wallet_walletTransaction_update_balance'" @click="doRefund(row)">
 										订单详情
 									</el-button>
-									<el-button
-										v-if="false"
-										icon="edit-pen"
-										text
-										type="primary"
-										v-auth="'hard_hardwareOrder_edit'"
-										@click="formDialogRef.openDialog(row.id)"
-									>
+									<el-button v-if="false" icon="edit-pen" text type="primary"
+										v-auth="'hard_hardwareOrder_edit'" @click="formDialogRef.openDialog(row.id)">
 										编辑
 									</el-button>
 									<el-button
 										v-if="!row.payRefundId && row.orderType !== '5' && !['5', '6', '8'].includes(row.payType)"
-										icon="stamp"
-										text
-										type="primary"
-										v-auth="'hard_hardAfterSale_adminRefund'"
-										@click="adminRefundDailogRef.openDialog(row.id)"
-									>
+										icon="stamp" text type="primary" v-auth="'hard_hardAfterSale_adminRefund'"
+										@click="adminRefundDailogRef.openDialog(row.id)">
 										退款
 									</el-button>
-									<el-button
-										v-if="false"
-										icon="delete"
-										text
-										type="primary"
-										v-auth="'hard_hardwareOrder_del'"
-										@click="handleDelete([row.id])"
-									>
+									<el-button v-if="false" icon="delete" text type="primary"
+										v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])">
 										删除
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+						v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
@@ -328,9 +277,12 @@ const transactionListRef = ref()
 const adminRefundDailogRef = ref()
 const tabList = ref<any>([{}])
 const activeName = ref(null)
+const draggableDepTreeRef = ref()
+
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
+
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
@@ -355,9 +307,9 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
-	state.queryForm.deptId = ""
-	state.queryForm.deptIds = []
-	// draggableDepTreeRef.value.resetData()
+	// state.queryForm.deptId = ""
+	state.queryForm.userDeptIds = []
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -387,8 +339,8 @@ const print = async (row: any) => {
 }
 
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
-	state.queryForm.deptId = curClickedNode.id
-	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
+	// state.queryForm.deptId = curClickedNode.id
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
@@ -437,36 +389,36 @@ const getSummaries = (param: SummaryMethodProps) => {
 		}
 		if (column.property === "paymentInformation") {
 			const priceVNode: VNode[] & string[] = []
-			;[
-				{ column: "totalPrice", columnName: "商品总价", color: "#67C260" },
-				{ column: "extraPrice", columnName: "额外支付", color: "#F56E9B" },
-				{ column: "payPrice", columnName: "实际支付", color: "#355CF6" },
-			].forEach(({ column, columnName, color }: any, index: number) => {
-				const values = data.map((item) => Number(item[column]))
-				if (!values.every((value) => Number.isNaN(value))) {
-					priceVNode.push(
-						h("div", {}, [
-							h("span", { style: { marginRight: "40px", minWidth: "60px", fontWeight: "bold" } }, [columnName]),
-							h("span", { style: { color, minWidth: "50px", flex: 1 } }, [
-								displayPrice(
-									values.reduce((prev, curr) => {
-										const value = Number(curr)
-										if (!Number.isNaN(value)) {
-											return prev + curr
-										} else {
-											return prev
-										}
-									}, 0),
-									"元",
-									2,
-								),
+				;[
+					{ column: "totalPrice", columnName: "商品总价", color: "#67C260" },
+					{ column: "extraPrice", columnName: "额外支付", color: "#F56E9B" },
+					{ column: "payPrice", columnName: "实际支付", color: "#355CF6" },
+				].forEach(({ column, columnName, color }: any, index: number) => {
+					const values = data.map((item) => Number(item[column]))
+					if (!values.every((value) => Number.isNaN(value))) {
+						priceVNode.push(
+							h("div", {}, [
+								h("span", { style: { marginRight: "40px", minWidth: "60px", fontWeight: "bold" } }, [columnName]),
+								h("span", { style: { color, minWidth: "50px", flex: 1 } }, [
+									displayPrice(
+										values.reduce((prev, curr) => {
+											const value = Number(curr)
+											if (!Number.isNaN(value)) {
+												return prev + curr
+											} else {
+												return prev
+											}
+										}, 0),
+										"元",
+										2,
+									),
+								]),
 							]),
-						]),
-					)
-				} else {
-					priceVNode.push("NaN")
-				}
-			})
+						)
+					} else {
+						priceVNode.push("NaN")
+					}
+				})
 			sums[index] = h("div", { style: {} }, [...priceVNode])
 		} else {
 			sums[index] = ""
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index cbd45aa..b67ad66 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -1,7 +1,7 @@
 <template>
 	<div v-loading="loading" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<div v-if="disabled" ref="baseDataInfoRef">
+			<div v-if="disabled" ref="baseInfoRef">
 				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279; display: flex; flex-wrap: wrap">
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">单据编号：</span>
@@ -34,7 +34,7 @@
 					</div>
 				</div>
 			</div>
-			<el-form v-else ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<el-form v-else ref="baseFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
 				<div class="flex flex-wrap">
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" :disabled="disabled" />
@@ -42,7 +42,7 @@
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-					<el-form-item label="关联采购订单" prop="linkCode">
+					<!-- <el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
 							:suffix-icon="Search"
@@ -52,7 +52,7 @@
 							style="width: 200px"
 							:disabled="disabled"
 						/>
-					</el-form-item>
+					</el-form-item> -->
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser
 							v-model.trim="baseDataForm.handlerUserId"
@@ -72,12 +72,12 @@
 
 			<el-row v-if="!disabled" class="my-3">
 				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
-				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
+				<el-button @click="removeRow">删除选中</el-button>
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<vxe-table
-				ref="editableTableRef"
+				ref="vxeTableRef"
 				border
 				:loading="loading"
 				show-overflow
@@ -97,10 +97,10 @@
 				:column-config="{ resizable: true }"
 				:row-config="{ isHover: true }"
 				:resizable-config="{ dragMode: 'fixed' }"
-				:data="state.editableTableData"
+				:data="vxeTableData"
 				:edit-rules="validRules"
-				@checkbox-all="selectChangeEvent"
-				@checkbox-change="selectChangeEvent"
+				@checkbox-all=""
+				@checkbox-change=""
 				size="mini"
 				align="center"
 			>
@@ -109,49 +109,44 @@
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
-						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
+						<span v-else>{{ row.erpSpuId && erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
-				<vxe-column field="unitObj" title="包装单位" :edit-render="{}">
+				<vxe-column field="selectedUnitObj" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
-						<el-select v-if="row.erpUnitVos" v-model="row.unitObj" value-key="id" placeholder="请选择包装单位">
+						<el-select v-model="row.selectedUnitObj" value-key="id" placeholder="请选择包装单位">
 							<el-option v-for="item in row.erpUnitVos" :key="item.id" :label="item.unit" :value="item" />
 						</el-select>
-						<el-select v-else v-model="row.unitId" value-key="id" placeholder="请选择包装单位">
+						<!-- <el-select v-else v-model="row.unitId" value-key="id" placeholder="请选择包装单位">
 							<el-option :key="row.id" :label="row.unit" :value="row.unitId" />
-						</el-select>
+						</el-select> -->
 					</template>
 					<template #default="{ row }">
-						<span v-if="row.erpUnitVos">{{ row.unitObj?.unit ?? "请选择" }}</span>
-						<span v-else>{{ row.unit }}</span>
+						<span>{{ row.selectedUnitObj?.unit ?? "请选择" }}</span>
 					</template>
 				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
-						<el-input v-model="row.quantity" />
+						<el-input v-model.number="row.quantity" />
 					</template>
 				</vxe-column>
 				<vxe-column field="unitPrice" title="原进价">
 					<template #default="{ row }">
-						{{ row.erpUnitVos ? displayPrice(row.unitObj?.purchasePrice || 0) : displayPrice(row.purchasePrice) }}
+						{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
 					</template>
 				</vxe-column>
 				<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #default="{ row }">
-						{{ row.erpUnitVos && row.unitObj ? row.unitObj?.realPrice || 0 : row.realPrice }}
+						{{ row?.selectedUnitObj?.realPrice || 0 }}
 					</template>
 					<template #edit="{ row }">
-						<el-input v-if="row.erpUnitVos && row.unitObj" v-model="row.unitObj.realPrice" />
-						<el-input v-else v-model="row.realPrice" />
+						<el-input-number v-if="row.selectedUnitObj" v-model="row.selectedUnitObj.realPrice" :min="0" :precision="2" />
 					</template>
 				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
-						<span v-if="row.erpUnitVos && row.unitObj && row.quantity">
-							{{ Number(row.quantity * parseFloat(row.unitObj.realPrice || 0)).toFixed(2) }}
-						</span>
-						<span v-else>
-							{{ Number(Number(row.quantity) * row.realPrice).toFixed(2) }}
+						<span v-if="row.selectedUnitObj && row.quantity">
+							{{ Number(row.quantity * parseFloat(row.selectedUnitObj.realPrice || 0)).toFixed(2) }}
 						</span>
 					</template>
 				</vxe-column>
@@ -172,20 +167,20 @@
 				<el-tooltip v-if="!disabled" effect="dark" content="保存并返回列表页面" placement="top">
 					<el-button type="primary" plain @click="onSave">保存</el-button>
 				</el-tooltip>
-				<el-tooltip v-if="disabled" effect="dark" content="打印清单" placement="top">
+				<!-- <el-tooltip v-if="disabled" effect="dark" content="打印清单" placement="top">
 					<el-button type="success" plain @click="printEvent">打印</el-button>
-				</el-tooltip>
+				</el-tooltip> -->
 			</el-row>
 
 			<!-- 商品选择对话框 -->
 			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
-			<link-code-dialog
+			<!-- <link-code-dialog
 				ref="linkCodeDialogRef"
 				title="关联采购订单"
 				:getTableData="getCgddPage"
 				@getSelectedLinkCode="getSelectedLinkCode"
-			/>
+			/> -->
 		</div>
 	</div>
 </template>
@@ -194,10 +189,9 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
-import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
+import { VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
-import { Search } from "@element-plus/icons-vue"
-import LinkCodeDialog from "/@/views/supermarketerp/components/link-code-dialog.vue"
+// import LinkCodeDialog from "/@/views/supermarketerp/components/link-code-dialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 import { useSmProcessFormAction } from "/@/hooks/smProcessFormAction"
@@ -206,220 +200,167 @@ const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/
 
 const props = withDefaults(
 	defineProps<{
-		formId: string | undefined
+		formId: string
 		disabled: boolean
 	}>(),
 	{
-		formId: undefined,
-		disabled: true,
+		formId: "",
+		disabled: false,
 	},
 )
 const emit = defineEmits(["close"])
 
-const loading = ref(false) // 采购计划加载
+const loading = ref(false)
 const disabled = ref(false)
-const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
-const linkCodeDialogRef = ref() // 关联采购申请单对话框ref
-const baseDataFormRef = ref() // 基本数据表单ref
-const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
-const baseDataInfoRef = ref() // 基本信息ref
-// 基本信息表单数据
+const erpSpuSelectDialogRef = ref()
+// const linkCodeDialogRef = ref()
+const baseFormRef = ref()
+const vxeTableRef = ref<VxeTableInstance<any>>()
+const baseInfoRef = ref()
 const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
 	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
 	supplierId: "",
 	remark: "",
 	inventoryType: "3",
 	orderType: "1",
-	totalAmount: "",
-})
-const state = reactive<{
-	editableTableData: any[]
-	erpSpuItemsMemo: any[]
-	selectedRowsErpSpuIds: string[]
-	erpSpuSimpleAll: any
-}>({
-	editableTableData: [], // 可编辑表格数据
-	erpSpuItemsMemo: [], // 请求到的可编辑表格商品数据的缓存
-	selectedRowsErpSpuIds: [], // 可编辑表格已选行的ErpSpuId
-	erpSpuSimpleAll: [], // 简要商品列表
 })
+const vxeTableData = ref<any>([])
+const erpSpuSimpleAll = ref<any>([])
 
 // 基本信息表单校验规则
 const dataRules = ref({
-	inventoryCode: [{ required: true, message: "出入库记录表编号不能为空", trigger: "blur" }],
-	inventoryDate: [{ required: true, message: "出入库记录表单据日期不能为空", trigger: "blur" }],
-	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
+	inventoryCode: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+	inventoryDate: [{ required: true, message: "单据日期不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
 
 // 可编辑表格校验规则
 const validRules = ref<VxeTablePropTypes.EditRules<any>>({
-	unitObj: [{ required: true, message: "必须选择" }],
+	selectedUnitObj: [{ required: true, message: "必须选择" }],
 	quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
 })
 
+onMounted(() => {
+	getInitData()
+})
+
 // 初始化数据
 const getInitData = async () => {
-	baseDataForm.id = undefined
+	baseDataForm.id = ""
 	const id = props.formId
 	disabled.value = props.disabled
 	if (id) {
 		loading.value = true
 		// 获取清单数据
-		const [cgPlanData] = await Promise.allSettled([getObj(id)])
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
-			.finally(() => (loading.value = false))
+		const [cgPlanData] = await Promise.allSettled([getObj(id)]).then((results) =>
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
+		)
 
-		if (cgPlanData && cgPlanData.code === 0) {
+		if (cgPlanData?.code === 0) {
 			Object.assign(baseDataForm, cgPlanData.data)
-			state.editableTableData = cgPlanData.data.items.map((item: any) => {
-				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
+			vxeTableData.value = cgPlanData.data.items.map((item: any) => {
+				const selectedUnitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
 				return {
 					...item,
-					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
-				}
-			})
-			state.erpSpuItemsMemo = cgPlanData.data.items.map((item: any) => {
-				const unitObj = item.erpUnitVos.find((unit: any) => unit.id === item.unitId)
-				return {
-					...item,
-					unitObj: { ...unitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
+					selectedUnitObj: { ...selectedUnitObj, realPrice: displayPrice(item?.realPrice, "") || 0 },
 				}
 			})
 		}
 	} else {
 		loading.value = true
 		// 获取采购入库编号
-		const [planCode] = await Promise.allSettled([getPlanCode({ type: 3 })])
-			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
-			.finally(() => (loading.value = false))
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 3 })]).then((results) =>
+			results.map((result) => (result.status === "fulfilled" ? result.value : null)),
+		)
 		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
-	loading.value = true
 	// 获取简要商品列表
-	const [erpSpuSimpleAll] = await Promise.allSettled([getErpSpuSimpleAll()])
+	const [erpSpuSimpleAllData] = await Promise.allSettled([getErpSpuSimpleAll()])
 		.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 		.finally(() => (loading.value = false))
-	erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
-}
-
-// 点击关联采购申请编号
-const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2)
-
-// 获取选择的采购申请
-const getSelectedLinkCode = (selectionRows: any) => {
-	console.log("被选择的关联数据", selectionRows)
-
-	baseDataForm.linkCode = selectionRows.code
-	state.editableTableData = selectionRows.items.map((item: any) => ({
-		...item,
-		unitObj: {},
-		realPrice: displayPrice(item.purchasePrice, ""),
-	}))
-	state.erpSpuItemsMemo = selectionRows.items.map((item: any) => ({
-		...item,
-		unitObj: {},
-		realPrice: displayPrice(item.purchasePrice, ""),
-	}))
-}
-
-// 删除选中的行
-const removeSelectRowEvent = () => {
-	const $table = editableTableRef.value
-	if ($table) {
-		const selectRecords = $table.getCheckboxRecords()
-		if (selectRecords.length > 0) {
-			state.editableTableData = state.editableTableData.filter((item) => !selectRecords.some((row) => row.erpSpuId === item.erpSpuId))
-		}
-	}
-}
-
-// 可编辑表格行勾选
-const selectChangeEvent: VxeTableEvents.CheckboxChange<any> = ({ checked }) => {
-	const $table = editableTableRef.value
-	if ($table) {
-		const records = $table.getCheckboxRecords()
-		console.log(checked ? "勾选事件" : "取消事件", records)
-		state.selectedRowsErpSpuIds = records.map((item) => item.erpSpuId)
-	}
+	erpSpuSimpleAllData && erpSpuSimpleAllData.code === 0 && (erpSpuSimpleAll.value = erpSpuSimpleAllData.data)
 }
 
 // 点击商品选择
 const handleClickSpuSelect = () => erpSpuSelectDialogRef.value.openDialog()
 
+// 点击关联采购申请编号
+// const handleClickLinkCode = () => linkCodeDialogRef.value.openLinkCodeDialog(2)
+
+// 获取选择的采购申请
+// const getSelectedLinkCode = (selectionRows: any) => {
+// 	console.log("被选择的关联数据", selectionRows)
+
+// 	baseDataForm.linkCode = selectionRows.code
+// 	vxeTableData.value = selectionRows.items.map((item: any) => ({
+// 		...item,
+// 		selectedUnitObj: {},
+// 		realPrice: displayPrice(item.purchasePrice, ""),
+// 	}))
+// }
+
 // 获取被选择的商品行
 const getSelectedRows = (selectionRows: any) => {
 	console.log("被选择的商品行", selectionRows)
 
 	// 筛选新勾选的项
 	const addedItems = selectionRows
-		.filter((item: any) => !state.editableTableData.some((editableTableItem: any) => editableTableItem.erpSpuId === item.erpSpuId))
+		.filter((item: any) => !vxeTableData.value.some((vxeTableItem: any) => vxeTableItem.erpSpuId === item.erpSpuId))
 		.map((addItem: any) => {
-			const index = state.erpSpuItemsMemo.findIndex((item: any) => item.erpSpuId === addItem.erpSpuId)
-			if (index !== -1) return state.erpSpuItemsMemo[index]
+			// const index = state.erpSpuItemsMemo.findIndex((item: any) => item.erpSpuId === addItem.erpSpuId)
+			// if (index !== -1) return state.erpSpuItemsMemo[index]
 			return {
 				...addItem,
 				erpUnitVos: addItem.erpUnitVos.map((item: any) => ({ ...item, realPrice: displayPrice(item.purchasePrice, "") })),
-				unitObj: addItem.erpUnitVos[0],
+				selectedUnitObj: addItem.erpUnitVos[0],
+				unitId: addItem.erpUnitVos[0].id,
+				quantity: 1,
 				isNew: true,
 			}
 		})
 	// 仅添加新勾选的项
-	state.editableTableData = [...state.editableTableData, ...addedItems]
+	vxeTableData.value.push(...addedItems)
 
 	// 筛选取消勾选的项
-	const removedItems = state.editableTableData.filter(
-		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	)
+	// const removedItems = vxeTableData.value.filter(
+	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
+	// )
 	// 仅移除取消勾选的项
-	state.editableTableData = state.editableTableData.filter(
-		(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
-	)
-	// state.editableTableData.push(item)
-	// nextTick(() => {
-	// 	const $table = editableTableRef.value
-	// 	if ($table) {
-	// 		$table.setRow(item)
-	// 	}
-	// })
-	console.log("state.editableTableData", state.editableTableData)
+	// vxeTableData.value = vxeTableData.value.filter(
+	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
+	// )
+	console.log("vxeTableData.value", vxeTableData.value)
 }
 
-// 整理数据
-const cgPlanSpuItems = computed(() => {
-	return state.editableTableData.map((item: any) => {
-		if (item.erpUnitVos) {
-			const unitObj = item.unitObj
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: unitObj.purchasePrice ? Number(unitObj?.purchasePrice) : 0,
-				realPrice: unitObj.realPrice ? storePrice(unitObj?.realPrice) : 0,
-				totalAmount: storePrice(Number(unitObj?.realPrice || 0) * item.quantity),
-				remark: item.remark,
-				unitId: unitObj.id,
-				orderType: baseDataForm.orderType,
-			}
-		} else {
-			return {
-				id: item.isNew ? undefined : item.id,
-				erpSpuId: item.erpSpuId,
-				quantity: item.quantity,
-				unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0,
-				realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
-				totalAmount: item?.realPrice && item.quantity ? storePrice(Number(item.realPrice) * item.quantity) : 0,
-				remark: item.remark,
-				unitId: item.unitId,
-				orderType: baseDataForm.orderType,
-			}
+// 删除选中的行
+const removeRow = () => {
+	const $table = vxeTableRef.value
+	if ($table) {
+		const selectRecords = $table.getCheckboxRecords()
+		if (selectRecords.length > 0) {
+			vxeTableData.value = vxeTableData.value.filter((item: any) => !selectRecords.some((row) => row.erpSpuId === item.erpSpuId))
+		}
+	}
+}
+
+// 整理table数据
+const settledTableItems = computed(() => {
+	return vxeTableData.value.map((item: any) => {
+		const selectedUnitObj = item.selectedUnitObj
+		return {
+			id: item.isNew ? "" : item.id,
+			erpSpuId: item.erpSpuId,
+			quantity: item.quantity,
+			unitPrice: selectedUnitObj.purchasePrice ? Number(selectedUnitObj?.purchasePrice) : 0,
+			realPrice: selectedUnitObj.realPrice ? storePrice(selectedUnitObj?.realPrice) : 0,
+			totalAmount: storePrice(Number(selectedUnitObj?.realPrice || 0) * item.quantity),
+			remark: item.remark,
+			unitId: selectedUnitObj.id,
+			orderType: baseDataForm.orderType,
 		}
 	})
 })
@@ -429,40 +370,34 @@ const { formValidate, submitData } = useSmProcessFormAction()
 // 点击继续添加
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData.value", vxeTableData.value)
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData()
 }
 
 // 点击保存
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
-	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+	console.log("vxeTableData.value", vxeTableData.value)
+	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
 		clearData() &&
 		emit("close")
 }
 
-// 清空填写的数据 返回 true
+// 清空填写的数据
 const clearData = () => {
 	for (const key in baseDataForm) {
 		if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue
 		baseDataForm[key] = ""
 	}
-	state.editableTableData = []
-	state.erpSpuItemsMemo = []
-	state.selectedRowsErpSpuIds = []
+	vxeTableData.value = []
 	return true
 }
 
 // 点击打印
-const printEvent = () => {
-	tablePrint(editableTableRef.value, baseDataInfoRef.value, state.editableTableData, 23, "采购入库")
-}
-
-onMounted(() => {
-	getInitData()
-})
+// const printEvent = () => {
+// 	tablePrint(vxeTableRef.value, baseInfoRef.value, vxeTableData.value, 23, "采购入库")
+// }
 </script>
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index 4df8ebf..b65b162 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="layout-padding">
-		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
+		<div v-if="!showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item label="单据编号" prop="inventoryCode">
@@ -18,20 +18,16 @@
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-					<!-- <el-form-item label="审批状态" prop="checkStatus">
-						<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
-							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
-						</el-select>
-					</el-form-item> -->
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
 						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
+
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create()" v-auth="'supermarket_smErpInventoryRecords_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'supermarket_smErpInventoryRecords_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -70,11 +66,6 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
-				<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
-					</template>
-				</el-table-column> -->
 				<el-table-column prop="supplierName" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip>
@@ -84,14 +75,7 @@
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="MessageBox" text type="success" @click="edit({ ...scope.row, checkStatus: 2 })">详情</el-button>
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_smErpInventoryRecords_edit'"
-							@click="edit({ ...scope.row, checkStatus: null })"
-						>
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
 						<el-button
@@ -103,26 +87,13 @@
 						>
 							删除
 						</el-button>
-						<!-- <el-button
-							type="primary"
-							size="small"
-							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
-							link
-							icon="VideoPlay"
-							@click="deal(scope.row)"
-						>
-							开始处理
-						</el-button> -->
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
-		<sm-form v-else :formId="processFormState.formId" :disabled="processFormState.formDisabled" @close="formClose" />
-
-		<!-- 审批抽屉 -->
-		<!-- <process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" /> -->
+		<sm-form v-else :formId="formId" :disabled="formDisabled" @close="formClose" />
 	</div>
 </template>
 
@@ -130,35 +101,63 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { displayPrice } from "/@/utils/formatMoney"
-import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
-const { check_status } = useDict("check_status")
-// 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
-// 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
-const processFormState = reactive<{ formId: string | undefined; formDisabled: boolean; showForm: boolean }>({
-	formId: undefined,
-	formDisabled: true,
-	showForm: false,
-})
-const processDrawerRef = ref<InstanceType<typeof ProcessDrawer> | null>(null)
-
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		inventoryType: "3",
 	},
 	pageList: fetchList,
 })
+const showForm = ref(false)
+const formDisabled = ref(false)
+const formId = ref("")
+
+// 新增
+const create = () => {
+	formDisabled.value = false
+	formId.value = ""
+	showForm.value = true
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+// 编辑
+const edit = (row: any) => {
+	if (!row.id) return useMessage().warning("清单id不存在")
+	formId.value = row.id
+	showForm.value = true
+}
+
+// 表单关闭
+const formClose = () => {
+	showForm.value = false
+	formId.value = ""
+	formDisabled.value = false
+	getDataList()
+}
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
@@ -180,28 +179,4 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	selectObjs.value = objs.map(({ id }) => id)
 	multiple.value = !objs.length
 }
-
-const { create, edit, close } = useSmProcessTableAction(processFormState)
-
-const formClose = () => {
-	close()
-	getDataList()
-}
-
-// 删除操作
-const handleDelete = async (ids: string[]) => {
-	try {
-		await useMessageBox().confirm("此操作将永久删除")
-	} catch {
-		return
-	}
-
-	try {
-		await delObjs(ids)
-		getDataList()
-		useMessage().success("删除成功")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	}
-}
 </script>
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 1f8f4c7..485baa8 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -220,7 +220,6 @@ const baseDataForm = reactive<any>({
 	receiveAmount: 0,
 })
 const vxeTableData = ref<any>([])
-const vxeTableDataMemo = ref([])
 const erpSpuSimpleAll = ref<any>([])
 
 const dataRules = ref({
@@ -252,7 +251,6 @@ const getInitData = async () => {
 		if (cgPlanData?.code === 0) {
 			Object.assign(baseDataForm, cgPlanData.data)
 			vxeTableData.value = cgPlanData.data.items
-			vxeTableDataMemo.value = cgPlanData.data.items
 		}
 	} else {
 		loading.value = true
@@ -286,16 +284,16 @@ const getSelectedRows = (selectionRows: any) => {
 			return { ...addItem, unitId: addItem.erpUnitVos[0].id, quantity: 1, isNew: true }
 		})
 	// 仅添加新勾选的项
-	vxeTableData.value = [...vxeTableData.value, ...addedItems]
+	vxeTableData.value.push(...addedItems)
 
 	// 筛选取消勾选的项
-	const removedItems = vxeTableData.value.filter(
-		(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
-	)
+	// const removedItems = vxeTableData.value.filter(
+	// 	(item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
+	// )
 	// 仅移除取消勾选的项
-	vxeTableData.value = vxeTableData.value.filter(
-		(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
-	)
+	// vxeTableData.value = vxeTableData.value.filter(
+	// 	(item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
+	// )
 	console.log("vxeTableData.value", vxeTableData.value)
 }
 
@@ -358,7 +356,6 @@ const clearData = () => {
 		baseDataForm[key] = ""
 	}
 	vxeTableData.value = []
-	vxeTableDataMemo.value = []
 	return true
 }
 </script>
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index 3443ef1..147006f 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -3,14 +3,19 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="商品名称" prop="productName">
+						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					</el-form-item>
+					<el-form-item label="商品分类" prop="categoryId">
+						<el-select v-model="state.queryForm.categoryId" placeholder="请选择商品分类">
+							<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name" :value="item?.id" />
+						</el-select>
+					</el-form-item>
 					<el-form-item label="货号" prop="productCode">
 						<el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
 					</el-form-item>
-					<el-form-item label="自编码/条码" prop="barcode">
-						<el-input placeholder="请输入自编码/条码" v-model="state.queryForm.barcode" />
-					</el-form-item>
-					<el-form-item label="商品名称" prop="productName">
-						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					<el-form-item label="条码" prop="barcode">
+						<el-input placeholder="条码" v-model="state.queryForm.barcode" />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
@@ -103,7 +108,10 @@
 				<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
 					<template #default="{ row }">{{ displayPrice(row.costPrice, "") }}</template>
 				</el-table-column>
-				<el-table-column prop="stock" label="总库存" show-overflow-tooltip />
+				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip width="120">
+					<template #default="{ row }">{{ displayPrice(row.retailPrice, "") }}</template>
+				</el-table-column>
+				<el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="specification" label="规格" show-overflow-tooltip /> -->
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index d24e05b..bfccbc0 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -52,7 +52,7 @@
 				@sort-change="sortChangeHandle">
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" />
-				<el-table-column prop="code" min-width="100" label="发票编号" />
+				<el-table-column prop="code" min-width="120" label="发票编号" sortable />
 				<el-table-column prop="time" min-width="120" label="发票日期">
 					<template #default="{ row }">
 						{{ parseTime(row.time, "{y}-{m}-{d}") }}
@@ -71,7 +71,7 @@
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="发票状态" width="120">
+				<el-table-column prop="status" label="发票状态" width="200">
 					<template #default="{ row }">
 						<dict-tag :options="recharge_invoice_status" :value="row.status" />
 					</template>
@@ -142,12 +142,11 @@
 
 <script setup lang="ts" name="systemWalletRechargeInvoice">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/wallet/wallet-recharge-invoice"
+import * as WalletRechargeInvoiceApi from "/@/api/wallet/wallet-recharge-invoice"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { displayPrice } from "/@/utils/formatMoney"
 import { parseTime } from "/@/utils/formatTime"
 import { useDict } from "/@/hooks/dict"
-import { getObj } from "/@/api/wallet/wallet-recharge-invoice"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { getDicts } from "/@/api/admin/dict"
 
@@ -174,13 +173,13 @@ const tabItems = ref<any>([{}])
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
-	pageList: fetchList,
+	pageList: WalletRechargeInvoiceApi.fetchList,
 })
 const printDialogRef = ref()
 const loading = ref(false)
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -203,7 +202,11 @@ const doInfo = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletRechargeInvoice/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeInvoice.xlsx")
+	postDownBlobFile("/wallet/walletRechargeInvoice/export", {
+		...state.queryForm,
+		ascs: state.ascs,
+		descs: state.descs,
+	}, "充值扣款发票申请.xlsx")
 }
 
 // 多选事件
@@ -234,7 +237,7 @@ const handleDelete = async (ids: string[]) => {
 	}
 
 	try {
-		await delObjs(ids)
+		await WalletRechargeInvoiceApi.delObjs(ids)
 		getDataList()
 		useMessage().success("删除成功")
 	} catch (err: any) {
@@ -247,7 +250,7 @@ const previewInvoice = async (row: any) => {
 	try {
 		loading.value = true
 		if (!row.id) return useMessage().error("发票ID不存在")
-		const res = await getObj(row.id)
+		const res = await WalletRechargeInvoiceApi.getObj(row.id)
 		if (res.code == 0 && printDialogRef.value) return printDialogRef.value.openDialog(res.data, res.data.id)
 		return useMessage().error(res.data.msg || "获取发票信息失败")
 	} catch (error: any) {
diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
index 6f52e45..c722b64 100644
--- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
+++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
@@ -60,8 +60,8 @@
 						<td class="border border-gray-600 px-2 w-1/6 h-[0.75cm]">收款单位<br />（盖章）</td>
 						<td class="border border-gray-600 px-2 text-left w-1/6 h-[0.75cm] text-sm text-blue-800">
 							<!-- <input type="text" v-model="receiptData.payeeDept" class="w-full h-full bg-transparent" /> -->
-							<img v-if="receiptData.stampPicUrl" class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]"
-								draggable="false"
+							<img v-if="receiptData.stampPicUrl && visibleStampPic"
+								class="w-[2.5cm] h-[2.5cm] absolute -top-2 left-[140px]" draggable="false"
 								style="-webkit-user-drag: none; user-select: none; pointer-events: none"
 								oncontextmenu="return false" src="/@/assets/receiptStamp.png" />
 						</td>
@@ -89,9 +89,9 @@
 
 		<template #footer>
 			<el-button @click="handleClose" :disabled="loading">关闭</el-button>
-			<el-button v-if="['2', '3'].includes(receiptData.processStatus!) && !['6'].includes(receiptData.status!)"
-				v-auth="'wallet_walletRechargeApply_back'" type="primary" plain @click="backInvoice"
-				:disabled="loading">
+			<!-- ['2', '3'].includes(receiptData.processStatus!) && !['6'].includes(receiptData.status!) -->
+			<el-button v-if="['2', '3'].includes(receiptData.processStatus!)" v-auth="'wallet_walletRechargeApply_back'"
+				type="primary" plain @click="backInvoice" :disabled="loading">
 				作废
 			</el-button>
 			<el-button v-if="!receiptData.processStatus && !['6'].includes(receiptData.status!)" type="primary"
@@ -101,6 +101,9 @@
 				:disabled="loading">保存</el-button>
 			<el-button v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="warning"
 				@click="handlePrint" :disabled="loading">打印</el-button>
+			<el-button v-auth="'wallet_invoice_refresh'"
+				v-if="receiptData.stampPicUrl && !['6'].includes(receiptData.status!)" type="primary" plain
+				icon="RefreshRight" @click="refreshInvoice" :disabled="refreshLoading">重新生成发票</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -108,14 +111,15 @@
 <script setup lang="ts">
 import { ref, computed } from "vue"
 import * as htmlToImage from "html-to-image"
-import { useMessage } from "/@/hooks/message"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 import request from "/@/utils/request"
 import { formatDate } from "/@/utils/formatTime"
 import { displayPrice } from "/@/utils/formatMoney"
 import printJS from "print-js"
-import { bindInvoice, invoiceBack, getObj, apply } from "/@/api/wallet/wallet-recharge-invoice"
+import * as  WalletRechargeInvoiceApi from "/@/api/wallet/wallet-recharge-invoice"
 import { useDict } from "/@/hooks/dict"
 
+
 interface ReceiptData {
 	id: string
 	itemJson: string
@@ -139,8 +143,10 @@ const { check_status } = useDict("check_status")
 let timer
 const visible = ref(false)
 const loading = ref(false)
+const refreshLoading = ref(false)
 const receiptRef = ref<HTMLElement | null>(null)
 const deptOrUserInput = ref<HTMLInputElement | null>(null)
+const visibleStampPic = ref<boolean>(true)
 const receiptData = ref<ReceiptData>({
 	id: "",
 	itemJson: "", // 款项json
@@ -183,12 +189,46 @@ const handleClose = () => {
 	timer = null
 }
 
+// 刷新发票
+const refreshInvoice = async () => {
+	try {
+		await useMessageBox().confirm("是否重新生成发票")
+	} catch {
+		return
+	}
+	refreshLoading.value = true
+	try {
+		// 现移除盖章图片
+		visibleStampPic.value = false
+		// 申请审批
+		const blob = await genImage()
+		if (!blob) return useMessage().error("图片生成失败")
+		const picUrl = await uploadImage(blob)
+		if (!picUrl) return useMessage().error("图片上传失败")
+
+		const _data = {
+			id: receiptData.value.id,
+			picUrl: picUrl
+		}
+		await WalletRechargeInvoiceApi.refreshInvoice(_data)
+		useMessage().success("重新生成发票成功")
+		emit("refresh")
+		visible.value = false
+	} catch (err: any) {
+		console.error(err);
+		useMessage().error(err.msg)
+	} finally {
+		refreshLoading.value = false
+		visibleStampPic.value = true
+	}
+}
+
 // 发票作废
 const backInvoice = async () => {
 	loading.value = true
 	try {
-		await invoiceBack({ id: receiptData.value.id })
-		const res = await getObj(receiptData.value.id)
+		await WalletRechargeInvoiceApi.invoiceBack({ id: receiptData.value.id })
+		const res = await WalletRechargeInvoiceApi.getObj(receiptData.value.id)
 		receiptData.value = res.data
 		emit("refresh")
 		useMessage().success("作废成功")
@@ -211,6 +251,7 @@ const genImage = async (): Promise<Blob | void | null> => {
 				pixelRatio: 6,
 			})
 			.catch((error) => {
+				console.error(error);
 				return useMessage().error("图片生成错误")
 			})
 		return blob
@@ -237,7 +278,7 @@ const uploadImage = async (blob: Blob): Promise<string | void> => {
 const saveReceipt = async (): Promise<void> => {
 	try {
 		loading.value = true
-		const { code, data } = await bindInvoice({
+		const { code, data } = await WalletRechargeInvoiceApi.bindInvoice({
 			...receiptData.value,
 			deptOrUser: receiptData.value.deptOrUser,
 			applyId: receiptData.value.id,
@@ -262,7 +303,7 @@ const applyStamp = async () => {
 	loading.value = true
 	try {
 		// 先保存
-		const res = await bindInvoice({
+		const res = await WalletRechargeInvoiceApi.bindInvoice({
 			...receiptData.value,
 			deptOrUser: receiptData.value.deptOrUser,
 			applyId: receiptData.value.id,
@@ -277,7 +318,7 @@ const applyStamp = async () => {
 		const picUrl = await uploadImage(blob)
 		if (!picUrl) return useMessage().error("图片上传失败")
 
-		const { code, msg } = await apply({ id: receiptData.value.id, picUrl })
+		const { code, msg } = await WalletRechargeInvoiceApi.apply({ id: receiptData.value.id, picUrl })
 		if (code == 0) {
 			useMessage().success("申请成功")
 			emit("refresh")