diff --git a/src/components/jero/JTable.vue b/src/components/jero/JTable.vue
index c475803b..d62c8099 100644
--- a/src/components/jero/JTable.vue
+++ b/src/components/jero/JTable.vue
@@ -446,7 +446,8 @@ export default {
col = columns.find(col => getKey(col) === key) || {}
}
// 没有开启拖拽 或 没有宽度 或 有定位,都不能拖拽(防止布局异常,至少有一列不设width并且不能有fixed)
- if (!col.width || !!col.fixed) {
+ // 或者是最后一列也不能拖拽
+ if (!col.width || !!col.fixed || col.title === columns[columns.length - 1].title) {
return
@@ -87,15 +82,17 @@
{{ text || text === 0 ? text : global.emptyLine }}
- {{ text }}
+ {{ text }}
+ {{ global.emptyLine }}
- {{ record.declareFileName || record.declareFileName === 0 ? record.declareFileName : global.emptyLine }}
- {{ record.declareFileName }}
+ {{ text || text === 0 ? text : global.emptyLine }}
+ {{ text }}
+ {{ global.emptyLine }}
@@ -176,6 +173,7 @@ export default {
title: this.$t('enterpriseStandardLibrary.publicize.relatedMaterial'),
align: 'center',
width: 180,
+ dataIndex: 'declareFileName',
scopedSlots: { customRender: 'relatedMaterial' }
}
],
diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
index 750cf0fa..1377d52e 100644
--- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
+++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
@@ -89,13 +89,6 @@
{{ text || text === 0 ? text : global.emptyLine }}
-
-
-
- {{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}
- {{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}
-
-
@@ -170,7 +163,8 @@ export default {
title: this.$t('enterpriseStandardLibrary.reviewPlan.mainDraftingUnit'),
align: 'center',
width: 180,
- scopedSlots: { customRender: 'mainDraftingUnit' }
+ dataIndex: 'mainDraftingUnit',
+ scopedSlots: { customRender: 'text' }
}
],
labelCol: {
diff --git a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue b/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
index 993dc458..807dc635 100644
--- a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
+++ b/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
@@ -36,14 +36,6 @@
-
-