From 57df672b7d358107addc7a4776cb1591a8e5a85d Mon Sep 17 00:00:00 2001
From: xiaobai <857694115@qq.com>
Date: Mon, 26 Jul 2021 18:00:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                  | 10 ++++++++++
 src/views/archive/archive_info.vue |  7 +++++--
 src/views/archive/archive_scan.vue |  5 ++++-
 src/views/dic/category.vue         | 15 +++++++++------
 src/views/dic/dic_data.vue         |  2 +-
 src/views/dic/dic_type.vue         |  2 +-
 src/views/flow/definition.vue      | 22 +++++++---------------
 src/views/flow/message.vue         | 11 ++++++-----
 8 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/api/common.js b/src/api/common.js
index 320e2b7..54d1a90 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -130,3 +130,13 @@ export function getDepartmentTreeList(params) {
     params
   })
 }
+export function deleteDefinitionFn(params) {
+  return api({
+    url: '/definition',
+    method: 'delete',
+    params: params,
+    paramsSerializer: function(data) {
+      return require('qs').stringify(data, { indices: false })
+    }
+  })
+}
diff --git a/src/views/archive/archive_info.vue b/src/views/archive/archive_info.vue
index f8a8776..01fd841 100644
--- a/src/views/archive/archive_info.vue
+++ b/src/views/archive/archive_info.vue
@@ -77,8 +77,11 @@ export default {
     },
     getList() {
       this.server({
-        url: '/archive/archive/getArchiveInfo/' + this.id,
-        method: 'get'
+        url: '/archive',
+        method: 'get',
+        params: {
+          id: this.id
+        }
       }).then(data => {
         this.archive = data.archive
         this.paramList = data.paramList
diff --git a/src/views/archive/archive_scan.vue b/src/views/archive/archive_scan.vue
index 750e2af..98043db 100644
--- a/src/views/archive/archive_scan.vue
+++ b/src/views/archive/archive_scan.vue
@@ -91,7 +91,10 @@ export default {
         this.jianyijiahao = this.frameNums
         if (this.isAppend) {
           this.api({
-            url: '/archive/getArchiveInfo/' + this.id,
+            url: '/archive',
+            params: {
+              id: this.id
+            },
             method: 'get'
           }).then(data => {
             this.archive = data.archive
diff --git a/src/views/dic/category.vue b/src/views/dic/category.vue
index 03096f6..5abca87 100644
--- a/src/views/dic/category.vue
+++ b/src/views/dic/category.vue
@@ -22,7 +22,7 @@
           </div>
           <el-table
             ref="list"
-            :data="parentList"
+            :data="leftList"
             :row-class-name="tableRowClassName"
             border
             fit
@@ -135,7 +135,8 @@ export default {
       listQuery: {
         pageNum: 1, // 页码
         pageSize: 20,
-        orderBy: 'sort asc'
+        orderBy: 'sort asc',
+        parentId: ''
       },
       dialogStatus: 'create',
       dialogFormVisible: false,
@@ -152,7 +153,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    // this.getList()
     this.getSbzlList()
     this.getParentList()
     this.getLeftList()
@@ -175,6 +176,8 @@ export default {
     },
     onRowClick(row) {
       this.$refs.list.toggleRowSelection(row)
+      this.listQuery.parentId = row.id
+      this.getList()
     },
     handleSelectionChange: function(val) {
       this.multipleSelection = val
@@ -274,7 +277,7 @@ export default {
     },
     getParentList() {
       this.api({
-        url: '/category/getCategoryList',
+        url: '/category/all',
         method: 'get',
         params: {
           parentCode: null,
@@ -286,14 +289,14 @@ export default {
     },
     getLeftList() {
       this.api({
-        url: '/getTopLevel',
+        url: '/category/getTopLevel',
         method: 'get',
         params: {
           pageNum: 10,
           pageSize: 10
         }
       }).then(data => {
-        this.leftList = data
+        this.leftList = data.list
       })
     },
     closeDialog() {
diff --git a/src/views/dic/dic_data.vue b/src/views/dic/dic_data.vue
index cc6d5ad..7840f45 100644
--- a/src/views/dic/dic_data.vue
+++ b/src/views/dic/dic_data.vue
@@ -153,7 +153,7 @@ export default {
     },
     getDicType() {
       this.api({
-        url: '/dicType/getAllDicType',
+        url: '/dicType/all',
         method: 'get'
       }).then(data => {
         this.dicTypeList = data
diff --git a/src/views/dic/dic_type.vue b/src/views/dic/dic_type.vue
index 305a163..4c1fa93 100644
--- a/src/views/dic/dic_type.vue
+++ b/src/views/dic/dic_type.vue
@@ -409,7 +409,7 @@ export default {
     },
     getDicType() {
       this.api({
-        url: '/dicType/getAllDicType',
+        url: '/dicType/all',
         method: 'get'
       }).then(data => {
         this.dicTypeList = data
diff --git a/src/views/flow/definition.vue b/src/views/flow/definition.vue
index 266f468..eaecff5 100644
--- a/src/views/flow/definition.vue
+++ b/src/views/flow/definition.vue
@@ -119,6 +119,7 @@
 </template>
 <script>
 import Pagination from '@/components/Pagination'
+import { deleteDefinitionFn } from '@/api/common'
 export default {
   name: 'FlowDefinition',
   components: { Pagination },
@@ -185,7 +186,7 @@ export default {
     },
     getAllDepartment() {
       this.api({
-        url: '/department/getAllDepartment',
+        url: '/department/all',
         method: 'get'
       }).then(data => {
         this.listDepartment = data
@@ -308,7 +309,7 @@ export default {
         if (valid) {
           this.formDefinition.neibuleibie = JSON.stringify(this.neibuleibie)
           this.api({
-            url: '/definition/add',
+            url: '/definition',
             method: 'post',
             data: this.formDefinition
           }).then(() => {
@@ -327,8 +328,8 @@ export default {
           const _vue = this
           this.formDefinition.neibuleibie = JSON.stringify(this.neibuleibie)
           this.api({
-            url: '/definition/update',
-            method: 'post',
+            url: '/definition',
+            method: 'put',
             data: this.formDefinition
           }).then(() => {
             this.dialogFormVisible = false
@@ -379,20 +380,11 @@ export default {
           type: 'warning'
         }).then(() => {
           const pks = []
-          const qs = require('qs')
           this.multipleSelection.forEach(definition => {
             pks.push(definition.id)
           })
-          this.api({
-            url: '/definition/delDefinition',
-            method: 'delete',
-            params: {
-              pks: pks
-            },
-            paramsSerializer: function(params) {
-              return qs.stringify(params, { indices: false })
-            }
-          }).then(() => {
+          console.log(pks)
+          deleteDefinitionFn({ pks: pks }).then(() => {
             this.$message({
               message: '删除成功',
               type: 'success',
diff --git a/src/views/flow/message.vue b/src/views/flow/message.vue
index 4462d06..f91f7b9 100644
--- a/src/views/flow/message.vue
+++ b/src/views/flow/message.vue
@@ -151,7 +151,7 @@ export default {
             return false
           }
           this.api({
-            url: '/message/addMessage',
+            url: '/message',
             method: 'post',
             data: {
               message: this.tempMessage,
@@ -171,8 +171,8 @@ export default {
       this.$refs['tempMessage'].validate(valid => {
         if (valid) {
           this.api({
-            url: '/message/updateMessage',
-            method: 'post',
+            url: '/message',
+            method: 'put',
             data: this.tempMessage
           }).then(() => {
             this.$message({ message: '更新成功。', type: 'success' })
@@ -187,10 +187,11 @@ export default {
     editStatus($index) {
       const messgae = this.list[$index]
       this.api({
-        url: '/message/updateMessage',
-        method: 'post',
+        url: '/message',
+        method: 'put',
         data: messgae
       }).then(() => {
+        this.$message({ message: '操作成功。', type: 'success' })
         this.getList()
       })
     }