Merge remote-tracking branch 'origin/master'

src/views/admin/system/role/index.vue

@@ -69,8 +69,8 @@
 						<el-button text type="primary" icon="edit-pen" v-auth="'sys_role_edit'" @click="roleDialogRef.openDialog(scope.row.roleId)">{{
 							$t("common.editBtn")
 						}}</el-button>
-
-						<el-button text type="primary" icon="turn-off" v-auth="'sys_role_perm'" @click="permessionRef.openDialog(scope.row)">{{
+						<!-- v-auth="'sys_role_perm'" -->
+						<el-button text type="primary" icon="turn-off" @click="permessionRef.openDialog(scope.row)">{{
 							$t("sysrole.permissionTip")
 						}}</el-button>
 

src/views/admin/system/sys-user-transaction/form.vue

@@ -0,0 +1,150 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="用户id" prop="userId">
+						<el-input v-model="form.userId" placeholder="请输入用户id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="业务id" prop="bizId">
+						<el-input v-model="form.bizId" placeholder="请输入业务id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="业务类型" prop="bizType">
+						<el-input v-model="form.bizType" placeholder="请输入业务类型" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="源部门id" prop="sourceDeptId">
+						<el-input v-model="form.sourceDeptId" placeholder="请输入源部门id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="目标部门id" prop="targetDeptId">
+						<el-input v-model="form.targetDeptId" placeholder="请输入目标部门id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="是否离职自动转账" prop="isWalletTransaction">
+						<el-input v-model="form.isWalletTransaction" placeholder="请输入是否离职自动转账" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="离职自动转账时间" prop="walletTransactionTime">
+						<el-input v-model="form.walletTransactionTime" placeholder="请输入离职自动转账时间" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="流程id" prop="processId">
+						<el-input v-model="form.processId" placeholder="请输入流程id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="审核状体" prop="processStatus">
+						<el-input v-model="form.processStatus" placeholder="请输入审核状体" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="审核时间" prop="processTime">
+						<el-input v-model="form.processTime" placeholder="请输入审核时间" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="SysUserTransactionDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as sysUserTransactionApi from "/@/api/admin/sys-user-transaction"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	userId: "",
+	bizId: "",
+	bizType: "",
+	sourceDeptId: "",
+	targetDeptId: "",
+	isWalletTransaction: "",
+	walletTransactionTime: "",
+	processId: "",
+	processStatus: "",
+	processTime: "",
+})
+
+// 定义校验规则
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取sysUserTransaction信息
+	if (id) {
+		form.id = id
+		getsysUserTransactionData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		form.id ? await sysUserTransactionApi.putObj(form) : await sysUserTransactionApi.addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getsysUserTransactionData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	sysUserTransactionApi
+		.getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/admin/system/sys-user-transaction/index.vue

@@ -0,0 +1,143 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'admin_sysUserTransaction_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'admin_sysUserTransaction_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'admin_sysUserTransaction_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</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"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+				<el-table-column prop="bizId" label="业务id" show-overflow-tooltip />
+				<el-table-column prop="bizType" label="业务类型" show-overflow-tooltip />
+				<el-table-column prop="sourceDeptId" label="源部门id" show-overflow-tooltip />
+				<el-table-column prop="targetDeptId" label="目标部门id" show-overflow-tooltip />
+				<el-table-column prop="isWalletTransaction" label="是否离职自动转账" show-overflow-tooltip />
+				<el-table-column prop="walletTransactionTime" label="离职自动转账时间" show-overflow-tooltip />
+				<el-table-column prop="processId" label="流程id" show-overflow-tooltip />
+				<el-table-column prop="processStatus" label="审核状体" show-overflow-tooltip />
+				<el-table-column prop="processTime" label="审核时间" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'admin_sysUserTransaction_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'admin_sysUserTransaction_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemSysUserTransaction">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as sysUserTransactionApi from "/@/api/admin/sys-user-transaction"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: sysUserTransactionApi.pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/admin/sysUserTransaction/export", Object.assign(state.queryForm, { ids: selectObjs }), "sysUserTransaction.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await sysUserTransactionApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>

src/views/canteen/canteenDailyMenu/form.vue

@@ -33,12 +33,7 @@
 		<table>
 			<tr class="food">
 				<div class="food_list" @mouseleave="hoverIndex = -1">
-					<td
-						class="food_list_item"
-						v-for="(item, index) in selectedFood"
-						:key="item.id"
-						@mouseenter="hoverIndex = index"
-					>
+					<td class="food_list_item" v-for="(item, index) in selectedFood" :key="item.id" @mouseenter="hoverIndex = index">
 						<el-icon
 							v-show="hoverIndex === index"
 							@click="removeSelectedItem(item.id)"
@@ -157,7 +152,6 @@
 
 <script setup lang="ts" name="CanteenDailyMenuDialog">
 import { useMessage } from "/@/hooks/message"
-import { rule } from "/@/utils/validate"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
@@ -192,7 +186,7 @@ const spuIds = computed(() => selectedFood.value?.map((item: any) => item.id))
 // 菜品查询表单
 const foodQueryForm = reactive<any>({
 	current: 1,
-	size: 10,
+	size: 20,
 	startTime: "",
 	hourType: undefined,
 })
@@ -256,7 +250,7 @@ const resetQuery = () => {
 	// 清空多选
 	selectObjs.value = []
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	getDataListAndSelect()
 }
 
@@ -313,7 +307,7 @@ const openDialog = (id: string, time?: string, hourType?: number, merchantId?: n
 	// 重置表单数据
 	dataFormRef.value?.resetFields()
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	selectObjs.value = []
 	selectedFood.value = []
 	foodDataList.value = []
@@ -349,7 +343,7 @@ const getcanteenDailyMenuData = (id: string) => {
 const handleClickSelect = async () => {
 	queryRef.value?.resetFields()
 	foodQueryForm.current = 1
-	foodQueryForm.size = 10
+	foodQueryForm.size = 20
 	selectDialogVisible.value = true
 
 	selectObjs.value = [...selectedFood.value]

src/views/canteen/canteenOnlineCategory/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="14" class="mb20">

src/views/canteen/canteenOnlineSpu/form.vue

@@ -4,7 +4,7 @@
 			<el-row :gutter="24">
 				<el-col :span="14" class="mb20">
 					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" />
+						<select-mch v-model="form.merchantId" :apiParams="{ types: '1' }" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="14" class="mb20">
@@ -50,9 +50,7 @@
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商品状态" prop="status">
 						<el-radio-group v-model="form.status">
-							<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index"
-								>{{ item.label }}
-							</el-radio>
+							<el-radio :label="item.value" v-for="(item, index) in spu_status" border :key="index">{{ item.label }} </el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>

src/views/canteenDailyDishes/index.vue

@@ -226,7 +226,7 @@ const getDishByType = async () => {
 					// foodData.breakfast = r.dailyMenuVOS
 					break
 				case 2:
-					foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 11)
+					foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 13)
 					break
 				case 3:
 					// foodData.dinner = r.dailyMenuVOS

src/views/hard/hard-appt/form.vue

@@ -0,0 +1,134 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="35%" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="标题" prop="title">
+						<el-input v-model="form.title" placeholder="请输入标题" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="类型" prop="hourType">
+						<dict-select v-model="form.hourType" dict-code="daily_menu" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="预约时间" prop="displayTime">
+						<el-time-picker v-model="form.displayTime" value-format="HH:mm" format="HH:mm" is-range />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="是否启用" prop="status">
+						<el-radio-group v-model="form.status">
+							<el-radio v-for="v in yes_no_type" :key="v.value" :label="v.value" border>
+								{{ v.label }}
+							</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="HardApptDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as hardApptApi from "/@/api/hard/hard-appt"
+import dayjs from "dayjs"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { yes_no_type } = useDict("yes_no_type")
+// 提交表单数据
+const form = reactive({
+	id: "",
+	title: "",
+	hourType: "",
+	displayTime: [],
+	startTime: "",
+	endTime: "",
+	status: "1",
+	remark: "",
+})
+
+// 定义校验规则
+const dataRules = ref({
+	title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+	hourType: [{ required: true, message: "类型不能为空", trigger: "blur" }],
+	displayTime: [{ required: true, message: "预约时间不能为空", type: "array", trigger: "change" }],
+	status: [{ required: true, message: "是否启用不能为空", trigger: "change" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+	// 获取hardAppt信息
+	if (id) {
+		form.id = id
+		gethardApptData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+	try {
+		loading.value = true
+		const _pa = {
+			...form,
+			startTime: dayjs(form.displayTime[0], "HH:mm").format("HH:mm:ss"),
+			endTime: dayjs(form.displayTime[1], "HH:mm").format("HH:mm:ss"),
+		}
+		form.id ? await hardApptApi.putObj(_pa) : await hardApptApi.addObj(_pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const gethardApptData = async (id: string) => {
+	// 获取数据
+	loading.value = true
+	try {
+		const { data } = await hardApptApi.getObj(id)
+		Object.assign(form, data, { displayTime: [data.startTime, data.endTime] })
+	} catch (error) {
+		console.error(error)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/hard/hard-appt/index.vue

@@ -0,0 +1,142 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="标题" prop="title">
+						<el-input v-model="state.queryForm.title" placeholder="请输入标题" />
+					</el-form-item>
+					<el-form-item>
+						<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>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'hard_hardAppt_add'">
+						新 增
+					</el-button>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardAppt_del'" @click="handleDelete(selectObjs)">
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'hard_hardAppt_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</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"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="title" label="标题" />
+				<el-table-column prop="title" label="类型">
+					<template #default="{ row }">
+						<dict-tag :options="daily_menu" :value="row.hourType" />
+					</template>
+				</el-table-column>
+				<el-table-column label="预约时间">
+					<template #default="{ row }">
+						<span> {{ row.startTime }}</span>
+						<span>-</span>
+						<span> {{ row.endTime }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="状态">
+					<template #default="{ row }">
+						<dict-tag :options="yes_no_type" :value="row.status" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="remark" label="备注" />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardAppt_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'hard_hardAppt_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemHardAppt">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardApptApi from "/@/api/hard/hard-appt"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+const { yes_no_type, daily_menu } = useDict("yes_no_type", "daily_menu")
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: hardApptApi.fetchList,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hardAppt/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardAppt.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+	try {
+		await hardApptApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>

src/views/hard/hard-dept-total/index.vue

@@ -113,14 +113,14 @@
 								<div :class="{ 'color-danger': row.orderRefundCont != 0 }">{{ row.orderRefundCont }}次</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="orderProfitPrice" label="消费净金额" align="center" min-width="90">
+						<el-table-column prop="orderProfitPrice" label="消费净金额" align="center" min-width="120">
 							<template #default="{ row }">
 								<div :class="{ 'color-success': row.orderProfitPrice != 0 }">
 									{{ displayPrice(row.orderProfitPrice) }}
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="orderProfitCont" label="消费净次数" align="center" min-width="90">
+						<el-table-column prop="orderProfitCont" label="消费净次数" align="center" min-width="120">
 							<template #default="{ row }">
 								<div :class="{ 'color-success': row.orderProfitCont != 0 }">{{ row.orderProfitCont }}次</div>
 							</template>

src/views/hard/hard-door-flow/index.vue

@@ -77,7 +77,7 @@
 					<el-table-column prop="requestOpenTime" label="请求开门时间" width="160" />
 					<el-table-column prop="openCallbackVo" label="开门回调返回" width="180">
 						<template #default="{ row }">
-							<preview-json :json="row.requestOpenVo" />
+							<preview-json :json="row.openCallbackVo" />
 						</template>
 					</el-table-column>
 					<el-table-column prop="openCallbackTime" label="开门回调时间" width="160" />

src/views/hard/hard-door-manager/index.vue

@@ -95,7 +95,7 @@
 						<el-descriptions-item label="货柜号：">{{ item.cabinetNo }}</el-descriptions-item>
 						<el-descriptions-item label="锁在线：">
 							<el-tag v-if="item.isLockOnline == 'Y'" type="primary">在线</el-tag>
-							<el-tag v-if="item.isLockOnline == 2" type="primary">离线</el-tag>
+							<el-tag v-if="item.isLockOnline == 2" type="danger">离线</el-tag>
 						</el-descriptions-item>
 						<el-descriptions-item label="锁状态：">
 							<el-tag v-if="item.lockStatus == 1" type="primary">锁关</el-tag>
@@ -159,10 +159,14 @@
 											<span>{{ v.spuDetail.specsCapacity }}</span>
 										</div>
 										<!-- <div class="w-full flex items-center justify-between">
-											<span>{{ v.spuDetail.specsTaste }}</span>
-											<span>{{ v.spuDetail.specsWeight }}</span>
-											<span>{{ v.spuDetail.categoryName }}</span>
+											<span>味道：{{ v.spuDetail.specsTaste }}</span>
+											<span>重量：{{ v.spuDetail.specsWeight }}</span>
+											<span>种类：{{ v.spuDetail.categoryName }}</span>
 										</div> -->
+										<div class="w-full flex items-center justify-between text-xs">
+											<span>库存:{{ v.spuDetail.repertoryCount || 0 }}</span>
+											<span>已售:{{ v.spuDetail.salesCount || 0 }}</span>
+										</div>
 									</div>
 									<div
 										v-else

src/views/hard/hard-manager/index.vue

@@ -68,7 +68,6 @@
 				<el-table-column prop="isTakeFood" width="200" label="是否为当前商户的取餐机器">
 					<template #default="{ row }">
 						<el-switch
-							v-if="row.type == 1"
 							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
 							:loading="switchTakeFoodLoading"
 							active-text="是"
@@ -78,7 +77,6 @@
 							v-model="row.isTakeFood"
 							@change="changeTakeFood($event, row)"
 						/>
-						<div v-else>只有超市需要设置</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="createTime" width="200" label="创建时间" />
@@ -156,10 +154,18 @@ const resetQuery = () => {
 const changeTakeFood = async (e: any, row: any) => {
 	switchTakeFoodLoading.value = true
 	try {
-		await hardManageApi.putObj({ id: row.id, isTakeFood: e })
-		getDataList()
+		const pa = {
+			id: row.id,
+			merchantId: row.merchantId,
+			isTakeFood: e,
+		}
+		await hardManageApi.putObj(pa)
+	} catch (error: any) {
+		console.error(error)
+		useMessage().error(error.msg)
 	} finally {
 		switchTakeFoodLoading.value = false
+		getDataList()
 	}
 }
 

src/views/hard/hard-sb/index.vue

@@ -86,14 +86,14 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="消费净金额" align="center" prop="totalProfitPrice">
+						<el-table-column label="消费净金额" align="center" prop="totalProfitPrice" min-width="120">
 							<template #default="{ row }">
 								<span class="color-success">
 									{{ displayPrice(row.totalProfitPrice) }}
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="消费净次数" align="center" prop="totalProfitCount">
+						<el-table-column label="消费净次数" align="center" prop="totalProfitCount" min-width="120">
 							<template #default="{ row }">
 								<span class="color-success">
 									{{ row.totalProfitCount || 0 }}

src/views/hard/hard-sh/index.vue

@@ -87,14 +87,14 @@
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="消费净金额" align="center" prop="totalProfitPrice">
+						<el-table-column label="消费净金额" align="center" prop="totalProfitPrice" min-width="120">
 							<template #default="{ row }">
 								<span class="color-success">
 									{{ displayPrice(row.totalProfitPrice) }}
 								</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="消费净次数" align="center" prop="totalProfitCount">
+						<el-table-column label="消费净次数" align="center" prop="totalProfitCount" min-width="120">
 							<template #default="{ row }">
 								<span class="color-success">
 									{{ row.totalProfitCount || 0 }}

src/views/supermarketerp/components/erpSpuSelectDialog.vue

@@ -190,20 +190,20 @@ const handleSelectDialogConfirm = () => {
 }
 
 onMounted(async () => {
-	// 获取商品分类
-	try {
-		const res = await getSupermarketCategory()
-		supermarketCategory.value = res.data
-	} catch (error) {
-		supermarketCategory.value = []
-	}
-	// 获取商品品牌
-	try {
-		const res = await getSupermarketBrand()
-		supermarketBrand.value = res.data
-	} catch (error) {
-		supermarketBrand.value = []
-	}
+	// // 获取商品分类
+	// try {
+	// 	const res = await getSupermarketCategory()
+	// 	supermarketCategory.value = res.data
+	// } catch (error) {
+	// 	supermarketCategory.value = []
+	// }
+	// // 获取商品品牌
+	// try {
+	// 	const res = await getSupermarketBrand()
+	// 	supermarketBrand.value = res.data
+	// } catch (error) {
+	// 	supermarketBrand.value = []
+	// }
 })
 
 defineExpose({

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -1,7 +1,39 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<div v-if="disabled" ref="baseDataInfoRef">
+				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据编号：</span>
+							<span>{{ baseDataForm.inventoryCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据日期：</span>
+							<span>{{ baseDataForm.inventoryDate }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">经办人：</span>
+							<span>{{ baseDataForm.handlerUserId }}</span>
+						</div>
+					</div>
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">关联补货申请：</span>
+							<span>{{ baseDataForm.linkCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">货商：</span>
+							<span>{{ baseDataForm.supplierId }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">备注：</span>
+							<span>{{ baseDataForm.remark }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<el-form v-else ref="baseDataFormRef" :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" />
@@ -36,41 +68,9 @@
 					</el-form-item>
 				</div>
 			</el-form>
-			<div v-else ref="baseDataInfoRef">
-				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据编号：</span>
-							<span>{{ baseDataForm.inventoryCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据日期：</span>
-							<span>{{ baseDataForm.inventoryDate }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">经办人：</span>
-							<span>{{ baseDataForm.handlerUserId }}</span>
-						</div>
-					</div>
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">关联补货申请：</span>
-							<span>{{ baseDataForm.linkCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">货商：</span>
-							<span>{{ baseDataForm.supplierId }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">备注：</span>
-							<span>{{ baseDataForm.remark }}</span>
-						</div>
-					</div>
-				</div>
-			</div>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -85,10 +85,10 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
+				</el-button> -->
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
 				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
+				<el-button type="danger" @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<vxe-table
@@ -137,7 +137,7 @@
 								:label="item.unit"
 								:value="item.id"
 							/>
-							<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
+							<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -192,7 +192,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -218,11 +218,12 @@ import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supe
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
 import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -307,7 +308,7 @@ const getInitData = async () => {
 	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))
@@ -317,16 +318,21 @@ const getInitData = async () => {
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
-		return
+	} else {
+		loading.value = true
+		// 获取采购退货编号
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 4 })])
+			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			.finally(() => (loading.value = false))
+		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
 	loading.value = true
-	// 获取采购退货编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 4 })])
+	// 获取简要商品列表
+	const [erpSpuSimpleAll] = 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)
-	planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 }
 
 // 点击关联采购申请编号
@@ -336,7 +342,7 @@ const handleClickLinkCode = () => linkCgPlanDialogRef.value.openLinkCodeDialog(3
 const getSelectedLinkCode = (selectionRows: any) => {
 	console.log("被选择的关联数据", selectionRows)
 
-	baseDataForm.linkCode = selectionRows.planCode
+	baseDataForm.linkCode = selectionRows.inventoryCode
 	state.editableTableData = selectionRows.items
 	state.erpSpuItemsMemo = selectionRows.items
 	state.linkCgPlanDialogVisible = false

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -1,7 +1,44 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.code" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<div v-if="disabled" ref="baseDataInfoRef">
+				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">编号：</span>
+							<span>{{ baseDataForm.code }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据日期：</span>
+							<span>{{ baseDataForm.ddDate }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">经办人：</span>
+							<SelectHandlerUser
+								v-model.trim="baseDataForm.handlerUserId"
+								placeholder="请选择经办人"
+								style="width: 200px"
+								:isDisplayName="true"
+							/>
+						</div>
+					</div>
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">关联补货申请：</span>
+							<span>{{ baseDataForm.linkCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">货商：</span>
+							<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" :isDisplayName="true" />
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">备注：</span>
+							<span>{{ baseDataForm.remark }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<el-form v-else ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
 				<div class="flex flex-wrap">
 					<el-form-item label="编号" prop="code">
 						<el-input v-model="baseDataForm.code" readonly style="width: 200px" :disabled="disabled" />
@@ -36,41 +73,12 @@
 					</el-form-item>
 				</div>
 			</el-form>
-			<div v-else ref="baseDataInfoRef">
-				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">编号：</span>
-							<span>{{ baseDataForm.code }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据日期：</span>
-							<span>{{ baseDataForm.ddDate }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">经办人：</span>
-							<span>{{ baseDataForm.handlerUserId }}</span>
-						</div>
-					</div>
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">关联补货申请：</span>
-							<span>{{ baseDataForm.linkCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">货商：</span>
-							<span>{{ baseDataForm.supplierId }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">备注：</span>
-							<span>{{ baseDataForm.remark }}</span>
-						</div>
-					</div>
-				</div>
-			</div>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
+				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -85,10 +93,7 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
-				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
+				</el-button> -->
 			</el-row>
 
 			<vxe-table
@@ -137,7 +142,7 @@
 								:label="item.unit"
 								:value="item.id"
 							/>
-							<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
+							<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -192,7 +197,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -218,11 +223,12 @@ import { getPlanCode, getErpSpuSimpleAll, getCgsqPage } from "/@/api/supermarket
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
 import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -307,7 +313,7 @@ const getInitData = async () => {
 	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))
@@ -317,16 +323,21 @@ const getInitData = async () => {
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
-		return
+	} else {
+		loading.value = true
+		// 获取采购订单编号
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 2 })])
+			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			.finally(() => (loading.value = false))
+		planCode && planCode.code === 0 && (baseDataForm.code = planCode.data)
 	}
 
 	loading.value = true
-	// 获取采购订单编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 2 })])
+	// 获取简要商品列表
+	const [erpSpuSimpleAll] = 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)
-	planCode && planCode.code === 0 && (baseDataForm.code = planCode.data)
 }
 
 // 点击关联采购申请编号

src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue

@@ -46,7 +46,11 @@
 					</template>
 				</el-table-column>
 				<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip /> -->
-				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
+				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip>
+					<template #default="{ row }">
+						{{ supplierSimpleAll.find((item) => item.supplierId == row.supplierId)?.supplierName }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
@@ -68,7 +72,7 @@
 						<el-button
 							type="primary"
 							size="small"
-							v-if="scope.row.checkStatus != '2' && scope.row.taskId"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
 							link
 							icon="VideoPlay"
 							@click="deal(scope.row)"
@@ -95,6 +99,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 
@@ -156,4 +161,14 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+let supplierSimpleAll: { supplierId: string; supplierName: string }[] | [] = []
+onMounted(async () => {
+	const { code, data } = await getSupplierSimpleAll()
+	if (code == 0) {
+		supplierSimpleAll = data
+		return
+	}
+	supplierSimpleAll = []
+})
 </script>

src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue

@@ -77,10 +77,22 @@
 				</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 />
+				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip>
+					<template #default="{ row }">
+						{{ displayPrice(row.totalAmount) }}
+					</template>
+				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button
 							v-else
 							icon="edit-pen"
@@ -92,7 +104,6 @@
 							编辑
 						</el-button>
 						<el-button
-							v-else
 							icon="delete"
 							text
 							type="primary"
@@ -101,7 +112,14 @@
 						>
 							删除
 						</el-button>
-						<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
+						<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>
@@ -124,6 +142,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 

src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue

@@ -1,7 +1,36 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.planCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<div v-if="disabled" ref="baseDataInfoRef">
+				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">编号：</span>
+							<span>{{ baseDataForm.planCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据日期：</span>
+							<span>{{ baseDataForm.planDate }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">经办人：</span>
+							<SelectHandlerUser
+								v-model.trim="baseDataForm.handlerUserId"
+								placeholder="请选择经办人"
+								style="width: 200px"
+								:isDisplayName="true"
+							/>
+						</div>
+					</div>
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">备注：</span>
+							<span>{{ baseDataForm.remark }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<el-form v-else ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
 				<div class="flex flex-wrap">
 					<el-form-item label="编号" prop="planCode">
 						<el-input v-model="baseDataForm.planCode" readonly style="width: 200px" :disabled="disabled" />
@@ -28,33 +57,12 @@
 					</el-form-item>
 				</div>
 			</el-form>
-			<div v-else ref="baseDataInfoRef">
-				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">编号：</span>
-							<span>{{ baseDataForm.planCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据日期：</span>
-							<span>{{ baseDataForm.planDate }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">经办人：</span>
-							<span>{{ baseDataForm.handlerUserId }}</span>
-						</div>
-					</div>
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">备注：</span>
-							<span>{{ baseDataForm.remark }}</span>
-						</div>
-					</div>
-				</div>
-			</div>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
+				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -69,10 +77,7 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
-				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
+				</el-button> -->
 			</el-row>
 
 			<vxe-table
@@ -185,7 +190,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -201,10 +206,11 @@ import { useMessage } from "/@/hooks/message"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgPlan"
 import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import { formatDate } from "/@/utils/formatTime"
 import { tablePrint } from "../../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -275,7 +281,7 @@ const getInitData = async () => {
 	disabled.value = props.disabled
 	if (id) {
 		loading.value = true
-		// 获取补货申请编号 & 获取简要商品列表
+		// 获取清单详情 & 获取简要商品列表
 		const [cgPlanData, erpSpuSimpleAll] = await Promise.allSettled([getObj(id), getErpSpuSimpleAll()])
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))

src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue

@@ -7,7 +7,7 @@
 						<el-input placeholder="请输入采购单据编号" v-model="state.queryForm.planCode" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="planDate">
-						<el-date-picker type="date" placeholder="请输入单据日期" v-model="state.queryForm.planDate" />
+						<el-date-picker v-model="state.queryForm.planDate" type="date" placeholder="请输入单据日期" value-format="YYYY-MM-DD" />
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
@@ -72,7 +72,15 @@
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
+						<el-button
+							v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
+							icon="MessageBox"
+							text
+							type="success"
+							@click="edit(scope.row)"
+						>
+							详情
+						</el-button>
 						<el-button v-else icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgPlan_edit'" @click="edit(scope.row)">
 							编辑
 						</el-button>
@@ -82,7 +90,7 @@
 						<el-button
 							type="primary"
 							size="small"
-							v-if="scope.row.checkStatus != '2' && scope.row.taskId"
+							v-if="scope.row.checkStatus == '1' && scope.row.taskId"
 							link
 							icon="VideoPlay"
 							@click="deal(scope.row)"

src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue

@@ -1,45 +1,7 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :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" />
-					</el-form-item>
-					<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-input
-							v-model="baseDataForm.linkCode"
-							:suffix-icon="Search"
-							@click="handleClickLinkCode"
-							readonly
-							placeholder="请选择采购订单"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
-					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser
-							v-model.trim="baseDataForm.handlerUserId"
-							placeholder="请选择经办人"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
-					</el-form-item>
-					<el-form-item label="货商" prop="supplierId">
-						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
-					</el-form-item>
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
-					</el-form-item>
-<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
-<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
-<!--					</el-form-item>-->
-				</div>
-			</el-form>
-			<div v-else ref="baseDataInfoRef">
+			<div v-if="disabled" ref="baseDataInfoRef">
 				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
 					<div style="display: inline-block; width: 100%">
 						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
@@ -81,9 +43,47 @@
 					</div>
 				</div>
 			</div>
+			<el-form v-else ref="baseDataFormRef" :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" />
+					</el-form-item>
+					<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-input
+							v-model="baseDataForm.linkCode"
+							:suffix-icon="Search"
+							@click="handleClickLinkCode"
+							readonly
+							placeholder="请选择采购订单"
+							style="width: 200px"
+							:disabled="disabled"
+						/>
+					</el-form-item>
+					<el-form-item label="经办人" prop="handlerUserId">
+						<SelectHandlerUser
+							v-model.trim="baseDataForm.handlerUserId"
+							placeholder="请选择经办人"
+							style="width: 200px"
+							:disabled="disabled"
+						/>
+					</el-form-item>
+					<el-form-item label="货商" prop="supplierId">
+						<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
+					</el-form-item>
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
+					</el-form-item>
+					<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
+					<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
+					<!--					</el-form-item>-->
+				</div>
+			</el-form>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -98,10 +98,10 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
+				</el-button> -->
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
 				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<div class="flex">
@@ -152,7 +152,7 @@
 										:label="item.unit"
 										:value="item.id"
 									/>
-									<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
+									<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 								</el-select>
 							</template>
 							<template #default="{ row }">
@@ -226,7 +226,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -252,12 +252,12 @@ import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supe
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
-import { useDict } from "/@/hooks/dict"
 import { tablePrint } from "../../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -276,7 +276,6 @@ const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
 const linkCgPlanDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
-const { check_status } = useDict("check_status")
 const baseDataInfoRef = ref() // 基本信息ref
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
@@ -356,7 +355,7 @@ const getInitData = async () => {
 	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))
@@ -366,16 +365,21 @@ const getInitData = async () => {
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
-		return
+	} else {
+		// 获取采购入库编号
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 6 })])
+			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			.finally(() => (loading.value = false))
+
+		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
+	// 获取简要商品列表
 	loading.value = true
-	// 获取采购入库编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 6 })])
+	const [erpSpuSimpleAll] = 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)
-	planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 }
 
 // 点击关联采购申请编号

src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue

@@ -18,11 +18,11 @@
 					<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 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>

src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue

@@ -1,7 +1,39 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
+			<div v-if="disabled" ref="baseDataInfoRef">
+				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据编号：</span>
+							<span>{{ baseDataForm.inventoryCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">单据日期：</span>
+							<span>{{ baseDataForm.inventoryDate }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">经办人：</span>
+							<span>{{ baseDataForm.handlerUserId }}</span>
+						</div>
+					</div>
+					<div style="display: inline-block; width: 100%">
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">关联补货申请：</span>
+							<span>{{ baseDataForm.linkCode }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">货商：</span>
+							<span>{{ baseDataForm.supplierId }}</span>
+						</div>
+						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
+							<span class="font-bold">备注：</span>
+							<span>{{ baseDataForm.remark }}</span>
+						</div>
+					</div>
+				</div>
+			</div>
+			<el-form v-else ref="baseDataFormRef" :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" />
@@ -34,46 +66,14 @@
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
-<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
-<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
-<!--					</el-form-item>-->
+					<!--					<el-form-item label="会员卡号" prop="memberNumber">-->
+					<!--						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" :disabled="disabled" />-->
+					<!--					</el-form-item>-->
 				</div>
 			</el-form>
-			<div v-else ref="baseDataInfoRef">
-				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据编号：</span>
-							<span>{{ baseDataForm.inventoryCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">单据日期：</span>
-							<span>{{ baseDataForm.inventoryDate }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">经办人：</span>
-							<span>{{ baseDataForm.handlerUserId }}</span>
-						</div>
-					</div>
-					<div style="display: inline-block; width: 100%">
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">关联补货申请：</span>
-							<span>{{ baseDataForm.linkCode }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">货商：</span>
-							<span>{{ baseDataForm.supplierId }}</span>
-						</div>
-						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
-							<span class="font-bold">备注：</span>
-							<span>{{ baseDataForm.remark }}</span>
-						</div>
-					</div>
-				</div>
-			</div>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -88,10 +88,10 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
+				</el-button> -->
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
 				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<div class="flex">
@@ -142,7 +142,7 @@
 										:label="item.unit"
 										:value="item.id"
 									/>
-									<el-option v-else :key="row.id" :label="row.unit" :value="row.id" />
+									<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 								</el-select>
 							</template>
 							<template #default="{ row }">
@@ -216,7 +216,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -242,12 +242,12 @@ import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarket
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
-import { useDict } from "/@/hooks/dict"
 import { tablePrint } from "../../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -266,7 +266,6 @@ const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
 const linkCgPlanDialogRef = ref() // 关联采购申请单对话框ref
 const baseDataFormRef = ref() // 基本数据表单ref
 const editableTableRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
-const { check_status } = useDict("check_status")
 const baseDataInfoRef = ref() // 基本信息ref
 // 基本信息表单数据
 const baseDataForm = reactive<any>({
@@ -346,7 +345,7 @@ const getInitData = async () => {
 	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))
@@ -356,16 +355,21 @@ const getInitData = async () => {
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
-		return
+	} else {
+		loading.value = true
+		// 获取采购入库编号
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 5 })])
+			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			.finally(() => (loading.value = false))
+		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
 	loading.value = true
-	// 获取采购入库编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 5 })])
+	// 获取简要商品列表
+	const [erpSpuSimpleAll] = 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)
-	planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 }
 
 // 点击关联采购申请编号

src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue

@@ -70,14 +70,18 @@
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" 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"></dict-tag>-->
-				<!--					</template>-->
-				<!--				</el-table-column>-->
-				<el-table-column prop="supplierId" 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="supplierName" 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>
+					<template #default="{ row }">
+						{{ displayPrice(row.totalAmount) }}
+					</template>
+				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button
@@ -138,6 +142,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import ProcessDrawer from "/@/components/processDrawer/index.vue"
 import { useSmProcessTableAction } from "/@/hooks/smProcessTableAction"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const SmForm = defineAsyncComponent(() => import("./form.vue"))
 

src/views/supermarketerp/stockTaking/barCodeEnter.vue

@@ -12,16 +12,11 @@
 			</el-form>
 		</el-row> -->
 
-		<el-table v-loading="state.loading" :data="state.dataList" @row-click="handleRowClick" :row-style="{ cursor: 'pointer' }">
+		<!-- <el-table v-loading="state.loading" :data="state.dataList" @row-click="handleRowClick" :row-style="{ cursor: 'pointer' }">
 			<el-table-column type="index" label="#" width="50" align="center" />
 			<el-table-column prop="productName" label="商品名称" width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="brandId" label="商品品牌" width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="categoryId" label="商品分类" width="100px" align="center" show-overflow-tooltip>
-				<template #default="{ row }">
-					<!-- {{ categoryOptions?.find((item: any) => item?.id === row?.categoryId)?.name }} -->
-					{{ row.categoryId }}
-				</template>
-			</el-table-column>
+			<el-table-column prop="categoryId" label="商品分类" width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="merchantId" label="商户" width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="sliderPicUrls" label="商品轮播图" align="center" show-overflow-tooltip>
 				<template #default="scope">
@@ -35,9 +30,9 @@
 			</el-table-column>
 			<el-table-column prop="barcode" label="商品条码" width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="supplierId" label="供货商" width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="sort" label="排序字段" align="center" show-overflow-tooltip />
+			<el-table-column prop="sort" label="排序字段" align="center" show-overflow-tooltip /> -->
 
-			<!-- <el-table-column prop="price" label="商品价格" align="center" show-overflow-tooltip>
+		<!-- <el-table-column prop="price" label="商品价格" align="center" show-overflow-tooltip>
 				<template #default="scope">
 					{{ displayPrice(scope.row.price) }}
 				</template>
@@ -51,13 +46,14 @@
 			<el-table-column prop="stock" label="库存" align="center" show-overflow-tooltip />
 			<el-table-column prop="salesCount" label="商品销量" align="center" show-overflow-tooltip />
 			<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip /> -->
-		</el-table>
+		<!-- </el-table> -->
+
 		<!-- <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" /> -->
 
 		<template #footer>
 			<div class="dialog-footer">
 				<el-button @click="visible = false">取消</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+				<!-- <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button> -->
 			</div>
 		</template>
 	</el-dialog>

src/views/supermarketerp/stockTaking/form.vue

@@ -1,28 +1,7 @@
 <template>
 	<div v-loading="loading" :element-loading-svg="svg" element-loading-svg-view-box="-10, -10, 50, 50" class="w-full h-full">
 		<div v-if="baseDataForm.inventoryCode" class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form v-if="!disabled" ref="baseDataFormRef" :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" />
-					</el-form-item>
-					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-input v-model="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
-					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser
-							v-model.trim="baseDataForm.handlerUserId"
-							placeholder="请选择经办人"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
-					</el-form-item>
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
-					</el-form-item>
-				</div>
-			</el-form>
-			<div v-else ref="baseDataInfoRef">
+			<div v-if="disabled" ref="baseDataInfoRef">
 				<div style="margin-bottom: 8px; padding: 8px 16px; color: #606279">
 					<div style="display: inline-block; width: 100%">
 						<div style="float: left; width: 33.33%; height: 28px; line-height: 28px">
@@ -46,9 +25,30 @@
 					</div>
 				</div>
 			</div>
+			<el-form v-else ref="baseDataFormRef" :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" />
+					</el-form-item>
+					<el-form-item label="单据日期" prop="inventoryDate">
+						<el-input v-model="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
+					</el-form-item>
+					<el-form-item label="经办人" prop="handlerUserId">
+						<SelectHandlerUser
+							v-model.trim="baseDataForm.handlerUserId"
+							placeholder="请选择经办人"
+							style="width: 200px"
+							:disabled="disabled"
+						/>
+					</el-form-item>
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
+					</el-form-item>
+				</div>
+			</el-form>
 
 			<el-row v-if="!disabled" class="my-3">
-				<el-button @click="addEvent">新增（顶部）</el-button>
+				<!-- <el-button @click="addEvent">新增（顶部）</el-button>
 				<el-button @click="pushEvent">新增（尾部）</el-button>
 				<el-button @click="insertEvent">
 					在第
@@ -63,11 +63,11 @@
 						style="min-width: 50px; margin: 0 5px"
 					/>
 					行新增
-				</el-button>
+				</el-button> -->
+				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
 				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
-				<el-button @click="clearData">清空数据</el-button>
-				<el-button @click="handleClickSpuSelect">商品选择</el-button>
-				<el-button @click="handleClickBarCodeEnter">条码录入</el-button>
+				<el-button type="danger" plain @click="clearData">清空数据</el-button>
+				<!-- <el-button @click="handleClickBarCodeEnter">条码录入</el-button> -->
 			</el-row>
 
 			<vxe-table
@@ -209,7 +209,7 @@
 			</el-row>
 
 			<!-- 商品选择对话框 -->
-			<erpSpuSelectDialog
+			<select-dialog
 				ref="erpSpuSelectDialogRef"
 				v-model="state.erpSpuSelectDialogVisible"
 				:selectedSpuRows="state.editableTableData"
@@ -228,11 +228,12 @@ import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
 import { getStockTakingDeatil, stockTakingAdd } from "/@/api/supermarketerp/stockTaking"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
-import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import barCodeEnter from "./barCodeEnter.vue"
 import { displayPrice } from "/@/utils/formatMoney"
 import { tablePrint } from "../supermarketUtils"
 
+const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
 const props = withDefaults(
 	defineProps<{
 		formId: string | undefined
@@ -310,7 +311,7 @@ const getInitData = async () => {
 	disabled.value = props.disabled
 	if (id) {
 		loading.value = true
-		// 获取采购计划数据 & 获取简要商品列表
+		// 获取清单数据
 		const [cgPlanData] = await Promise.allSettled([getStockTakingDeatil({ id })])
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))
@@ -320,16 +321,21 @@ const getInitData = async () => {
 			state.editableTableData = cgPlanData.data.items
 			state.erpSpuItemsMemo = cgPlanData.data.items
 		}
-		return
+	} else {
+		// 获取采购入库编号
+		const [planCode] = await Promise.allSettled([getPlanCode({ type: 7 })])
+			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+			.finally(() => (loading.value = false))
+
+		planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 	}
 
+	// 获取简要商品列表
 	loading.value = true
-	// 获取采购入库编号
-	const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 7 })])
+	const [erpSpuSimpleAll] = 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)
-	planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
 }
 
 // 计算账面数量

src/views/supermarketerp/stockTaking/index.vue

@@ -18,11 +18,11 @@
 					<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 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>
@@ -160,17 +160,17 @@ const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableActi
 
 // 删除操作
 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)
-	// }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+	try {
+		// await delObjs(ids)
+		// getDataList()
+		// useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
 }
 </script>