tangning 1 年之前
父节点
当前提交
524ed72556
共有 2 个文件被更改,包括 16 次插入11 次删除
  1. 8 7
      src/views/productOperation/modal/PowersModal.vue
  2. 8 4
      src/views/productOperation/modal/detailModal.vue

+ 8 - 7
src/views/productOperation/modal/PowersModal.vue

@@ -54,6 +54,7 @@
   import { usePermissionStore } from '/@/store/modules/permission';
   import { getAuthList, setAuthType, delAuth } from '/@/api/operate';
   import { BasicTable, useTable, TableAction, BasicColumn } from '/@/components/Table';
+  import dayjs from 'dayjs';
   const { t } = useI18n();
   export default defineComponent({
     components: { BasicModal, BasicForm, BasicTable, TableAction, detailModal },
@@ -83,23 +84,23 @@
           title: '查看权限',
           dataIndex: 'lookAuth',
           customRender: ({ record }) => {
-            return record.lookAuth == 1 ? '不限时间' : record.lookAuth == 0 ? '无权' : `${record.lookEndTime} 截止`;
+            return record.lookAuth == 1 ? '不限时间' : record.lookAuth == 0 ? '无权' : `${dayjs(record.lookEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
           },
-          width: 120,
+          width: 150,
         },
         {
           title: '编辑权限',
           dataIndex: 'editAuth',
           customRender: ({ record }) => {
-            return record.editAuth == 1 ? '不限时间' : record.editAuth == 0 ? '无权' : `${record.editEndTime} 截止`;
+            return record.editAuth == 1 ? '不限时间' : record.editAuth == 0 ? '无权' : `${dayjs(record.editEndTime).format('YYYY-MM-DD HH:mm')} 截止`;
           },
-          width: 120,
+          width: 150,
         },
         {
           title: '可授权他人',
           dataIndex: 'canLook',
           customRender: ({ record }) => {
-            return record.canEditLook == 1 ? '编辑' : record.canAuthLook == 1 ? '查看' : `无权`;
+            return record.canEditLook == 1 ? '编辑和查看' : record.canAuthLook == 1 ? '查看' : `无权`;
           },
           width: 120,
         },
@@ -110,7 +111,7 @@
           ifShow: true,
           fixed: 'right',
           flag: 'ACTION',
-          width: 120,
+          width: 80,
         },
       ];
       const permissionStore = usePermissionStore();
@@ -199,7 +200,7 @@
           console.log('res', res);
           closeModal();
           resetFields();
-          createMessage.success('场景迁移成功。');
+          createMessage.success('操作成功');
           emit('update');
         } catch (error) {
           console.log('not passing', error);

+ 8 - 4
src/views/productOperation/modal/detailModal.vue

@@ -145,10 +145,10 @@
                     disabled: value.target.value == 1,
                   },
                 },
-                {
-                  field: 'lookEndTime',
-                  ifShow: value.target.value != 1,
-                },
+                // {
+                //   field: 'lookEndTime',
+                //   ifShow: value.target.value != 1,
+                // },
                 {
                   field: 'isEmpower',
                   componentProps: {
@@ -172,6 +172,7 @@
               valueFormat: 'HH:mm',
               format: 'HH:mm',
             },
+            showToday: false,
             valueFormat: 'YYYY-MM-DD HH:mm',
             type: 'datetime',
             format: 'YYYY-MM-DD HH:mm',
@@ -223,6 +224,7 @@
               valueFormat: 'HH:mm',
               format: 'HH:mm',
             },
+            showToday: false,
             valueFormat: 'YYYY-MM-DD HH:mm',
             format: 'YYYY-MM-DD HH:mm',
             disabledTime: disabledTime,
@@ -384,6 +386,8 @@
           let canEditLook = params.isEmpower && params.isEmpower.some((item) => item == 1) ? 1 : 0;
           await addAuth({
             ...params,
+            lookEndTime: dayjs(params.lookEndTime).format('YYYY-MM-DD HH:mm:ss'),
+            editEndTime: dayjs(params.editEndTime).format('YYYY-MM-DD HH:mm:ss'),
             canEditLook,
             canAuthLook:
               canEditLook || (params.isEmpower && params.isEmpower.some((item) => item == 0))