diff --git a/src/components/jero/JTable.vue b/src/components/jero/JTable.vue
index d62c8099..1e69109b 100644
--- a/src/components/jero/JTable.vue
+++ b/src/components/jero/JTable.vue
@@ -52,7 +52,7 @@
{{ operation.text }}
-
+
@@ -80,7 +80,7 @@
{{ operation.text }}
-
+
@@ -446,8 +446,7 @@ export default {
col = columns.find(col => getKey(col) === key) || {}
}
// 没有开启拖拽 或 没有宽度 或 有定位,都不能拖拽(防止布局异常,至少有一列不设width并且不能有fixed)
- // 或者是最后一列也不能拖拽
- if (!col.width || !!col.fixed || col.title === columns[columns.length - 1].title) {
+ if (!col.width || !!col.fixed) {
return
{children} |
}
// 开始拖拽监听
@@ -484,6 +483,7 @@ export default {
const onDrag = (x) => {
return x >= (col.minWidth || this.columnMinWidth)
}
+ // 解决都有dataIndex时会有横向滚动条的问题,让最后一列的拖拽容器宽度为0
return (
diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue
index 5065f1ca..7da67373 100644
--- a/src/views/enterpriseStandardLibrary/check/CheckList.vue
+++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue
@@ -300,7 +300,8 @@ export default {
],
url: {
list: '/enterprise/inspect/page',
- exportPostponeDataUrl: '', // 导出延期数据
+ exportXlsUrl: '/enterprise/inspect/exportData',
+ exportPostponeDataUrl: '/enterprise/inspect/exportDataWithDelay', // 导出延期数据
exportRectificationPlanUrl: '' // 导出整改计划
},
operationList: [
diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
index 2643be48..56a0cb31 100644
--- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue
+++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue
@@ -396,7 +396,8 @@ export default {
}
],
url: {
- list: '/enterprise/plan/page'
+ list: '/enterprise/plan/page',
+ exportXlsUrl: '/enterprise/plan/exportData'
}
}
},
diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
index fae574ab..3159410e 100644
--- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
@@ -178,7 +178,8 @@ export default {
}
],
url: {
- list: '/enterprise/declare/page'
+ list: '/enterprise/declare/page',
+ exportXlsUrl: '/enterprise/declare/exportData'
}
}
},
diff --git a/src/views/personalCenter/receivedShare/ReceivedShare.vue b/src/views/personalCenter/receivedShare/ReceivedShare.vue
index d5671012..c702d1f9 100644
--- a/src/views/personalCenter/receivedShare/ReceivedShare.vue
+++ b/src/views/personalCenter/receivedShare/ReceivedShare.vue
@@ -53,9 +53,9 @@
- {{ record.title || record.title === 0 ? record.title : global.emptyLine }}
- {{ record.title }}
- {{ record.title || record.title === 0 ? record.title : global.emptyLine }}
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ text || text === 0 ? text : global.emptyLine }}
@@ -93,6 +93,7 @@ export default {
title: this.$t('personalCenter.receivedShare.title'),
align: 'center',
width: 180,
+ dataIndex: 'rubric',
scopedSlots: { customRender: 'titleSlot' }
},
{
diff --git a/src/views/personalCenter/sentShare/SentShare.vue b/src/views/personalCenter/sentShare/SentShare.vue
index 7f47a993..d4e33856 100644
--- a/src/views/personalCenter/sentShare/SentShare.vue
+++ b/src/views/personalCenter/sentShare/SentShare.vue
@@ -53,9 +53,9 @@
- {{ record.title || record.title === 0 ? record.title : global.emptyLine }}
- {{ record.title }}
- {{ record.title || record.title === 0 ? record.title : global.emptyLine }}
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ text || text === 0 ? text : global.emptyLine }}
@@ -93,6 +93,7 @@ export default {
title: this.$t('personalCenter.sentShare.title'),
align: 'center',
width: 180,
+ dataIndex: 'rubric',
scopedSlots: { customRender: 'titleSlot' }
},
{
|