diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 342777e..2452e8b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -459,7 +459,7 @@ module.exports = { gbt: 'GB/T', gso: 'GSO', batchSetting: '批量设置', - clauseContent: '条文内容', + clauseContent: '条款内容', clauseNo: '条款号', clauseName: '条款名称', selectDirectoryTerms: '请选择添加条款的目录位置', diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index fa0c2e3..bfd419e 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -32,6 +32,9 @@ export const constantRouterMap = [ { path: '/documentTool/StandardSplitSheet', name: 'documentTool-StandardSplitSheet', + meta: { + title: '标准分解单' + }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/StandardSplitSheet') }, // 新旧拆分单对比 @@ -44,19 +47,37 @@ export const constantRouterMap = [ { path: '/documentTool/InitiateComparison', name: 'documentTool-InitiateComparison', + meta: { + title: '新旧拆分单对比-发起比对' + }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/InitiateComparison') }, // 新旧拆分单对比-文档对比 { path: '/documentTool/DocumentDataComparison', name: 'documentTool-DocumentDataComparison', + meta: { + title: '新旧拆分单对比-文档对比' + }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/DocumentDataComparison') }, // 新旧拆分单对比-对比结果 { path: '/documentTool/ComparisonResults', name: 'documentTool-ComparisonResults', + meta: { + title: '新旧拆分单对比-对比结果' + }, component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentComparison/ComparisonResults') + }, + // 文档拆分详情 + { + path: '/documentTool/DocumentSplitDetail', + name: 'documentTool-DocumentSplitDetail', + meta: { + title: '文档拆分详情' + }, + component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/DocumentSplitDetail') } ] }, @@ -73,12 +94,6 @@ export const constantRouterMap = [ // } // ] // }, - // 文档拆分详情 - { - path: '/documentTool/DocumentSplitDetail', - name: 'documentTool-DocumentSplitDetail', - component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/DocumentSplitDetail') - }, { path: '/404', component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404') diff --git a/jero-web/src/mixins/ConfigurableTableMixin.js b/jero-web/src/mixins/ConfigurableTableMixin.js index 9e02f8d..e9f8d5c 100644 --- a/jero-web/src/mixins/ConfigurableTableMixin.js +++ b/jero-web/src/mixins/ConfigurableTableMixin.js @@ -109,6 +109,7 @@ export const ConfigurableTableMixin = { */ searchReset () { this.searchParams = {} + this.queryParam = {} this.selectedRowKeys = [] this.getTableHeader() this.loadData(1) diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue index bb55f99..a441d0f 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue @@ -99,20 +99,12 @@ import { releaseSplitStandard, changePermission, withdraw } from '@api/documentT import ImportSplitResultModal from './modules/ImportSplitResultModal.vue' import UserSelectModal from '../../../components/selection/UserSelectModal.vue' import { SplitStatus, StandardSource } from '@/enums/commonEnums' -import { mapGetters } from 'vuex' export default { name: 'DocumentSplit', components: { JTable, SplitText, ImportSplitResultModal, UserSelectModal }, mixins: [JeroListMixin], - computed: { - ...mapGetters(['userInfo']), - administrators () { - const adminRoleList = window._CONFIG.adminRoleCode.split(',') - const userRoleList = this.userInfo.roleCode.split(',') - return userRoleList.some(tt => adminRoleList.includes(tt)) - } - }, + computed: {}, data () { return { operationList: [ diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index dfeab2e..7d46ba8 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -66,26 +66,34 @@
- + - - - + + - - - + + + + + + +
- + {{$t('query')}} - - - - -
- + {{ $t('import') }} @@ -266,19 +269,19 @@ export default { columns: [ { dataIndex: 'item_num', - title: '条款号', + title: this.$t('docTool.split.clauseNo'), align: 'center', width: 150 }, { - dataIndex: 'item_name', - title: '条款名称', + dataIndex: 'item_title', + title: this.$t('docTool.split.clauseName'), align: 'center', width: 150 }, { dataIndex: 'item_content', - title: '条款内容', + title: this.$t('docTool.split.clauseContent'), align: 'center', width: 150, scopedSlots: { customRender: 'item_content' } @@ -300,17 +303,17 @@ export default { // 编辑 { text: this.$t('edit'), - clickEvent: 'handleEdit', + clickEvent: 'handleEdit' }, // 复制 { text: this.$t('copy'), - clickEvent: 'handleCopy', + clickEvent: 'handleCopy' }, // 删除 { text: this.$t('delete'), - clickEvent: 'handleDelete', + clickEvent: 'handleDelete' } ], url: { diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index c12426f..28425e1 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -10,163 +10,36 @@
- +
- + +
+
+ {{ $t('docTool.split.clauseName') }} +
+ + + +
@@ -220,36 +93,22 @@