Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/components/Wechat/wx-msg/comment.scss

@@ -58,7 +58,7 @@
 			width: 0;
 			height: 0;
 			display: block;
-			content: ' ';
+			content: " ";
 			border-color: transparent;
 			border-style: solid solid outset;
 			border-width: 8px 8px 8px 0;
@@ -78,14 +78,14 @@
 		padding: 15px;
 		overflow: hidden;
 		background: #fff;
-		font-family: Segoe UI, Lucida Grande, Helvetica, Arial, Microsoft YaHei, FreeSans, Arimo, Droid Sans, wenquanyi micro hei, Hiragino Sans GB,
-			Hiragino Sans GB W3, FontAwesome, sans-serif;
+		font-family: Noto Sans SC, Segoe UI, Lucida Grande, Helvetica, Arial, Microsoft YaHei, FreeSans, Arimo, Droid Sans, wenquanyi micro hei,
+			Hiragino Sans GB, Hiragino Sans GB W3, FontAwesome, sans-serif;
 		color: #333;
 		font-size: 14px;
 	}
 	blockquote {
 		margin: 0;
-		font-family: Georgia, Times New Roman, Times, Kai, Kaiti SC, KaiTi, BiauKai, FontAwesome, serif;
+		font-family: Noto Sans SC, Georgia, Times New Roman, Times, Kai, Kaiti SC, KaiTi, BiauKai, FontAwesome, serif;
 		padding: 1px 0 1px 15px;
 		border-left: 4px solid #ddd;
 	}

src/theme/app.scss

@@ -31,7 +31,7 @@ body,
 	padding: 0;
 	width: 100%;
 	height: 100%;
-	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+	font-family: Noto Sans SC, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
 	font-weight: 400;
 	-webkit-font-smoothing: antialiased;
 	-webkit-tap-highlight-color: transparent;

src/theme/login.scss

@@ -106,7 +106,7 @@
 .login-title {
 	font-size: 20px;
 	font-weight: 500;
-	font-family: PingFang SC, Arial, Hiragino Sans GB, Microsoft YaHei, sans-serif;
+	font-family: Noto Sans SC, PingFang SC, Arial, Hiragino Sans GB, Microsoft YaHei, sans-serif;
 	margin-bottom: 32px;
 }
 .login-box {

src/views/admin/userTrustedDevice/index.vue

@@ -42,7 +42,7 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="id" label="用户id" show-overflow-tooltip />
 				<el-table-column prop="mobilePhone" label="手机号" show-overflow-tooltip />
 				<el-table-column prop="deviceFingerprint" label="MD5" show-overflow-tooltip />

src/views/canteen/canteenErpMaterial/form.vue

@@ -1,124 +1,137 @@
 <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="12" class="mb20">
-      <el-form-item label="商品名称" prop="name">
-        <el-input v-model="form.name" placeholder="请输入商品名称"/>
-      </el-form-item>
-      </el-col>
+	<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="12" class="mb20">
+					<el-form-item label="食材名称" prop="name">
+						<el-input v-model="form.name" placeholder="请输入食材名称" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="商品单位" prop="unit">
-        <el-input v-model="form.unit" placeholder="请输入商品单位"/>
-      </el-form-item>
-      </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="食材单位" prop="unit">
+						<el-input v-model="form.unit" placeholder="请输入食材单位" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="进价(元)" prop="purchasePrice">
+						<el-input v-model="form.purchasePrice" placeholder="请输入食材进价" />
+					</el-form-item>
+				</el-col>
 
-         <el-col :span="12" class="mb20">
-           <el-form-item label="期初库存" prop="baseStock">
-             <el-input v-model="form.baseStock" placeholder="请输入期初库存"/>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="库存下限" prop="inventoryLowerLimit">
-             <el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"/>
-           </el-form-item>
-         </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="库存上限" prop="inventoryUpperLimit">
-             <el-input v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"/>
-           </el-form-item>
-         </el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="期初库存" prop="baseStock">
+						<el-input v-model="form.baseStock" placeholder="请输入期初库存" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="库存下限" prop="inventoryLowerLimit">
+						<el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="库存上限" prop="inventoryUpperLimit">
+						<el-input v-model="form.inventoryUpperLimit" 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>
+		</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="CanteenErpMaterialDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/canteen/canteenErpMaterial'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { getObj, addObj, putObj } from "/@/api/canteen/canteenErpMaterial"
+import { rule } from "/@/utils/validate"
+import { displayPrice, storePrice } from "/@/utils/formatMoney"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  name: '',
-	  unit: '',
-    baseStock: '',
-  inventoryLowerLimit:  '',
-    inventoryUpperLimit:  '',
-});
+	id: "",
+	name: "",
+	unit: "",
+	purchasePrice: "",
+	baseStock: "",
+	inventoryLowerLimit: "",
+	inventoryUpperLimit: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '商品名称不能为空', trigger: 'blur'}],
-        unit: [{required: true, message: '商品单位不能为空', trigger: 'blur'}],
+	name: [{ required: true, message: "食材名称不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "食材单位不能为空", trigger: "blur" }],
+	purchasePrice: [{ required: true, message: "食材进价不能为空", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取canteenErpMaterial信息
-  if (id) {
-    form.id = id
-    getcanteenErpMaterialData(id)
-  }
-};
+	// 获取canteenErpMaterial信息
+	if (id) {
+		form.id = id
+		getcanteenErpMaterialData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	const _pa = {
+		...form,
+		purchasePrice: storePrice(form.purchasePrice),
+	}
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(_pa) : await addObj(_pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-    loading.value = false;
-  }
-};
-
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getcanteenErpMaterialData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data, { purchasePrice: displayPrice(res.data.purchasePrice, "") })
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
+	openDialog,
+})
 </script>

