From e555988ed0ef1f3fc34973102c2ec1aad06df93b Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Fri, 28 Jun 2024 14:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E4=BA=A7=E5=89=8D?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Gcrl/index.vue             |  2 +-
 src/views/jhzx/components/sygdpc/Dhjh.vue | 94 ++++++++++++-----------
 src/views/jhzx/components/sygdpc/GxCD.vue | 12 ++-
 src/views/jhzx/components/sygdpc/Sbcn.vue |  4 +
 src/views/jhzx/symxCX.vue                 |  2 +-
 src/views/sjzx/sbjgryWH.vue               |  2 +-
 src/views/sjzx/sbwxjhWH.vue               |  2 +-
 7 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/src/components/Gcrl/index.vue b/src/components/Gcrl/index.vue
index 0386fe4..066b39a 100644
--- a/src/components/Gcrl/index.vue
+++ b/src/components/Gcrl/index.vue
@@ -281,7 +281,7 @@ td {
 
 .content {
   position: relative;
-  min-height: 100px;
+  min-height: 90px;
 }
 vertical-align: top;
 .top-day {
diff --git a/src/views/jhzx/components/sygdpc/Dhjh.vue b/src/views/jhzx/components/sygdpc/Dhjh.vue
index 71ec068..ca07a26 100644
--- a/src/views/jhzx/components/sygdpc/Dhjh.vue
+++ b/src/views/jhzx/components/sygdpc/Dhjh.vue
@@ -1,59 +1,63 @@
 <template>
-  <div class="mytable">
-    <el-button size="small"  type="primary" @click="getList" >查询</el-button>
-    <el-button size="small"  type="success" @click="add" >新增</el-button>
-    <el-button size="small"  type="danger" @click="remove" >删除</el-button>
-    <el-button size="small"  type="success" @click="saveGxcd" >保存</el-button>
-    <vxe-grid
-      id="dhId"
-      ref="xGridDh"
-      border
-      resizable
-      keep-source
-      :align="'center'"
-      :height="height"
-      :auto-resize="true"
-      :columns="dhjhTableColumn"
-      :data="dhjhList"
-      :custom-config="{storage: true }"
-      :edit-config="{
+  <div>
+    <el-row style="width: 100%;text-align: right;margin-bottom: 3px">
+      <el-button size="small"  type="primary" @click="getList" >查询</el-button>
+      <el-button size="small"  type="success" @click="add" >新增</el-button>
+      <el-button size="small"  type="danger" @click="remove" >删除</el-button>
+      <el-button size="small"  type="success" @click="saveGxcd" >保存</el-button>
+    </el-row>
+    <el-row>
+      <vxe-grid
+        id="dhId"
+        ref="xGridDh"
+        border
+        resizable
+        keep-source
+        :align="'center'"
+        :height="height"
+        :auto-resize="true"
+        :columns="dhjhTableColumn"
+        :data="dhjhList"
+        :custom-config="{storage: true }"
+        :edit-config="{
                 trigger: 'click',
                 mode: 'row',
                 showStatus: true,
               }"
-      :scroll-x="{enabled: true}"
-      :scroll-y="{enabled: true}"
-      highlight-current-row
-      highlight-hover-row
-      show-overflow
-      show-header-overflow
-    >
-      <template #month_edit="{ row }">
-        <vxe-input
-          v-model="row.month"
-          type="month"
-          value-format="yyyy/MM"
-          placeholder=""
-          transfer
-        ></vxe-input>
-      </template>
-      <template #allArriveData_edit="{ row }">
-        <vxe-input
-          v-model="row.allArriveData"
-          type="date"
-          value-format="yyyy/MM/dd"
-          placeholder=""
-          transfer
-        ></vxe-input>
-      </template>
-    </vxe-grid>
+        :scroll-x="{enabled: true}"
+        :scroll-y="{enabled: true}"
+        highlight-current-row
+        highlight-hover-row
+        show-overflow
+        show-header-overflow
+      >
+        <template #month_edit="{ row }">
+          <vxe-input
+            v-model="row.month"
+            type="month"
+            value-format="yyyy/MM"
+            placeholder=""
+            transfer
+          ></vxe-input>
+        </template>
+        <template #allArriveData_edit="{ row }">
+          <vxe-input
+            v-model="row.allArriveData"
+            type="date"
+            value-format="yyyy/MM/dd"
+            placeholder=""
+            transfer
+          ></vxe-input>
+        </template>
+      </vxe-grid>
+    </el-row>
   </div>
 </template>
 
 <script>
 import {getDhjhAll, saveDhjh, removeDhjh} from '@/api/jhzx/pc'
 export default {
-  name:'GxCD',
+  name:'Dhjh',
   props:{
     height:{
       type:Number,
diff --git a/src/views/jhzx/components/sygdpc/GxCD.vue b/src/views/jhzx/components/sygdpc/GxCD.vue
index b5cded8..21355a9 100644
--- a/src/views/jhzx/components/sygdpc/GxCD.vue
+++ b/src/views/jhzx/components/sygdpc/GxCD.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="mytable">
-    <el-button size="small"  type="primary" @click="getList" >查询</el-button>
-    <el-button size="small"  type="success" @click="add" >新增</el-button>
-    <el-button size="small"  type="danger" @click="remove" >删除</el-button>
-    <el-button size="small"  type="success" @click="saveGxcd" >保存</el-button>
+    <el-row style="width: 100%;text-align: right;margin-bottom: 3px">
+      <el-button size="small"  type="primary" @click="getList" >查询</el-button>
+      <el-button size="small"  type="success" @click="add" >新增</el-button>
+      <el-button size="small"  type="danger" @click="remove" >删除</el-button>
+      <el-button size="small"  type="success" @click="saveGxcd" >保存</el-button>
+    </el-row>
+    <el-row>
     <vxe-grid
       id="gxId"
       ref="xGridGx"
@@ -29,6 +32,7 @@
       show-header-overflow
     >
     </vxe-grid>
+    </el-row>
   </div>
 </template>
 
diff --git a/src/views/jhzx/components/sygdpc/Sbcn.vue b/src/views/jhzx/components/sygdpc/Sbcn.vue
index 9f21be6..19475c5 100644
--- a/src/views/jhzx/components/sygdpc/Sbcn.vue
+++ b/src/views/jhzx/components/sygdpc/Sbcn.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="mytable">
+    <el-row style="width: 100%;text-align: right;margin-bottom: 3px">
     <el-button size="small"  type="primary" @click="getList" >查询</el-button>
     <el-button size="small"  type="success" @click="add" >新增</el-button>
     <el-button size="small"  type="danger" @click="remove" >删除</el-button>
     <el-button size="small"  type="success" @click="saveSbcn" >保存</el-button>
+    </el-row>
+    <el-row>
     <vxe-grid
       id="sbcnId"
       ref="xGridSbcn"
@@ -29,6 +32,7 @@
       show-header-overflow
     >
     </vxe-grid>
+    </el-row>
   </div>
 </template>
 
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 33209d6..d86283a 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -296,7 +296,7 @@
       </template>
     </vxe-modal>
     <!-- 弹出层——展示待确认项-->
-    <vxe-modal v-model="dialogVisible2" width="80%" :title="title2">
+    <vxe-modal v-model="dialogVisible2" width="80%" :title="title2" height="100%">
       <template #default>
         <el-row class="query_wrapper">
           <el-steps :active="active" finish-status="success" align-center>
diff --git a/src/views/sjzx/sbjgryWH.vue b/src/views/sjzx/sbjgryWH.vue
index a1d1733..e2d44fa 100644
--- a/src/views/sjzx/sbjgryWH.vue
+++ b/src/views/sjzx/sbjgryWH.vue
@@ -502,7 +502,7 @@ export default {
       }
     },
     getHeight() {
-      this.height = window.innerHeight - 180;
+      this.height = window.innerHeight - 230;
     },
   },
 };
diff --git a/src/views/sjzx/sbwxjhWH.vue b/src/views/sjzx/sbwxjhWH.vue
index 63b125b..8df26c7 100644
--- a/src/views/sjzx/sbwxjhWH.vue
+++ b/src/views/sjzx/sbwxjhWH.vue
@@ -683,7 +683,7 @@ export default {
       }
     },
     getHeight() {
-      this.height = window.innerHeight - 180;
+      this.height = window.innerHeight - 230;
     },
   },
 };