From aec1959b836aa9124078a717f815460aa3b1cc62 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 20 Mar 2025 16:37:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/form.vue | 2 +- src/views/canteenDailyDishes/index.vue | 6 +++--- .../supermarketerp/purchaseManagement/smErpCgPlan/index.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue index d837d35..e8231be 100644 --- a/src/views/admin/system/user/form.vue +++ b/src/views/admin/system/user/form.vue @@ -153,7 +153,7 @@ const dataForm = reactive({ const dataRules = ref({ // 用户名校验，不能为空 、长度 5-20、不能和已有数据重复 username: [ - // { required: true, message: "用户名不能为空", trigger: "blur" }, + { required: true, message: "用户名不能为空", trigger: "blur" }, { min: 5, max: 60, message: "用户名称长度必须介于5-20个字符之间", trigger: "blur" }, { pattern: /^[^\u4e00-\u9fa5]+$/, message: "用户名称不能包含中文", trigger: "blur" }, // { diff --git a/src/views/canteenDailyDishes/index.vue b/src/views/canteenDailyDishes/index.vue index 65702cc..fc3a145 100644 --- a/src/views/canteenDailyDishes/index.vue +++ b/src/views/canteenDailyDishes/index.vue @@ -214,8 +214,8 @@ const foodData = reactive<{ // 根据时段获取菜品 const getDishByType = async () => { const result = await selectTimeFoodApi({ - // time: dayjs().format("YYYY-MM-DD"), - time: "2025-03-14", + time: dayjs().format("YYYY-MM-DD"), + // time: "2025-03-14", // time: "2025-02-07", merchantId: "1887400193644199937", // hourType: 2, @@ -227,7 +227,7 @@ const getDishByType = async () => { // foodData.breakfast = r.dailyMenuVOS break case 2: - foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 13) + foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 15) break case 3: // foodData.dinner = r.dailyMenuVOS diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue index 36acada..f75c05a 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue @@ -146,7 +146,7 @@ const handleClickCreateCgPlan = () => { // 点击编辑采购清单 const handleClickEditCgPlan = (id: string) => { purchaseStore.setSmErpCgPlanId(id) - purchaseStore.setSmErpCgPlanDisabled(false) + purchaseStore.setSmErpCgPlanDisabled(true) router.push({ path: "/supermarketerp/purchaseManagement/smErpCgPlan/form" }) } From 4518749f537f7916227ad1776a4cf45373d28d96 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 20 Mar 2025 17:09:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=AD=A3=E5=85=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index d6df8ef..57cefe0 100644 --- a/.env.development +++ b/.env.development @@ -8,18 +8,18 @@ VITE_OPEN = true ENV = 'development' # ADMIN 服务地址 -VITE_ADMIN_PROXY_PATH = http://47.96.250.9:8089/api/ # 测试线上 +# VITE_ADMIN_PROXY_PATH = http://47.96.250.9: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.64:9999/ # 邓-本地 +VITE_ADMIN_PROXY_PATH = http://192.168.101.64:9999/ # 邓-本地 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上 # 图片访问基础地址 # VITE_IMAGE_BASE_PATH = http://47.96.250.9: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.64:9999 # 邓-本地 -VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 +VITE_IMAGE_BASE_PATH = http://192.168.101.64:9999 # 邓-本地 +# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上 # 代码生成服务地址 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003