|
@@ -111,6 +111,7 @@ export default defineComponent({
|
|
|
type: any = 1
|
|
|
) {
|
|
|
let data: any = proxyData.workkArr;
|
|
|
+ proxyData.text = "";
|
|
|
return formateTimeContinuous(
|
|
|
index,
|
|
|
startTime,
|
|
@@ -209,13 +210,13 @@ export default defineComponent({
|
|
|
if ((!cusStartTime || !cusEndTime) && !customSceneList.length) {
|
|
|
// 查找最近的一段预约数据
|
|
|
let btnObj: any = proxyData.formateTimeContinuous(
|
|
|
- 1,
|
|
|
+ 0,
|
|
|
startTime,
|
|
|
endTime,
|
|
|
2
|
|
|
);
|
|
|
if (btnObj && btnObj.text) {
|
|
|
- proxyData.timerText.text = `已预约~(${btnObj.text})`;
|
|
|
+ proxyData.timerText.text = `已预约(${btnObj.text})`;
|
|
|
proxyData.timerText.timer =
|
|
|
formatTimerStr(btnObj.startTime) +
|
|
|
"~" +
|
|
@@ -241,13 +242,13 @@ export default defineComponent({
|
|
|
proxyData.forcedOverTimeFlag = false;
|
|
|
} else {
|
|
|
let btnObj: any = proxyData.formateTimeContinuous(
|
|
|
- 1,
|
|
|
+ 0,
|
|
|
startTime,
|
|
|
endTime,
|
|
|
2
|
|
|
);
|
|
|
if (btnObj && btnObj.text) {
|
|
|
- proxyData.timerText.text = `已预约~(${btnObj.text})`;
|
|
|
+ proxyData.timerText.text = `已预约(${btnObj.text})`;
|
|
|
proxyData.timerText.timer =
|
|
|
formatTimerStr(btnObj.startTime) +
|
|
|
"~" +
|
|
@@ -279,7 +280,7 @@ export default defineComponent({
|
|
|
/**
|
|
|
* 需要补加上和未来时间连续的问题
|
|
|
*/
|
|
|
-
|
|
|
+
|
|
|
let btnObj: any = proxyData.formateTimeContinuous(
|
|
|
1,
|
|
|
startTime,
|
|
@@ -359,59 +360,31 @@ export default defineComponent({
|
|
|
proxyData.timerText.showDel = true;
|
|
|
proxyData.forcedOverTimeFlag = false;
|
|
|
} else {
|
|
|
- customSceneList.map((item: any) => {
|
|
|
- if (nowTime < item.startTime) {
|
|
|
- startTime = item.startTime;
|
|
|
- endTime = item.endTime;
|
|
|
- if (item.startTime < startTime) {
|
|
|
- startTime = item.startTime;
|
|
|
- endTime = item.endTime;
|
|
|
- } else if (endTime === item.startTime) {
|
|
|
- endTime = item.endTime;
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- /**
|
|
|
- *需要补加上和未来时间连续的问题
|
|
|
- */
|
|
|
- if (startTime && endTime) {
|
|
|
- proxyData.timerText.text = "已预约~今日";
|
|
|
+ let btnObj: any = proxyData.formateTimeContinuous(
|
|
|
+ 0,
|
|
|
+ startTime,
|
|
|
+ endTime,
|
|
|
+ 2
|
|
|
+ );
|
|
|
+ if (
|
|
|
+ btnObj &&
|
|
|
+ btnObj.text &&
|
|
|
+ btnObj.startTime &&
|
|
|
+ btnObj.endTime
|
|
|
+ ) {
|
|
|
+ proxyData.timerText.text = `已预约(${btnObj.text})`;
|
|
|
proxyData.timerText.timer =
|
|
|
- formatTimerStr(startTime) + "~" + formatTimerStr(endTime);
|
|
|
- proxyData.timerText.classColor = "grey";
|
|
|
- proxyData.timerText.btnText = "预约时间";
|
|
|
- proxyData.timerText.showDel = false;
|
|
|
- proxyData.forcedOverTimeFlag = true;
|
|
|
+ formatTimerStr(btnObj.startTime) +
|
|
|
+ "~" +
|
|
|
+ formatTimerStr(btnObj.endTime);
|
|
|
} else {
|
|
|
- // 查找最近的一段预约数据
|
|
|
- // debuggers
|
|
|
- let btnObj: any = proxyData.formateTimeContinuous(
|
|
|
- 1,
|
|
|
- startTime,
|
|
|
- endTime,
|
|
|
- 2
|
|
|
- );
|
|
|
- if (
|
|
|
- btnObj &&
|
|
|
- btnObj.text &&
|
|
|
- btnObj.startTime &&
|
|
|
- btnObj.endTime
|
|
|
- ) {
|
|
|
- proxyData.timerText.text = `已预约~${btnObj.text}`;
|
|
|
- proxyData.timerText.timer =
|
|
|
- formatTimerStr(btnObj.startTime) +
|
|
|
- "~" +
|
|
|
- formatTimerStr(btnObj.endTime);
|
|
|
- } else {
|
|
|
- proxyData.timerText.text = "请选择工作时间段";
|
|
|
- proxyData.timerText.timer = "将自动开启办公服务";
|
|
|
- }
|
|
|
- proxyData.timerText.classColor = "grey";
|
|
|
- proxyData.timerText.btnText = "预约时间";
|
|
|
- proxyData.timerText.showDel = false;
|
|
|
- proxyData.forcedOverTimeFlag = true;
|
|
|
+ proxyData.timerText.text = "请选择工作时间段";
|
|
|
+ proxyData.timerText.timer = "将自动开启办公服务";
|
|
|
}
|
|
|
+ proxyData.timerText.classColor = "grey";
|
|
|
+ proxyData.timerText.btnText = "预约时间";
|
|
|
+ proxyData.timerText.showDel = false;
|
|
|
+ proxyData.forcedOverTimeFlag = true;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -469,7 +442,7 @@ export default defineComponent({
|
|
|
*需要补加上和未来时间连续的问题
|
|
|
*/
|
|
|
if (startTime && endTime) {
|
|
|
- proxyData.timerText.text = "已预约~(今日)";
|
|
|
+ proxyData.timerText.text = "已预约(今日)";
|
|
|
proxyData.timerText.timer =
|
|
|
formatTimerStr(startTime) + "~" + formatTimerStr(endTime);
|
|
|
proxyData.timerText.classColor = "grey";
|
|
@@ -514,8 +487,8 @@ export default defineComponent({
|
|
|
// 我要离开
|
|
|
myLeaving() {
|
|
|
proxyData.formatDataDel();
|
|
|
- console.log("删除了=====");
|
|
|
- console.log(proxyData.delTimeArr);
|
|
|
+ // console.log("删除了=====");
|
|
|
+ // console.log(proxyData.delTimeArr);
|
|
|
proxyData.leaveBtnFlag = true;
|
|
|
// 取消加班
|
|
|
proxyData.saveBatchCustomScene();
|