diff --git a/src/views/flow/task/pending.vue b/src/views/flow/task/pending.vue
index 3784c1e..5296a68 100644
--- a/src/views/flow/task/pending.vue
+++ b/src/views/flow/task/pending.vue
@@ -17,9 +17,9 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -59,7 +59,7 @@
 
 			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
 
-			<!--			右侧抽屉-->
+			<!--右侧抽屉-->
 			<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
 				<template #header>
 					<h3>{{ currentData?.processName }}</h3>
@@ -104,108 +104,108 @@
 	</div>
 </template>
 <script setup lang="ts">
-import FormRender from '/@/views/flow/form/render/FormRender.vue';
-import AgreeHandle from './handler/agree.vue';
-import RefuseHandle from './handler/refuse.vue';
-import TransferHandle from './handler/transfer.vue';
-import FlowNodeFormat from '/@/views/flow/form/tools/FlowNodeFormatData.vue';
-import other from '/@/utils/other';
-import { queryMineTask, queryTask } from '/@/api/flow/task';
-import { BasicTableProps, useTable } from '/@/hooks/table';
+import FormRender from "/@/views/flow/form/render/FormRender.vue"
+import AgreeHandle from "./handler/agree.vue"
+import RefuseHandle from "./handler/refuse.vue"
+import TransferHandle from "./handler/transfer.vue"
+import FlowNodeFormat from "/@/views/flow/form/tools/FlowNodeFormatData.vue"
+import other from "/@/utils/other"
+import { queryMineTask, queryTask } from "/@/api/flow/task"
+import { BasicTableProps, useTable } from "/@/hooks/table"
 
-const rightDrawerVisible = ref(false);
-const showSearch = ref(true);
-const loading = ref(false);
-const queryRef = ref();
+const rightDrawerVisible = ref(false)
+const showSearch = ref(true)
+const loading = ref(false)
+const queryRef = ref()
 
-const currentData = ref();
+const currentData = ref()
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: queryMineTask,
 	queryForm: {
-		processName: '',
+		processName: "",
 		taskTime: undefined,
 	},
-});
+})
 
-const { tableStyle, getDataList, currentChangeHandle, sizeChangeHandle } = useTable(state);
+const { tableStyle, getDataList, currentChangeHandle, sizeChangeHandle } = useTable(state)
 
 /**
  * 点击开始处理
  * @param row
  */
 const deal = (row: any) => {
-	currentData.value = row;
+	currentData.value = row
 	queryTask(row.taskId, false).then((res) => {
-		currentOpenFlowForm.value = res.data.formItems;
-		rightDrawerVisible.value = true;
-	});
-};
-const currentOpenFlowForm = ref();
+		currentOpenFlowForm.value = res.data.formItems
+		rightDrawerVisible.value = true
+	})
+}
+const currentOpenFlowForm = ref()
 const addLayoutOneItem = (id: Number) => {
 	for (const item of currentOpenFlowForm.value) {
 		if (item.id !== id) {
-			continue;
+			continue
 		}
-		let value = item.props.value;
-		let oriForm = item.props.oriForm;
-		value.push(other.deepClone(oriForm));
-		item.props.value = value;
+		let value = item.props.value
+		let oriForm = item.props.oriForm
+		value.push(other.deepClone(oriForm))
+		item.props.value = value
 	}
-};
+}
 const deleteLayoutOneItem = (id, index) => {
 	for (const item of currentOpenFlowForm.value) {
 		if (item.id !== id) {
-			continue;
+			continue
 		}
-		item.props.value.splice(index, 1);
+		item.props.value.splice(index, 1)
 	}
-};
+}
 
