门类管理档号规则设置 bug修正

3 years ago · 96ce8eab89
9 changed files with 136 additions and 956 deletions
--- a/src/api/category/fileNoFormat.js
+++ b/src/api/category/fileNoFormat.js
@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function getNoFormatField() {
+  return request({
+    url: 'api/dic-setting/list',
+    method: 'get'
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dic-setting/update',
+    method: 'put',
+    data
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/dic-setting/create',
+    method: 'post',
+    data
+  })
+}
+
+export function order(data) {
+  return request({
+    url: 'api/dic-setting/squence',
+    method: 'put',
+    data
+  })
+}
+
+export function del(data) {
+  return request({
+    url: 'api/dic-setting/delete',
+    method: 'delete',
+    data
+  })
+}
+export default { edit }
--- a/src/views/category/descriptionPreview/index.vue
+++ b/src/views/category/descriptionPreview/index.vue
@ -100,7 +100,7 @@ export default {
  },
  methods: {
    getArchivesType() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isDataType: 2 }).then(res => {
+      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
        this.allFieldsData.splice(0, this.allFieldsData.length)
        res.forEach((item, index) => {
          // 防止对应字典是null时报错
--- a/src/views/category/fieldManage/index.vue
+++ b/src/views/category/fieldManage/index.vue
@ -136,7 +136,7 @@ export default {
    // 获取数据前设置默认参数
    [CRUD.HOOK.beforeRefresh]() {
      this.crud.query.categoryId = this.selectedCategory.id
-      this.crud.query.isDataType = 2
+      this.crud.query.isType = 2
    },
    [CRUD.HOOK.afterRefresh](crud) {
      crud.data.forEach(function(item, index) {
--- a/src/views/category/fileNoFormat/data1.json
+++ b/src/views/category/fileNoFormat/data1.json
@ -1,823 +0,0 @@
-{
-  "total": 0,
-  "rows": [
-    {
-      "id": "24a3dc3ceff24822a8863635ce576cb6",
-      "fieldName": "pigeonhole_date",
-      "fieldCnName": "归档日期",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 20,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 20,
-      "isType": 4,
-      "isGlobal": 0,
-      "isSystem": 1,
-      "isAccede": "0",
-      "isAutoaccountvalue": "0",
-      "isOperate": "0",
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 80,
-      "isDisplayOrder": 12,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-datebox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "29f16d62bc7242d5ba8dc84de5451f93",
-      "fieldName": "case_no",
-      "fieldCnName": "盒号",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 10,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 7,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1518079815000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-numberbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 1,
-      "isSupplementNum": 3,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "2f6dd49e061a43b89ab918f40b1ebd10",
-      "fieldName": "folder_location",
-      "fieldCnName": "存放位置",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 50,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 21,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": null,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "desc",
-      "isDisplay": 1,
-      "isDisplayWidth": 200,
-      "isDisplayOrder": 13,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": null,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "432616f5d6794ba6bef6b25508424f1c",
-      "fieldName": "page_no",
-      "fieldCnName": "页数",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 10,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 13,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": null,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 60,
-      "isDisplayOrder": 10,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-numberbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "45ff597e7cc64d11803ac422816b1e23",
-      "fieldName": "security_class",
-      "fieldCnName": "密级",
-      "isDefaultValue": "",
-      "isDefaultValueType": "f08bc3b382914081ad4c85d103617e90",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 10,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 16,
-      "isType": 4,
-      "isGlobal": 0,
-      "isSystem": 1,
-      "isAccede": "0",
-      "isAutoaccountvalue": "0",
-      "isOperate": "0",
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-combobox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "49106aa0d1534a7a900843d0c4531840",
-      "fieldName": "collator",
-      "fieldCnName": "立卷人",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 17,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691877000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "515b173ef664438ca99d2ea68242df2f",
-      "fieldName": "note",
-      "fieldCnName": "备注",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 200,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 22,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1524115995000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": null,
-      "isDisplay": 1,
-      "isDisplayWidth": 150,
-      "isDisplayOrder": 15,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 650,
-      "isFullrow": 1,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": null,
-      "isSupplement": null,
-      "isSupplementNum": null,
-      "isNoRepetition": null,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "53e68102f0bc44a98704e478565cd414",
-      "fieldName": "archive_no",
-      "fieldCnName": "档号",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 9,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": null,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 1,
-      "isOrderSeq": 1,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 170,
-      "isDisplayOrder": 2,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": null,
-      "isAuto": 1,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 1,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "64c96ef6ad2a4d05abe15bdecc35f763",
-      "fieldName": "doc_no",
-      "fieldCnName": "文号",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 50,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 5,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691735000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 160,
-      "isDisplayOrder": 7,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "71d71889bc6f4a88bd42dc9d7e35dade",
-      "fieldName": "responsibleby",
-      "fieldCnName": "责任者",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 14,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691770000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 150,
-      "isDisplayOrder": 11,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "85ece56a60f340bc98d992c5c6dd9ab1",
-      "fieldName": "department",
-      "fieldCnName": "部门名称",
-      "isDefaultValue": "",
-      "isDefaultValueType": "64c310871c8c4468bc0a8257c7bb8f5e",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 3,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": null,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "desc",
-      "isDisplay": 1,
-      "isDisplayWidth": 120,
-      "isDisplayOrder": 1,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-combobox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 1,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "9060aae9150a4ee69e67d21f4328a6a3",
-      "fieldName": "created_date",
-      "fieldCnName": "文件形成时间",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 20,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 12,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691755000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": null,
-      "isDisplay": 1,
-      "isDisplayWidth": 120,
-      "isDisplayOrder": 9,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-datebox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "9e8f5652e66e4c888d1a1a317a83447b",
-      "fieldName": "maintitle",
-      "fieldCnName": "题名",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 400,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 11,
-      "isType": 4,
-      "isGlobal": 0,
-      "isSystem": 1,
-      "isAccede": "0",
-      "isAutoaccountvalue": "0",
-      "isOperate": "0",
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689066000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 1,
-      "isDisplayWidth": 450,
-      "isDisplayOrder": 8,
-      "isDisplayAlign": "left",
-      "isInputClass": "textarea",
-      "isInput": 1,
-      "isInputLength": 650,
-      "isFullrow": 1,
-      "isRequired": 1,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 1,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 1,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "a0ffdd94161146c49161662c3f9a70cd",
-      "fieldName": "number_no",
-      "fieldCnName": "份数",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 10,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 15,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": null,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502689065000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-numberbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 0,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "bbe08d4fad374e499324d1140646d656",
-      "fieldName": "archive_flag",
-      "fieldCnName": "归档标识",
-      "isDefaultValue": "已归档",
-      "isDefaultValueType": "ba88ae3ef4ff45968a64aa5579b2c365",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 18,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 1,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691856000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": null,
-      "isDisplay": 1,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 14,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-combobox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "dff5529c0d0f45b2b19f2adec7ca0102",
-      "fieldName": "checker",
-      "fieldCnName": "检查人",
-      "isDefaultValue": "",
-      "isDefaultValueType": "",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 100,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 19,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691890000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": null,
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "easyui-textbox",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    },
-    {
-      "id": "f3f6ff94c26a4a54967de9cfc56a3b01",
-      "fieldName": "code_class",
-      "fieldCnName": "门类代码",
-      "isDefaultValue": "WS",
-      "isDefaultValueType": "08267a6b57904b25bddb217d8474b8a2",
-      "isPattern": null,
-      "isPrecept": null,
-      "isDataType": 1,
-      "isColumnLength": 10,
-      "isMaxlength": null,
-      "isMinlength": null,
-      "isSequence": 2,
-      "isType": 4,
-      "isGlobal": null,
-      "isSystem": 0,
-      "isAccede": null,
-      "isAutoaccountvalue": null,
-      "isOperate": null,
-      "isSearch": 0,
-      "isCategoryId": "f88a8b3960ac476b8d94e63961bbeabe",
-      "createTime": 1502691133000,
-      "isOrder": 0,
-      "isOrderSeq": 0,
-      "isOrderType": "asc",
-      "isDisplay": 0,
-      "isDisplayWidth": 100,
-      "isDisplayOrder": 0,
-      "isDisplayAlign": "center",
-      "isInputClass": "popmodality",
-      "isInput": 1,
-      "isInputLength": 245,
-      "isFullrow": 0,
-      "isRequired": 0,
-      "isInherit": 1,
-      "isIncrease": 0,
-      "isAuto": 0,
-      "isAutoField": 0,
-      "isDosearchCard": 0,
-      "isSupplement": 0,
-      "isSupplementNum": null,
-      "isNoRepetition": 0,
-      "isAdjust": 0,
-      "isAdjustSeq": 0,
-      "isAdjustWidth": 0,
-      "isRelevance": null,
-      "relevanceSeq": null
-    }
-  ],
-  "footer": null,
-  "postparam": null
-}
--- a/src/views/category/fileNoFormat/data2.json
+++ b/src/views/category/fileNoFormat/data2.json
@ -1,57 +0,0 @@
-{
-  "total":0,
-  "rows":[
-      {
-          "id":"a38da83350114b459ef3469340ffe577",
-          "ikFieldName":"全宗号",
-          "fieldYingName":"fonds_no",
-          "ikConnector":"-",
-          "ikSequence":1,
-          "ikFiledId":"3d6d548d30db426ea3d95d63f589b294",
-          "ikCategoryId":"f88a8b3960ac476b8d94e63961bbeabe",
-          "ikInputClass":"easyui-combobox"
-      },
-      {
-          "id":"c669f176ba80402d865f899b2976ffd8",
-          "ikFieldName":"归档年度",
-          "fieldYingName":"filing_year",
-          "ikConnector":"-",
-          "ikSequence":2,
-          "ikFiledId":"d173c2d2e6ab49e0a38e1c46343e69b1",
-          "ikCategoryId":"f88a8b3960ac476b8d94e63961bbeabe",
-          "ikInputClass":"easyui-numberbox"
-      },
-      {
-          "id":"a61508d47433421a989fed6385facd17",
-          "ikFieldName":"机构（问题）",
-          "fieldYingName":"archive_ctg_no",
-          "ikConnector":"-",
-          "ikSequence":3,
-          "ikFiledId":"01b22836d0d1442094e2ecb78210306c",
-          "ikCategoryId":"f88a8b3960ac476b8d94e63961bbeabe",
-          "ikInputClass":"easyui-combobox"
-      },
-      {
-          "id":"6dc035b5f60a4f4dba256e96877a9541",
-          "ikFieldName":"保管期限",
-          "fieldYingName":"retention",
-          "ikConnector":"-",
-          "ikSequence":4,
-          "ikFiledId":"ebc2ceda16ff40ebab0d3c82d2721002",
-          "ikCategoryId":"f88a8b3960ac476b8d94e63961bbeabe",
-          "ikInputClass":"easyui-combobox"
-      },
-      {
-          "id":"3deb020b78dc4770b95b9b484e965f84",
-          "ikFieldName":"件号",
-          "fieldYingName":"piece_no",
-          "ikConnector":"",
-          "ikSequence":5,
-          "ikFiledId":"8a1700abf5c346fda9a3f898569039d3",
-          "ikCategoryId":"f88a8b3960ac476b8d94e63961bbeabe",
-          "ikInputClass":"easyui-numberbox"
-      }
-  ],
-  "footer":null,
-  "postparam":null
-}
--- a/src/views/category/fileNoFormat/index.vue
+++ b/src/views/category/fileNoFormat/index.vue
@ -30,14 +30,14 @@
      <el-table ref="rightTable" v-loading="table.right.loading" :data="table.right.data" style="min-width: 100%;" height="calc(100vh - 302px)" @selection-change="(val)=>selectionChangeHandler(val,'right')" @row-click="(row,column,e)=>clickRowHandler(row,column,e,'rightTable')">
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column prop="ikFieldName" label="组成字段" align="center" />
-        <el-table-column prop="ikConnector" label="组成符号" align="center" />
+        <el-table-column prop="filedCnName" label="组成字段" align="center" />
+        <el-table-column prop="connector" label="组成符号" align="center" />
      </el-table>
      <!--表单渲染-->
-      <eForm ref="cuform" />
+      <eForm ref="cuform" @refresh="initData" />
    </div>
    <!--排序对话框组件-->
-    <sortDialog ref="sort" @doSort="doSort" />
+    <sortDialog ref="sort" @refresh="initData" />
    <!--删除对话框组件-->
    <el-dialog title="移除字段" :visible.sync="deleteVisible">
      <span class="dialog-right-top" />
@ -55,11 +55,11 @@
 </template>

 <script>
-// import { add, edit } from '@/api/archivesConfig/field'
-import data1 from './data1.json'
-import data2 from './data2.json'
+import { FetchArchivesTypeManage } from '@/api/category/category'
+import { getNoFormatField, del } from '@/api/category/fileNoFormat'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
+import Vue from 'vue'

 export default {
  components: { eForm, sortDialog },
@ -80,12 +80,6 @@ export default {
        sort: ['admin', 'fileNoFormat:sort']
      },
      deleteVisible: false,
-      // form: {
-      //   verifyCode: ''
-      // },
-      // formLabelWidth: '110px',
-      // btn: '',
-      // showVerifyDialog: true,
      sortLoading: false,
      delAllLoading: false,
      table: {
@ -104,40 +98,48 @@ export default {
  },
  watch: {
    selectedCategory: function(newValue, oldValue) {
-      // this.initData()
+      this.initData()
    }
  },
  created() {
-    // this.crud.title = this.title
-    // this.crud.query = {
-    //   isType: this.isType
-    // }
-    // this.crud.toQuery()
-    // verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => {}
-    this.getLeftTableData()
-    this.getRightTableData()
+    this.initData()
  },
  methods: {
-    getLeftTableData() {
-      // verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => {}
-      this.table.left.data = data1.rows
-    },
-    getRightTableData() {
-      // verifyMaintenance(encrypt(this.form.verifyCode)).then((res) => {}
-      this.table.right.data = data2.rows
+    initData() {
+      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+        this.table.left.data.splice(0, this.table.left.data.length)
+        res.forEach((item) => {
+          if (!item.isDisplayformat) {
+            this.table.left.data.push(item)
+          }
+        })
+      })
+      getNoFormatField().then((res) => {
+        this.table.right.data.splice(0, this.table.right.data.length)
+        res.forEach((item) => {
+          this.table.right.data.push(item)
+        })
+      })
    },
    clickRowHandler(row, column, e, tableName) {
      this.$refs[tableName].toggleRowSelection(row)
    },
    selectionChangeHandler(val, tableName) {
+      console.log(123)
      this.table[tableName].selections = val
    },
    toAdd() {
-      this.$refs.cuform.formData = this.table.left.selections
+      this.table.left.selections.forEach((item) => {
+        Vue.set(item, 'connector', '-')
+        Vue.set(item, 'categoryId', this.selectedCategory.id)
+      })
+      this.$refs.cuform.title = '新增字段'
+      this.$refs.cuform.formData.fields = this.table.left.selections
      this.$refs.cuform.cuDialogVisible = true
    },
    toEdit() {
-      this.$refs.cuform.formData = this.table.right.selections
+      this.$refs.cuform.title = '编辑字段'
+      this.$refs.cuform.formData.fields = this.table.right.selections
      this.$refs.cuform.cuDialogVisible = true
    },
    toDelete() {
@ -146,38 +148,20 @@ export default {
    handleDelConfirm() {
      this.deleteVisible = false
      this.delAllLoading = true
-      // sort(encrypt(this.form.verifyCode)).then((res) => {
+      const deleteData = this.table.right.selections
+      del(deleteData).then((res) => {
        this.delAllLoading = false
        this.$notify({
          title: '删除成功',
          type: 'success',
          duration: 2500
        })
-      this.getRightTableData()
-      this.getLeftTableData()
-      // }).catch(() => {
-      //   this.delAllLoading = false
-      // })
+        this.initData()
+      })
    },
    toSort() {
-      // findSubsetById(data[0].id).then(res => {
      this.$refs.sort.sortTableData = this.table.right.data
      this.$refs.sort.sortVisible = true
-      // })
-    },
-    doSort(data) {
-      this.sortLoading = true
-      // sort(encrypt(this.form.verifyCode)).then((res) => {
-      this.sortLoading = false
-      this.$notify({
-        title: '保存成功',
-        type: 'success',
-        duration: 2500
-      })
-      this.getRightTableData()
-      // }).catch(() => {
-      //   this.sortLoading = false
-      // })
    }
  }
 }
--- a/src/views/category/fileNoFormat/module/form.vue
+++ b/src/views/category/fileNoFormat/module/form.vue
@ -1,44 +1,73 @@
 <template>
-  <el-dialog :close-on-click-modal="false" :visible.sync="cuDialogVisible" title="修改字段">
+  <el-dialog :close-on-click-modal="false" :visible.sync="cuDialogVisible" :title="title">
    <span class="dialog-right-top" />
    <span class="dialog-left-bottom" />
    <div class="setting-dialog">
      <div class="fields-list">
-        <el-form ref="form" :model="formData" size="small" label-width="75px">
-          <el-row v-for="(item) in formData" :key="item.id" :gutter="10">
-            <el-col :span="14">
+        <el-form ref="formData" :model="formData" size="small" label-width="75px">
+          <el-row v-for="(item) in formData.fields" :key="item.id" :gutter="10">
+            <el-col :span="15">
              <el-form-item label="组成字段">
-                <el-input v-if="item.fieldCnName" v-model="item.fieldCnName" :disabled="true" />
-                <el-input v-if="item.ikFieldName" v-model="item.ikFieldName" :disabled="true" />
+                <el-input v-model="item.fieldCnName" :disabled="true" />
              </el-form-item>
            </el-col>
            <el-col :span="9">
              <el-form-item label="组成符号">
-                <el-input v-model="item.ikConnector" />
+                <el-input v-model="item.connector" />
              </el-form-item>
            </el-col>
          </el-row>
        </el-form>
      </div>
      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitCU">保存</el-button>
+        <el-button type="primary" @click="save">保存</el-button>
      </div>
    </div>
  </el-dialog>
 </template>

 <script>
+import { add, edit } from '@/api/category/fileNoFormat'
 export default {
  data() {
    return {
      cuDialogVisible: false,
-      formData: {}
+      formData: {},
+      title: '新增字段'
    }
  },
  methods: {
-    submitCU() {
-      console.log(2)
-      // this.cuDialogVisible = false
+    save() {
+      if (this.title === '新增字段') {
+        const addData = this.formData.fields.map((item) => {
+          return {
+            dictionaryId: item.id,
+            fieldName: item.fieldName,
+            fieldCnName: item.fieldCnName,
+            connector: item.connector,
+            categoryId: item.categoryId
+          }
+        })
+        add(addData).then((res) => {
+          this.$notify({
+            title: '保存成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.cuDialogVisible = false
+          this.$emit('refresh')
+        })
+      } else {
+        edit(this.formData.fields).then((res) => {
+          this.$notify({
+            title: '保存成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.cuDialogVisible = false
+          this.$emit('refresh')
+        })
+      }
    }
  }
 }
--- a/src/views/category/fileNoFormat/module/sortDialog.vue
+++ b/src/views/category/fileNoFormat/module/sortDialog.vue
@ -7,7 +7,7 @@
      <i class="drag-tip">提示：请通过拖动鼠标来调整当前顺序</i>
      <el-table :data="sortTableData" class="fileno-format-sort" style="width: 100%;max-height: 70vh;" row-key="id">
        <el-table-column type="index" label="序号" width="100" align="center" />
-        <el-table-column prop="ikFieldName" label="字段名称" />
+        <el-table-column prop="fieldCnName" label="字段名称" />
      </el-table>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click.native="handleSort">保存</el-button>
@ -18,6 +18,7 @@

 <script>
 import Sortable from 'sortablejs'
+import { order } from '@/api/category/fileNoFormat'

 export default {
  data() {
@ -45,8 +46,13 @@ export default {
      this.rowDrop('fileno-format-sort', 'sortTableData')
    },
    handleSort() {
+      this.sortTableData.forEach((item, index) => {
+        item.sequence = index + 1
+      })
+      order(this.sortTableData).then(() => {
        this.sortVisible = false
-      this.$emit('doSort', this.sortTableData)
+        this.$emit('refresh')
+      })
    }
  }
 }
--- a/src/views/category/listBrowsing/index.vue
+++ b/src/views/category/listBrowsing/index.vue
@ -134,7 +134,7 @@ export default {
      this.getBottomTableData()
    },
    getDisplayFieldData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isDataType: 2 }).then((res) => {
+      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
        this.table.right.data.splice(0, this.table.right.data.length)
        this.table.left.data.splice(0, this.table.left.data.length)
        res.sort((item1, item2) => { return item1.displayOrder - item2.displayOrder }).forEach((item) => {