zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/views/canteen/canteenErpMaterial/index.vue
This commit is contained in:
zjf committed 2025-05-23 10:26:21 +08:00
2 parents d1faa5ba1b 5a1850f9a4
commit 91922eeffd
4 files changed
+186 -164
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/canteen/canteenErpMaterial/form.vue
+98 -92
View File
@@ -1,131 +1,137 @@
<template> <template>
<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
:close-on-click-modal="false" draggable> <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading"> <el-row :gutter="24">
<el-row :gutter="24"> <el-col :span="12" class="mb20">
<el-col :span="12" class="mb20"> <el-form-item label="食材名称" prop="name">
<el-form-item label="食材名称" prop="name"> <el-input v-model="form.name" placeholder="请输入食材名称" />
<el-input v-model="form.name" placeholder="请输入食材名称"/> </el-form-item>
</el-form-item> </el-col>
</el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="食材单位" prop="unit"> <el-form-item label="食材单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入食材单位"/> <el-input v-model="form.unit" placeholder="请输入食材单位" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="进价(元)" prop="purchasePrice"> <el-form-item label="进价(元)" prop="purchasePrice">
<el-input v-model="form.purchasePrice" placeholder="请输入食材进价"/> <el-input v-model="form.purchasePrice" placeholder="请输入食材进价" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="期初库存" prop="baseStock"> <el-form-item label="期初库存" prop="baseStock">
<el-input v-model="form.baseStock" placeholder="请输入期初库存"/> <el-input v-model="form.baseStock" placeholder="请输入期初库存" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="库存下限" prop="inventoryLowerLimit"> <el-form-item label="库存下限" prop="inventoryLowerLimit">
<el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"/> <el-input v-model="form.inventoryLowerLimit" placeholder="请输入库存下限" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="库存上限" prop="inventoryUpperLimit"> <el-form-item label="库存上限" prop="inventoryUpperLimit">
<el-input v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"/> <el-input v-model="form.inventoryUpperLimit" placeholder="请输入库存上限" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="visible = false">取消</el-button> <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>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</template> </template>
<script setup lang="ts" name="CanteenErpMaterialDialog"> <script setup lang="ts" name="CanteenErpMaterialDialog">
import { useDict } from '/@/hooks/dict'; import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"; import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj } from '/@/api/canteen/canteenErpMaterial' import { getObj, addObj, putObj } from "/@/api/canteen/canteenErpMaterial"
import { rule } from '/@/utils/validate'; import { rule } from "/@/utils/validate"
const emit = defineEmits(['refresh']); import { displayPrice, storePrice } from "/@/utils/formatMoney"
const emit = defineEmits(["refresh"])
// 定义变量内容 // 定义变量内容
const dataFormRef = ref(); const dataFormRef = ref()
const visible = ref(false) const visible = ref(false)
const loading = ref(false) const loading = ref(false)
// 定义字典 // 定义字典
// 提交表单数据 // 提交表单数据
const form = reactive({ const form = reactive({
id:'', id: "",
name: '', name: "",
unit: '', unit: "",
purchasePrice: '', purchasePrice: "",
baseStock: '', baseStock: "",
inventoryLowerLimit: '', inventoryLowerLimit: "",
inventoryUpperLimit: '', inventoryUpperLimit: "",
}); })
// 定义校验规则 // 定义校验规则
const dataRules = ref({ const dataRules = ref({
name: [{required: true, message: '食材名称不能为空', trigger: 'blur'}], name: [{ required: true, message: "食材名称不能为空", trigger: "blur" }],
unit: [{required: true, message: '食材单位不能为空', trigger: 'blur'}], unit: [{ required: true, message: "食材单位不能为空", trigger: "blur" }],
purchasePrice: [{required: true, message: '食材进价不能为空', trigger: 'blur'}], purchasePrice: [{ required: true, message: "食材进价不能为空", trigger: "blur" }],
}) })
// 打开弹窗 // 打开弹窗
const openDialog = (id: string) => { const openDialog = (id: string) => {
visible.value = true visible.value = true
form.id = '' form.id = ""
// 重置表单数据 // 重置表单数据
nextTick(() => { nextTick(() => {
dataFormRef.value?.resetFields(); dataFormRef.value?.resetFields()
}); })
// 获取canteenErpMaterial信息 // 获取canteenErpMaterial信息
if (id) { if (id) {
form.id = id form.id = id
getcanteenErpMaterialData(id) getcanteenErpMaterialData(id)
} }
}; }
// 提交 // 提交
const onSubmit = async () => { const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {}); const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false; if (!valid) return false
const _pa = {
...form,
purchasePrice: storePrice(form.purchasePrice),
}
try { try {
loading.value = true; loading.value = true
form.id ? await putObj(form) : await addObj(form); form.id ? await putObj(_pa) : await addObj(_pa)
useMessage().success(form.id ? '修改成功' : '添加成功'); useMessage().success(form.id ? "修改成功" : "添加成功")
visible.value = false; visible.value = false
emit('refresh'); emit("refresh")
} catch (err: any) { } catch (err: any) {
useMessage().error(err.msg); useMessage().error(err.msg)
} finally { } finally {
loading.value = false; loading.value = false
} }
}; }
// 初始化表单数据 // 初始化表单数据
const getcanteenErpMaterialData = (id: string) => { const getcanteenErpMaterialData = (id: string) => {
// 获取数据 // 获取数据
loading.value = true loading.value = true
getObj(id).then((res: any) => { getObj(id)
Object.assign(form, res.data) .then((res: any) => {
}).finally(() => { Object.assign(form, res.data, { purchasePrice: displayPrice(res.data.purchasePrice, "") })
loading.value = false })
}) .finally(() => {
}; loading.value = false
})
}
// 暴露变量 // 暴露变量
defineExpose({ defineExpose({
openDialog openDialog,
}); })
</script> </script>
src/views/canteen/canteenErpMaterial/index.vue
+72 -60
View File
@@ -1,23 +1,43 @@
<template> <template>
<div class="layout-padding"> <div class="layout-padding">
<div class="layout-padding-auto layout-padding-view"> <div class="layout-padding-auto layout-padding-view">
<el-row> <el-row>
<div class="mb8" style="width: 100%"> <div class="mb8" style="width: 100%">
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" <el-button
v-auth="'canteen_canteenErpMaterial_add'"> icon="folder-add"
新 增 type="primary"
</el-button> class="ml10"
<el-button plain :disabled="multiple" icon="Delete" type="primary" @click="formDialogRef.openDialog()"
v-auth="'canteen_canteenErpMaterial_del'" @click="handleDelete(selectObjs)"> v-auth="'canteen_canteenErpMaterial_add'"
删除 >
</el-button> 新 增
<right-toolbar v-model:showSearch="showSearch" :export="'canteen_canteenErpMaterial_export'" </el-button>
@exportExcel="exportExcel" class="ml10 mr20" style="float: right;" <el-button
@queryTable="getDataList"></right-toolbar> plain
</div> :disabled="multiple"
</el-row> icon="Delete"
<el-table :data="state.dataList" v-loading="state.loading" border type="primary"
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle" 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" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"> @sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
@@ -40,20 +60,19 @@
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" /> <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div> </div>
<!-- 编辑、新增 --> <!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" /> <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
</div>
</div>
</template> </template>
<script setup lang="ts" name="systemCanteenErpMaterial"> <script setup lang="ts" name="systemCanteenErpMaterial">
import { BasicTableProps, useTable } from "/@/hooks/table"; import { BasicTableProps, useTable } from "/@/hooks/table"
import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial"; import { fetchList, delObjs } from "/@/api/canteen/canteenErpMaterial"
import { useMessage, useMessageBox } from "/@/hooks/message"; import { useMessage, useMessageBox } from "/@/hooks/message"
import { useDict } from '/@/hooks/dict'; import { displayPrice } from "/@/utils/formatMoney"
// 引入组件 // 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue')); const FormDialog = defineAsyncComponent(() => import("./form.vue"))
// 定义查询字典 // 定义查询字典
// 定义变量内容 // 定义变量内容
@@ -66,54 +85,47 @@ const selectObjs = ref([]) as any
const multiple = ref(true) const multiple = ref(true)
const state: BasicTableProps = reactive<BasicTableProps>({ const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {}, queryForm: {},
pageList: fetchList pageList: fetchList,
}) })
// table hook // table hook
const { const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
getDataList,
currentChangeHandle,
sizeChangeHandle,
sortChangeHandle,
downBlobFile,
tableStyle
} = useTable(state)
// 清空搜索条件 // 清空搜索条件
const resetQuery = () => { const resetQuery = () => {
// 清空搜索条件 // 清空搜索条件
queryRef.value?.resetFields() queryRef.value?.resetFields()
// 清空多选 // 清空多选
selectObjs.value = [] selectObjs.value = []
getDataList() getDataList()
} }
// 导出excel // 导出excel
const exportExcel = () => { 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 }[]) => { const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id); selectObjs.value = objs.map(({ id }) => id)
multiple.value = !objs.length; multiple.value = !objs.length
}; }
// 删除操作 // 删除操作
const handleDelete = async (ids: string[]) => { const handleDelete = async (ids: string[]) => {
try { try {
await useMessageBox().confirm('此操作将永久删除'); await useMessageBox().confirm("此操作将永久删除")
} catch { } catch {
return; return
} }
try { try {
await delObjs(ids); await delObjs(ids)
getDataList(); getDataList()
useMessage().success('删除成功'); useMessage().success("删除成功")
} catch (err: any) { } catch (err: any) {
useMessage().error(err.msg); useMessage().error(err.msg)
} }
}; }
</script> </script>
src/views/canteen/canteenInventoryRecords/form.vue
+12 -11
View File
@@ -60,16 +60,16 @@
<vxe-column field="name" title="库存食材"> <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>
<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }"> <vxe-column field="purchasePrice" title="原进价">
<template #edit="{ row }"><el-input v-model="row.quantity" /></template> <template #default="{ row }">{{ displayPrice(row.purchasePrice) || 0 }}</template>
</vxe-column>
<vxe-column field="unitPrice" title="原进价">
<template #default="{ row }">{{ row.unitPrice || 0 }}</template>
</vxe-column> </vxe-column>
<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }"> <vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
<template #default="{ row }">{{ row.realPrice }}</template> <template #default="{ row }">{{ row.realPrice }}</template>
<template #edit="{ row }"><el-input v-model="row.realPrice" /></template> <template #edit="{ row }"><el-input v-model="row.realPrice" /></template>
</vxe-column> </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="totalAmount" title="累计总金额"> <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>
@@ -154,10 +154,11 @@ const openDialog = async (id: string) => {
.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null))) .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
.finally(() => (loading.value = false)) .finally(() => (loading.value = false))
if (res && res.code == 0) { 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) => ({ state.itemTableForm = res.data.items.map((item: any) => ({
...item, ...item,
unitPrice: displayPrice(item.unitPrice, ""), purchasePrice: item.unitPrice,
realPrice: displayPrice(item.realPrice, ""), realPrice: displayPrice(item.realPrice, ""),
totalAmount: displayPrice(item.totalAmount, ""), totalAmount: displayPrice(item.totalAmount, ""),
})) }))
@@ -244,7 +245,7 @@ const tableFormItems = () =>
id: item.isNew ? undefined : item.id, id: item.isNew ? undefined : item.id,
erpMaterialId: item.erpMaterialId, erpMaterialId: item.erpMaterialId,
quantity: item.quantity, quantity: item.quantity,
unitPrice: storePrice(item.unitPrice), unitPrice: item.purchasePrice,
realPrice: item.realPrice ? storePrice(item.realPrice) : 0, realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)), totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)),
stock: item.stock, stock: item.stock,
@@ -253,11 +254,11 @@ const tableFormItems = () =>
// 提交数据 成功返回 true 失败返回 false // 提交数据 成功返回 true 失败返回 false
const submitData = async () => { const submitData = async () => {
const canteenInventoryRecordsItemDTOS = tableFormItems() const items = tableFormItems()
const _pa = { const _pa = {
...baseForm, ...baseForm,
totalAmount: canteenInventoryRecordsItemDTOS.reduce((acc: number, cur: any) => acc + Number(cur.totalAmount), 0), totalAmount: items.reduce((acc: number, cur: any) => acc + Number(cur.totalAmount), 0),
canteenInventoryRecordsItemDTOS, items,
} }
console.log("提交的数据：", _pa) console.log("提交的数据：", _pa)
src/views/canteen/canteenInventoryRecords/select-dialog.vue
+4 -1
View File
@@ -26,7 +26,9 @@
<el-table-column prop="name" label="食材名称" min-width="150px" align="center" show-overflow-tooltip /> <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="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="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
<el-table-column prop="purchasePrice" 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> </el-table>
<pagination <pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@@ -46,6 +48,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from "vue" import { ref } from "vue"
import { fetchErpMaterialPageList } from "/@/api/canteen/canteenErpMaterial" import { fetchErpMaterialPageList } from "/@/api/canteen/canteenErpMaterial"
import { displayPrice } from "/@/utils/formatMoney"
const emit = defineEmits(["getSelectedRows"]) const emit = defineEmits(["getSelectedRows"])
const props = withDefaults( const props = withDefaults(