From 6ad62a223a7c4f716bb5e5fdf61066f31fdefa78 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Tue, 14 Jun 2022 14:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/category/category.js      | 10 +++++++++-
 src/api/category/fieldManage.js   | 10 ++++++++++
 src/views/category/index.vue      | 17 +++--------------
 src/views/category/sortDialog.vue | 16 +++++++++++++---
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/api/category/category.js b/src/api/category/category.js
index ba03a34..b4393be 100644
--- a/src/api/category/category.js
+++ b/src/api/category/category.js
@@ -14,7 +14,6 @@ export function getCategoryType() {
   })
 }
 
-// 根据字典id查询子集
 export function FetchArchivesTypeManage(parameter) {
   return request({
     url: 'api/archives-type/manage',
@@ -23,6 +22,15 @@ export function FetchArchivesTypeManage(parameter) {
   })
 }
 
+// 点击排序对话框保存按钮，保存顺序
+export function sort(data) {
+  return request({
+    url: 'api/archives-type/sort',
+    method: 'put',
+    data
+  })
+}
+
 export function add(data) {
   data = Object.assign({ isTypeMetic: data.isType === 6 }, data)
   return request({
diff --git a/src/api/category/fieldManage.js b/src/api/category/fieldManage.js
index 18e0c88..5a8abe9 100644
--- a/src/api/category/fieldManage.js
+++ b/src/api/category/fieldManage.js
@@ -1,6 +1,11 @@
 import request from '@/utils/request'
 
 export function add(data) {
+  if (data.isDataType === 1) {
+    data.isDataTypeDetail = 'varchar'
+  } else if (data.isDataType === 2) {
+    data.isDataTypeDetail = 'int'
+  }
   return request({
     url: 'api/archives-type/create-dic',
     method: 'post',
@@ -18,6 +23,11 @@ export function del(ids) {
 }
 
 export function edit(data) {
+  if (data.isDataType === 1) {
+    data.isDataTypeDetail = 'varchar'
+  } else if (data.isDataType === 2) {
+    data.isDataTypeDetail = 'int'
+  }
   return request({
     url: 'api/archives-type/update',
     method: 'put',
diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index 87d7e46..3a512a8 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -24,7 +24,7 @@
       </div>
     </el-dialog>
     <!--排序对话框组件-->
-    <sortDialog ref="sort" />
+    <sortDialog ref="sort" @treeNodeSort="treeNodeSort" />
     <!-- 门类列表 -->
     <el-row class="container-main" :gutter="20">
       <el-col class="container-left curd-in-out" :xs="10" :sm="8" :md="5" :lg="6" :xl="5">
@@ -207,17 +207,8 @@ export default {
         return false
       }
     },
-    updateKeyChildren(data) {
-      const oldDatas = this.$refs.tree.getCurrentNode().children
-      if (oldDatas) {
-        for (let i = 0; i < data.length; i++) {
-          const oldData = oldDatas.find((d) => { return d.id === data[i].id })
-          if (oldData) {
-            data[i].children = oldData.children
-          }
-        }
-      }
-      this.$refs.tree.updateKeyChildren(this.$refs.tree.getCurrentKey(), data)
+    treeNodeSort(data) {
+      this.$refs.tree.updateKeyChildren(data[0].pid, JSON.parse(JSON.stringify(data)))
     },
     toDelete(data) {
       this.deleteData = data
@@ -237,10 +228,8 @@ export default {
       done()
     },
     toSort(data) {
-      // findSubsetById(data[0].id).then(res => {
       this.$refs.sort.sortTableData = data[0].children
       this.$refs.sort.sortVisible = true
-      // })
     },
     changeActiveTab(data) {
       this.activeIndex = data
diff --git a/src/views/category/sortDialog.vue b/src/views/category/sortDialog.vue
index 6dedb01..d546b09 100644
--- a/src/views/category/sortDialog.vue
+++ b/src/views/category/sortDialog.vue
@@ -1,11 +1,11 @@
 <template>
   <!--表单组件-->
-  <el-dialog title="排序" :visible.sync="sortVisible" @opened="opened">
+  <el-dialog :close-on-click-modal="false" title="排序" :visible.sync="sortVisible" @opened="opened">
     <span class="dialog-right-top" />
     <span class="dialog-left-bottom" />
     <div class="setting-dialog">
       <i class="drag-tip">提示：请通过拖动鼠标来调整当前顺序</i>
-      <el-table :data="sortTableData" class="category-sort" style="width: 100%;max-height: 70vh;" row-key="id">
+      <el-table :data="sortTableData" :tree-props="{children: 'childrens'}" class="category-sort" style="width: 100%;max-height: 70vh;" row-key="id">
         <el-table-column type="index" label="序号" width="100" align="center" />
         <el-table-column prop="cnName" label="门类名称" />
       </el-table>
@@ -18,6 +18,7 @@
 
 <script>
 import Sortable from 'sortablejs'
+import { sort } from '@/api/category/category'
 
 export default {
   data() {
@@ -45,7 +46,16 @@ export default {
       this.rowDrop('category-sort', 'sortTableData')
     },
     handleSort() {
-
+      const data = this.sortTableData.map((value, index) => {
+        return { id: value.id, sort: index + 1 }
+      })
+      this.sortTableData.forEach((item, index) => {
+        item.categorySeq = index + 1
+      })
+      sort(data).then(() => {
+        this.sortVisible = false
+        this.$emit('treeNodeSort', this.sortTableData)
+      })
     }
   }
 }