From 7544ea49937836c57d0e9ce069fb73b8f21bf478 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Sat, 30 Sep 2023 14:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/dialog/index.vue     |  6 ++--
 src/views/components/tempDialog/index.vue |  9 ++++--
 src/views/yingji/planManage.vue           | 39 +++++++++++++++++++----
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index a2dc689..90d97f4 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -592,6 +592,9 @@ export default {
     },
     // 关闭
     Close(item) {
+      this.pages.pageNum = 1;
+      this.pages.pageSize = 10;
+      this.$refs.mypagination.defaultPages();
       this.dialogVisible = false;
       this.tableData = [];
       this.multipleSelection = [];
@@ -601,9 +604,6 @@ export default {
       Object.keys(this.form).forEach((key) => (this.form[key] = ""));
       Object.keys(this.form2).forEach((key) => (this.form2[key] = ""));
       // this.unCount = 0;
-      this.pages.pageNum = 1;
-      this.pages.pageSize = 10;
-      this.$refs.mypagination.defaultPages();
       this.selected = 0;
       // this.unselected = 0;
       // this.count = 0;
diff --git a/src/views/components/tempDialog/index.vue b/src/views/components/tempDialog/index.vue
index db8a06f..8f678c8 100644
--- a/src/views/components/tempDialog/index.vue
+++ b/src/views/components/tempDialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-28 11:25:48
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-30 13:40:17
+ * @LastEditTime: 2023-09-30 14:01:06
 -->
 <template>
   <el-dialog
@@ -160,7 +160,7 @@ export default {
         .then(async() => {
           try {
             let downloadLoadingInstance = Loading.service({
-              text: "正在删除计划，请稍候",
+              text: "正在修改计划，请稍候",
               spinner: "el-icon-loading",
               background: "rgba(0, 0, 0, 0.7)",
             });
@@ -172,6 +172,11 @@ export default {
             console.log(data)
             if(data.code == 200){
               downloadLoadingInstance.close();
+              this.$message({
+                showClose: true,
+                message: '修改成功',
+                type: 'success'
+              });
               this.Close("newsuccess")
             }
           } catch (error) {
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 3119a8b..c963c7f 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-30 13:44:10
+ * @LastEditTime: 2023-09-30 13:57:47
 -->
 <template>
     <div class="plan-management">
@@ -262,12 +262,10 @@
           this.pages.pageSize = 10;
           this.$refs.mypagination.defaultPages();
           let obj
-          // console.log(newForm,'newForm')
+          console.log(newForm,'newForm')
           // 如果是苏州市或者是某个区
           if(!this.disabled) {
-            console.log('123')
             if(Array.isArray(newForm.district)){
-              console.log('456')
               if(newForm.district.length == 2) {
                 let district = this.form.district[1].slice(1, 11);
                 obj = { ...this.pages, ...this.form,district };
@@ -390,12 +388,39 @@
       },
       // 新增成功后关闭dialog事件触发
       padlock(){
-        let { district} = this.form;
+        // let { district} = this.form;
         this.pages.pageNum = 1;
         this.pages.pageSize = 10;
         this.$refs.mypagination.defaultPages();
-        let obj = {...this.pages,district}
-        console.log('123')
+        let obj
+        if(!this.disabled) {
+          if(Array.isArray(this.form.district)){
+            if(this.form.district.length == 2) {
+              let district = this.form.district[1].slice(1, 11);
+              obj = { ...this.pages, ...this.form,district };
+            } else if(this.form.district.length == 1) {
+              let district = this.form.district[0].slice(1, 8);
+              obj = { ...this.pages, ...this.form,district };
+            } else {
+              obj = { ...this.pages, ...this.form};
+            }
+            // 不是数组
+          } else {
+            // 判断是区县
+            if(this.county){
+              let district = this.form.district.slice(1, 8);
+              obj = { ...this.pages, ...this.form,district };
+            } else {
+              let district = this.form.district.slice(1, 11);
+              obj = { ...this.pages, ...this.form,district };
+            }
+          }
+        } else {
+          // 不是苏州市是乡镇
+          let district = this.form.district;
+          obj = { ...this.pages, ...this.form,district };
+        }
+        // console.log('obj',obj)
         this.getList(obj);
       },
       // 区划级联选择器选择触发