tangning 1 ano atrás
pai
commit
36bb6deeb8

+ 2 - 2
src/views/productOperation/modal/PowersModal.vue

@@ -86,7 +86,7 @@
           title: '查看权限',
           dataIndex: 'lookAuth',
           customRender: ({ record }) => {
-            return record.lookAuth == 1 ? '不限时间' : record.lookAuth == 0 ? '无权' : dayjs().isBefore(dayjs(record.lookEndTime)) ? '已过期' : `${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().isBefore(dayjs(record.editEndTime)) ? '已过期' : `${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,
         },

+ 5 - 6
src/views/productOperation/modal/detailModal.vue

@@ -196,13 +196,13 @@
               required: true,
               // @ts-ignore
               validator: async (rule, value) => {
-                console.log('value',value)
+                console.log('value',value, dayjs().isBefore(dayjs(value)))
                 if (!value) {
                   return Promise.reject('请选中日期');
                 }
-                if (dayjs().isBefore(dayjs(value))) {
+                if (!dayjs().isBefore(dayjs(value))) {
                   /* eslint-disable-next-line */
-                  return Promise.reject('请选择正确的到期时间');
+                  return Promise.reject('到期时间已过期');
                 }
                 return Promise.resolve();
               },
@@ -284,13 +284,12 @@
               required: true,
               // @ts-ignore
               validator: async (rule, value) => {
-                console.log('value',value)
                 if (!value) {
                   return Promise.reject('请选中日期');
                 }
-                if (dayjs().isBefore(dayjs(value))) {
+                if (!dayjs().isBefore(dayjs(value))) {
                   /* eslint-disable-next-line */
-                  return Promise.reject('请选择正确的到期时间');
+                  return Promise.reject('到期时间已过期');
                 }
                 return Promise.resolve();
               },