-const agreeHandler = ref();
-const refuseHandler = ref();
-const transferHandler = ref();
+const agreeHandler = ref()
+const refuseHandler = ref()
+const transferHandler = ref()
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 const taskSubmitEvent = () => {
-	rightDrawerVisible.value = false;
-	getDataList();
-};
+	rightDrawerVisible.value = false
+	getDataList()
+}
 
 /**
  * 提交任务
  */
 const submitTask = () => {
-	agreeHandler.value.handle(currentData.value, currentOpenFlowForm.value);
-};
+	agreeHandler.value.handle(currentData.value, currentOpenFlowForm.value)
+}
 /**
  * 拒绝任务
  */
 const refuseTask = () => {
-	refuseHandler.value.handle(currentData.value, currentOpenFlowForm.value);
-};
+	refuseHandler.value.handle(currentData.value, currentOpenFlowForm.value)
+}
 
 /**
  * 转办任务
  */
 const transferTask = () => {
-	transferHandler.value.handle(currentData.value, currentOpenFlowForm.value);
-};
+	transferHandler.value.handle(currentData.value, currentOpenFlowForm.value)
+}
 
 onMounted(() => {
-	getDataList();
-});
+	getDataList()
+})
 
 const formValue = computed(() => {
-	const obj = {};
+	const obj = {}
 
 	for (var item of currentOpenFlowForm.value) {
-		obj[item.id] = item.props.value;
+		obj[item.id] = item.props.value
 	}
-	return obj;
-});
+	return obj
+})
 </script>
diff --git a/src/views/flow/task/started.vue b/src/views/flow/task/started.vue
index a38023f..4d631b3 100644
--- a/src/views/flow/task/started.vue
+++ b/src/views/flow/task/started.vue
@@ -68,11 +68,7 @@
 				</el-table-column>
 			</el-table>
 
-			<pagination
-				@current-change="currentChangeHandle"
-				@size-change="sizeChangeHandle"
-				v-bind="state.pagination"
-			></pagination>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
 			<!--			右侧抽屉-->
 			<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
 				<template #header>
diff --git a/src/views/supermarketerp/smErpCgBack/index.vue b/src/views/supermarketerp/smErpCgBack/index.vue
index 34ea740..9227c70 100644
--- a/src/views/supermarketerp/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/smErpCgBack/index.vue
@@ -78,14 +78,14 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
 				<el-table-column prop="handlerUserId" 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"></dict-tag>
-					</template>
-				</el-table-column>
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+<!--					<template #default="scope">-->
+<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
+<!--				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />-->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button
diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
index 442c91a..1361182 100644
--- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
@@ -11,13 +11,13 @@
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
 
-					<el-form-item label="关联采购订单" prop="linkCode">
+					<el-form-item label="关联入库单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
 							:suffix-icon="Search"
 							@click="handleClickLinkCode"
 							readonly
-							placeholder="请选择采购订单"
+							placeholder="请选择采购入库单"
 							style="width: 200px"
 						/>
 					</el-form-item>
@@ -26,9 +26,6 @@
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
 
-					<el-form-item label="审批状态" prop="checkStatus">
-						<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
-					</el-form-item>
 
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
@@ -202,7 +199,7 @@ const baseDataForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
 	inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
-	inventoryType: "3",
+	inventoryType: "4",
 	sourceId: "",
 	warehouseId: "",
 	handlerUserId: "",
@@ -213,7 +210,7 @@ const baseDataForm = reactive<any>({
 	deptId: "",
 	supplierId: "",
 	remark: "",
-	orderType: "1",
+	orderType: "2",
 	totalAmount: "",
 })
 const state = reactive<{
@@ -273,7 +270,7 @@ const getInitData = async () => {
 	const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
 		getErpSpuSimpleAll(),
 		getSupplierTypeOptions(),
-		getPlanCode({ type: 3 }),
+		getPlanCode({ type: 4 }),
 	]).then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 	erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
 	supplierTypeOptions && supplierTypeOptions.code === 0 && (supplierTypeDict.value = supplierTypeOptions.data)
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index 22a9c6c..a0b5fd3 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -39,7 +39,7 @@
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="code" label="编号" show-overflow-tooltip />
-				<el-table-column prop="dDate" label="单据日期" show-overflow-tooltip />
+				<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
         <el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
 				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
 				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
@@ -47,7 +47,7 @@
 						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />
+<!--				<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index ad8c382..3260674 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -8,7 +8,7 @@
 					</el-form-item>
 
 					<el-form-item label="单据日期" prop="dDate">
-						<el-input v-model="baseDataForm.dDate" readonly style="width: 200px" />
+						<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" />
 					</el-form-item>
 
 					<el-form-item label="经办人" prop="handlerUserId">
