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

Browse Source
This commit is contained in:
weiwei committed 2025-05-19 11:11:37 +08:00
1 parent 448a799223
commit c037de727c
9 files changed
+56 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/canteen/common.ts
+1 -1
View File
@@ -1,7 +1,7 @@
import request from "/@/utils/request"
// 获取食堂业务流水编号
export function getCanteenSequence(params?: { type: string | number }) {
export function getCanteenSequence(params?: { date?:string ; type: string | number }) {
return request({
url: "/canteen/canteen/common/getSequence",
method: "get",
src/views/canteen/canteenInventoryRecords/form.vue
+20 -20
View File
@@ -64,17 +64,19 @@
>
<vxe-column type="checkbox" width="40" fixed="left" />
<vxe-column type="seq" width="50" fixed="left" />
<vxe-column field="name" title="库存食材" />
<vxe-column field="stock" title="库存" />
<vxe-column field="unit" title="单位" />
<vxe-column field="name" title="库存食材">
<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="price" title="原进价">
<vxe-column field="unitPrice" title="原进价">
<template #default="{ row }">
{{ row.price }}
{{ row.unitPrice || 0 }}
</template>
</vxe-column>
<vxe-column field="realPrice" title="实际进价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -112,9 +114,6 @@
<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-button type="success" plain @click="">打印</el-button>
</el-tooltip> -->
</el-row>
</div>
</div>
@@ -178,9 +177,17 @@ const validRules = ref<VxeTablePropTypes.EditRules<any>>({
totalNumber: [{ required: true, type: "number", min: 1, message: "必填" }],
})
watch(
() => props.formId,
async (val) => {
await getInitData()
},
)
// 初始化数据
const getInitData = async () => {
baseForm.id = undefined
clearData()
const id = props.formId
if (id) {
loading.value = true
@@ -193,8 +200,8 @@ const getInitData = async () => {
state.itemTableForm = res.data.items.map((item: any) => ({
...item,
realPrice: displayPrice(item.realPrice, ""),
totalAmount: displayPrice(item.totalNumber, ""),
price: displayPrice(item.unitPrice, ""),
totalAmount: displayPrice(item.totalAmount, ""),
unitPrice: displayPrice(item.unitPrice, ""),
}))
}
} else {
@@ -205,13 +212,6 @@ const getInitData = async () => {
.finally(() => (loading.value = false))
sequenceCode && sequenceCode.code === 0 && (baseForm.inventoryCode = sequenceCode.data)
}
// loading.value = true
// 获取简要食材列表
// 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)
}
// 点击食材选择
@@ -224,7 +224,7 @@ const getSelectedRows = (selectionRows: any) => {
// 筛选新勾选的项并处理
const addedItems = selectionRows
.filter((selectionRowsItem: any) => !state.itemTableForm.some((item: any) => item.erpMaterialId === selectionRowsItem.erpMaterialId))
.map((addItem: any) => ({ ...addItem, price: displayPrice(addItem.price, ""), isNew: true }))
.map((addItem: any) => ({ ...addItem, isNew: true }))
state.itemTableForm = [...state.itemTableForm, ...addedItems]
@@ -258,10 +258,10 @@ const removeSelectedRows = () => {
const tableFormItems = () => {
return state.itemTableForm.map((item: any) => {
return {
// id: item.isNew ? undefined : item.id,
id: item.isNew ? undefined : item.id,
erpMaterialId: item.erpMaterialId,
quantity: item.quantity,
unitPrice: storePrice(item.price),
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,
src/views/canteen/canteenInventoryRecords/index.vue
+7 -3
View File
@@ -1,6 +1,6 @@
<template>
<div class="layout-padding">
<div v-if="!formState.showForm" class="layout-padding-auto layout-padding-view">
<div v-show="!formState.showForm" 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">
@@ -60,7 +60,11 @@
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" label="商品" show-overflow-tooltip />
<el-table-column prop="productName" label="商品" show-overflow-tooltip>
<template #default="{ row }">
<el-tag v-for="(item, index) in row.productName.split(',')" :key="index">{{ item }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip /> -->
<!-- <el-table-column prop="checkUserId" label="审批人id" show-overflow-tooltip /> -->
@@ -91,7 +95,7 @@
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</div>
<ct-form v-else :formId="formState.formId" @close="formClose" />
<ct-form v-show="formState.showForm" :formId="formState.formId" @close="formClose" />
</div>
</template>
src/views/canteen/canteenInventoryRecords/select-dialog.vue
+3 -7
View File
@@ -13,6 +13,7 @@
</el-row>
<el-table
ref="tableRef"
border
:data="dataList"
v-loading="loading"
:row-key="(row:any) => row.id"
@@ -84,10 +85,8 @@ const getDataListAndSelect = async () => {
const rowsToSelect = [
...props.selectedRows.filter((row) => dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
]
// 去重
const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpMaterialId, row])).values())
// 为匹配的行设置选中状态
uniqueRowsToSelect.forEach((row) => {
rowsToSelect.forEach((row) => {
const targetRow = dataList.value.find((item) => item.erpMaterialId === row.erpMaterialId)
targetRow && tableRef.value?.toggleRowSelection(targetRow, true)
})
@@ -131,10 +130,7 @@ const dialogConfirm = () => {
...currentSelectedRows,
...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
]
// 去重
const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpMaterialId, row])).values())
emit("getSelectedRows", uniqueSelectedRows)
emit("getSelectedRows", allSelectedRows)
}
}
src/views/canteen/canteenProductionRecord/form.vue
+6 -6
View File
@@ -2,7 +2,7 @@
<el-dialog
:title="form.id ? '编辑生产记录' : '新增生产记录'"
v-model="visible"
width="1300px"
width="80%"
:close-on-click-modal="false"
draggable
>
@@ -178,12 +178,12 @@
@current-change="val => { templateQuery.current = val; searchTemplate() }"
/>
</div>
<div class="dialog-footer" style="margin-top: 20px;">
<el-button @click="templateDialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmTemplateSelection">确定</el-button>
</div>
</div>
<template #footer>
<el-button @click="templateDialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmTemplateSelection">确定</el-button>
</template>
</el-dialog>
</el-dialog>
</template>
src/views/canteen/canteenProductionRecord/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@
@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 type="index" label="#" width="50" />
<el-table-column prop="productionTime" label="加工日期" show-overflow-tooltip/>
<el-table-column prop="handlerUser" label="加工人" show-overflow-tooltip/>
<el-table-column prop="recordCode" label="加工批次号" show-overflow-tooltip/>
src/views/canteen/canteenProductionTemplate/index.vue
+1 -1
View File
@@ -34,7 +34,7 @@
@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 type="index" label="#" width="50" />
<el-table-column prop="templateName" label="模版名称" show-overflow-tooltip/>
<!-- <el-table-column prop="dishId" label="菜品id" show-overflow-tooltip/>-->
<el-table-column prop="baseOutput" label="基准产出量" show-overflow-tooltip/>
src/views/canteen/canteenSupplier/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@
@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 type="index" label="#" width="50" />
<el-table-column prop="supplierName" label="货商名称" show-overflow-tooltip/>
<el-table-column prop="phone" label="电话号码" show-overflow-tooltip/>
<el-table-column prop="tax" label="税号" show-overflow-tooltip/>
src/views/supermarketerp/components/erpSpuSelectDialog.vue
+16 -19
View File
@@ -27,6 +27,7 @@
</el-row>
<el-table
ref="spuMultipleTableRef"
border
:data="spuDataList"
v-loading="spuListLoading"
:row-key="(row:any) => row.id"
@@ -34,7 +35,7 @@
@row-click="rowClick"
:row-style="{ cursor: 'pointer' }"
>
<el-table-column type="selection" width="40" fixed="left" align="center" />
<el-table-column type="selection" width="50" fixed="left" align="center" />
<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
<el-table-column prop="productName" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
<el-table-column prop="picUrl" label="封面图" align="center" show-overflow-tooltip>
@@ -45,18 +46,17 @@
<!-- <el-table-column prop="barcode" label="自编码/条码" min-width="150px" align="center" show-overflow-tooltip /> -->
<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>-->
<!-- <template #default="scope">-->
<!-- {{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
</template>
</el-table-column>
<el-table-column prop="categoryId" label="分类" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
</template>
</el-table-column>
<!-- <el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip /> -->
<el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip />
</el-table-column> -->
<!-- <el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip /> -->
<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status" />
@@ -129,14 +129,11 @@ const getDataListAndSelect = async () => {
// 清空表格数据后重新设置
nextTick(() => {
// 合并当前页面数据中的已选行和之前保存的已选行
const rowsToSelect = [
// ...currentSelectedRows,
...props.selectedSpuRows.filter((row) => spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
]
const rowsToSelect = [...props.selectedSpuRows.filter((row) => spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId))]
// 去重
const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpSpuId, row])).values())
// const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpSpuId, row])).values())
// 为匹配的行设置选中状态
uniqueRowsToSelect.forEach((row) => {
rowsToSelect.forEach((row) => {
const targetRow = spuDataList.value.find((item) => item.erpSpuId === row.erpSpuId)
targetRow && spuMultipleTableRef.value?.toggleRowSelection(targetRow, true)
})
@@ -183,14 +180,14 @@ const handleSelectDialogConfirm = () => {
...props.selectedSpuRows.filter((row) => !spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
]
// 去重
const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpSpuId, row])).values())
// const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpSpuId, row])).values())
emit("getSelectedSpuRows", uniqueSelectedRows)
emit("getSelectedSpuRows", allSelectedRows)
}
}
onMounted(() => {
// 获取商品分类
onMounted(async () => {
// // 获取商品分类
// try {
// const res = await getSupermarketCategory()
// supermarketCategory.value = res.data