diff --git a/src/api/system/category/category.js b/src/api/system/category/category.js index 834696e..e2885c7 100644 --- a/src/api/system/category/category.js +++ b/src/api/system/category/category.js @@ -87,24 +87,6 @@ export function FetchEnabledFilingseal(data) { }) } -// 新增公共筛选 -export function FetchAddCategoryScreen(data) { - return request({ - url: 'api/category/addCategoryScreen', - method: 'post', - data - }) -} - -// 删除公共筛选 -export function FetchDelCategoryScreen(data) { - return request({ - url: 'api/category/delCategoryScreen', - method: 'post', - data - }) -} - // 门类下得字段 export function FetchInitCategoryField(params) { return request({ diff --git a/src/api/system/fileLibrary/fieldManage.js b/src/api/system/fileLibrary/fieldManage.js new file mode 100644 index 0000000..8b636cf --- /dev/null +++ b/src/api/system/fileLibrary/fieldManage.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +// 编辑门类字段 +export function add(data) { + data.isSystem = false + if (data.isDataType === 1) { + data.isDataTypeDetails = 'varchar' + } else if (data.isDataType === 2) { + data.isDataTypeDetails = 'int' + } + return request({ + url: 'api/document/editDocumentDictionary', + method: 'post', + data + }) +} + +export function edit(data) { + if (data.isDataType === 1) { + data.isDataTypeDetails = 'varchar' + } else if (data.isDataType === 2) { + data.isDataTypeDetails = 'int' + } + return request({ + url: 'api/document/editDocumentDictionary', + method: 'post', + data + }) +} + +// 删除门类类型菜单 +export function del(ids) { + const params = { id: ids[0] } + return request({ + url: 'api/document/deleteDocumentDictionary', + method: 'delete', + params + }) +} + +// 门类字段快速设置 +export function FetchEditFast(data) { + return request({ + url: 'api/document/editFast', + method: 'post', + data + }) +} + +export default { add, edit, del, FetchEditFast } diff --git a/src/api/system/fileLibrary/fileLibrary.js b/src/api/system/fileLibrary/fileLibrary.js new file mode 100644 index 0000000..5bc1a97 --- /dev/null +++ b/src/api/system/fileLibrary/fileLibrary.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 获取树状菜单 +export function FetchDocumentMenu() { + return request({ + url: 'api/document/menu', + method: 'get' + }) +} + +export function add(data) { + return request({ + url: 'api/document/editDocument', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/document/editDocument', + method: 'post', + data + }) +} + +// 删除门类 +export function del(ids) { + const params = { id: ids[0] } + return request({ + url: 'api/document/delete', + method: 'delete', + params + }) +} + +// 修改门类树状菜单 +export function sort(data) { + return request({ + url: 'api/document/sort', + method: 'put', + data + }) +} + +// 门类下得字段 +export function FetchInitCategoryField(params) { + return request({ + url: 'api/document/initDocumentField', + method: 'get', + params + }) +} + +// 著录界面排序 +export function FetchUpardicSort(data) { + return request({ + url: 'api/document/upardicSort', + method: 'put', + data + }) +} + +export default { add, edit, del, sort, FetchDocumentMenu } diff --git a/src/api/system/fileLibrary/listBrowsing.js b/src/api/system/fileLibrary/listBrowsing.js new file mode 100644 index 0000000..4014a6d --- /dev/null +++ b/src/api/system/fileLibrary/listBrowsing.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/document/createListDisplay', + method: 'post', + data + }) +} + +export function edit(data) { + return request({ + url: 'api/document/createListDisplay', + method: 'post', + data + }) +} + +// export function previewFormOrder(data) { +// return request({ +// url: 'api/arc-display/sort', +// method: 'put', +// data +// }) +// } + +export function order(data) { + return request({ + url: 'api/document/display-order', + method: 'put', + data + }) +} + +export default { add } diff --git a/src/api/system/fileLibrary/orderingRule.js b/src/api/system/fileLibrary/orderingRule.js new file mode 100644 index 0000000..ef236fc --- /dev/null +++ b/src/api/system/fileLibrary/orderingRule.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +export function getDisplayField(params) { + return request({ + url: 'api/document/getIsDisPlayState', + method: 'get', + params + }) +} + +export function edit(data) { + return request({ + url: 'api/document/orderby', + method: 'put', + data + }) +} + +export function order(data) { + return request({ + url: 'api/document/update-queue', + method: 'put', + data + }) +} +export default { edit } diff --git a/src/api/system/subjectLibraryField.js b/src/api/system/subjectLibraryField.js index c87383c..c07d3da 100644 --- a/src/api/system/subjectLibraryField.js +++ b/src/api/system/subjectLibraryField.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/special/editField', + url: 'api/specialField/editField', method: 'post', data }) @@ -10,7 +10,7 @@ export function add(data) { export function edit(data) { return request({ - url: 'api/special/editField', + url: 'api/specialField/editField', method: 'post', data }) diff --git a/src/utils/request.js b/src/utils/request.js index 0297fc6..aa5460d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -71,7 +71,6 @@ service.interceptors.response.use( return Promise.reject(error) } } - console.log(code) if (code) { if (code === 401) { store.dispatch('LogOut').then(() => { diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue index 7c7f88a..117882c 100644 --- a/src/views/components/category/SettingForm.vue +++ b/src/views/components/category/SettingForm.vue @@ -192,7 +192,8 @@ export default { return { form: { dictionaryId: { - id: null + id: null, + dictionaryName: null } }, rules: getRules(), @@ -217,7 +218,6 @@ export default { { value: 2, label: '档案分类' }, { value: 3, label: '字典' } ] - // dictionaryId: null } }, watch: { @@ -228,10 +228,12 @@ export default { } } }, + created() { + console.log(this.form) + }, mounted() { + this.form = this.thisFields this.$nextTick(() => { - this.form = this.thisFields - console.log(this.form) if (!this.isAdd) { this.getForm() } @@ -248,7 +250,10 @@ export default { if (this.form.mateData !== 3) { this.dictionaryData = [] - this.form.dictionaryId.id = null + this.form.dictionaryId = { + id: null, + dictionaryName: null + } } // 字段类型 @@ -284,7 +289,10 @@ export default { this.getDictrionaryList() } else { this.dictionaryData = [] - this.form.dictionaryId.id = null + this.form.dictionaryId = { + id: null, + dictionaryName: null + } } } }, @@ -298,7 +306,10 @@ export default { // this.dictionaryId = value // }, changeDictType(value) { - this.form.dictionaryId.id = null + this.form.dictionaryId = { + id: null, + dictionaryName: null + } }, // 著录形式为'下拉框'、'弹出框'的,对应字典不为空,反之为空 selectInputClass(value) { @@ -307,7 +318,10 @@ export default { } else { this.dictionaryData = [] this.form.mateData = null - this.form.dictionaryId.id = null + this.form.dictionaryId = { + id: null, + dictionaryName: null + } } // 字段类型为数字型,且默认著录类型为数字框不可更改 if (this.form.isDataType === 2 && this.form.isInputClass !== 'number') { diff --git a/src/views/system/archivesCategory/descriptionPreview/index.vue b/src/views/system/archivesCategory/descriptionPreview/index.vue index 08882f2..b9bf314 100644 --- a/src/views/system/archivesCategory/descriptionPreview/index.vue +++ b/src/views/system/archivesCategory/descriptionPreview/index.vue @@ -85,7 +85,10 @@ export default { settingFormVisible: false, // 修改编辑字段 - dialog previewFormVisible: false, // 界面预览form - dialog fieldsActive: 0, // 当前字段index - thisFields: { dictionaryConfigId: { dicName: null, id: null }}, // 当前项字段内容 + thisFields: { dictionaryId: { + id: null, + dictionaryName: null + }}, // 当前项字段内容 editField: {}, isInputFields: [], loading: false, diff --git a/src/views/system/archivesCategory/fieldManage/index.vue b/src/views/system/archivesCategory/fieldManage/index.vue index 3282c9f..93ee978 100644 --- a/src/views/system/archivesCategory/fieldManage/index.vue +++ b/src/views/system/archivesCategory/fieldManage/index.vue @@ -132,7 +132,7 @@ export default { }, [CRUD.HOOK.afterRefresh](crud) { crud.data.forEach(function(item, index) { - item.dictionaryId = item.dictionaryId || { id: null } + item.dictionaryId = item.dictionaryId || { id: null, dictionaryName: null } }) }, [CRUD.HOOK.beforeValidateCU](crud) { diff --git a/src/views/system/archivesCategory/fieldManage/module/form.vue b/src/views/system/archivesCategory/fieldManage/module/form.vue index 51a8a50..76f9ef6 100644 --- a/src/views/system/archivesCategory/fieldManage/module/form.vue +++ b/src/views/system/archivesCategory/fieldManage/module/form.vue @@ -49,7 +49,8 @@ const defaultForm = { displayLength: null, mateData: null, dictionaryId: { - id: null + id: null, + dictionaryName: null } } export default { diff --git a/src/views/system/archivesCategory/form.vue b/src/views/system/archivesCategory/form.vue index 01a32e8..6a8ca23 100644 --- a/src/views/system/archivesCategory/form.vue +++ b/src/views/system/archivesCategory/form.vue @@ -37,9 +37,6 @@ - @@ -117,39 +114,11 @@ export default { } }, created() { - this.getSelectOptions() }, methods: { // 新建时,判断当前节点类型,“门类类型” option区分可选 beforeToAdd() { this.form.isType = null - if (this.selectedCategory.isType === 1) { - this.selectOptions.forEach(item => { - if (item.value === 4) { - item.typeState = true - } else { - item.typeState = false - } - }) - } else if (this.selectedCategory.isType === 2) { - this.selectOptions.forEach(item => { - if (item.value !== 3) { - item.typeState = true - } else { - item.typeState = false - } - }) - this.form.isType = 3 - } else if (this.selectedCategory.isType === 3) { - this.selectOptions.forEach(item => { - if (item.value !== 4) { - item.typeState = true - } else { - item.typeState = false - } - }) - this.form.isType = 4 - } }, [CRUD.HOOK.beforeSubmit]() { if (this.form.templateId) { @@ -172,29 +141,12 @@ export default { this.form.isCase = null this.form.arrangeType = null } - // if (this.form.isType === 6) { - // // this.crudDict.getDicts() - // this.getTemplateTree() - // } else { - // this.form.dicExplain = null - // } }, getTemplateTree() { getCategoryTree().then(res => { this.templateTree = res }) }, - getSelectOptions() { - // getCategoryType().then(res => { - // for (const key in res) { - // this.selectOptions.push({ - // value: Number(key), - // label: res[key], - // typeState: false - // }) - // } - // }) - }, normalizer(node) { if (node.children && !node.children.length) { delete node.children diff --git a/src/views/system/archivesCategory/publicScreening/index.vue b/src/views/system/archivesCategory/publicScreening/index.vue index 583814d..c68ade5 100644 --- a/src/views/system/archivesCategory/publicScreening/index.vue +++ b/src/views/system/archivesCategory/publicScreening/index.vue @@ -14,9 +14,9 @@
- - - + + + @@ -53,18 +53,22 @@ diff --git a/src/views/system/fileLibraryManage/descriptionPreview/index.vue b/src/views/system/fileLibraryManage/descriptionPreview/index.vue index 7722aab..c436c12 100644 --- a/src/views/system/fileLibraryManage/descriptionPreview/index.vue +++ b/src/views/system/fileLibraryManage/descriptionPreview/index.vue @@ -64,9 +64,9 @@ - - diff --git a/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue b/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue deleted file mode 100644 index 6148a0d..0000000 --- a/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue b/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue deleted file mode 100644 index 88e0652..0000000 --- a/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/src/views/system/fileLibraryManage/form.vue b/src/views/system/fileLibraryManage/form.vue index 21f8bb9..95b179b 100644 --- a/src/views/system/fileLibraryManage/form.vue +++ b/src/views/system/fileLibraryManage/form.vue @@ -4,44 +4,19 @@
- - + + - - - + - - - - + @@ -54,14 +29,9 @@ diff --git a/src/views/system/fileLibraryManage/index.vue b/src/views/system/fileLibraryManage/index.vue index 1aff6af..7483965 100644 --- a/src/views/system/fileLibraryManage/index.vue +++ b/src/views/system/fileLibraryManage/index.vue @@ -6,22 +6,21 @@
@@ -32,13 +31,13 @@
- + {{ data.cnName }} - + {{ data.cnName }} - + {{ data.cnName }} @@ -53,10 +52,10 @@
  • 基本信息
  • -
  • 字段管理
  • -
  • 著录界面设置
  • -
  • 列表界面设置
  • -
  • 排序规则设置
  • +
  • 字段管理
  • +
  • 著录界面设置
  • +
  • 列表界面设置
  • +
  • 排序规则设置
@@ -96,7 +95,7 @@