From 85f5bf5103ec944e6bcce7e55aab100cd5bb8be0 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 15 Aug 2023 17:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=97=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/category/category.js           | 20 +++++++-
 src/api/system/category/fieldManage.js        | 51 +++++++++++++++++++
 src/api/system/category/fileNoFormat.js       | 42 +++++++++++++++
 src/api/system/category/listBrowsing.js       | 35 +++++++++++++
 src/api/system/category/orderingRule.js       | 26 ++++++++++
 src/api/system/dict.js                        | 16 +++---
 src/api/system/logs.js                        |  2 +-
 src/assets/styles/yxk-admin.scss              |  2 +-
 src/views/components/category/PreviewForm.vue |  2 +-
 src/views/components/category/SettingForm.vue | 36 ++++++++-----
 .../descriptionPreview/index.vue              | 10 ++--
 .../archivesCategory/fieldManage/index.vue    | 42 +++++++--------
 .../fieldManage/module/form.vue               |  1 +
 .../fieldManage/module/quickSetting.vue       | 17 +++++--
 .../archivesCategory/fileNoFormat/index.vue   |  6 +--
 .../fileNoFormat/module/form.vue              |  2 +-
 .../fileNoFormat/module/sortDialog.vue        |  2 +-
 src/views/system/archivesCategory/form.vue    |  2 -
 .../archivesCategory/listBrowsing/index.vue   |  6 +--
 .../listBrowsing/module/form.vue              |  2 +-
 .../listBrowsing/module/sortDialog.vue        |  2 +-
 .../archivesCategory/orderingRule/index.vue   |  4 +-
 .../orderingRule/module/form.vue              |  2 +-
 .../orderingRule/module/sortDialog.vue        |  2 +-
 .../fileLibraryManage/baseInfo/index.vue      |  2 +-
 .../descriptionPreview/index.vue              |  8 +--
 .../fileLibraryManage/fileNoFormat/index.vue  |  6 +--
 .../fileNoFormat/module/form.vue              |  2 +-
 .../fileNoFormat/module/sortDialog.vue        |  2 +-
 .../fileLibraryManage/listBrowsing/index.vue  |  4 +-
 .../fileLibraryManage/orderingRule/index.vue  |  4 +-
 .../orderingRule/module/form.vue              |  2 +-
 .../orderingRule/module/sortDialog.vue        |  2 +-
 src/views/system/log/errorLog/index.vue       |  2 +-
 src/views/system/log/loginLog/index.vue       |  2 +-
 src/views/system/log/operateLog/index.vue     |  2 +-
 src/views/system/notifyManage/index.vue       |  2 +-
 .../descriptionPreview/index.vue              |  8 +--
 .../listBrowsing/index.vue                    |  4 +-
 .../orderingRule/index.vue                    |  4 +-
 .../orderingRule/module/form.vue              |  2 +-
 .../orderingRule/module/sortDialog.vue        |  2 +-
 42 files changed, 287 insertions(+), 105 deletions(-)
 create mode 100644 src/api/system/category/fieldManage.js
 create mode 100644 src/api/system/category/fileNoFormat.js
 create mode 100644 src/api/system/category/listBrowsing.js
 create mode 100644 src/api/system/category/orderingRule.js

diff --git a/src/api/system/category/category.js b/src/api/system/category/category.js
index 91aacf5..834696e 100644
--- a/src/api/system/category/category.js
+++ b/src/api/system/category/category.js
@@ -105,4 +105,22 @@ export function FetchDelCategoryScreen(data) {
   })
 }
 
