From 44f2662b5bb9955abdefcea84741b0145dd86200 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 14 May 2025 16:32:58 +0800
Subject: [PATCH]

---
 .../canteen/canteenInventoryRecords/form.vue  |   4 +-
 .../canteenInventoryRecords/form11.vue        | 112 ----------
 .../canteen/canteenInventoryRecords/index.vue |   7 +-
 .../canteenInventoryRecordsItem/form.vue      | 209 ------------------
 4 files changed, 6 insertions(+), 326 deletions(-)
 delete mode 100644 src/views/canteen/canteenInventoryRecords/form11.vue
 delete mode 100644 src/views/canteen/canteenInventoryRecordsItem/form.vue

diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue
index 43390f0..23956eb 100644
--- a/src/views/canteen/canteenInventoryRecords/form.vue
+++ b/src/views/canteen/canteenInventoryRecords/form.vue
@@ -112,9 +112,9 @@
 				<el-tooltip effect="dark" content="保存并返回列表页面" placement="top">
 					<el-button type="primary" plain @click="onSave">保存</el-button>
 				</el-tooltip>
-				<el-tooltip effect="dark" content="打印清单" placement="top">
+				<!-- <el-tooltip effect="dark" content="打印清单" placement="top">
 					<el-button type="success" plain @click="">打印</el-button>
-				</el-tooltip>
+				</el-tooltip> -->
 			</el-row>
 		</div>
 	</div>