src/views/canteen/canteenErpMaterial/index.vue

@@ -1,29 +1,50 @@
 <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="'canteen_canteenErpMaterial_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'canteen_canteenErpMaterial_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'canteen_canteenErpMaterial_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"
+	<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="'canteen_canteenErpMaterial_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'canteen_canteenErpMaterial_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'canteen_canteenErpMaterial_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="name" label="商品名称"  show-overflow-tooltip/>
           <el-table-column prop="unit" label="商品单位"  show-overflow-tooltip/>
+        <el-table-column prop="purchasePrice" label="进价"  show-overflow-tooltip/>
         <el-table-column prop="baseStock" label="期初库存"  show-overflow-tooltip/>
         <el-table-column prop="currentStock" label="总库存"  show-overflow-tooltip/>
         <el-table-column prop="inventoryLowerLimit" label="库存下限"  show-overflow-tooltip/>
@@ -39,20 +60,19 @@
       <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
     </div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemCanteenErpMaterial">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial";
-import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
@@ -65,54 +85,47 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-	tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/canteen/canteenErpMaterial/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenErpMaterial.xlsx')
+	downBlobFile("/canteen/canteenErpMaterial/export", Object.assign(state.queryForm, { ids: selectObjs }), "canteenErpMaterial.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({ id }) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>

src/views/canteen/canteenInventoryRecords/form.vue

@@ -1,39 +1,32 @@
 <template>
-	<div v-loading="loading" class="w-full h-full">
-		<div class="layout-padding-auto layout-padding-view" style="overflow: scroll">
-			<el-form ref="baseFormRef" :model="baseForm" :rules="dataRules" label-width="100px">
-				<div class="flex flex-wrap">
-					<el-form-item label="单据编号" prop="inventoryCode">
-						<el-input v-model.trim="baseForm.inventoryCode" readonly style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-input v-model.trim="baseForm.inventoryDate" readonly style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser v-model.trim="baseForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="货商" prop="supplierId">
-						<SelectCanteenSupplier v-model="baseForm.supplierId" style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="备注" prop="remark">
-						<el-input v-model.trim="baseForm.remark" placeholder="请输入备注" style="width: 200px" />
-					</el-form-item>
-				</div>
+	<el-dialog :title="baseForm.id ? '食材采购-编辑' : '食材采购-新增'" v-model="dialogVisible" fullscreen>
+		<div v-loading="loading">
+			<el-form class="flex flex-wrap" ref="baseFormRef" :model="baseForm" :rules="dataRules" label-width="100px">
+				<el-form-item label="单据编号" prop="inventoryCode">
+					<el-input v-model.trim="baseForm.inventoryCode" readonly style="width: 200px" />
+				</el-form-item>
+				<el-form-item label="单据日期" prop="inventoryDate">
+					<el-input v-model.trim="baseForm.inventoryDate" readonly style="width: 200px" />
+				</el-form-item>
+				<el-form-item label="经办人" prop="handlerUserId">
+					<SelectHandlerUser v-model.trim="baseForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
+				</el-form-item>
+				<el-form-item label="货商" prop="supplierId">
+					<SelectCanteenSupplier v-model="baseForm.supplierId" style="width: 200px" />
+				</el-form-item>
+				<el-form-item label="备注" prop="remark">
+					<el-input v-model.trim="baseForm.remark" placeholder="请输入备注" style="width: 200px" />
+				</el-form-item>
 			</el-form>
 
 			<el-row class="my-3">
-				<el-button type="primary" plain @click="clickSelectDialog">食材选择</el-button>
+				<el-button type="primary" plain @click="selectDialogRef.openDialog()">食材选择</el-button>
 				<el-button @click="removeSelectedRows" :disabled="state.selectedRowIds.length <= 0">删除选中</el-button>
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
 			<!-- 对话框选择 -->
-			<select-dialog
-				ref="selectDialogRef"
-				v-model="state.selectDialogVisible"
-				:selectedRows="state.itemTableForm"
-				@getSelectedRows="getSelectedRows"
-			/>
+			<select-dialog ref="selectDialogRef" :selectedRows="state.itemTableForm" @getSelectedRows="getSelectedRows" />
 
 			<vxe-table
 				ref="itemTableFormRef"
@@ -65,62 +58,39 @@
 				<vxe-column type="checkbox" width="40" fixed="left" />
 				<vxe-column type="seq" width="50" fixed="left" />
 				<vxe-column field="name" title="库存食材">
-					<template #default="{ row }">
-						{{ row.name || row.erpMaterialId }}
-					</template>
+					<template #default="{ row }">{{ row.name || row.erpMaterialId }}</template>
 				</vxe-column>
-				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
-						<el-input v-model="row.quantity" />
-					</template>
-				</vxe-column>
-				<vxe-column field="unitPrice" title="原进价">
-					<template #default="{ row }">
-						{{ row.unitPrice || 0 }}
-					</template>
+				<vxe-column field="purchasePrice" title="原进价">
+					<template #default="{ row }">{{ displayPrice(row.purchasePrice) || 0 }}</template>
 				</vxe-column>
 				<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #default="{ row }">
-						{{ row.realPrice }}
-					</template>
-					<template #edit="{ row }">
-						<el-input v-model="row.realPrice" />
-					</template>
+					<template #default="{ row }">{{ row.realPrice }}</template>
+					<template #edit="{ row }"><el-input v-model="row.realPrice" /></template>
 				</vxe-column>
-				<vxe-column field="totalNumber" title="总数" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
-						<el-input v-model="row.totalNumber" />
-					</template>
+				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+					<template #edit="{ row }"><el-input v-model="row.quantity" /></template>
 				</vxe-column>
 				<vxe-column field="totalAmount" title="累计总金额">
-					<template #default="{ row }">
-						{{ (Number(row.quantity || 0) * Number(row.realPrice || 0)).toFixed(2) }}
-					</template>
+					<template #default="{ row }">{{ (Number(row.quantity || 0) * Number(row.realPrice || 0)).toFixed(2) }}</template>
 				</vxe-column>
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-					<template #edit="{ row }">
-						<el-input v-model="row.remark" />
-					</template>
+					<template #edit="{ row }"><el-input v-model="row.remark" /></template>
 				</vxe-column>
 			</vxe-table>
-
-			<el-row class="my-3">
-				<el-tooltip effect="dark" content="返回列表页面" placement="top">
-					<el-button type="primary" plain @click="emit('close')">返回</el-button>
-				</el-tooltip>
-				<el-tooltip v-if="!baseForm.id" effect="dark" content="保存并清空数据" placement="top">
-					<el-button type="primary" plain @click="onContinueAdd">继续添加</el-button>
-				</el-tooltip>
-				<el-tooltip effect="dark" content="保存并返回列表页面" placement="top">
-					<el-button type="primary" plain @click="onSave">保存</el-button>
-				</el-tooltip>
-			</el-row>
 		</div>
-	</div>
+
+		<template #footer>
+			<el-button @click="dialogVisible = false" :disabled="loading">取消</el-button>
+			<el-tooltip v-if="!baseForm.id" effect="dark" content="保存并清空数据" placement="top">
+				<el-button type="primary" plain @click="onContinueAdd" :disabled="loading">继续添加</el-button>
+			</el-tooltip>
+			<el-button type="primary" @click="onSave" :disabled="loading">保存</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from "vue"
+import { ref, reactive } from "vue"
 import { getObj, addObj, putObj } from "/@/api/canteen/canteenInventoryRecords"
 import { getCanteenSequence } from "/@/api/canteen/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
@@ -130,21 +100,15 @@ import { useMessage } from "/@/hooks/message"
 
 const SelectDialog = defineAsyncComponent(() => import("./select-dialog.vue"))
 
-const props = withDefaults(
-	defineProps<{
-		formId?: string | undefined
-	}>(),
-	{
-		formId: undefined,
-	},
-)
-
-const emit = defineEmits(["close"])
+const emit = defineEmits(["refresh"])
 
 const loading = ref(false)
+const dialogVisible = ref<boolean>(false)
+
 const baseFormRef = ref() // 基本表单ref
 const selectDialogRef = ref() // 对话框选择ref
 const itemTableFormRef = ref<VxeTableInstance<any>>() // 可编辑表格ref
+
 const baseForm = reactive<any>({
 	id: "",
 	inventoryCode: "",
@@ -157,7 +121,6 @@ const baseForm = reactive<any>({
 	totalAmount: 0,
 })
 const state = reactive<any>({
-	selectDialogVisible: false, // 对话框选择开关
 	itemTableForm: [], // 可编辑表格数据
 	selectedRowIds: [], // 可编辑表格已选行的id
 })
@@ -177,31 +140,27 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
 	totalNumber: [{ required: true, type: "number", min: 1, message: "必填" }],
 })
 
-watch(
-	() => props.formId,
-	async (val) => {
-		await getInitData()
-	},
-)
+const openDialog = async (id: string) => {
+	dialogVisible.value = true
+	baseForm.id = ""
 
-// 初始化数据
-const getInitData = async () => {
-	baseForm.id = undefined
 	clearData()
-	const id = props.formId
+
 	if (id) {
+		baseForm.id = id
 		loading.value = true
 		// 获取清单数据
 		const [res] = await Promise.allSettled([getObj(id)])
 			.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
 			.finally(() => (loading.value = false))
 		if (res && res.code == 0) {
-			Object.assign(baseForm, res.data, { items: "" })
+			Object.assign(baseForm, res.data)
+			delete baseForm.items
 			state.itemTableForm = res.data.items.map((item: any) => ({
 				...item,
+				purchasePrice: item.unitPrice,
 				realPrice: displayPrice(item.realPrice, ""),
 				totalAmount: displayPrice(item.totalAmount, ""),
-				unitPrice: displayPrice(item.unitPrice, ""),
 			}))
 		}
 	} else {
@@ -214,8 +173,16 @@ const getInitData = async () => {
 	}
 }
 
-// 点击食材选择
-const clickSelectDialog = () => selectDialogRef.value.openDialog()
+// 清空填写的数据 返回 true
+const clearData = () => {
+	for (const key in baseForm) {
+		if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue
+		baseForm[key] = ""
+	}
+	state.itemTableForm = []
+	state.selectedRowIds = []
+	return true
+}
 
 // 获取被选择的食材行
 const getSelectedRows = (selectionRows: any) => {
@@ -228,7 +195,6 @@ const getSelectedRows = (selectionRows: any) => {
 
 	state.itemTableForm = [...state.itemTableForm, ...addedItems]
 
-	state.selectDialogVisible = false
 	console.log("state.itemTableForm", state.itemTableForm)
 }
 
@@ -254,38 +220,8 @@ const removeSelectedRows = () => {
 	}
 }
 
-// 整理数据
-const tableFormItems = () => {
-	return state.itemTableForm.map((item: any) => {
-		return {
-			id: item.isNew ? undefined : item.id,
-			erpMaterialId: item.erpMaterialId,
-			quantity: item.quantity,
-			unitPrice: storePrice(item.unitPrice),
-			realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
-			totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)),
-			stock: item.stock,
-			remark: item.remark,
-			totalNumber: item.totalNumber,
-		}
-	})
-}
-
-// 点击继续添加
-const onContinueAdd = async () => {
-	;(await baseFormValidate()) && (await itemTableFormValidate()) && (await submitData()) && clearData()
-}
-
-// 点击保存
-const onSave = async () => {
-	;(await baseFormValidate()) && (await itemTableFormValidate()) && (await submitData()) && clearData() && emit("close")
-}
-
 // 校验基本数据表单 成功返回 true 失败返回 undefined
-const baseFormValidate = async () => {
-	const valid = await baseFormRef.value.validate().catch(() => {})
-	return valid
-}
+const baseFormValidate = async () => await baseFormRef.value.validate().catch(() => {})
 
 // 校验可编辑表格 成功返回 true 失败返回 false
 const itemTableFormValidate = async () => {
@@ -298,23 +234,31 @@ const itemTableFormValidate = async () => {
 	const $table = itemTableFormRef.value
 	if ($table) {
 		const errMap = await $table.validate(true)
-		if (errMap) {
-			console.log("全量校验失败！")
-			return false
-		} else {
-			console.log("全量校验成功！")
-			return true
-		}
+		if (errMap) return false
+		return true
 	}
 }
 
+// 整理数据
+const tableFormItems = () =>
+	state.itemTableForm.map((item: any) => ({
+		id: item.isNew ? undefined : item.id,
+		erpMaterialId: item.erpMaterialId,
+		quantity: item.quantity,
+		unitPrice: item.purchasePrice,
+		realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
+		totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)),
+		stock: item.stock,
+		remark: item.remark,
+	}))
+
 // 提交数据 成功返回 true 失败返回 false
 const submitData = async () => {
-	const canteenInventoryRecordsItemDTOS = tableFormItems()
+	const items = tableFormItems()
 	const _pa = {
 		...baseForm,
-		totalAmount: canteenInventoryRecordsItemDTOS.reduce((acc: number, cur: any) => acc + Number(cur.totalAmount), 0),
-		canteenInventoryRecordsItemDTOS,
+		totalAmount: items.reduce((acc: number, cur: any) => acc + Number(cur.totalAmount), 0),
+		items,
 	}
 	console.log("提交的数据：", _pa)
 
@@ -336,18 +280,20 @@ const submitData = async () => {
 	}
 }
 
