diff --git a/.env b/.env index 9a1e7a01..5f08198f 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ NODE_ENV=production VUE_APP_PLATFORM_NAME=JeroBoot 企业级快速开发平台 -VUE_APP_SSO=false \ No newline at end of file +VUE_APP_SSO=false +VUE_TAG_FLAG=0 \ No newline at end of file diff --git a/.env.development b/.env.development index 083c815f..aa76a6ef 100644 --- a/.env.development +++ b/.env.development @@ -1 +1,2 @@ -NODE_ENV=development \ No newline at end of file +NODE_ENV=development +VUE_APP_TAG_FLAG=0 \ No newline at end of file diff --git a/.env.production b/.env.production index 995fca4a..7a5c58b2 100644 --- a/.env.production +++ b/.env.production @@ -1 +1,2 @@ -NODE_ENV=production \ No newline at end of file +NODE_ENV=production +VUE_APP_TAG_FLAG=1 \ No newline at end of file diff --git a/.env.test b/.env.test index 8faabbd6..b7941266 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,5 @@ NODE_ENV=production VUE_APP_API_BASE_URL=http://boot.jero.com:8080/laws-sinotruk VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas -VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview \ No newline at end of file +VUE_APP_ONLINE_BASE_URL=http://fileview.jero.com/onlinePreview +VUE_APP_TAG_FLAG=1 \ No newline at end of file diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js new file mode 100644 index 00000000..569028d9 --- /dev/null +++ b/src/api/documentToolApi.js @@ -0,0 +1,21 @@ +// 本地工具-即文档功能对应的接口 + +import { getAction } from './manage' + +// 文档拆分-获取查询条件-todo 全部需要修改接口 +const getDocumentSplitSearchForm = (params) => getAction('/split/sarFileSplitInfo/queryCondition', params) +// 文档拆分-获取表单模型 +const getDocumentSplitFormModal = (params) => getAction('/laws/standard/domestic/getFormModel', params) +// 文档拆分-获取信息 +const getDocumentSplitDocumentInfo = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) +// 文档拆分-获取表头信息 +const getDocumentSplitTableHeader = (params) => getAction('/split/sarFileSplitInfo/getHeader', params) + +export { + // 文档拆分 + getDocumentSplitSearchForm, + getDocumentSplitFormModal, + getDocumentSplitDocumentInfo, + getDocumentSplitTableHeader + +} diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index 58309ebb..6707fdb3 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -7,7 +7,16 @@ {{ item.text }} - + 请选择 @@ -63,6 +72,10 @@ export default { } }, methods: { + filterOption (input, option) { + const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, initDictData () { // 优先从缓存中读取字典配置 if (getDictItemsFromCache(this.dictCode)) { diff --git a/src/views/documentTool/DocumentSplit.vue b/src/views/documentTool/DocumentSplit.vue index c2b69b9d..976e7a23 100644 --- a/src/views/documentTool/DocumentSplit.vue +++ b/src/views/documentTool/DocumentSplit.vue @@ -4,18 +4,18 @@ - - + + {{ $t('docTool.split.splitText') }} - - + + {{ $t('docTool.split.importResults') }} - - + + {{ $t('batchDelete') }} @@ -37,10 +37,8 @@ {{ operation.text }} - - - {{ $t('more') }} - + + @@ -75,6 +73,7 @@ import SplitText from './modules/SplitText' import ImportResult from './modules/ImportResult' import { httpAction, getAction } from '@/api/manage' import { ConfigurableTableMixin } from '@/mixins/ConfigurableTableMixin' +import { getDocumentSplitSearchForm, getDocumentSplitTableHeader } from '../../api/documentToolApi' export default { name: 'DocumentSplit', @@ -84,26 +83,31 @@ export default { return { selectedRowKeys: [], operationList: [ - // 回传至文档库 - { - text: this.$t('docTool.split.backDocument'), - clickEvent: 'backDocument' - }, // 查看 { text: this.$t('view'), - clickEvent: 'detailClick' + clickEvent: 'detailClick', + has: '' + }, + // 回传至文档库 + { + text: this.$t('docTool.split.backDocument'), + clickEvent: 'backDocument', + has: '' }, // 删除 { text: this.$t('delete'), - clickEvent: 'deleteDetail' + clickEvent: 'deleteDetail', + has: '' } ], + getTableHeaderFunc: getDocumentSplitTableHeader, + getQueryConditionFunc: getDocumentSplitSearchForm, url: { // tableHeader: '/split/sarFileSplitInfo/getHeader', // 表格头部字段 - searchList: '/split/sarFileSplitInfo/queryCondition', // 搜索字段 - // list: '/split/sarFileSplitInfo/page', // 表格数据 + // searchList: '/split/sarFileSplitInfo/queryCondition', // 搜索字段 + list: '/split/sarFileSplitInfo/page', // 表格数据 deleteBatch: '', // 批量删除 deleteUrl: '', backDocument: '' // 回传至文档库 diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue index ca332642..93ef76a8 100644 --- a/src/views/system/tags/modules/ClauseSplittingDrawer.vue +++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue @@ -24,7 +24,7 @@ - + {{ translate(item.langKey) }} @@ -69,7 +69,12 @@ - + {{ item.dictName }} @@ -238,12 +243,16 @@ export default { }, add () { this.edit({ - isModel: this.type + isModel: this.type, + fieldMustInput: 1, + isShowList: 1, + isQuery: 1 }) }, edit (record) { this.$refs.editForm && this.$refs.editForm.resetFields() this.form = Object.assign({}, record) + this.form.isModel = 4 this.isEdit = !!this.form.id this.initData() this.visible = true @@ -363,6 +372,10 @@ export default { } } }) + }, + filterOption (input, option) { + const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 } } } diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue index 635eceed..9f68d72d 100644 --- a/src/views/system/tags/modules/TagContentDictItemModal.vue +++ b/src/views/system/tags/modules/TagContentDictItemModal.vue @@ -40,6 +40,8 @@ v-model="model.parentId" :placeholder="$t('pleaseSelect')" allowClear + showSearch + tree-node-filter-prop="title" > diff --git a/src/views/system/tags/modules/TagContentDictListDrawer.vue b/src/views/system/tags/modules/TagContentDictListDrawer.vue index 85fdf09d..7daf9a03 100644 --- a/src/views/system/tags/modules/TagContentDictListDrawer.vue +++ b/src/views/system/tags/modules/TagContentDictListDrawer.vue @@ -147,7 +147,7 @@ export default { /* 排序参数--按照排序字段失序 */ isorter: { column: 'sortOrder', - order: 'ascend' + order: 'asc' }, // 树形结构对应的接口 treeUrl: { diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue index ad045f22..4e925a60 100644 --- a/src/views/system/tags/pages/ClauseSplittingList.vue +++ b/src/views/system/tags/pages/ClauseSplittingList.vue @@ -44,17 +44,10 @@ :scroll="{x: '100%'}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - - - {{ text || text === 0 ? text : global.emptyLine }} - {{ text || text === 0 ? text : global.emptyLine }} - - - - - + {{ $t('edit') }} - {{ $t('delete') }} @@ -93,44 +86,56 @@ export default { filters: { isModel: this.type }, + /* 排序参数 */ + isorter: { + column: 'orderNum', + order: 'asc' + }, columns: [ { title: this.$t('system.tag.attributeName'), align: 'left', - width: 100, - dataIndex: 'dbFieldTxt' + // width: 100, + dataIndex: 'dbFieldTxt', + scopedSlots: { customRender: 'text' } }, { title: this.$t('system.tag.attributeNameEnglish'), align: 'left', width: 100, - dataIndex: 'dbFieldEnName' + dataIndex: 'dbFieldEnName', + scopedSlots: { customRender: 'text' } }, { title: this.$t('system.tag.attributeType'), align: 'left', width: 100, - dataIndex: 'fieldShowTypeName' + dataIndex: 'fieldShowType_dictText', + scopedSlots: { customRender: 'text' } }, { title: this.$t('system.tag.fieldLength'), align: 'left', width: 80, - dataIndex: 'dbLength' + dataIndex: 'dbLength', + scopedSlots: { customRender: 'text' } }, { title: this.$t('system.tag.displayOrder'), align: 'left', width: 80, - dataIndex: 'orderNum' + dataIndex: 'orderNum', + scopedSlots: { customRender: 'text' } }, { title: this.$t('operation'), scopedSlots: { customRender: 'action' }, - align: 'left', + align: 'center', + fixed: 'right', width: 170 } - ] + ], + canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0' // 是否可以操作编辑和删除,开发环境可以 } } } diff --git a/src/views/system/tags/pages/StandardList.vue b/src/views/system/tags/pages/StandardList.vue index cba14840..057b9be3 100644 --- a/src/views/system/tags/pages/StandardList.vue +++ b/src/views/system/tags/pages/StandardList.vue @@ -58,9 +58,9 @@ > - {{ $t('edit') }} - {{ $t('delete') }} @@ -108,6 +108,11 @@ export default { filters: { isModel: this.type }, + /* 排序参数 */ + isorter: { + column: 'orderNum', + order: 'asc' + }, columns: [ { title: this.$t('system.tag.attributeName'), @@ -152,7 +157,8 @@ export default { fixed: 'right', width: 150 } - ] + ], + canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0' // 是否可以操作编辑和删除,开发环境可以 } }, methods: { @@ -174,6 +180,7 @@ export default { } }, created () { + console.log('-----------process.env.VUE_TAG_FLAG--------', process.env) this.getShowAreaData() } }