chenxiaochao 14 ore fa
parent
commit
c3b3309718

BIN
apps/web-ele/public/menulogo2.png


+ 1 - 1
apps/web-ele/src/preferences.ts

@@ -17,7 +17,7 @@ export const overridesPreferences = defineOverridesPreferences({
17 17
   },
18 18
   logo: {
19 19
     enable: true,
20
-    source: '/menulogo.png', // 这里修改为你的 logo 图片路径
20
+    source: '/menulogo.png',
21 21
   },
22 22
   theme: {
23 23
     colorPrimary: '#E9481C',

+ 14 - 0
apps/web-ele/src/views/system/taskDesign/taskTemplate/index.vue

@@ -200,6 +200,20 @@ const handleConfirm = async (data: any) => {
200 200
     if (!data.taskLeader) {
201 201
       data.taskLeader = '';
202 202
     }
203
+    //  if(data.startTimeMonth){
204
+    // data.startTimeMonth = Number(data?.startTimeMonth);
205
+    // }
206
+    if(data.startTimeYearDay){
207
+    data.startTimeDay = Number(data?.startTimeYearDay);
208
+    delete data.startTimeYearDay;
209
+    }
210
+    //  if(data.endTimeMonth){
211
+    // data.endTimeMonth = Number(data?.endTimeMonth);
212
+    // }
213
+    if(data.endTimeYearDay){
214
+    data.endTimeDay = Number(data?.endTimeYearDay);
215
+    delete data.endTimeYearDay;
216
+    }
203 217
     // 根据是否包含 id 来决定调用新增接口还是编辑接口
204 218
     if (data.id) {
205 219
       // 编辑操作

+ 11 - 5
apps/web-ele/src/views/system/taskDesign/taskTemplate/taskTemplate-data.tsx

@@ -980,8 +980,10 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
980 980
           Array.isArray(values.isCycleEnd) &&
981 981
           values.isCycleEnd[0] === true),
982 982
       componentProps(values: any) {
983
+        const startMonth = Number.parseInt(values.startTimeMonth) || 1;
983 984
         const startDay = Number.parseInt(values.startTimeYearDay) || 1;
984
-        const month = Number.parseInt(values.endTimeMonth) || 1;
985
+        const endMonth = Number.parseInt(values.endTimeMonth) || 1;
986
+        const month = endMonth;
985 987
 
986 988
         // 计算每个月的天数
987 989
         let daysInMonth = 31;
@@ -991,19 +993,23 @@ export const drawerFormSchema: FormSchemaGetter = (props?: any) => [
991 993
           daysInMonth = 28; // 简化处理,不考虑闰年
992 994
         }
993 995
 
994
-        const count = daysInMonth - startDay + 1;
996
+        // 如果是同月,结束天数必须大于等于开始天数
997
+        // 如果是跨月,结束天数可以从1号开始
998
+        const start = startMonth === endMonth ? startDay : 1;
999
+        const count = daysInMonth - start + 1;
995 1000
         return {
996 1001
           options: Array.from({ length: count }, (_, i) => ({
997
-            label: (startDay + i).toString(),
998
-            value: startDay + i,
1002
+            label: (start + i).toString(),
1003
+            value: start + i,
999 1004
           })),
1000
-          defaultValue: startDay.toString(),
1005
+          defaultValue: start.toString(),
1001 1006
         };
1002 1007
       },
1003 1008
       triggerFields: [
1004 1009
         'endoftheperiod',
1005 1010
         'isCycleEnd',
1006 1011
         'taskFrequency',
1012
+        'startTimeMonth',
1007 1013
         'startTimeYearDay',
1008 1014
         'endTimeMonth',
1009 1015
       ],

+ 1 - 1
packages/effects/layouts/src/basic/layout.vue

@@ -222,7 +222,7 @@ const headerSlots = computed(() => {
222 222
         v-if="preferences.logo.enable"
223 223
         :class="logoClass"
224 224
         :collapsed="true"
225
-        :src="preferences.logo.source"
225
+        :src="logoCollapsed ? '/menulogo2.png' : preferences.logo.source"
226 226
         :text="preferences.app.name"
227 227
         :theme="showHeaderNav ? headerTheme : theme"
228 228
         @click="clickLogo"

+ 1 - 1
packages/locales/src/langs/zh-CN/authentication.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "welcomeBack": "欢迎回来",
3
-  "pageTitle": "欢迎使用汇能云油零售管理平台",
3
+  "pageTitle": "智慧管家数字化管理平台",
4 4
   "pageDesc": "工程化、高性能、跨组件库的前端模版",
5 5
   "loginSuccess": "登录成功",
6 6
   "loginSuccessDesc": "欢迎回来",