From d339cd922fcdc92a9ff1024f5ea7257c31a22258 Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 6 Dec 2024 10:40:56 +0800
Subject: [PATCH] =?UTF-8?q?Task=20=E7=BB=BC=E5=90=88=E5=85=AC=E5=BC=802?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/otherOpen.js            |   7 +++----
 .../index_block_zonghegongkai.png               | Bin 0 -> 3480 bytes
 .../index_code_btn_zonghegongkai.png            | Bin 0 -> 14444 bytes
 src/views/sunVillage_info/index_code.vue        |   1 -
 .../sunVillage_info/otherOpen/otherOpenEdit.vue |   8 ++++----
 .../sunVillage_info/otherOpen/otherOpenList.vue |  14 +++++++-------
 .../otherOpen/otherOpenVisitDetail.vue          |   2 +-
 .../otherOpen/otherOpenVisitList.vue            |   6 +++---
 8 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/index_block_zonghegongkai.png
 create mode 100644 src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png

diff --git a/src/api/sunVillage_info/otherOpen.js b/src/api/sunVillage_info/otherOpen.js
index 305363f7..6f46afd1 100644
--- a/src/api/sunVillage_info/otherOpen.js
+++ b/src/api/sunVillage_info/otherOpen.js
@@ -46,19 +46,18 @@ export function delOther(id) {
 // 查询其他公开列表 游客
 export function otherOpenList(query) {
   return request({
-    url: '/open/villageAffairs/public/otherOpenList',
+    url: '/open/villageAffairs/public/otherPublicList',
     method: 'get',
     params: query
   })
 }
 
 // 查询其他公开详细 游客
-export function otherOpenDetail(bookId, id) {
+export function otherOpenDetail(id) {
   return request({
-    url: '/open/villageAffairs/public/otherOpenDetail',
+    url: '/open/villageAffairs/public/otherPublicDetail',
     method: 'get',
     params: {
-      bookId,
       id,
     },
   })
diff --git a/src/assets/images/sunVillage_info/index_block_zonghegongkai.png b/src/assets/images/sunVillage_info/index_block_zonghegongkai.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12f4364a3c6b517e6743dc34c9c048681998310
GIT binary patch
literal 3480
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png b/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f8bca4098a4a014fd760fec722c45caf33bb166
GIT binary patch
literal 14444
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
DD8d$5

literal 0
HcmV?d00001

diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue
index 21f339db..0d2aa9af 100644
--- a/src/views/sunVillage_info/index_code.vue
+++ b/src/views/sunVillage_info/index_code.vue
@@ -98,7 +98,6 @@ import {bookListByDept} from "@/api/onlineHome/villageAffairs";
         //账套列表
         bookVisbile:false,
         bookList:[],
-        bookName:"",
         bookId:"",
         book:"",
 
diff --git a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue
index 3ec8a69f..0e017ab8 100644
--- a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue
+++ b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue
@@ -107,19 +107,19 @@
          intent: null,
          content: '',
          otherTypeOptions: [],
-         type: null,
+         otherType: null,
          title: '综合公开',
        };
      },
      created() {
        this.id = this.$route.query.id;
        this.intent = this.$route.query.intent;
-       this.type = this.$route.query.type;
+       this.otherType = this.$route.query.otherType;
        if(this.isEdit)
         this.getDetail();
        else
        {
-         this.form.otherType = this.$route.query.type;
+         this.form.otherType = this.$route.query.otherType;
          this.getDicts('other_gk_type').then((resp) => {
            this.otherTypeOptions = resp.data;
            const dict = resp.data.find((x) => x.dictValue == this.form.otherType);
@@ -191,7 +191,7 @@
          return this.intent === 'edit' ? '编辑' : '新增';
        },
        showTypeSelector() {
-         return this.isAdd && !this.type;
+         return this.isAdd && !this.otherType;
        },
      },
    }
diff --git a/src/views/sunVillage_info/otherOpen/otherOpenList.vue b/src/views/sunVillage_info/otherOpen/otherOpenList.vue
index 63bbf5de..84808d1d 100644
--- a/src/views/sunVillage_info/otherOpen/otherOpenList.vue
+++ b/src/views/sunVillage_info/otherOpen/otherOpenList.vue
@@ -93,7 +93,7 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets";
       };
     },
     created() {
-      this.queryParams.otherType = this.$route.query.type || '';
+      this.queryParams.otherType = this.$route.query.otherType || '';
       this.getDicts('other_gk_type').then((resp) => {
         let arr = [];
         arr.push({
@@ -135,28 +135,28 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets";
           intent: 'view',
         };
         if(this.queryParams.otherType)
-          parms.type = this.queryParams.otherType;
+          parms.otherType = this.queryParams.otherType;
         this.$router.push({
           name: 'otherOpenDetail',
           query: parms,
         }).catch(() => {});
       },
       viewItem(id){
-        this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) );
+        this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) );
       },
       gotoAdd() {
         let parms = {
           intent: 'add',
         };
         if(this.queryParams.otherType)
-          parms.type = this.queryParams.otherType;
+          parms.otherType = this.queryParams.otherType;
         this.$router.push({
           name: 'otherOpenEdit',
           query: parms,
         }).catch(() => {});
       },
       add() {
-        this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoAdd(), () => this.gotoAdd() );
+        this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoAdd(), () => this.gotoAdd() );
       },
       gotoEdit(id) {
         let parms = {
@@ -164,14 +164,14 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets";
           intent: 'edit',
         };
         if(this.queryParams.otherType)
-          parms.type = this.queryParams.otherType;
+          parms.otherType = this.queryParams.otherType;
         this.$router.push({
           name: 'otherOpenEdit',
           query: parms,
         }).catch(() => {});
       },
       edit(id) {
-        this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoEdit(id), () => this.gotoEdit(id) );
+        this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoEdit(id), () => this.gotoEdit(id) );
       },
       remove(id) {
         Dialog.confirm({
diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue
index 92bd31b1..f71cefef 100644
--- a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue
+++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue
@@ -90,7 +90,7 @@
            return;
          }
 
-         otherOpenDetail(this.bookId, this.id).then((resp) => {
+         otherOpenDetail(this.id).then((resp) => {
            this.form = resp.data;
            this.getDicts('other_gk_type').then((resp) => {
              const dict = resp.data.find((x) => x.dictValue == this.form.otherType);
diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue
index ac6129ea..36934d60 100644
--- a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue
+++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue
@@ -97,7 +97,7 @@ import Cookies from "js-cookie";
         return;
       }
 
-      this.queryParams.otherType = this.$route.query.type || '';
+      this.queryParams.otherType = this.$route.query.otherType || '';
       this.getDicts('other_gk_type').then((resp) => {
         let arr = [];
         arr.push({
@@ -139,14 +139,14 @@ import Cookies from "js-cookie";
           intent: 'view',
         };
         if(this.queryParams.otherType)
-          parms.type = this.queryParams.otherType;
+          parms.otherType = this.queryParams.otherType;
         this.$router.push({
           name: 'otherOpenVisitDetail',
           query: parms,
         }).catch(() => {});
       },
       viewItem(id){
-        this.$router.replace(`/sunVillage_info/otherOpenVisitIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) );
+        this.$router.replace(`/sunVillage_info/otherOpenVisitIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) );
       },
       back() {
         this.$router.replace('/sunVillage_info/otherOpenVisitIndex', () => this.$router.back(), () => this.$router.back() );