-export default { add, edit, del, FetchCategoryMenu }
+// 门类下得字段
+export function FetchInitCategoryField(params) {
+  return request({
+    url: 'api/category/initCategoryField',
+    method: 'get',
+    params
+  })
+}
+
+// 著录界面排序
+export function FetchUpardicSort(data) {
+  return request({
+    url: 'api/category/upardicSort',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, FetchCategoryMenu, FetchInitCategoryField, FetchUpardicSort }
diff --git a/src/api/system/category/fieldManage.js b/src/api/system/category/fieldManage.js
new file mode 100644
index 0000000..6eafe53
--- /dev/null
+++ b/src/api/system/category/fieldManage.js
@@ -0,0 +1,51 @@
+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/category/editArchivesDictionary',
+    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/category/editArchivesDictionary',
+    method: 'post',
+    data
+  })
+}
+
+// 删除门类类型菜单
+export function del(ids) {
+  const params = { id: ids[0] }
+  return request({
+    url: 'api/category/deleteArchivesDictionary',
+    method: 'delete',
+    params
+  })
+}
+
+// 门类字段快速设置
+export function FetchEditFast(data) {
+  return request({
+    url: 'api/category/editFast',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, FetchEditFast }
diff --git a/src/api/system/category/fileNoFormat.js b/src/api/system/category/fileNoFormat.js
new file mode 100644
index 0000000..34c5d7a
--- /dev/null
+++ b/src/api/system/category/fileNoFormat.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function getNoFormatField(params) {
+  return request({
+    url: 'api/category/list',
+    method: 'get',
+    params
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/dic-setting/update',
+    method: 'put',
+    data
+  })
+}
+
+export function add(data) {
+  return request({
+    url: 'api/category/createSetting',
+    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 }
diff --git a/src/api/system/category/listBrowsing.js b/src/api/system/category/listBrowsing.js
new file mode 100644
index 0000000..59e0035
--- /dev/null
+++ b/src/api/system/category/listBrowsing.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/category/createListDisplay',
+    method: 'post',
+    data
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/category/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/category/display-order',
+    method: 'put',
+    data
+  })
+}
+
+export default { add }
diff --git a/src/api/system/category/orderingRule.js b/src/api/system/category/orderingRule.js
new file mode 100644
index 0000000..d8070dd
--- /dev/null
+++ b/src/api/system/category/orderingRule.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+export function getDisplayField(params) {
+  return request({
+    url: 'api/category/getIsDisPlayState',
+    method: 'get',
+    params
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/category/orderby',
+    method: 'put',
+    data
+  })
+}
+
+export function order(data) {
+  return request({
+    url: 'api/category/update-queue',
+    method: 'put',
+    data
+  })
+}
+export default { edit }
diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 655b32f..ffaf573 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -1,12 +1,12 @@
 import request from '@/utils/request'
 
-export function getDictsList(params) {
-  return request({
-    url: 'api/dictionary/initDictionaryList',
-    method: 'get',
-    params
-  })
-}
+// export function getDictsList(params) {
+//   return request({
+//     url: 'api/dictionary/initDictionaryList',
+//     method: 'get',
+//     params
+//   })
+// }
 
 export function add(data) {
   return request({
@@ -48,4 +48,4 @@ export function FetchSonDictionaryList(params) {
   })
 }
 
-export default { add, edit, del, getDictsList, FetchDictionaryTree, FetchSonDictionaryList }
+export default { add, edit, del, FetchDictionaryTree, FetchSonDictionaryList }
diff --git a/src/api/system/logs.js b/src/api/system/logs.js
index 59abce3..11d93f0 100644
--- a/src/api/system/logs.js
+++ b/src/api/system/logs.js
@@ -14,7 +14,7 @@ export function warnRemark(data) {
 // 获取表格
 export function getNoticeList(params) {
   return request({
-    url: 'api/notice/list',
+    url: 'api/notice/initNotice',
     method: 'get',
     params
   })
diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index f0c4753..4d94b5b 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -1696,7 +1696,7 @@ input[type ='number'] {
   }
 
   .des-preview-right {
-    width: 758px;
+    width: 740px;
     margin-left: 20px;
   }
 }
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 32653c5..94d5fc9 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -89,7 +89,7 @@
 <script>
 import { crud } from '@crud/crud'
 import { edit, FetchDoeditIsRepeat } from '@/api/archivesManage/archivesList'
-import { getNoFormatField } from '@/api/category/fileNoFormat'
+import { getNoFormatField } from '@/api/system/category/fileNoFormat'
 import draggable from 'vuedraggable'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
diff --git a/src/views/components/category/SettingForm.vue b/src/views/components/category/SettingForm.vue
index 3e72240..29ff90c 100644
--- a/src/views/components/category/SettingForm.vue
+++ b/src/views/components/category/SettingForm.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="des-form">
-
     <el-form ref="form" :model="form" :rules="rules" :hide-required-asterisk="isDisabled" size="small" label-width="80px">
       <el-row>
         <el-col :span="16">
@@ -36,11 +35,11 @@
             <el-input v-if="isDisabled" v-model="form.dictionaryConfigId.dicName" disabled />
             <!-- @change="selectDictionary" -->
             <div v-else class="dictionary-selected">
-              <el-select v-model="form.dictionaryConfigId.type" class="dictionary-left" placeholder="" value-key="id" :disabled="form.isInputClass !== 'select' && form.isInputClass !== 'popover'">
+              <el-select v-model="form.mateData" class="dictionary-left" placeholder="" value-key="id" :disabled="form.isInputClass !== 'select' && form.isInputClass !== 'popover'" @change="changeDictType">
                 <el-option v-for="item in dataOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <el-select v-model="form.dictionaryConfigId.id" class="dictionary-right" placeholder="" value-key="id" :disabled="form.dictionaryConfigId.type !== 'dictionary'">
-                <el-option v-for="item in dictionaryData" :key="item.id" :label="item.dicName" :value="item.id" />
+              <el-select v-model="form.dictionaryConfigId.id" class="dictionary-right" placeholder="" value-key="id" :disabled="form.mateData !== 3">
+                <el-option v-for="item in dictionaryData" :key="item.id" :label="item.dictionaryName" :value="item.id" />
               </el-select>
             </div>
           </el-form-item>
@@ -90,8 +89,8 @@
 </template>
 
 <script>
-import { getDicts } from '@/api/archivesConfig/dict'
-import { getNoFormatField } from '@/api/category/fileNoFormat'
+import { FetchDictionaryTree } from '@/api/system/dict'
+import { getNoFormatField } from '@/api/system/category/fileNoFormat'
 
 export default {
   name: 'SettingForm',
@@ -144,7 +143,7 @@ export default {
     }
     // 对应字典必填判断
     var checkDictionaryConfigId = (rule, value, callback) => {
-      if ((this.form.isInputClass === 'select' || this.form.isInputClass === 'popover') && !this.form.dictionaryConfigId.id) {
+      if ((this.form.isInputClass === 'select' || this.form.isInputClass === 'popover') && !this.form.dictionaryConfigId.id && this.form.mateData === 3) {
         callback(new Error('对应字典项不可为空！'))
       } else {
         callback()
@@ -193,8 +192,7 @@ export default {
     return {
       form: {
         dictionaryConfigId: {
-          id: null,
-          type: null
+          id: null
         }
       },
       rules: getRules(),
@@ -215,9 +213,9 @@ export default {
       // 对应字典
       dictionaryData: [],
       dataOptions: [
-        { value: 'group', label: '全宗' },
-        { value: 'classify', label: '档案分类' },
-        { value: 'dictionary', label: '字典' }
+        { value: 1, label: '全宗' },
+        { value: 2, label: '档案分类' },
+        { value: 3, label: '字典' }
       ]
       // dictionaryId: null
     }
@@ -233,6 +231,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       this.form = this.thisFields
+      console.log(this.form)
       if (!this.isAdd) {
         this.getForm()
       }
@@ -246,6 +245,12 @@ export default {
       this.form.isInput = !!this.form.isInput
       this.form.isRequired = !!this.form.isRequired
       this.form.isAutomatic = !!this.form.isAutomatic
+
+      if (this.form.mateData !== 3) {
+        this.dictionaryData = []
+        this.form.dictionaryConfigId.id = null
+      }
+
       // 字段类型
       if (this.form.isDataType === 1) {
         this.form.isDataTypeTxt = '字符'
@@ -279,24 +284,29 @@ export default {
           this.getDictrionaryList()
         } else {
           this.dictionaryData = []
+          this.form.dictionaryConfigId.id = null
         }
       }
     },
     // 获取对应字典list
     getDictrionaryList() {
-      getDicts().then(res => {
+      FetchDictionaryTree().then(res => {
         this.dictionaryData = res
       })
     },
     // selectDictionary(value) {
     //   this.dictionaryId = value
     // },
+    changeDictType(value) {
+      this.form.dictionaryConfigId.id = null
+    },
     // 著录形式为'下拉框'、'弹出框'的，对应字典不为空，反之为空
     selectInputClass(value) {
       if (value === 'select' || value === 'popover') {
         this.getDictrionaryList()
       } else {
         this.dictionaryData = []
+        this.form.mateData = null
         this.form.dictionaryConfigId.id = null
       }
       // 字段类型为数字型，且默认著录类型为数字框不可更改
diff --git a/src/views/system/archivesCategory/descriptionPreview/index.vue b/src/views/system/archivesCategory/descriptionPreview/index.vue
index 260a144..08882f2 100644
--- a/src/views/system/archivesCategory/descriptionPreview/index.vue
+++ b/src/views/system/archivesCategory/descriptionPreview/index.vue
@@ -64,9 +64,9 @@
 <script>
 import PreviewForm from '@/views/components/category/PreviewForm'
 import SettingForm from '@/views/components/category/SettingForm'
-import { FetchArchivesTypeManage } from '@/api/category/category'
-import { edit } from '@/api/category/fieldManage'
-import { previewFormOrder } from '@/api/category/listBrowsing'
+import { FetchInitCategoryField } from '@/api/system/category/category'
+import { edit } from '@/api/system/category/fieldManage'
+import { FetchUpardicSort } from '@/api/system/category/category'
 export default {
   name: 'DescriptionPreview',
   components: { PreviewForm, SettingForm },
@@ -104,7 +104,7 @@ export default {
     getArchivesType(setField) {
       // 门类切换时，表单校验清除
       this.$refs.previewForm1.$refs['addOrUpdateForm'].clearValidate()
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
+      FetchInitCategoryField({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
         this.allFieldsData.splice(0, this.allFieldsData.length)
         this.isInputFields.splice(0, this.isInputFields.length)
         if (!setField) {
@@ -174,7 +174,7 @@ export default {
           id: item.id
         }
       })
-      previewFormOrder(sortParam).then(() => {
+      FetchUpardicSort(sortParam).then(() => {
         this.previewFormVisible = false
         this.getArchivesType()
       })
diff --git a/src/views/system/archivesCategory/fieldManage/index.vue b/src/views/system/archivesCategory/fieldManage/index.vue
index 08b1157..2a881d7 100644
--- a/src/views/system/archivesCategory/fieldManage/index.vue
+++ b/src/views/system/archivesCategory/fieldManage/index.vue
@@ -67,24 +67,13 @@
     </el-table>
     <!--表单渲染-->
     <eForm crud-tag="field" />
-    <quickSetting ref="quick" />
-    <el-dialog title="删除字段" :visible.sync="deleteVisible" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :before-close="handleClose">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <div class="setting-dialog">
-        <div class="dialog-delt">
-          <p><span>确定要删除当前字段吗？</span></p>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click.native="handleConfirm">确定</el-button>
-        </div>
-      </div>
-    </el-dialog>
+    <quickSetting ref="quick" @refresh="initData" />
+
   </div>
 </template>
 
 <script>
-import fieldCrudMethod from '@/api/category/fieldManage'
+import fieldCrudMethod from '@/api/system/category/fieldManage'
 import eForm from './module/form'
 import quickSetting from './module/quickSetting'
 import CRUD, { presenter } from '@crud/crud'
@@ -98,7 +87,7 @@ export default {
   cruds() {
     return CRUD({
       tag: 'field',
-      url: 'api/arc-dic/manage',
+      url: 'api/category/initCategoryField',
       crudMethod: fieldCrudMethod,
       title: '字段',
       optShow: {
@@ -197,16 +186,16 @@ export default {
         return
       }
       this.deleteData = data
-      this.deleteVisible = true
-    },
-    handleConfirm() {
-      this.deleteVisible = false
-      this.crud.delAllLoading = true
-      this.crud.doDelete(this.deleteData)
-    },
-    handleClose(done) {
-      this.deleteData = {}
-      done()
+      this.$confirm('此操作将删除当前所选' + this.crud.title + '<span>你是否还要继续？</span>', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消',
+        type: 'warning',
+        dangerouslyUseHTMLString: true
+      }).then(() => {
+        this.crud.delAllLoading = true
+        this.crud.doDelete(this.deleteData)
+      }).catch(() => {
+      })
     },
     digitFormatter(row, column, cellValue) {
       return cellValue || '-'
@@ -214,6 +203,9 @@ export default {
     toQuick() {
       this.$refs.quick.quickTableData = JSON.parse(JSON.stringify(this.crud.data))
       this.$refs.quick.quickVisible = true
+    },
+    initData() {
+      this.crud.refresh()
     }
   }
 }
diff --git a/src/views/system/archivesCategory/fieldManage/module/form.vue b/src/views/system/archivesCategory/fieldManage/module/form.vue
index 5cdf797..194c6b8 100644
--- a/src/views/system/archivesCategory/fieldManage/module/form.vue
+++ b/src/views/system/archivesCategory/fieldManage/module/form.vue
@@ -47,6 +47,7 @@ const defaultForm = {
   displayformatType: null,
   editLength: 196,
   displayLength: null,
+  mateData: null,
   dictionaryConfigId: {
     id: null
   }
diff --git a/src/views/system/archivesCategory/fieldManage/module/quickSetting.vue b/src/views/system/archivesCategory/fieldManage/module/quickSetting.vue
index 77ecea1..3f039e9 100644
--- a/src/views/system/archivesCategory/fieldManage/module/quickSetting.vue
+++ b/src/views/system/archivesCategory/fieldManage/module/quickSetting.vue
@@ -19,13 +19,14 @@
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="quickVisible=false">取消</el-button>
-        <el-button type="primary" @click.native="handleSort">保存</el-button>
+        <el-button type="primary" @click.native="handleSave">保存</el-button>
       </div>
     </div>
   </el-dialog>
 </template>
 
 <script>
+import { FetchEditFast } from '@/api/system/category/fieldManage'
 export default {
   data() {
     return {
@@ -40,9 +41,17 @@ export default {
     })
   },
   methods: {
-    handleSort() {
-      this.quickTableData.forEach((item, index) => {
-        item.sequence = index + 1
+    handleSave() {
+      FetchEditFast(this.quickTableData).then(res => {
+        if (res === 'SUCCESS') {
+          this.$message({
+            message: '快速设置字段成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.$emit('refresh')
+          this.quickVisible = false
+        }
       })
     }
   }
diff --git a/src/views/system/archivesCategory/fileNoFormat/index.vue b/src/views/system/archivesCategory/fileNoFormat/index.vue
index d888cfb..3eba8a2 100644
--- a/src/views/system/archivesCategory/fileNoFormat/index.vue
+++ b/src/views/system/archivesCategory/fileNoFormat/index.vue
@@ -55,8 +55,8 @@
 </template>
 
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
-import { getNoFormatField, del } from '@/api/category/fileNoFormat'
+import { FetchInitCategoryField } from '@/api/system/category/category'
+import { getNoFormatField, del } from '@/api/system/category/fileNoFormat'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
@@ -106,7 +106,7 @@ export default {
   },
   methods: {
     initData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+      FetchInitCategoryField({ 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 && item.isInput && !item.isAutomatic) {
diff --git a/src/views/system/archivesCategory/fileNoFormat/module/form.vue b/src/views/system/archivesCategory/fileNoFormat/module/form.vue
index 65872e7..6148a0d 100644
--- a/src/views/system/archivesCategory/fileNoFormat/module/form.vue
+++ b/src/views/system/archivesCategory/fileNoFormat/module/form.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/category/fileNoFormat'
+import { add, edit } from '@/api/system/category/fileNoFormat'
 export default {
   data() {
     return {
diff --git a/src/views/system/archivesCategory/fileNoFormat/module/sortDialog.vue b/src/views/system/archivesCategory/fileNoFormat/module/sortDialog.vue
index e631d06..88e0652 100644
--- a/src/views/system/archivesCategory/fileNoFormat/module/sortDialog.vue
+++ b/src/views/system/archivesCategory/fileNoFormat/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/fileNoFormat'
+import { order } from '@/api/system/category/fileNoFormat'
 
 export default {
   data() {
diff --git a/src/views/system/archivesCategory/form.vue b/src/views/system/archivesCategory/form.vue
index e247593..01a32e8 100644
--- a/src/views/system/archivesCategory/form.vue
+++ b/src/views/system/archivesCategory/form.vue
@@ -160,8 +160,6 @@ export default {
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU](crud) {
-      console.log(this.pid)
-      console.log(crud.form)
       delete crud.form.parentName
       return true
     },
diff --git a/src/views/system/archivesCategory/listBrowsing/index.vue b/src/views/system/archivesCategory/listBrowsing/index.vue
index 4b54fc8..7970837 100644
--- a/src/views/system/archivesCategory/listBrowsing/index.vue
+++ b/src/views/system/archivesCategory/listBrowsing/index.vue
@@ -73,9 +73,9 @@
   </div>
 </template>
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
+import { FetchInitCategoryField } from '@/api/system/category/category'
 import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
-import { add } from '@/api/category/listBrowsing'
+import { add } from '@/api/system/category/listBrowsing'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
@@ -135,7 +135,7 @@ export default {
       this.getBottomTableData()
     },
     getDisplayFieldData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+      FetchInitCategoryField({ 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) => {
diff --git a/src/views/system/archivesCategory/listBrowsing/module/form.vue b/src/views/system/archivesCategory/listBrowsing/module/form.vue
index 3f936a2..a0218cf 100644
--- a/src/views/system/archivesCategory/listBrowsing/module/form.vue
+++ b/src/views/system/archivesCategory/listBrowsing/module/form.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/category/listBrowsing'
+import { add, edit } from '@/api/system/category/listBrowsing'
 export default {
   data() {
     return {
diff --git a/src/views/system/archivesCategory/listBrowsing/module/sortDialog.vue b/src/views/system/archivesCategory/listBrowsing/module/sortDialog.vue
index 0847889..6875498 100644
--- a/src/views/system/archivesCategory/listBrowsing/module/sortDialog.vue
+++ b/src/views/system/archivesCategory/listBrowsing/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/listBrowsing'
+import { order } from '@/api/system/category/listBrowsing'
 
 export default {
   data() {
diff --git a/src/views/system/archivesCategory/orderingRule/index.vue b/src/views/system/archivesCategory/orderingRule/index.vue
index 5b77439..7449edd 100644
--- a/src/views/system/archivesCategory/orderingRule/index.vue
+++ b/src/views/system/archivesCategory/orderingRule/index.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import { getDisplayField } from '@/api/category/orderingRule'
-import { edit } from '@/api/category/orderingRule'
+import { getDisplayField } from '@/api/system/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
diff --git a/src/views/system/archivesCategory/orderingRule/module/form.vue b/src/views/system/archivesCategory/orderingRule/module/form.vue
index 01a6930..b6936a9 100644
--- a/src/views/system/archivesCategory/orderingRule/module/form.vue
+++ b/src/views/system/archivesCategory/orderingRule/module/form.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { edit } from '@/api/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 export default {
   data() {
     return {
diff --git a/src/views/system/archivesCategory/orderingRule/module/sortDialog.vue b/src/views/system/archivesCategory/orderingRule/module/sortDialog.vue
index 811517d..1e13788 100644
--- a/src/views/system/archivesCategory/orderingRule/module/sortDialog.vue
+++ b/src/views/system/archivesCategory/orderingRule/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/orderingRule'
+import { order } from '@/api/system/category/orderingRule'
 
 export default {
   data() {
diff --git a/src/views/system/fileLibraryManage/baseInfo/index.vue b/src/views/system/fileLibraryManage/baseInfo/index.vue
index 0650bb9..fe42d29 100644
--- a/src/views/system/fileLibraryManage/baseInfo/index.vue
+++ b/src/views/system/fileLibraryManage/baseInfo/index.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { getNoFormatField } from '@/api/category/fileNoFormat'
+import { getNoFormatField } from '@/api/system/category/fileNoFormat'
 export default {
   name: 'BaseInfo',
   props: {
diff --git a/src/views/system/fileLibraryManage/descriptionPreview/index.vue b/src/views/system/fileLibraryManage/descriptionPreview/index.vue
index 260a144..7722aab 100644
--- a/src/views/system/fileLibraryManage/descriptionPreview/index.vue
+++ b/src/views/system/fileLibraryManage/descriptionPreview/index.vue
@@ -64,9 +64,9 @@
 <script>
 import PreviewForm from '@/views/components/category/PreviewForm'
 import SettingForm from '@/views/components/category/SettingForm'
-import { FetchArchivesTypeManage } from '@/api/category/category'
+import { FetchInitCategoryField } from '@/api/system/category/category'
 import { edit } from '@/api/category/fieldManage'
-import { previewFormOrder } from '@/api/category/listBrowsing'
+import { FetchUpardicSort } from '@/api/system/category/category'
 export default {
   name: 'DescriptionPreview',
   components: { PreviewForm, SettingForm },
@@ -104,7 +104,7 @@ export default {
     getArchivesType(setField) {
       // 门类切换时，表单校验清除
       this.$refs.previewForm1.$refs['addOrUpdateForm'].clearValidate()
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
+      FetchInitCategoryField({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
         this.allFieldsData.splice(0, this.allFieldsData.length)
         this.isInputFields.splice(0, this.isInputFields.length)
         if (!setField) {
@@ -174,7 +174,7 @@ export default {
           id: item.id
         }
       })
-      previewFormOrder(sortParam).then(() => {
+      FetchUpardicSort(sortParam).then(() => {
         this.previewFormVisible = false
         this.getArchivesType()
       })
diff --git a/src/views/system/fileLibraryManage/fileNoFormat/index.vue b/src/views/system/fileLibraryManage/fileNoFormat/index.vue
index d888cfb..3eba8a2 100644
--- a/src/views/system/fileLibraryManage/fileNoFormat/index.vue
+++ b/src/views/system/fileLibraryManage/fileNoFormat/index.vue
@@ -55,8 +55,8 @@
 </template>
 
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
-import { getNoFormatField, del } from '@/api/category/fileNoFormat'
+import { FetchInitCategoryField } from '@/api/system/category/category'
+import { getNoFormatField, del } from '@/api/system/category/fileNoFormat'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
@@ -106,7 +106,7 @@ export default {
   },
   methods: {
     initData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+      FetchInitCategoryField({ 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 && item.isInput && !item.isAutomatic) {
diff --git a/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue b/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue
index 65872e7..6148a0d 100644
--- a/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue
+++ b/src/views/system/fileLibraryManage/fileNoFormat/module/form.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { add, edit } from '@/api/category/fileNoFormat'
+import { add, edit } from '@/api/system/category/fileNoFormat'
 export default {
   data() {
     return {
diff --git a/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue b/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue
index e631d06..88e0652 100644
--- a/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue
+++ b/src/views/system/fileLibraryManage/fileNoFormat/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/fileNoFormat'
+import { order } from '@/api/system/category/fileNoFormat'
 
 export default {
   data() {
diff --git a/src/views/system/fileLibraryManage/listBrowsing/index.vue b/src/views/system/fileLibraryManage/listBrowsing/index.vue
index b3e1ee1..6c4c607 100644
--- a/src/views/system/fileLibraryManage/listBrowsing/index.vue
+++ b/src/views/system/fileLibraryManage/listBrowsing/index.vue
@@ -73,7 +73,7 @@
   </div>
 </template>
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
+import { FetchInitCategoryField } from '@/api/system/category/category'
 import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
 import { add } from '@/api/category/listBrowsing'
 import eForm from './module/form'
@@ -135,7 +135,7 @@ export default {
       this.getBottomTableData()
     },
     getDisplayFieldData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+      FetchInitCategoryField({ 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) => {
diff --git a/src/views/system/fileLibraryManage/orderingRule/index.vue b/src/views/system/fileLibraryManage/orderingRule/index.vue
index 2ca5b75..d3532aa 100644
--- a/src/views/system/fileLibraryManage/orderingRule/index.vue
+++ b/src/views/system/fileLibraryManage/orderingRule/index.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import { getDisplayField } from '@/api/category/orderingRule'
-import { edit } from '@/api/category/orderingRule'
+import { getDisplayField } from '@/api/system/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
diff --git a/src/views/system/fileLibraryManage/orderingRule/module/form.vue b/src/views/system/fileLibraryManage/orderingRule/module/form.vue
index 4e69ca9..df80526 100644
--- a/src/views/system/fileLibraryManage/orderingRule/module/form.vue
+++ b/src/views/system/fileLibraryManage/orderingRule/module/form.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { edit } from '@/api/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 export default {
   data() {
     return {
diff --git a/src/views/system/fileLibraryManage/orderingRule/module/sortDialog.vue b/src/views/system/fileLibraryManage/orderingRule/module/sortDialog.vue
index 716dafe..f8b3256 100644
--- a/src/views/system/fileLibraryManage/orderingRule/module/sortDialog.vue
+++ b/src/views/system/fileLibraryManage/orderingRule/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/orderingRule'
+import { order } from '@/api/system/category/orderingRule'
 
 export default {
   data() {
diff --git a/src/views/system/log/errorLog/index.vue b/src/views/system/log/errorLog/index.vue
index ca0c09f..d193131 100644
--- a/src/views/system/log/errorLog/index.vue
+++ b/src/views/system/log/errorLog/index.vue
@@ -66,7 +66,7 @@ export default {
   name: 'ErrorLog',
   components: { Search, pagination },
   cruds() {
-    return CRUD({ title: '异常日志', url: 'api/logs/error' })
+    return CRUD({ title: '异常日志', url: 'api/log/initErrorLog' })
   },
   mixins: [presenter()],
   data() {
diff --git a/src/views/system/log/loginLog/index.vue b/src/views/system/log/loginLog/index.vue
index 2db1be1..6fb1d09 100644
--- a/src/views/system/log/loginLog/index.vue
+++ b/src/views/system/log/loginLog/index.vue
@@ -51,7 +51,7 @@ export default {
   mixins: [presenter(), crud(), header()],
   cruds() {
     return CRUD({
-      url: 'api/loginlogs/list',
+      url: 'api/log/initLoginLog',
       // sort: ['update_time,desc'],
       // crudMethod: caseCrudMethod,
       optShow: {
diff --git a/src/views/system/log/operateLog/index.vue b/src/views/system/log/operateLog/index.vue
index 774a4c0..2a30589 100644
--- a/src/views/system/log/operateLog/index.vue
+++ b/src/views/system/log/operateLog/index.vue
@@ -64,7 +64,7 @@ export default {
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      url: 'api/logs',
+      url: 'api/log/initLog',
       title: '操作日志',
       optShow: {
         add: false,
diff --git a/src/views/system/notifyManage/index.vue b/src/views/system/notifyManage/index.vue
index b6c37bc..99e66a2 100644
--- a/src/views/system/notifyManage/index.vue
+++ b/src/views/system/notifyManage/index.vue
@@ -122,7 +122,7 @@ export default {
   name: 'NotifyManage',
   components: { rrOperation, DateRangePicker, SelectObj },
   cruds() {
-    return CRUD({ title: '通知', url: 'api/system/logs', crudMethod: { }})
+    return CRUD({ title: '通知', url: 'api/notice/initNotice', crudMethod: { }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   inject: ['reload'],
diff --git a/src/views/system/subjectLibraryManage/descriptionPreview/index.vue b/src/views/system/subjectLibraryManage/descriptionPreview/index.vue
index 4b0890d..da11a0f 100644
--- a/src/views/system/subjectLibraryManage/descriptionPreview/index.vue
+++ b/src/views/system/subjectLibraryManage/descriptionPreview/index.vue
@@ -64,9 +64,9 @@
 <script>
 import PreviewForm from '@/views/components/category/PreviewForm'
 import SettingForm from '@/views/components/category/SettingForm'
-import { FetchArchivesTypeManage } from '@/api/category/category'
+import { FetchInitCategoryField } from '@/api/system/category/category'
 import { edit } from '@/api/category/fieldManage'
-import { previewFormOrder } from '@/api/category/listBrowsing'
+import { FetchUpardicSort } from '@/api/system/category/category'
 export default {
   name: 'DescriptionPreview',
   components: { PreviewForm, SettingForm },
@@ -104,7 +104,7 @@ export default {
     getArchivesType(setField) {
       // 门类切换时，表单校验清除
       this.$refs.previewForm1.$refs['addOrUpdateForm'].clearValidate()
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
+      FetchInitCategoryField({ categoryId: this.selectedCategory.id, isType: 2 }).then(res => {
         this.allFieldsData.splice(0, this.allFieldsData.length)
         this.isInputFields.splice(0, this.isInputFields.length)
         if (!setField) {
@@ -174,7 +174,7 @@ export default {
           id: item.id
         }
       })
-      previewFormOrder(sortParam).then(() => {
+      FetchUpardicSort(sortParam).then(() => {
         this.previewFormVisible = false
         this.getArchivesType()
       })
diff --git a/src/views/system/subjectLibraryManage/listBrowsing/index.vue b/src/views/system/subjectLibraryManage/listBrowsing/index.vue
index 26c8ad7..40b7e4c 100644
--- a/src/views/system/subjectLibraryManage/listBrowsing/index.vue
+++ b/src/views/system/subjectLibraryManage/listBrowsing/index.vue
@@ -73,7 +73,7 @@
   </div>
 </template>
 <script>
-import { FetchArchivesTypeManage } from '@/api/category/category'
+import { FetchInitCategoryField } from '@/api/system/category/category'
 import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
 import { add } from '@/api/category/listBrowsing'
 import eForm from './module/form'
@@ -135,7 +135,7 @@ export default {
       this.getBottomTableData()
     },
     getDisplayFieldData() {
-      FetchArchivesTypeManage({ categoryId: this.selectedCategory.id, isType: 2 }).then((res) => {
+      FetchInitCategoryField({ 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) => {
diff --git a/src/views/system/subjectLibraryManage/orderingRule/index.vue b/src/views/system/subjectLibraryManage/orderingRule/index.vue
index 736266b..ab3511a 100644
--- a/src/views/system/subjectLibraryManage/orderingRule/index.vue
+++ b/src/views/system/subjectLibraryManage/orderingRule/index.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import { getDisplayField } from '@/api/category/orderingRule'
-import { edit } from '@/api/category/orderingRule'
+import { getDisplayField } from '@/api/system/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
 import Vue from 'vue'
diff --git a/src/views/system/subjectLibraryManage/orderingRule/module/form.vue b/src/views/system/subjectLibraryManage/orderingRule/module/form.vue
index 4e69ca9..df80526 100644
--- a/src/views/system/subjectLibraryManage/orderingRule/module/form.vue
+++ b/src/views/system/subjectLibraryManage/orderingRule/module/form.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { edit } from '@/api/category/orderingRule'
+import { edit } from '@/api/system/category/orderingRule'
 export default {
   data() {
     return {
diff --git a/src/views/system/subjectLibraryManage/orderingRule/module/sortDialog.vue b/src/views/system/subjectLibraryManage/orderingRule/module/sortDialog.vue
index 716dafe..f8b3256 100644
--- a/src/views/system/subjectLibraryManage/orderingRule/module/sortDialog.vue
+++ b/src/views/system/subjectLibraryManage/orderingRule/module/sortDialog.vue
@@ -17,7 +17,7 @@
 
 <script>
 import Sortable from 'sortablejs'
-import { order } from '@/api/category/orderingRule'
+import { order } from '@/api/system/category/orderingRule'
 
 export default {
   data() {