From bf4bd9e8d46c42cbbe25f68f4059ef02a76ddcb0 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 11 Jul 2022 16:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...onthlyReportTitleTemplateEOController.java | 14 ++++-
 .../components/modules/fillTable.vue          | 54 ++++++++++++++++---
 2 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
index db6a7d163..4ccc7a42f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
@@ -1,5 +1,7 @@
 package com.jero.modules.report.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -23,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -186,13 +189,20 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 
 	 /**
 	  * 上移下移
-	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @param jsonObject
 	  * @return
 	  */
 	 @AutoLog(value = "上移下移")
 	 @ApiOperation(value="上移下移", notes="上移下移")
 	 @PostMapping(value = "/move")
-	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+	 public Result<?> move(@RequestBody JSONObject jsonObject) {
+		 JSONArray lawsMonthlyReportTitleTemplateJson = jsonObject.getJSONArray("lawsMonthlyReportTitleTemplateEOS");
+		 LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO = null;
+		 List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = new ArrayList<>();
+		 for (Object o : lawsMonthlyReportTitleTemplateJson) {
+			 lawsMonthlyReportTitleTemplateEO=JSONObject.parseObject(JSONObject.toJSONString(o),LawsMonthlyReportTitleTemplateEO.class);
+			 lawsMonthlyReportTitleTemplateEOS.add(lawsMonthlyReportTitleTemplateEO);
+		 }
 		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
 		 return Result.OK("操作成功！");
 	 }
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
index f738e0f96..7d2abf4fb 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue
@@ -28,9 +28,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="moveUpClick(record)">{{$t('moveUp')}}</a>
-           <a class="text-operation" @click="moveDownClick(record)">{{$t('moveDown')}}</a>
+        <span slot="operation" slot-scope="text,record,index">
+           <a class="text-operation" @click="moveUpClick(record,index)">{{$t('moveUp')}}</a>
+           <a class="text-operation" @click="moveDownClick(record,index)">{{$t('moveDown')}}</a>
            <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
            <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
@@ -69,6 +69,7 @@
         dataSource: [],
         pageNo: 1,
         pageSize: 10,
+        sortList: [],
         total: 0,
         columns: [
           {
@@ -146,11 +147,49 @@
           }
         })
       },
-      moveUpClick() {
-
+      moveUpClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != 0) {
+            this.sortList.push(content[0].children[index - 1])
+          }
+        } else {
+          if (index != 0) {
+            this.sortList.push(this.dataSource[index - 1])
+          }
+        }
+        this.move()
       },
-      moveDownClick() {
-
+      moveDownClick(row, index) {
+        this.sortList = []
+        this.sortList.push(row)
+        if (row.parentId) {
+          let content = this.dataSource.filter(res => {
+            return row.parentId == res.id
+          })
+          if (index != (content[0].children.length - 1)) {
+            this.sortList.push(content[0].children[index + 1])
+          }
+        } else {
+          if (index != (this.dataSource.length - 1)) {
+            this.sortList.push(this.dataSource[index + 1])
+          }
+        }
+        this.move()
+      },
+      move() {
+        postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.getList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+        })
       },
       deleteLib(val) {
         let _this = this
@@ -185,6 +224,7 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
   .text-operation {
     margin-right: 8px;
   }