diff --git a/.env.development b/.env.development
index 8ee6e13..cebb88f 100644
--- a/.env.development
+++ b/.env.development
@@ -8,17 +8,17 @@ VITE_OPEN = true
ENV = 'development'
# ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.125:9999/ # 邓-本地
+# VITE_ADMIN_PROXY_PATH = http://192.168.101.125:9999/ # 邓-本地
# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
# 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上
# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
# VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.125:9999 # 邓-本地
+# VITE_IMAGE_BASE_PATH = http://192.168.101.125:9999 # 邓-本地
# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
# 代码生成服务地址
diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts
index 2ced6cf..46e748a 100644
--- a/src/api/admin/user.ts
+++ b/src/api/admin/user.ts
@@ -1,5 +1,15 @@
import request from "/@/utils/request"
+/**
+ * 同步用户食堂信息
+ */
+export const syncDeptMch = () => {
+ return request({
+ url: "/admin/user/sync-user-canteen",
+ method: "post",
+ })
+}
+
export const list = () => {
return request({
url: "/admin/user/list",
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index b7ac970..5e08753 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -128,6 +128,7 @@
/>
+
保存
-
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
+
+ {{ displayPrice(row.totalAmount) }}
+
@@ -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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 67b8e56..bd6ae27 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -35,19 +35,19 @@
-
+
{{ item.label }}
-
+
-
+
@@ -179,33 +179,17 @@ const jobTime = reactive<{
const merchantTypeRadioDisabled = ref(false)
// 定义校验规则
-const dataRulesArr = {
+const dataRules = {
name: [{ required: true, message: "商户名不能为空", trigger: "change" }],
types: [{ required: true, message: "请选择商户类型", trigger: "change" }],
logoPic: [{ required: true, message: "请上传商户logo", trigger: "change" }],
swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
- rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
sort: [{ required: true, message: "请输入排序", trigger: "change" }],
catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }],
+ supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
+ cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
}
-const dataRules = computed(() => {
- if (form.types == "2" && form.supType == "20") {
- return {
- ...dataRulesArr,
- supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
- cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
- // parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
- }
- } else if (form.types == "2") {
- return {
- ...dataRulesArr,
- supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
- }
- } else {
- return dataRulesArr
- }
-})
// 打开弹窗
const openDialog = async (id: string) => {
@@ -241,6 +225,7 @@ watch(
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return false
+
const _pa = {
...form,
isSyncZy: form.isSyncZy ? "1" : "0",
diff --git a/src/views/wallet/wallet-setting/components/user/index.vue b/src/views/wallet/wallet-setting/components/user/index.vue
new file mode 100644
index 0000000..26414bd
--- /dev/null
+++ b/src/views/wallet/wallet-setting/components/user/index.vue
@@ -0,0 +1,29 @@
+
+
+
+
diff --git a/src/views/wallet/wallet-setting/index.vue b/src/views/wallet/wallet-setting/index.vue
index 412e190..fef58ed 100644
--- a/src/views/wallet/wallet-setting/index.vue
+++ b/src/views/wallet/wallet-setting/index.vue
@@ -15,6 +15,7 @@