diff --git a/src/components/customField/TableData.vue b/src/components/customField/TableData.vue index bea84c78..057acb55 100644 --- a/src/components/customField/TableData.vue +++ b/src/components/customField/TableData.vue @@ -21,7 +21,8 @@ {{ !record.subscribeFlag || record.subscribeFlag === 0 ? $t('subscribe') :$t('cancelSubscribe') }} - + + {{ ol.text }} @@ -200,6 +201,21 @@ export default { // scopedSlots: { customRender: 'operation' } // } ] + let width = 0 + if (this.operationList.length > 0) { + for (let i = 0; i < this.operationList.length; i++) { + width += this.getTextWith(this.operationList[i].text) + } + } + if (this.showAction) { + this.columns.push({ + title: this.$t('operation'), + align: 'center', + fixed: 'right', + width: width, + scopedSlots: { customRender: 'operation' } + }) + } this.dataSource = [ { collectFlag: '0', diff --git a/src/views/businessSupport/DataCenter.vue b/src/views/businessSupport/DataCenter.vue index afd267c7..ac558721 100644 --- a/src/views/businessSupport/DataCenter.vue +++ b/src/views/businessSupport/DataCenter.vue @@ -2,7 +2,7 @@
-
+
- +
@@ -143,7 +143,7 @@ {{item.db_field_txt}}
- @@ -329,16 +329,16 @@ import UploadFile from '@/components/UploadFile' import StandardSelection from '@/components/selection/StandardSelection' import SplitUpload from '@/components/splitUpload/SplitUpload' import UEditor from '@/components/uEditor/UEditor' -import moment from 'moment' import axios from 'axios' -import { getAction, postAction } from '@/api/manage' +import { getAction } from '@/api/manage' import { ACCESS_TOKEN } from '@/store/mutation-types' +import Vue from 'vue' export default { name: 'SplitAddForm', components: { - uploadFile, - Standardselection, + UploadFile, + StandardSelection, SplitUpload, UEditor }, @@ -726,7 +726,7 @@ export default { this.$message.warning(this.$t('oneTableAdded')) } else if (!ueContent || ueContent.length < 1) { this.$message.warning(this.$t('addATable')) - } if (ueContent && ueContent.length == 1) { + } if (ueContent && ueContent.length === 1) { this.tableVisible = false if (this.isTableEdit) { this.contentList[this.addIndex] = { diff --git a/src/views/documentTool/modules/SplitDetail.vue b/src/views/documentTool/modules/SplitDetail.vue index f0782048..3f098e2c 100644 --- a/src/views/documentTool/modules/SplitDetail.vue +++ b/src/views/documentTool/modules/SplitDetail.vue @@ -1,215 +1,211 @@