diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue
index d091d75..333d84f 100644
--- a/src/views/canteen/canteenInventoryRecords/form.vue
+++ b/src/views/canteen/canteenInventoryRecords/form.vue
@@ -22,8 +22,8 @@
- 商品选择
- 删除选中
+ 食材选择
+ 删除选中
清空数据
@@ -64,7 +64,7 @@
>
-
+
@@ -90,16 +90,6 @@
-
-
-
-
-
-
-
-
-
-
{{ (Number(row.quantity || 0) * Number(row.realPrice || 0)).toFixed(2) }}
@@ -186,8 +176,6 @@ const validRules = ref>({
quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
realPrice: [{ required: true, type: "number", min: 1, message: "必填" }],
totalNumber: [{ required: true, type: "number", min: 1, message: "必填" }],
- taxAmount: [{ required: true, type: "number", min: 1, message: "必填" }],
- taxRate: [{ required: true, type: "number", min: 1, message: "必填" }],
})
// 初始化数据
@@ -213,19 +201,19 @@ const getInitData = async () => {
}
// 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)
}
-// 点击商品选择
+// 点击食材选择
const clickSelectDialog = () => selectDialogRef.value.openDialog()
-// 获取被选择的商品行
+// 获取被选择的食材行
const getSelectedRows = (selectionRows: any) => {
- console.log("被选择的商品行", selectionRows)
+ console.log("被选择的食材行", selectionRows)
// 筛选新勾选的项并处理
const addedItems = selectionRows
@@ -274,8 +262,6 @@ const tableFormItems = () => {
remark: item.remark,
orderType: 1,
totalNumber: item.totalNumber,
- taxAmount: item.taxAmount,
- taxRate: item.taxRate,
}
})
}
@@ -299,7 +285,7 @@ const baseFormValidate = async () => {
// 校验可编辑表格 成功返回 true 失败返回 false
const itemTableFormValidate = async () => {
if (state.itemTableForm.length <= 0) {
- useMessage().warning("请选择商品")
+ useMessage().warning("请选择食材")
return false
}
diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue
index 40a8cc0..1371dc9 100644
--- a/src/views/canteen/canteenInventoryRecords/index.vue
+++ b/src/views/canteen/canteenInventoryRecords/index.vue
@@ -157,7 +157,8 @@ const create = () => {
// 点击编辑
const edit = (row: any) => {
- row.id ? (formState.formId = row.id) : useMessage().warning("清单id不存在")
+ if (!row.id) return useMessage().warning("清单id不存在")
+ formState.formId = row.id
formState.showForm = true
}
diff --git a/src/views/canteen/canteenInventoryRecords/select-dialog.vue b/src/views/canteen/canteenInventoryRecords/select-dialog.vue
index 9524514..79711af 100644
--- a/src/views/canteen/canteenInventoryRecords/select-dialog.vue
+++ b/src/views/canteen/canteenInventoryRecords/select-dialog.vue
@@ -1,9 +1,9 @@
-
+
-
-
+
+
查询
@@ -22,7 +22,7 @@
>
-
+
@@ -71,7 +71,7 @@ const openDialog = () => {
getDataListAndSelect()
}
-// 获取商品数据并且勾选
+// 获取食材数据并且勾选
const getDataListAndSelect = async () => {
loading.value = true
try {
@@ -115,12 +115,12 @@ const resetQuery = () => {
getDataListAndSelect()
}
-// 点击商品列表表格行
+// 点击食材列表表格行
const rowClick = (row: any) => {
tableRef.value.toggleRowSelection(row)
}
-// 商品选择对话框确认
+// 食材选择对话框确认
const dialogConfirm = () => {
const $table = tableRef.value
if ($table) {