diff --git a/src/views/canteen/canteenInventoryRecords/form11.vue b/src/views/canteen/canteenInventoryRecords/form11.vue
deleted file mode 100644
index 7907697..0000000
--- a/src/views/canteen/canteenInventoryRecords/form11.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<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-col :span="12" class="mb20">
-				<el-form-item label="部门id" prop="deptId">
-					<el-input v-model="form.deptId" placeholder="请输入部门id" />
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12" class="mb20">
-				<el-form-item label="收款金额" prop="receiveAmount">
-					<el-input v-model="form.receiveAmount" placeholder="请输入收款金额" />
-				</el-form-item>
-			</el-col>
-		</el-form>
-	</el-dialog>
-</template>
-
-<script setup lang="ts" name="CanteenInventoryRecordsDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-const { canteen_inventory_type } = useDict("canteen_inventory_type")
-
-// 提交表单数据
-const form = reactive({
-	id: "",
-	inventoryCode: "",
-	inventoryDate: "",
-	inventoryType: "",
-	linkCode: "",
-	handlerUserId: "",
-	checkStatus: "",
-	checkUserId: "",
-	checkTime: "",
-	merchantId: "",
-	deptId: "",
-	supplierId: "",
-	remark: "",
-	orderType: "",
-	totalAmount: "",
-	receiveAmount: "",
-	processInstanceId: "",
-	checkReason: "",
-})
-
-// 定义校验规则
-const dataRules = ref({
-	inventoryCode: [{ required: true, message: "单据编号(规则生成，出入库编号)不能为空", trigger: "blur" }],
-	inventoryDate: [{ required: true, message: "单据日期不能为空", trigger: "blur" }],
-	inventoryType: [{ required: true, message: "单据类型(字典inventory_type)采购入库不能为空", trigger: "blur" }],
-})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-
-	// 获取canteenInventoryRecords信息
-	if (id) {
-		form.id = id
-		getcanteenInventoryRecordsData(id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	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(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const getcanteenInventoryRecordsData = (id: string) => {
-	// 获取数据
-	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
-</script>
diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue
index e644e54..ed2ecc9 100644
--- a/src/views/canteen/canteenInventoryRecords/index.vue
+++ b/src/views/canteen/canteenInventoryRecords/index.vue
@@ -67,7 +67,9 @@
 				<!-- <el-table-column prop="checkTime" label="审核日期" show-overflow-tooltip /> -->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-				<el-table-column 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 prop="checkReason" label="审核原因" show-overflow-tooltip /> -->
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
@@ -97,10 +99,9 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs } from "/@/api/canteen/canteenInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
+import { displayPrice } from "/@/utils/formatMoney"
 
 const CtForm = defineAsyncComponent(() => import("./form.vue"))
-const { canteen_inventory_type } = useDict("canteen_inventory_type")
 
 const queryRef = ref()
 const showSearch = ref(true)
diff --git a/src/views/canteen/canteenInventoryRecordsItem/form.vue b/src/views/canteen/canteenInventoryRecordsItem/form.vue
deleted file mode 100644
index b067372..0000000
--- a/src/views/canteen/canteenInventoryRecordsItem/form.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<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="单据类型(字典inventory_type)" prop="inventoryType">
-        <el-input v-model="form.inventoryType" placeholder="请输入单据类型(字典inventory_type)"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="原料id" prop="erpMaterialId">
-        <el-input v-model="form.erpMaterialId" placeholder="请输入原料id"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="商户编号" prop="merchantId">
-        <el-input v-model="form.merchantId" placeholder="请输入商户编号"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="部门id" prop="deptId">
-        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="出入库数量" prop="quantity">
-        <el-input v-model="form.quantity" placeholder="请输入出入库数量"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="单价" prop="unitPrice">
-        <el-input v-model="form.unitPrice" placeholder="请输入单价"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="总金额" prop="totalAmount">
-        <el-input v-model="form.totalAmount" placeholder="请输入总金额"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="税率%" prop="taxRate">
-        <el-input v-model="form.taxRate" placeholder="请输入税率%"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="税前金额" prop="taxAmount">
-        <el-input v-model="form.taxAmount" placeholder="请输入税前金额"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="货商" prop="supplierId">
-        <el-input v-model="form.supplierId" placeholder="请输入货商"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" placeholder="请输入备注"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="订单类型(1入库 2出库)" prop="orderType">
-        <el-input v-model="form.orderType" placeholder="请输入订单类型(1入库 2出库)"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="出入库关联id" prop="inventoryId">
-        <el-input v-model="form.inventoryId" placeholder="请输入出入库关联id"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="总数" prop="totalNumber">
-        <el-input v-model="form.totalNumber" placeholder="请输入总数"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="账面数量" prop="accountNumber">
-        <el-input v-model="form.accountNumber" placeholder="请输入账面数量"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="实际数量" prop="realNumber">
-        <el-input v-model="form.realNumber" placeholder="请输入实际数量"/>
-      </el-form-item>
-      </el-col>
-
-    <el-col :span="12" class="mb20">
-      <el-form-item label="实际单价" prop="realPrice">
-        <el-input v-model="form.realPrice" 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="CanteenInventoryRecordsItemDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/canteen/canteenInventoryRecordsItem'
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
-
-// 定义变量内容
-const dataFormRef = ref();
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-
-// 提交表单数据
-const form = reactive({
-		id:'',
-	  inventoryType: '',
-	  erpMaterialId: '',
-	  merchantId: '',
-	  deptId: '',
-	  quantity: '',
-	  unitPrice: '',
-	  totalAmount: '',
-	  taxRate: '',
-	  taxAmount: '',
-	  supplierId: '',
-	  remark: '',
-	  orderType: '',
-	  inventoryId: '',
-	  totalNumber: '',
-	  accountNumber: '',
-	  realNumber: '',
-	  realPrice: '',
-});
-
-// 定义校验规则
-const dataRules = ref({
-})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
-
-  // 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
-
-  // 获取canteenInventoryRecordsItem信息
-  if (id) {
-    form.id = id
-    getcanteenInventoryRecordsItemData(id)
-  }
-};
-
-// 提交
-const onSubmit = async () => {
-	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(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
-	} catch (err: any) {
-		useMessage().error(err.msg);
-	} finally {
-    loading.value = false;
-  }
-};
-
-
-// 初始化表单数据
-const getcanteenInventoryRecordsItemData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
-
-// 暴露变量
-defineExpose({
-  openDialog
-});
-</script>
\ No newline at end of file