From d7fb757eceac03abb8077502d4b55414dfeaaa34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 21 Oct 2024 17:16:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=AF=BC=E5=85=A5=E9=A1=B9?=
 =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E6=94=AF=E6=8C=81=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=B7=B2=E4=B8=8B=E5=8F=91=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=203.=E6=9C=88=E5=BA=A6=E8=AE=A1=E5=88=92=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92,=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=A0=B9=E6=8D=AE=E5=8F=8C=E5=91=A8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=AF=BC=E5=85=A5=E6=97=B6=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/jhzx/sygdSH.vue | 14 ++++++--------
 src/views/jhzx/sygdWH.vue | 12 +++++-------
 src/views/jhzx/symxCX.vue |  1 -
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/views/jhzx/sygdSH.vue b/src/views/jhzx/sygdSH.vue
index f0d1e58..61a6640 100644
--- a/src/views/jhzx/sygdSH.vue
+++ b/src/views/jhzx/sygdSH.vue
@@ -74,19 +74,17 @@
               border
               resizable
               keep-source
-              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
+              highlight-current-row
               :data="list"
               :custom-config="{ storage: true }"
-              highlight-current-row
+              :scroll-y="{enabled: true}"
               highlight-hover-row
-              :span-method="rowspanMethod"
-              @checkbox-all="selectAllEvent"
-              @checkbox-change="selectChangeEvent"
-              :scroll-y="{ enabled: true }"
+              show-overflow
+              show-header-overflow
             >
             </vxe-grid>
           </div>
@@ -98,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList, sh, tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, sh, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -432,7 +430,7 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getSygdList(this.queryParam).then((res) => {
+      getList(this.queryParam).then((res) => {
         this.list = res.data.list
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue
index 790b7a4..d0b5020 100644
--- a/src/views/jhzx/sygdWH.vue
+++ b/src/views/jhzx/sygdWH.vue
@@ -74,19 +74,17 @@
               border
               resizable
               keep-source
-              show-overflow
               :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
+              highlight-current-row
               :data="list"
               :custom-config="{ storage: true }"
-              highlight-current-row
+              :scroll-y="{enabled: true}"
               highlight-hover-row
-              :span-method="rowspanMethod"
-              @checkbox-all="selectAllEvent"
-              @checkbox-change="selectChangeEvent"
-              :scroll-y="{ enabled: true }"
+              show-overflow
+              show-header-overflow
             >
             </vxe-grid>
           </div>
@@ -98,7 +96,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList,tj} from '@/api/jhzx/sygd'
+import {getList, getSygdList, tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 475ffcf..83c61eb 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -3094,7 +3094,6 @@ export default {
       const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
       生成月度计划(data).then(res=>{
         this.list=res.data
-        this.initList()
       })
     },
     paichan(){