@@ -204,7 +204,7 @@ const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
 const baseDataForm = reactive<any>({
 	id: "",
 	code: "",
-	dDate: formatDate(new Date(), "YYYY-mm-dd"),
+	ddDate: formatDate(new Date(), "YYYY-mm-dd"),
 	warehouseId: "",
 	handlerUserId: "",
 	linkCode: "",
@@ -243,7 +243,7 @@ const state = reactive<{
 // 基本信息表单校验规则
 const dataRules = ref({
 	code: [{ required: true, message: "采购订单编号不能为空", trigger: "blur" }],
-	dDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
+	ddDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
 	handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
 	supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
 })
diff --git a/src/views/supermarketerp/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue
index fcecf03..36cc754 100644
--- a/src/views/supermarketerp/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/smErpCgPlan/index.vue
@@ -64,7 +64,7 @@
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="planCode" label="编号" show-overflow-tooltip />
 				<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
-				<el-table-column prop="prodouctName" label="商品信息" show-overflow-tooltip />
+				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
 				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
 				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index d51fe81..97b9142 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -22,13 +22,7 @@
 
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'wallet_walletFreeze_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_walletFreeze_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -89,14 +83,7 @@
 							@click="formDialogRef.openDialog(row.id)"
 							>编辑</el-button
 						>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletFreeze_del'"
-							@click="handleDelete([row.id])"
-							>删除</el-button
-						>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletFreeze_del'" @click="handleDelete([row.id])">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -110,7 +97,7 @@
 
 <script setup lang="ts" name="systemWalletFreeze">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { getObj, addObj, putObj, fetchList, pageJoin } from "/@/api/wallet/wallet-freeze"
+import { delObjs, pageJoin } from "/@/api/wallet/wallet-freeze"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 const { push } = useRouter()
@@ -134,8 +121,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 58e919c..ddc325a 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -14,8 +14,8 @@
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
-								<el-form-item class="w100" label="用户" prop="userIds">
-									<select-user v-model="state.queryForm.userIds" />
+								<el-form-item class="w100" label="用户" prop="userId">
+									<select-user v-model="state.queryForm.userId" />
 								</el-form-item>
 							</el-col>
 							<el-col :span="4">
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 11029e5..b2238e6 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -21,13 +21,7 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="uploadExcelRef.show()"
-						v-auth="'wallet_walletRechargeApply_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()" v-auth="'wallet_walletRechargeApply_add'">
 						导 入
 					</el-button>
 					<el-button
@@ -60,14 +54,14 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="username" label="申请人" show-overflow-tooltip />
-				<el-table-column prop="bizType" label="充值类型" show-overflow-tooltip>
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column prop="username" label="申请人" />
+				<el-table-column prop="bizType" width="100" label="充值类型">
 					<template #default="{ row }">
 						<dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="walletTypeId" widht="150" label="饭卡类型" show-overflow-tooltip>
+				<el-table-column prop="walletTypeId" width="200" label="饭卡类型">
 					<template #default="{ row }">
 						<div class="flex items-center justify-center">
 							<div class="color-primary">{{ row.walletTypeName }}</div>
@@ -77,25 +71,18 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
-				<el-table-column prop="importTime" label="充值月" show-overflow-tooltip />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="deptName" width="200" label="部门" />
+				<el-table-column prop="importTime" width="100" label="充值月" />
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
-				<el-table-column label="操作" width="300">
+				<el-table-column prop="remark" width="300" label="备注" />
+				<el-table-column prop="createTime" width="200" label="创建时间" />
+				<el-table-column label="操作" width="300" fixed="right">
 					<template #default="{ row }">
-						<el-button
-							icon="Document"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_edit'"
-							@click="doInfo(row)"
-							>数据</el-button
-						>
+						<el-button icon="Document" text type="primary" v-auth="'wallet_walletRechargeApply_edit'" @click="doInfo(row)">数据</el-button>
 						<el-button
 							v-if="row.importTime && !row.processId"
 							icon="Connection"
@@ -171,8 +158,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -185,11 +171,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/wallet/walletRechargeApply/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"walletRechargeApply.xlsx",
-	)
+	downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx")
 }
 
 const doApply = async (row: any) => {