Merge remote-tracking branch 'origin/master'

.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

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" },
 		// {

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

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" })
 }