From ce7dfeff006a19da0174fa98144fc67b65b778f5 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Mon, 5 Jun 2023 09:53:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=BA=A7=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sunVillage_info/entityReport/reportLineList.vue | 2 +-
 .../sunVillage_info/entityReport/reportLineSummary.vue    | 8 +++++++-
 src/views/sunVillage_info/entityReport/reportLineView.vue | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/sunVillage_info/entityReport/reportLineList.vue b/src/views/sunVillage_info/entityReport/reportLineList.vue
index 7bbd653c..1cd582df 100644
--- a/src/views/sunVillage_info/entityReport/reportLineList.vue
+++ b/src/views/sunVillage_info/entityReport/reportLineList.vue
@@ -30,7 +30,7 @@
                 </div>
                 <div class="flex_block">
                   <i class="icon icon_2"></i>
-                  <div class="text">填报数: {{item.params.numReport}}</div>
+                  <div class="text">总填报数: {{item.params.numReport}}</div>
                 </div>
               </div>
             </div>
diff --git a/src/views/sunVillage_info/entityReport/reportLineSummary.vue b/src/views/sunVillage_info/entityReport/reportLineSummary.vue
index 7d77f904..39c03b4e 100644
--- a/src/views/sunVillage_info/entityReport/reportLineSummary.vue
+++ b/src/views/sunVillage_info/entityReport/reportLineSummary.vue
@@ -71,7 +71,7 @@
                     <div class="full-height" v-else-if="col.type === '4'">
                       <input class="input-field align-center full-height" v-model="col.name" :readonly="disableEdit"></input>
                     </div>
-                    <div v-else :style="{'text-align': calcAlign(col.type)}">{{col.name}}</div>
+                    <div v-else class="full-height flex-center" :style="{'justify-content': calcAlign(col.type)}">{{col.name}}</div>
 
                     <van-icon name="edit" v-if="cindex === editorData.headerTypes.length - 1 && canEdit(col)" class="edit-icon" color="#1989fa" size="24" @click="edit(col)"/>
                   </div>
@@ -170,6 +170,7 @@ export default {
       this.loading = true;
       summaryList({
         templateId: this.editorData.templateId,
+        deptId: Cookies.get('deptId'),
       }).then((resp) => {
         this.editorData = resp.data;
       }).finally(() => {
@@ -467,6 +468,11 @@ export default {
     right: -0.6rem;
     top: calc(50% - 0.3rem);
   }
+  .flex-center {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 
 
diff --git a/src/views/sunVillage_info/entityReport/reportLineView.vue b/src/views/sunVillage_info/entityReport/reportLineView.vue
index 383109be..a22484ca 100644
--- a/src/views/sunVillage_info/entityReport/reportLineView.vue
+++ b/src/views/sunVillage_info/entityReport/reportLineView.vue
@@ -525,6 +525,11 @@ export default {
   .form_readonly /deep/ .van-icon-arrow-down {
     display: none;
   }
+
+  .main-table /deep/ .van-field {
+    height: unset;
+    min-height: 1rem;
+  }
 }