-
+ |
import { useMessage } from "/@/hooks/message"
-import { rule } from "/@/utils/validate"
import { useDict } from "/@/hooks/dict"
import { displayPrice } from "/@/utils/formatMoney"
import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
@@ -192,7 +186,7 @@ const spuIds = computed(() => selectedFood.value?.map((item: any) => item.id))
// 菜品查询表单
const foodQueryForm = reactive({
current: 1,
- size: 10,
+ size: 20,
startTime: "",
hourType: undefined,
})
@@ -256,7 +250,7 @@ const resetQuery = () => {
// 清空多选
selectObjs.value = []
foodQueryForm.current = 1
- foodQueryForm.size = 10
+ foodQueryForm.size = 20
getDataListAndSelect()
}
@@ -313,7 +307,7 @@ const openDialog = (id: string, time?: string, hourType?: number, merchantId?: n
// 重置表单数据
dataFormRef.value?.resetFields()
foodQueryForm.current = 1
- foodQueryForm.size = 10
+ foodQueryForm.size = 20
selectObjs.value = []
selectedFood.value = []
foodDataList.value = []
@@ -349,7 +343,7 @@ const getcanteenDailyMenuData = (id: string) => {
const handleClickSelect = async () => {
queryRef.value?.resetFields()
foodQueryForm.current = 1
- foodQueryForm.size = 10
+ foodQueryForm.size = 20
selectDialogVisible.value = true
selectObjs.value = [...selectedFood.value]
diff --git a/src/views/canteenDailyDishes/index.vue b/src/views/canteenDailyDishes/index.vue
index 1f1e151..07a86aa 100644
--- a/src/views/canteenDailyDishes/index.vue
+++ b/src/views/canteenDailyDishes/index.vue
@@ -226,7 +226,7 @@ const getDishByType = async () => {
// foodData.breakfast = r.dailyMenuVOS
break
case 2:
- foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 11)
+ foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 13)
break
case 3:
// foodData.dinner = r.dailyMenuVOS
diff --git a/src/views/hard/hard-door-manager/index.vue b/src/views/hard/hard-door-manager/index.vue
index 29835da..be6c446 100644
--- a/src/views/hard/hard-door-manager/index.vue
+++ b/src/views/hard/hard-door-manager/index.vue
@@ -95,7 +95,7 @@
{{ item.cabinetNo }}
在线
- 离线
+ 离线
锁关
diff --git a/src/views/supermarketerp/components/erpSpuSelectDialog.vue b/src/views/supermarketerp/components/erpSpuSelectDialog.vue
index 9610c3f..cecc47a 100644
--- a/src/views/supermarketerp/components/erpSpuSelectDialog.vue
+++ b/src/views/supermarketerp/components/erpSpuSelectDialog.vue
@@ -190,20 +190,20 @@ const handleSelectDialogConfirm = () => {
}
onMounted(async () => {
- // 获取商品分类
- try {
- const res = await getSupermarketCategory()
- supermarketCategory.value = res.data
- } catch (error) {
- supermarketCategory.value = []
- }
- // 获取商品品牌
- try {
- const res = await getSupermarketBrand()
- supermarketBrand.value = res.data
- } catch (error) {
- supermarketBrand.value = []
- }
+ // // 获取商品分类
+ // try {
+ // const res = await getSupermarketCategory()
+ // supermarketCategory.value = res.data
+ // } catch (error) {
+ // supermarketCategory.value = []
+ // }
+ // // 获取商品品牌
+ // try {
+ // const res = await getSupermarketBrand()
+ // supermarketBrand.value = res.data
+ // } catch (error) {
+ // supermarketBrand.value = []
+ // }
})
defineExpose({
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index 399af4f..35d3c26 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -1,7 +1,39 @@
-
+
+
+
+
+ 单据编号：
+ {{ baseDataForm.inventoryCode }}
+
+
+ 单据日期：
+ {{ baseDataForm.inventoryDate }}
+
+
+ 经办人：
+ {{ baseDataForm.handlerUserId }}
+
+
+
+
+ 关联补货申请：
+ {{ baseDataForm.linkCode }}
+
+
+ 货商：
+ {{ baseDataForm.supplierId }}
+
+
+ 备注：
+ {{ baseDataForm.remark }}
+
+
+
+
@@ -36,41 +68,9 @@
-
-
-
-
- 单据编号：
- {{ baseDataForm.inventoryCode }}
-
-
- 单据日期：
- {{ baseDataForm.inventoryDate }}
-
-
- 经办人：
- {{ baseDataForm.handlerUserId }}
-
-
-
-
- 关联补货申请：
- {{ baseDataForm.linkCode }}
-
-
- 货商：
- {{ baseDataForm.supplierId }}
-
-
- 备注：
- {{ baseDataForm.remark }}
-
-
-
-
-
+
+
+
+
+ 编号：
+ {{ baseDataForm.code }}
+
+
+ 单据日期：
+ {{ baseDataForm.ddDate }}
+
+
+ 经办人：
+
+
+
+
+
+ 关联补货申请：
+ {{ baseDataForm.linkCode }}
+
+
+ 货商：
+
+
+
+ 备注：
+ {{ baseDataForm.remark }}
+
+
+
+
@@ -36,41 +73,12 @@
-
-
-
-
- 编号：
- {{ baseDataForm.code }}
-
-
- 单据日期：
- {{ baseDataForm.ddDate }}
-
-
- 经办人：
- {{ baseDataForm.handlerUserId }}
-
-
-
-
- 关联补货申请：
- {{ baseDataForm.linkCode }}
-
-
- 货商：
- {{ baseDataForm.supplierId }}
-
-
- 备注：
- {{ baseDataForm.remark }}
-
-
-
-
-
+
+
+
+
+ 编号：
+ {{ baseDataForm.planCode }}
+
+
+ 单据日期：
+ {{ baseDataForm.planDate }}
+
+
+ 经办人：
+
+
+
+
+
+ 备注：
+ {{ baseDataForm.remark }}
+
+
+
+
@@ -28,33 +57,12 @@
-
-
-
-
- 编号：
- {{ baseDataForm.planCode }}
-
-
- 单据日期：
- {{ baseDataForm.planDate }}
-
-
- 经办人：
- {{ baseDataForm.handlerUserId }}
-
-
-
-
- 备注：
- {{ baseDataForm.remark }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 新增（顶部）
+
+ 商品选择
删除选中
- 清空数据
- 商品选择
+ 清空数据
@@ -152,7 +152,7 @@
:label="item.unit"
:value="item.id"
/>
-
+
@@ -226,7 +226,7 @@
- import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
const props = withDefaults(
defineProps<{
formId: string | undefined
@@ -276,7 +276,6 @@ const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
const linkCgPlanDialogRef = ref() // 关联采购申请单对话框ref
const baseDataFormRef = ref() // 基本数据表单ref
const editableTableRef = ref>() // 可编辑表格ref
-const { check_status } = useDict("check_status")
const baseDataInfoRef = ref() // 基本信息ref
// 基本信息表单数据
const baseDataForm = reactive({
@@ -356,7 +355,7 @@ const getInitData = async () => {
disabled.value = props.disabled
if (id) {
loading.value = true
- // 获取采购计划数据 & 获取简要商品列表
+ // 获取清单数据
const [cgPlanData] = await Promise.allSettled([getObj(id)])
.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
.finally(() => (loading.value = false))
@@ -366,16 +365,21 @@ const getInitData = async () => {
state.editableTableData = cgPlanData.data.items
state.erpSpuItemsMemo = cgPlanData.data.items
}
- return
+ } else {
+ // 获取采购入库编号
+ const [planCode] = await Promise.allSettled([getPlanCode({ type: 6 })])
+ .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+ .finally(() => (loading.value = false))
+
+ planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
+ // 获取简要商品列表
loading.value = true
- // 获取采购入库编号
- const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 6 })])
+ 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)
- planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
// 点击关联采购申请编号
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
index 0b2573a..0cde6d4 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
@@ -18,11 +18,11 @@
-
-
-
-
-
+
+
+
+
+
查询
重置
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 5082a95..2c1efbb 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -1,7 +1,39 @@
-
+
+
+
+
+ 单据编号：
+ {{ baseDataForm.inventoryCode }}
+
+
+ 单据日期：
+ {{ baseDataForm.inventoryDate }}
+
+
+ 经办人：
+ {{ baseDataForm.handlerUserId }}
+
+
+
+
+ 关联补货申请：
+ {{ baseDataForm.linkCode }}
+
+
+ 货商：
+ {{ baseDataForm.supplierId }}
+
+
+ 备注：
+ {{ baseDataForm.remark }}
+
+
+
+
@@ -34,46 +66,14 @@
-
-
-
+
+
+
-
-
-
-
- 单据编号：
- {{ baseDataForm.inventoryCode }}
-
-
- 单据日期：
- {{ baseDataForm.inventoryDate }}
-
-
- 经办人：
- {{ baseDataForm.handlerUserId }}
-
-
-
-
- 关联补货申请：
- {{ baseDataForm.linkCode }}
-
-
- 货商：
- {{ baseDataForm.supplierId }}
-
-
- 备注：
- {{ baseDataForm.remark }}
-
-
-
-
@@ -142,7 +142,7 @@
:label="item.unit"
:value="item.id"
/>
-
+
@@ -216,7 +216,7 @@
- import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
const props = withDefaults(
defineProps<{
formId: string | undefined
@@ -266,7 +266,6 @@ const erpSpuSelectDialogRef = ref() // 商品选择对话框ref
const linkCgPlanDialogRef = ref() // 关联采购申请单对话框ref
const baseDataFormRef = ref() // 基本数据表单ref
const editableTableRef = ref>() // 可编辑表格ref
-const { check_status } = useDict("check_status")
const baseDataInfoRef = ref() // 基本信息ref
// 基本信息表单数据
const baseDataForm = reactive({
@@ -346,7 +345,7 @@ const getInitData = async () => {
disabled.value = props.disabled
if (id) {
loading.value = true
- // 获取采购计划数据 & 获取简要商品列表
+ // 获取清单数据
const [cgPlanData] = await Promise.allSettled([getObj(id)])
.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
.finally(() => (loading.value = false))
@@ -356,16 +355,21 @@ const getInitData = async () => {
state.editableTableData = cgPlanData.data.items
state.erpSpuItemsMemo = cgPlanData.data.items
}
- return
+ } else {
+ loading.value = true
+ // 获取采购入库编号
+ const [planCode] = await Promise.allSettled([getPlanCode({ type: 5 })])
+ .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+ .finally(() => (loading.value = false))
+ planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
loading.value = true
- // 获取采购入库编号
- const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 5 })])
+ // 获取简要商品列表
+ 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)
- planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
// 点击关联采购申请编号
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
index 1c321ca..719cfd7 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
@@ -70,14 +70,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+ {{ displayPrice(row.totalAmount) }}
+
+
import("./form.vue"))
diff --git a/src/views/supermarketerp/stockTaking/barCodeEnter.vue b/src/views/supermarketerp/stockTaking/barCodeEnter.vue
index e1b6240..bf00215 100644
--- a/src/views/supermarketerp/stockTaking/barCodeEnter.vue
+++ b/src/views/supermarketerp/stockTaking/barCodeEnter.vue
@@ -12,16 +12,11 @@
-->
-
+
- {{ row.categoryId }}
-
-
+
@@ -35,9 +30,9 @@
-
+ -->
-
-
+
+
diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue
index 55135b5..bc954e2 100644
--- a/src/views/supermarketerp/stockTaking/form.vue
+++ b/src/views/supermarketerp/stockTaking/form.vue
@@ -1,28 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 新增（顶部）
+
+ 商品选择
删除选中
- 清空数据
- 商品选择
- 条码录入
+ 清空数据
+
- import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
+
const props = withDefaults(
defineProps<{
formId: string | undefined
@@ -310,7 +311,7 @@ const getInitData = async () => {
disabled.value = props.disabled
if (id) {
loading.value = true
- // 获取采购计划数据 & 获取简要商品列表
+ // 获取清单数据
const [cgPlanData] = await Promise.allSettled([getStockTakingDeatil({ id })])
.then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
.finally(() => (loading.value = false))
@@ -320,16 +321,21 @@ const getInitData = async () => {
state.editableTableData = cgPlanData.data.items
state.erpSpuItemsMemo = cgPlanData.data.items
}
- return
+ } else {
+ // 获取采购入库编号
+ const [planCode] = await Promise.allSettled([getPlanCode({ type: 7 })])
+ .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
+ .finally(() => (loading.value = false))
+
+ planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
+ // 获取简要商品列表
loading.value = true
- // 获取采购入库编号
- const [erpSpuSimpleAll, planCode] = await Promise.allSettled([getErpSpuSimpleAll(), getPlanCode({ type: 7 })])
+ 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)
- planCode && planCode.code === 0 && (baseDataForm.inventoryCode = planCode.data)
}
// 计算账面数量
diff --git a/src/views/supermarketerp/stockTaking/index.vue b/src/views/supermarketerp/stockTaking/index.vue
index 3df5e60..8030707 100644
--- a/src/views/supermarketerp/stockTaking/index.vue
+++ b/src/views/supermarketerp/stockTaking/index.vue
@@ -18,11 +18,11 @@
-
-
-
-
-
+
+
+
+
+
查询
重置
@@ -160,17 +160,17 @@ const { create, edit, formClose, deal, taskSubmitEvent } = useSmProcessTableActi
// 删除操作
const handleDelete = async (ids: string[]) => {
- // try {
- // await useMessageBox().confirm("此操作将永久删除")
- // } catch {
- // return
- // }
- // try {
- // await delObjs(ids)
- // getDataList()
- // useMessage().success("删除成功")
- // } catch (err: any) {
- // useMessage().error(err.msg)
- // }
+ try {
+ await useMessageBox().confirm("此操作将永久删除")
+ } catch {
+ return
+ }
+ try {
+ // await delObjs(ids)
+ // getDataList()
+ // useMessage().success("删除成功")
+ } catch (err: any) {
+ useMessage().error(err.msg)
+ }
}
From a94242be52040785fb1b1ae1656523e7ad3928cc Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 21 Apr 2025 20:05:13 +0800
Subject: [PATCH 03/10] 11
---
src/api/admin/sys-user-transaction.ts | 48 ++++++
.../system/sys-user-transaction/form.vue | 150 ++++++++++++++++++
.../system/sys-user-transaction/index.vue | 143 +++++++++++++++++
3 files changed, 341 insertions(+)
create mode 100644 src/api/admin/sys-user-transaction.ts
create mode 100644 src/views/admin/system/sys-user-transaction/form.vue
create mode 100644 src/views/admin/system/sys-user-transaction/index.vue
diff --git a/src/api/admin/sys-user-transaction.ts b/src/api/admin/sys-user-transaction.ts
new file mode 100644
index 0000000..1c4a283
--- /dev/null
+++ b/src/api/admin/sys-user-transaction.ts
@@ -0,0 +1,48 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+ return request({
+ url: "/admin/sys-user-transaction/page-join",
+ method: "get",
+ params: query,
+ })
+}
+
+export function fetchList(query?: Object) {
+ return request({
+ url: "/admin/sys-user-transaction/page",
+ method: "get",
+ params: query,
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: "/admin/sys-user-transaction",
+ method: "post",
+ data: obj,
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: "/admin/sys-user-transaction/" + id,
+ method: "get",
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: "/admin/sys-user-transaction",
+ method: "delete",
+ data: ids,
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: "/admin/sys-user-transaction",
+ method: "put",
+ data: obj,
+ })
+}
diff --git a/src/views/admin/system/sys-user-transaction/form.vue b/src/views/admin/system/sys-user-transaction/form.vue
new file mode 100644
index 0000000..d98c311
--- /dev/null
+++ b/src/views/admin/system/sys-user-transaction/form.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/system/sys-user-transaction/index.vue b/src/views/admin/system/sys-user-transaction/index.vue
new file mode 100644
index 0000000..d34e014
--- /dev/null
+++ b/src/views/admin/system/sys-user-transaction/index.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 联系热线：
+ 18367908152
+ 15657370065
+
+
+
- {{ $t('user.dropdown1') }}
- {{ $t('user.dropdown2') }}
- {{ $t('user.dropdown5') }}
+ {{ $t("user.dropdown1") }}
+ {{ $t("user.dropdown2") }}
+ {{ $t("user.dropdown5") }}
@@ -68,168 +84,168 @@
|