1

src/views/productOperation/cameraScene.vue

@@ -40,7 +40,7 @@
               },
               {
                 label: '权限',
-                disabled: (!(record.status == 1 || record.status == -2)),
+                disabled: (!(record.status == 1 || record.status == -2)) || !record.isAuth,
                 ifShow: getTypeCheckPerm('scenes-powers'),
                 onClick: handlePowers.bind(null, record),
               },

src/views/productOperation/modal/PowersModal.vue

@@ -86,7 +86,7 @@
           title: '查看权限',
           dataIndex: 'lookAuth',
           customRender: ({ record }) => {
-            return record.lookAuth == 1 ? '不限时间' : record.lookAuth == 0 ? '无权' : `${dayjs(record.lookEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
+            return record.lookAuth == 1 ? '不限时间' : record.lookAuth == 0 ? '无权' : dayjs().isBefore(dayjs(record.lookEndTime)) ? '已过期' : `${dayjs(record.lookEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
           },
           width: 150,
         },
@@ -94,7 +94,7 @@
           title: '编辑权限',
           dataIndex: 'editAuth',
           customRender: ({ record }) => {
-            return record.editAuth == 1 ? '不限时间' : record.editAuth == 0 ? '无权' : `${dayjs(record.editEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
+            return record.editAuth == 1 ? '不限时间' : record.editAuth == 0 ? '无权' : dayjs().isBefore(dayjs(record.editEndTime)) ? '已过期' : `${dayjs(record.editEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
           },
           width: 150,
         },

src/views/productOperation/modal/detailModal.vue

@@ -376,11 +376,12 @@
             componentProps: {
               disabled: checkAuthOther.lookEndTime,
               disabledDate: (current) => {
-                if (checkAuthOther.lookEndTime) {
+                let mylookEndTime = dayjs(checkAuthOther.editEndTime)>dayjs(checkAuthOther.lookEndTime)?checkAuthOther.editEndTime:checkAuthOther.lookEndTime
+                if (mylookEndTime) {
                   return (
                     current &&
                     (current < dayjs().startOf('day') ||
-                      current > dayjs(checkAuthOther.lookEndTime))
+                      current > dayjs(mylookEndTime))
                   );
                 } else {
                   return current && current < dayjs().startOf('day');