tangning 6 月之前
父节点
当前提交
4bd6eca2ab

+ 18 - 0
src/views/empower/data.ts

@@ -254,6 +254,24 @@ export const rtkdeviceColumns: any[] = [
       return obj[record.accountType] || '-';
       return obj[record.accountType] || '-';
     },
     },
   },
   },
+  {
+    title: '差分账号最新生效日期',
+    ellipsis: true,
+    dataIndex: 'validStartTime',
+    width: 180,
+    customRender: ({ record }) => {
+      return record.validStartTime || '-';
+    },
+  },
+  {
+    title: '差分账号最新到期日期',
+    ellipsis: true,
+    dataIndex: 'validEndTime',
+    width: 180,
+    customRender: ({ record }) => {
+      return record.validStartTime || '-';
+    },
+  },
 ];
 ];
 
 
 export const rtkuserColumns: any[] = [
 export const rtkuserColumns: any[] = [

+ 2 - 2
src/views/empower/modal/difference/logListModal.vue

@@ -62,12 +62,12 @@
         },
         },
         {
         {
           title: '差分账号生效日期',
           title: '差分账号生效日期',
-          dataIndex: 'validEndTime',
+          dataIndex: 'validStartTime',
           width: 150,
           width: 150,
         },
         },
         {
         {
           title: '差分账号到期日期',
           title: '差分账号到期日期',
-          dataIndex: 'validStartTime',
+          dataIndex: 'validEndTime',
           width: 150,
           width: 150,
         },
         },
         {
         {

+ 2 - 2
src/views/order/data.ts

@@ -543,9 +543,9 @@ export const differenceColumns: BasicColumn[] = [
   {
   {
     title: '差分账号期限',
     title: '差分账号期限',
     ellipsis: true,
     ellipsis: true,
-    dataIndex: 'sgRtkSn',
+    dataIndex: 'validDay',
     customRender: ({ record }) => {
     customRender: ({ record }) => {
-      return record.sgRtkSn || '-';
+      return record.validDay || '-';
     },
     },
     width: 160,
     width: 160,
   },
   },

+ 2 - 2
src/views/order/differenceList.vue

@@ -48,7 +48,7 @@
   import { authorizeRtkList, authorizeRtkExport } from '/@/api/order';
   import { authorizeRtkList, authorizeRtkExport } from '/@/api/order';
   import { downloadByData } from '/@/utils/file/download';
   import { downloadByData } from '/@/utils/file/download';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { usePermissionStore } from '/@/store/modules/permission';
-  import { dowmColumns, equitySearchForm } from './data';
+  import { differenceColumns, equitySearchForm } from './data';
 
 
   export default defineComponent({
   export default defineComponent({
     components: {
     components: {
@@ -69,7 +69,7 @@
         api: authorizeRtkList,
         api: authorizeRtkList,
         title: '差分账号订单列表',
         title: '差分账号订单列表',
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: dowmColumns,
+        columns: differenceColumns,
         useSearchForm: true,
         useSearchForm: true,
         formConfig: equitySearchForm,
         formConfig: equitySearchForm,
         showTableSetting: true,
         showTableSetting: true,