From 78501fab687ecd2512190b3d90e83b23e535ebf6 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 24 Aug 2023 17:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E6=9D=83=E8=B0=83=E6=9F=A5=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contracted/village/massif/massif.vue      | 14 ++++++++----
 .../village/massif/massifDetail.vue           | 22 +++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue
index 46b17964..dac05e2d 100644
--- a/src/views/contracted/village/massif/massif.vue
+++ b/src/views/contracted/village/massif/massif.vue
@@ -82,6 +82,9 @@
           dklb: null,
           pageNum:1,
           pageSize:20,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
         },
         // 地块类别字典
         dklbOptions: [],
@@ -103,9 +106,10 @@
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
         if (this.dklbOptions.length > 0) {
-          this.queryParams.dklb = this.dklbOptions[0].dictValue;
-          this.landCategory = this.dklbOptions[0].dictValue;
-          this.tagName = this.dklbOptions[0].dictLabel;
+          const dklb = this.$route.query.dklb;
+          this.queryParams.dklb = dklb ? dklb : this.dklbOptions[0].dictValue;
+          this.landCategory = dklb ? dklb : this.dklbOptions[0].dictValue;
+          this.tagName = dklb ? this.selectDictLabel(this.dklbOptions, dklb) : this.dklbOptions[0].dictLabel;
         }
         this.getList();
       });
@@ -150,6 +154,7 @@
             path:'/contracted/village/massifDetail',
             query: {
               deptId: this.$route.query.deptId,
+              deptName: this.$route.query.deptName,
               id: id
             }
           });
@@ -157,7 +162,8 @@
           this.$router.push({
             path:'/contracted/village/massifDetail',
             query: {
-              deptId: this.$route.query.deptId
+              deptId: this.$route.query.deptId,
+              deptName: this.$route.query.deptName
             }
           });
         }
diff --git a/src/views/contracted/village/massif/massifDetail.vue b/src/views/contracted/village/massif/massifDetail.vue
index 3df9f003..1d602652 100644
--- a/src/views/contracted/village/massif/massifDetail.vue
+++ b/src/views/contracted/village/massif/massifDetail.vue
@@ -213,6 +213,8 @@
     },
     created() {
       this.taskStatus = Cookies.get('taskStatus');
+      console.log(this.$route.query);
+      console.log(this.$route.params);
       this.getDicts("land_ownership").then(response => {
         this.syqxzOptions = response.data;
       });
@@ -330,7 +332,15 @@
                   message: '保存成功',
                   duration:"1000",
                   onClose: () => {
-                    this.goBack();
+                    // this.goBack();
+                    this.$router.push({
+                      path:'/contracted/village/massif',
+                      query: {
+                        deptId: this.$route.query.deptId,
+                        deptName: this.$route.query.deptName,
+                        dklb: this.form.dklb
+                      }
+                    });
                   }
                 });
               }
@@ -344,7 +354,15 @@
                   message: '保存成功',
                   duration:"1000",
                   onClose: () => {
-                    this.goBack();
+                    // this.goBack();
+                    this.$router.push({
+                      path:'/contracted/village/massif',
+                      query: {
+                        deptId: this.$route.query.deptId,
+                        deptName: this.$route.query.deptName,
+                        dklb: this.form.dklb
+                      }
+                    });
                   }
                 });
               }