-// 清空填写的数据 返回 true
-const clearData = () => {
-	for (const key in baseForm) {
-		if (key === "id" || key === "inventoryCode" || key === "inventoryDate" || key === "inventoryType" || key === "orderType") continue
-		baseForm[key] = ""
-	}
-	state.itemTableForm = []
-	state.selectedRowIds = []
-	return true
+// 点击继续添加
+const onContinueAdd = async () => {
+	;(await baseFormValidate()) && (await itemTableFormValidate()) && (await submitData()) && clearData() && emit("refresh")
 }
 
-onMounted(() => {
-	getInitData()
+// 点击保存
+const onSave = async () => {
+	if ((await baseFormValidate()) && (await itemTableFormValidate()) && (await submitData()) && clearData()) {
+		dialogVisible.value = false
+		emit("refresh")
+	}
+}
+
+defineExpose({
+	openDialog,
 })
 </script>

src/views/canteen/canteenInventoryRecords/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="layout-padding">
-		<div v-show="!formState.showForm" class="layout-padding-auto layout-padding-view">
+		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
 					<el-form-item label="单据编号" prop="inventoryCode">
@@ -23,7 +23,13 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="create" v-auth="'canteen_canteenInventoryRecords_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'canteen_canteenInventoryRecords_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -77,7 +83,13 @@
 				<!-- <el-table-column prop="checkReason" label="审核原因" show-overflow-tooltip /> -->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenInventoryRecords_edit'" @click="edit(scope.row)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_canteenInventoryRecords_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
 						<el-button
@@ -95,7 +107,7 @@
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 
-		<ct-form v-show="formState.showForm" :formId="formState.formId" @close="formClose" />
+		<ct-form ref="formDialogRef" @refresh="getDataList()" />
 	</div>
 </template>
 
@@ -111,11 +123,7 @@ const queryRef = ref()
 const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
-const formState = reactive<{ formId: string | undefined; showForm: boolean }>({
-	formId: undefined,
-	showForm: false,
-})
-
+const formDialogRef = ref()
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		inventoryType: "1",
@@ -145,19 +153,6 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-// 新增
-const create = () => {
-	formState.formId = undefined
-	formState.showForm = true
-}
-
-// 点击编辑
-const edit = (row: any) => {
-	if (!row.id) return useMessage().warning("清单id不存在")
-	formState.formId = row.id
-	formState.showForm = true
-}
-
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
@@ -174,11 +169,4 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
-
-// 表单关闭
-const formClose = () => {
-	formState.showForm = false
-	formState.formId = undefined
-	getDataList()
-}
 </script>

src/views/canteen/canteenInventoryRecords/select-dialog.vue

@@ -26,6 +26,9 @@
 			<el-table-column prop="name" label="食材名称" min-width="150px" align="center" show-overflow-tooltip />
 			<el-table-column prop="unit" label="单位" min-width="100px" align="center" show-overflow-tooltip />
 			<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
+			<el-table-column prop="purchasePrice" label="食材价格(元)" min-width="80px" align="center" show-overflow-tooltip>
+				<template #default="{ row }">{{ displayPrice(row.purchasePrice) }}</template>
+			</el-table-column>
 		</el-table>
 		<pagination
 			@size-change="sizeChangeHandle"
@@ -45,8 +48,8 @@
 <script setup lang="ts">
 import { ref } from "vue"
 import { fetchErpMaterialPageList } from "/@/api/canteen/canteenErpMaterial"
+import { displayPrice } from "/@/utils/formatMoney"
 
-const dialogVisible = defineModel()
 const emit = defineEmits(["getSelectedRows"])
 const props = withDefaults(
 	defineProps<{
@@ -60,6 +63,7 @@ const props = withDefaults(
 const queryRef = ref()
 const tableRef = ref() // 对话框多选表格ref
 const loading = ref(false) // 对话框多选表格loading
+const dialogVisible = ref(false)
 const queryForm = reactive<any>({
 	name: "",
 })
@@ -130,6 +134,7 @@ const dialogConfirm = () => {
 			...currentSelectedRows,
 			...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
 		]
+		dialogVisible.value = false
 		emit("getSelectedRows", allSelectedRows)
 	}
 }

src/views/flow/workflow/assets/base.css

@@ -65,8 +65,8 @@ body {
 	background: var(--color-background);
 	transition: color 0.5s, background-color 0.5s;
 	line-height: 1.6;
-	font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-		sans-serif;
+	font-family: Noto Sans SC, Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans",
+		"Droid Sans", "Helvetica Neue", sans-serif;
 	font-size: 15px;
 	text-rendering: optimizeLegibility;
 	-webkit-font-smoothing: antialiased;

src/views/gen/template/form.vue

@@ -23,8 +23,8 @@
 
 		<template #footer>
 			<span class="dialog-footer">
-				<el-button @click="visible = false">{{ $t('common.cancelButtonText') }}</el-button>
-				<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText') }}</el-button>
+				<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
+				<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t("common.confirmButtonText") }}</el-button>
 			</span>
 		</template>
 	</el-dialog>
@@ -32,86 +32,95 @@
 
 <script lang="ts" name="GenTemplateDialog" setup>
 // 定义子组件向父组件传值/事件
-import { useMessage } from '/@/hooks/message';
-import { addObj, getObj, putObj } from '/@/api/gen/template';
-import { useI18n } from 'vue-i18n';
-import {rule} from "/@/utils/validate";
+import { useMessage } from "/@/hooks/message"
+import { addObj, getObj, putObj } from "/@/api/gen/template"
+import { useI18n } from "vue-i18n"
+import { rule } from "/@/utils/validate"
 
-const CodeEditor = defineAsyncComponent(() => import('/@/components/CodeEditor/index.vue'));
-const emit = defineEmits(['refresh']);
+const CodeEditor = defineAsyncComponent(() => import("/@/components/CodeEditor/index.vue"))
+const emit = defineEmits(["refresh"])
 
-const { t } = useI18n();
+const { t } = useI18n()
 
 // 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false);
-const loading = ref(false);
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
 
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-	id: '',
-	templateName: '',
-	generatorPath: '',
-	templateDesc: '',
-	templateCode: '',
-});
+	id: "",
+	templateName: "",
+	generatorPath: "",
+	templateDesc: "",
+	templateCode: "",
+})
 
 // 定义校验规则
 const dataRules = ref({
-	templateName: [{ validator: rule.overLength, trigger: 'blur' },{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
-	generatorPath: [{ validator: rule.overLength, trigger: 'blur' },{ required: true, message: '模板路径不能为空', trigger: 'blur' }],
-	templateDesc: [{ validator: rule.overLength, trigger: 'blur' },{ required: true, message: '模板描述不能为空', trigger: 'blur' }],
-});
+	templateName: [
+		{ validator: rule.overLength, trigger: "blur" },
+		{ required: true, message: "模板名称不能为空", trigger: "blur" },
+	],
+	generatorPath: [
+		{ validator: rule.overLength, trigger: "blur" },
+		{ required: true, message: "模板路径不能为空", trigger: "blur" },
+	],
+	templateDesc: [
+		{ validator: rule.overLength, trigger: "blur" },
+		{ required: true, message: "模板描述不能为空", trigger: "blur" },
+	],
+})
 
 // 打开弹窗
 const openDialog = (id: string) => {
-	visible.value = true;
-	form.id = '';
+	visible.value = true
+	form.id = ""
 
 	// 重置表单数据
 	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+		dataFormRef.value?.resetFields()
+	})
 	// 获取genTemplate信息
 	if (id) {
-		form.id = id;
-		getgenTemplateData(id);
+		form.id = id
+		getgenTemplateData(id)
 	}
