From 44f2662b5bb9955abdefcea84741b0145dd86200 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 14 May 2025 16:32:58 +0800 Subject: [PATCH 1/5] --- .../canteen/canteenInventoryRecords/form.vue | 4 +- .../canteenInventoryRecords/form11.vue | 112 ---------- .../canteen/canteenInventoryRecords/index.vue | 7 +- .../canteenInventoryRecordsItem/form.vue | 209 ------------------ 4 files changed, 6 insertions(+), 326 deletions(-) delete mode 100644 src/views/canteen/canteenInventoryRecords/form11.vue delete mode 100644 src/views/canteen/canteenInventoryRecordsItem/form.vue diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue index 43390f0..23956eb 100644 --- a/src/views/canteen/canteenInventoryRecords/form.vue +++ b/src/views/canteen/canteenInventoryRecords/form.vue @@ -112,9 +112,9 @@ 保存 - + 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 @@ - + + + + +
+
+
+
+ 同步用户食堂信息 +
+
+
+ + 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 @@ + @@ -27,6 +28,7 @@ const Refund = defineAsyncComponent(() => import("./components/refund/index.vue" const OffLine = defineAsyncComponent(() => import("./components/off-line/index.vue")) const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/index.vue")) const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue")) +const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue")) const data = { tabList: [ @@ -36,6 +38,7 @@ const data = { { id: 40, label: "二维码配置" }, { id: 50, label: "离线配置" }, { id: 60, label: "正元同步配置" }, + { id: 70, label: "用户同步配置" }, ], } From 368b5f3a1e7109dc0c84f6b44bbbaac648640c06 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 14 May 2025 17:05:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mch/mch-manage/form.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue index 67b8e56..5779913 100644 --- a/src/views/mch/mch-manage/form.vue +++ b/src/views/mch/mch-manage/form.vue @@ -184,10 +184,8 @@ const dataRulesArr = { 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" }], } const dataRules = computed(() => { if (form.types == "2" && form.supType == "20") { @@ -201,6 +199,7 @@ const dataRules = computed(() => { return { ...dataRulesArr, supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }], + catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }], } } else { return dataRulesArr From 6809b4fa2a4d3f2ac6362155ab6db9d1c66c953b Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 14 May 2025 17:30:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mch/mch-manage/form.vue | 32 ++++++++++--------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue index 5779913..b823aec 100644 --- a/src/views/mch/mch-manage/form.vue +++ b/src/views/mch/mch-manage/form.vue @@ -35,19 +35,19 @@ - + {{ item.label }} - + - + @@ -179,32 +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" }], 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" }], - catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }], - } - } else { - return dataRulesArr - } -}) // 打开弹窗 const openDialog = async (id: string) => { @@ -240,6 +225,9 @@ watch( const onSubmit = async () => { const valid = await dataFormRef.value.validate().catch(() => {}) if (!valid) return false + console.log(valid) + return + const _pa = { ...form, isSyncZy: form.isSyncZy ? "1" : "0", From 8790c9694feb9ab0dc78a04931736896ff150954 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 14 May 2025 17:54:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mch/mch-manage/form.vue | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue index 5779913..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,32 +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" }], 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" }], - catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }], - } - } else { - return dataRulesArr - } -}) // 打开弹窗 const openDialog = async (id: string) => { @@ -240,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",