1

src/views/productOperation/modal/detailModal.vue

@@ -54,13 +54,13 @@
         return result;
       };
       const disabledLookTime = (date) => {
-        const hour = dayjs(editTime.value).hour(); // 获取当前的小时
-        const min = dayjs(editTime.value).minute(); // 获取当前的分钟
-        const second = dayjs(editTime.value).second(); // 获取当前秒
-        console.log('disabledLookTime', hour, min, second);
-        if (dayjs(date).format('YYYY-MM-DD') === dayjs(editTime.value).format('YYYY-MM-DD')) {
-          if (dayjs(date).format('HH') === dayjs(editTime.value).format('HH')) {
-            if (dayjs(date).format('mm') === dayjs(editTime.value).format('mm')) {
+        let startTime = editTime.value || '';
+        const hour = dayjs(startTime).hour(); // 获取当前的小时
+        const min = dayjs(startTime).minute(); // 获取当前的分钟
+        const second = dayjs(startTime).second(); // 获取当前秒
+        if (dayjs(date).format('YYYY-MM-DD') === dayjs(startTime).format('YYYY-MM-DD')) {
+          if (dayjs(date).format('HH') === dayjs(startTime).format('HH')) {
+            if (dayjs(date).format('mm') === dayjs(startTime).format('mm')) {
               return {
                 disabledHours: () => range(0, 24).splice(0, hour),
                 disabledMinutes: () => range(0, 60).splice(0, min),
@@ -343,7 +343,6 @@
       onMounted(() => {});
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner(async (data) => {
-        editTime.value = '';
         onSearch('');
         let checkAuthOther = await checkAuthOtherApi({ num: data.num });
         let setData = {
@@ -351,6 +350,9 @@
           ...data,
           isEmpower: [0], //[data.canAuthLook ? 0 : '', data.canEditLook ? 1 : ''],
         };
+        let lookEndTime = checkAuthOther.lookEndTime?checkAuthOther.lookEndTime:dayjs().format('YYYY-MM-DD HH:mm:ss')
+        let mylookEndTime = checkAuthOther.editEndTime>lookEndTime?checkAuthOther.editEndTime:lookEndTime
+        editTime.value = checkAuthOther.editEndTime;
         console.log('setData', setData);
         isEdit.value = true;
         if (data) {
@@ -413,12 +415,10 @@
             componentProps: {
               disabled: checkAuthOther.lookEndTime,
               disabledDate: (current) => {
-                let mylookEndTime = dayjs(checkAuthOther.editEndTime)>dayjs(checkAuthOther.lookEndTime)?checkAuthOther.editEndTime:checkAuthOther.lookEndTime
                 if (mylookEndTime) {
                   return (
                     current &&
-                    (current < dayjs().startOf('day') ||
-                      current > dayjs(mylookEndTime))
+                    (current < dayjs(mylookEndTime))
                   );
                 } else {
                   return current && current < dayjs().startOf('day');