-};
+}
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
 	// 校验模板是否为空
 
 	try {
-		loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(t(form.id ? 'common.editSuccessText' : 'common.addSuccessText'));
-		visible.value = false;
-		emit('refresh');
+		loading.value = true
+		form.id ? await putObj(form) : await addObj(form)
+		useMessage().success(t(form.id ? "common.editSuccessText" : "common.addSuccessText"))
+		visible.value = false
+		emit("refresh")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-		loading.value = false;
+		loading.value = false
 	}
-};
+}
 // 初始化表单数据
 const getgenTemplateData = (id: string) => {
 	// 获取数据
 	getObj(id).then((res: any) => {
-		Object.assign(form, res.data);
-	});
-};
+		Object.assign(form, res.data)
+	})
+}
 
 // 暴露变量
 defineExpose({
 	openDialog,
-});
+})
 </script>
 
 <style scoped>

src/views/integrated/meetingRoom/form.vue

@@ -155,7 +155,7 @@ const loading = ref(false)
 const activeTab = ref('basic')
 
 interface Equipment {
-  id: string;
+  equipId: string;
   equipmentName: string;
   quantity: number;
 }
@@ -258,12 +258,12 @@ const handleCurrentChange = (val: number) => {
 const handleEquipmentConfirm = () => {
   // 过滤掉已经存在的设备
   const newEquipment = selectedEquipment.value.filter(selected => 
-    !equipmentList.value.some(existing => existing.id === selected.id)
+    !equipmentList.value.some(existing => existing.equipId === selected.id)
   )
   
   // 添加新选择的设备
   equipmentList.value.push(...newEquipment.map(item => ({
-    id: item.id,
+    equipId: item.id,
     equipmentName: item.name,
     quantity: 1
   })))