From 60b91005bbd3928449ecb4de0352ae6d57d85acf Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sun, 30 Oct 2022 23:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=E6=8E=92?= =?UTF-8?q?=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduleClassesWeek.html | 10 ++-- .../scheduleClassesWeek.js | 51 ++++++++++--------- .../addScheduleClasses.html | 6 +-- .../addScheduleClasses/addScheduleClasses.js | 2 +- .../editScheduleClasses.html | 6 +-- public/vcCore/vcFramework.js | 17 ++++++- 6 files changed, 55 insertions(+), 37 deletions(-) diff --git a/public/components/property/scheduleClassesWeek/scheduleClassesWeek.html b/public/components/property/scheduleClassesWeek/scheduleClassesWeek.html index 1f3f2a74e..254343637 100644 --- a/public/components/property/scheduleClassesWeek/scheduleClassesWeek.html +++ b/public/components/property/scheduleClassesWeek/scheduleClassesWeek.html @@ -7,7 +7,7 @@
-
+
-
{{item.day}}
+ style="border-radius: 5px;cursor:pointer" @click="_changeWorkdayWeekInfo(item)" v-if="item.weekFlag == week"> +
{{vc.getWorkDay(item.day)}}
{{item.workdayName}}
{{time.startTime}}-{{time.endTime}}
diff --git a/public/components/property/scheduleClassesWeek/scheduleClassesWeek.js b/public/components/property/scheduleClassesWeek/scheduleClassesWeek.js index bd8cb5e11..bf73cc2e0 100644 --- a/public/components/property/scheduleClassesWeek/scheduleClassesWeek.js +++ b/public/components/property/scheduleClassesWeek/scheduleClassesWeek.js @@ -2,48 +2,51 @@ vc.extends({ data: { scheduleClassesWeekInfo: { - scheduleCycle:1, - days:[] + scheduleCycle: 1, + days: [] } }, _initMethod: function () { - + }, _initEvent: function () { - + vc.on("scheduleClassesWeekInfo", "notify", function (_param) { $that.scheduleClassesWeekInfo.days = _param.days; - $that.scheduleClassesWeekInfo.scheduleCycle = _param.scheduleCycle; + $that.scheduleClassesWeekInfo.scheduleCycle = parseInt(_param.scheduleCycle); - if(_param.days && _param.days.length>0){ - return ; + if (_param.days && _param.days.length > 0) { + return; } $that._changeInspectionPeriodWeek(); }); }, methods: { - _changeInspectionPeriodWeek:function(){ + _changeInspectionPeriodWeek: function () { let _days = $that.scheduleClassesWeekInfo.days; - _days.splice(0,_days.length); - for(let cycleIndex = 0; cycleIndex < $that.scheduleClassesWeekInfo.scheduleCycle; cycleIndex++){ - _days.push({ - day:cycleIndex+1, - workday:'1001', - workdayName:'正常上下班', - times:[{ - id:vc.uuid(), - startTime:'08:30', - endTime:'18:00' - }] - }) + _days.splice(0, _days.length); + for (let weekIndex = 0; weekIndex < $that.scheduleClassesWeekInfo.scheduleCycle; weekIndex++) { + for (let cycleIndex = 0; cycleIndex < 7; cycleIndex++) { + _days.push({ + weekFlag: weekIndex+1, + day: cycleIndex + 1, + workday: '1001', + workdayName: '正常上下班', + times: [{ + id: vc.uuid(), + startTime: '08:30', + endTime: '18:00' + }] + }) + } } - vc.emit('addScheduleClasses','notifyScheduleCycle',$that.scheduleClassesWeekInfo.scheduleCycle); + vc.emit('addScheduleClasses', 'notifyScheduleCycle', $that.scheduleClassesWeekInfo.scheduleCycle); }, - _changeWorkdayWeekInfo:function(item){ - vc.emit('editScheduleClassesDay', 'notify',item); + _changeWorkdayWeekInfo: function (item) { + vc.emit('editScheduleClassesDay', 'notify', item); } - + } }); })(window.vc); \ No newline at end of file diff --git a/public/pages/property/addScheduleClasses/addScheduleClasses.html b/public/pages/property/addScheduleClasses/addScheduleClasses.html index f3ae5c89f..150b8092a 100644 --- a/public/pages/property/addScheduleClasses/addScheduleClasses.html +++ b/public/pages/property/addScheduleClasses/addScheduleClasses.html @@ -29,7 +29,7 @@ {{vc.i18n('必填，请选择排班类型','addScheduleClasses')}} - +
@@ -38,9 +38,9 @@
- +
diff --git a/public/pages/property/addScheduleClasses/addScheduleClasses.js b/public/pages/property/addScheduleClasses/addScheduleClasses.js index d3a987ebd..c8b944ac1 100644 --- a/public/pages/property/addScheduleClasses/addScheduleClasses.js +++ b/public/pages/property/addScheduleClasses/addScheduleClasses.js @@ -29,7 +29,7 @@ } if($that.addScheduleClassesInfo.scheduleType == '2002'){ - vc.emit("scheduleClassesDayInfo", "notify",{ + vc.emit("scheduleClassesWeekInfo", "notify",{ scheduleCycle:$that.addScheduleClassesInfo.scheduleCycle, days:$that.addScheduleClassesInfo.days }) diff --git a/public/pages/property/editScheduleClasses/editScheduleClasses.html b/public/pages/property/editScheduleClasses/editScheduleClasses.html index b71fafa04..c69bd42bd 100644 --- a/public/pages/property/editScheduleClasses/editScheduleClasses.html +++ b/public/pages/property/editScheduleClasses/editScheduleClasses.html @@ -29,7 +29,7 @@ {{vc.i18n('必填，请选择排班类型','editScheduleClasses')}} - +
@@ -38,9 +38,9 @@
- +
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js index 177aaddde..eb41bdaf4 100755 --- a/public/vcCore/vcFramework.js +++ b/public/vcCore/vcFramework.js @@ -1970,6 +1970,22 @@ }) } + vcFramework.getWeek = function(_week){ + if(_week == 1){ + return '第一周'; + } + if(_week == 2){ + return '第二周'; + } + if(_week == 3){ + return '第三周'; + } + if(_week == 4){ + return '第四周'; + } + + } + vcFramework.getWorkDay = function(_day){ if(_day == 1){ return '星期一'; @@ -1992,7 +2008,6 @@ if(_day == 7){ return '星期日'; } - } })(window.vcFramework);