diff --git a/src/assets/less/common.less b/src/assets/less/common.less index a6fa463b..a0d06139 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -1,8 +1,8 @@ /*列表上方操作按钮区域*/ -.ant-card-body .table-operator { +/*.ant-card-body .table-operator { margin-bottom: 8px; -} +}*/ /* 列表可拖拽改变列宽 begin */ .nio-header-th { @@ -27,7 +27,8 @@ /* 列表可拖拽改变列宽 end */ /*列表上方操作按钮区域*/ -.ant-card-body .table-operator { +.ant-card-body .table-operator, +.table-operator { margin-bottom: 29px; text-align: right; } diff --git a/src/common/lang/system/en.js b/src/common/lang/system/en.js index f612a3d3..df713a20 100644 --- a/src/common/lang/system/en.js +++ b/src/common/lang/system/en.js @@ -33,6 +33,17 @@ module.exports = { selectSearchCenterDisplayed: '请选择搜索中心是否展示', selectWhetherRequired: '请选择是否必填', describe: '描述', - dictionaryConfiguration: '字典配置' + dictionaryConfiguration: '字典配置', + documentSplitDisplay: '文档拆分模块展示', + documentSplitList: '文档拆分列表展示', + selectSplitListDisplay: '请选择是否文档拆分列表展示', + // 标签项内容管理 + labelItemName: '标签项名称', + // 字段列表 + name: '名称', + dataValue: '数据值', + parentName: '父级名称', + select: '下拉选择', + tree: '树形结构' } } diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js index bca2b4ef..df713a20 100644 --- a/src/common/lang/system/zh.js +++ b/src/common/lang/system/zh.js @@ -34,6 +34,16 @@ module.exports = { selectWhetherRequired: '请选择是否必填', describe: '描述', dictionaryConfiguration: '字典配置', - + documentSplitDisplay: '文档拆分模块展示', + documentSplitList: '文档拆分列表展示', + selectSplitListDisplay: '请选择是否文档拆分列表展示', + // 标签项内容管理 + labelItemName: '标签项名称', + // 字段列表 + name: '名称', + dataValue: '数据值', + parentName: '父级名称', + select: '下拉选择', + tree: '树形结构' } } diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index 9b825112..22f2a96e 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -235,48 +235,48 @@ export default { field_show_type: '1', tree: [] }, - // { - // db_field_name: 'state', - // db_field_txt: '状态', - // dict_field: 'state', - // field_show_type: '3', - // tree: [] - // }, - // { - // db_field_name: 'region', - // db_field_txt: '适用地区', - // dict_field: 'region', - // field_show_type: '4', - // tree: [] - // }, - // { - // db_field_name: 'technology_territory', - // db_field_txt: '技术领域', - // dict_field: 'technology_territory', - // field_show_type: '0', - // tree: [] - // }, - // { - // db_field_name: 'issue_time', - // db_field_txt: '发布日期', - // dict_field: '', - // field_show_type: '5', - // tree: [] - // }, - // { - // db_field_name: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', - // db_field_txt: '新车型实施日期', - // dict_field: '', - // field_show_type: '5', - // tree: [] - // }, - // { - // db_field_name: 'implement_time', - // db_field_txt: '在产车实施日期', - // dict_field: '', - // field_show_type: '5', - // tree: [] - // } + { + db_field_name: 'state', + db_field_txt: '状态', + dict_field: 'state', + field_show_type: '3', + tree: [] + }, + { + db_field_name: 'region', + db_field_txt: '适用地区', + dict_field: 'region', + field_show_type: '4', + tree: [] + }, + { + db_field_name: 'technology_territory', + db_field_txt: '技术领域', + dict_field: 'technology_territory', + field_show_type: '0', + tree: [] + }, + { + db_field_name: 'issue_time', + db_field_txt: '发布日期', + dict_field: '', + field_show_type: '5', + tree: [] + }, + { + db_field_name: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', + db_field_txt: '新车型实施日期', + dict_field: '', + field_show_type: '5', + tree: [] + }, + { + db_field_name: 'implement_time', + db_field_txt: '在产车实施日期', + dict_field: '', + field_show_type: '5', + tree: [] + } ] }, methods: { @@ -292,26 +292,26 @@ export default { const params = { flag: this.flag } - getAction(this.url.getSearchList, params).then((res) => { - if (res.success) { - this.searchList = res.result - // if (this.searchQueryList && this.searchQueryList.length > 0) { - // for (let i = 0; i < this.searchList.length; i++) { - // // 是要去掉这个字段的搜索?? - // if (this.searchList[i].db_field_name === 'issue_time') { - // this.searchList.splice(i, 1) - // i-- - // } - // // db_field_name 说明可以被代替位置?? - // if (this.searchList[i].db_field_name === 'title') { - // const data = this.searchList[i + 1] - // this.searchList[i + 1] = this.searchQueryList[0] - // this.searchList.push(data) - // } - // } - // } - } - }) + // getAction(this.url.getSearchList, params).then((res) => { + // if (res.success) { + // this.searchList = res.result + // // if (this.searchQueryList && this.searchQueryList.length > 0) { + // // for (let i = 0; i < this.searchList.length; i++) { + // // // 是要去掉这个字段的搜索?? + // // if (this.searchList[i].db_field_name === 'issue_time') { + // // this.searchList.splice(i, 1) + // // i-- + // // } + // // // db_field_name 说明可以被代替位置?? + // // if (this.searchList[i].db_field_name === 'title') { + // // const data = this.searchList[i + 1] + // // this.searchList[i + 1] = this.searchQueryList[0] + // // this.searchList.push(data) + // // } + // // } + // // } + // } + // }) }, onChange (item) { if (this.queryParam[item] && this.queryParam[item].length > 0) { diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 71cde23f..8c14a507 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -1,8 +1,4 @@ import EsEnums from './EsEnum' -import DomesticList from '../views/system/tags/pages/DomesticList' -import ForeignList from '../views/system/tags/pages/ForeignList' -import EnterpriseList from '../views/system/tags/pages/EnterpriseList' -import ClauseSplittingList from '../views/system/tags/pages/ClauseSplittingList' export const YesOrNoEnum = new EsEnums({ NO: { name: '否', index: 0 }, @@ -32,3 +28,9 @@ export const TagsTypeEnums = new EsEnums({ ENTERPRISE_LIST: { text: '企业标准', langKey: 'system.tag.enterpriseStandards', value: 3 }, CLAUSE_SPLITTING_LIST: { text: '条款拆分', langKey: 'system.tag.clauseSplitting', value: 4 } }) + +// 标签类型 +export const TagsAttributeTypeEnums = { + SELECT: { text: '下拉选择', langKey: 'system.tag.select', value: 1 }, + TREE: { text: '树形结构', langKey: 'system.tag.tree', value: 2 } +} diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue index 9e08948b..8b8f86c7 100644 --- a/src/views/system/modules/DictItemModal.vue +++ b/src/views/system/modules/DictItemModal.vue @@ -47,7 +47,7 @@ :wrapperCol="wrapperCol" :label="$t('dict.rankingValue')"> - {{ $t('valueSmallerIsHigher') }} + {{ $t('dict.valueSmallerIsHigher') }} + + + + + diff --git a/src/views/system/tags/modules/AreaModal.vue b/src/views/system/tags/modules/AreaModal.vue new file mode 100644 index 00000000..bfeb3782 --- /dev/null +++ b/src/views/system/tags/modules/AreaModal.vue @@ -0,0 +1,146 @@ + + + + + + diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue new file mode 100644 index 00000000..46b4d08c --- /dev/null +++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue @@ -0,0 +1,344 @@ + + + + + + diff --git a/src/views/system/tags/modules/DomesticDrawer.vue b/src/views/system/tags/modules/DomesticDrawer.vue deleted file mode 100644 index 1016264a..00000000 --- a/src/views/system/tags/modules/DomesticDrawer.vue +++ /dev/null @@ -1,397 +0,0 @@ - - - - - - diff --git a/src/views/system/tags/modules/ModalDemo.vue b/src/views/system/tags/modules/ModalDemo.vue new file mode 100644 index 00000000..b5c0e879 --- /dev/null +++ b/src/views/system/tags/modules/ModalDemo.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/views/system/tags/modules/StandardDrawer.vue b/src/views/system/tags/modules/StandardDrawer.vue new file mode 100644 index 00000000..f1e3133f --- /dev/null +++ b/src/views/system/tags/modules/StandardDrawer.vue @@ -0,0 +1,414 @@ + + + + + + diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue new file mode 100644 index 00000000..6b1ca7b7 --- /dev/null +++ b/src/views/system/tags/modules/TagContentDictItemModal.vue @@ -0,0 +1,214 @@ + + + + + + diff --git a/src/views/system/tags/modules/TagContentDictListDrawer.vue b/src/views/system/tags/modules/TagContentDictListDrawer.vue new file mode 100644 index 00000000..61967c11 --- /dev/null +++ b/src/views/system/tags/modules/TagContentDictListDrawer.vue @@ -0,0 +1,187 @@ + + + + + + diff --git a/src/views/system/tags/modules/TagContentModal.vue b/src/views/system/tags/modules/TagContentModal.vue index feb3e462..4962ac36 100644 --- a/src/views/system/tags/modules/TagContentModal.vue +++ b/src/views/system/tags/modules/TagContentModal.vue @@ -12,24 +12,32 @@ @cancel="handleCancel"> - + + - - + + + - - + + - + + @@ -40,8 +48,13 @@ diff --git a/src/views/system/tags/pages/EnterpriseList.vue b/src/views/system/tags/pages/EnterpriseList.vue deleted file mode 100644 index 16b05c0c..00000000 --- a/src/views/system/tags/pages/EnterpriseList.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/src/views/system/tags/pages/ForeignList.vue b/src/views/system/tags/pages/ForeignList.vue deleted file mode 100644 index 35bbfb30..00000000 --- a/src/views/system/tags/pages/ForeignList.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/src/views/system/tags/pages/DomesticList.vue b/src/views/system/tags/pages/StandardList.vue similarity index 88% rename from src/views/system/tags/pages/DomesticList.vue rename to src/views/system/tags/pages/StandardList.vue index 11543a51..2256a25d 100644 --- a/src/views/system/tags/pages/DomesticList.vue +++ b/src/views/system/tags/pages/StandardList.vue @@ -73,8 +73,10 @@ - - + + + + @@ -84,22 +86,30 @@ import { TagListMixin } from './TagListMixin' import { ResizeColumnProvide, ResizeHeader } from '../../../../mixins/header' import '@assets/less/common.less' -import DomesticDrawer from '../modules/DomesticDrawer' +import StandardDrawer from '../modules/StandardDrawer' +import AreaModal from '../modules/AreaModal' export default { - name: 'DomesticList', + name: 'StandardList', mixins: [TagListMixin, ResizeHeader, ResizeColumnProvide], components: { - DomesticDrawer + StandardDrawer, + AreaModal }, - data() { + props: { + type: { + required: false, + type: Number + } + }, + data () { return { // 展示区域-下拉框的数据 areasArr: [], // 混入中查询等相关接口 url: {}, filters: { - isModel: 1 + isModel: this.type }, columns: [ { @@ -150,15 +160,19 @@ export default { }, methods: { // 获取展示区域下拉框数据 - getShowAreaData() { - getShowAreaData().then(res => { + getShowAreaData () { + getShowAreaData({ type: this.type }).then(res => { if (res.success) { this.areasArr = res.result || [] } }) + }, + // 展示区域管理 + handleShow () { + this.$refs.areaModal.show() } }, - created() { + created () { this.getShowAreaData() } } diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue index 227e576c..1583cae2 100644 --- a/src/views/system/tags/pages/TagContent.vue +++ b/src/views/system/tags/pages/TagContent.vue @@ -9,6 +9,12 @@ v-model="queryParam.dictName"> + + + + +
{{ $t('reset') }} @@ -22,12 +28,12 @@
-
+
{{ $t('newlyAdded') }}
-
+
{{ $t('batchDelete') }}
@@ -45,8 +51,6 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @change="handleTableChange" > - - @@ -74,14 +80,18 @@ import '@assets/less/common.less' import { TagListMixin } from './TagListMixin' import { ResizeColumnProvide, ResizeHeader } from '../../../../mixins/header' import TagContentModal from '../modules/TagContentModal' +import TagContentDictListDrawer from '../modules/TagContentDictListDrawer' +import JDictSelectTag from '../../../../components/dict/JDictSelectTag' export default { name: 'TagContent', mixins: [TagListMixin, ResizeHeader, ResizeColumnProvide], components: { - TagContentModal + TagContentModal, + TagContentDictListDrawer, + JDictSelectTag }, - data() { + data () { return { columns: [ { @@ -123,7 +133,7 @@ export default { width: 170 } ], - // dataSource: [], + dataSource: [{}], url: { list: '' } @@ -131,8 +141,8 @@ export default { }, methods: { // 编辑字典数据 - editDictItem(record) { - this.$refs.dictItemList.edit(record) + editDictItem (record) { + this.$refs.tagContentDictListDrawer.show(record) } } } diff --git a/src/views/system/tags/pages/TagItem.vue b/src/views/system/tags/pages/TagItem.vue index 1eaf7767..60b32e87 100644 --- a/src/views/system/tags/pages/TagItem.vue +++ b/src/views/system/tags/pages/TagItem.vue @@ -3,7 +3,7 @@ - + @@ -13,27 +13,22 @@