From 436d99aac557d87d0326a1cfde796cbadc860084 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:15:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/people-info.scss             |  16 +-
 src/views/modules/shequ/cpts/fangwu-info.vue |   2 +
 src/views/modules/shequ/cpts/people-more.vue | 257 ++++++++++---------
 src/views/modules/shequ/cpts/xuqiu-info.vue  |   2 +
 4 files changed, 146 insertions(+), 131 deletions(-)

diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index fa0354ca2..24428cddc 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
-        padding: 20px;
-        width: 1000px;
+        margin: 5vh auto;
+        height: 90vh;
+        width: 1040px;
         background-color: #fff;
 
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1040px;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
         .title {
             padding: 10px;
             font-size: 22px;
@@ -33,6 +42,7 @@
 
         .btn-close {
             position: absolute;
+            z-index: 2;
             top: -30px;
             right: -30px;
             cursor: pointer;
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index ec0bad720..15babd2f4 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -202,6 +202,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 4fd6debdf..f7c47e98c 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -1,109 +1,142 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="title">
-        <span>更多信息</span>
-      </div>
-
       <div class="btn-close" @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
-
-      <div
-        :key="'fieldSubList' + index"
-        v-for="(fieldSubList, index) in fieldList"
-      >
-        <div class="list">
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属网格：</span>
-            <span>{{ gridName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属小区：</span>
-            <span>{{ xiaoquName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属楼宇：</span>
-            <span>{{ louName }}-{{ danyuanName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ homeName }}</span>
-          </div>
-          <div class="item" :key="field.itemId" v-for="field in fieldSubList">
-            <span class="item-field">{{ field.label }}：</span>
-
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
-                info[field.columnName] == null
-                  ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      info[field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              info[field.columnName] == null ? "--" : info[field.columnName]
-            }}</span>
-          </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>更多信息</span>
         </div>
 
-        <div class="line"></div>
-      </div>
-
-      <div class="tabs">
         <div
-          class="tab-btn"
-          @click="subStartGroupIndex"
-          v-if="groupList.length > 9"
+          :key="'fieldSubList' + index"
+          v-for="(fieldSubList, index) in fieldList"
         >
-          <img src="@/assets/img/shuju/people/arrow-double-left.png" />
-        </div>
-        <div
-          v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-          class="tab"
-          :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-          :key="'tab' + index"
-          @click="groupIndex = index"
-          v-for="(item, index) in groupList"
-        >
-          {{ item.label }}
+          <div class="list">
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属网格：</span>
+              <span>{{ gridName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属小区：</span>
+              <span>{{ xiaoquName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属楼宇：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
+            </div>
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
+            </div>
+          </div>
+
+          <div class="line"></div>
         </div>
-        <div
-          class="tab-btn"
-          @click="addStartGroupIndex"
-          v-if="groupList.length > 9"
-        >
-          <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
         </div>
-      </div>
 
-      <div
-        :key="'group' + index"
-        v-show="groupIndex % groupList.length == index"
-        v-for="(group, index) in groupList"
-      >
         <div
-          v-if="
-            group.tableName == 'ic_resi_demand' &&
-            Array.isArray(allInfo.ic_resi_demand) &&
-            allInfo.ic_resi_demand.length > 0
-          "
+          :key="'group' + index"
+          v-show="groupIndex % groupList.length == index"
+          v-for="(group, index) in groupList"
         >
           <div
-            class="list"
-            :key="'ic_resi_demand' + infoIndex"
-            v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
           >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
             <div
               class="item"
               :key="field.itemId"
@@ -118,52 +151,24 @@
                   field.itemType == 'cascader'
                 "
                 >{{
-                  infoItem[field.columnName] == null
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
                     : getOptionLabel(
                         field.options,
-                        infoItem[field.columnName],
+                        allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
                 }}</span
               >
 
               <span v-else>{{
-                infoItem[field.columnName] == null
-                  ? "--"
-                  : infoItem[field.columnName]
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
-            <span class="item-field">{{ field.label }}：</span>
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
                 !allInfo[group.tableName] ||
                 allInfo[group.tableName][0][field.columnName] == null
                   ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      allInfo[group.tableName][0][field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              !allInfo[group.tableName] ||
-              allInfo[group.tableName][0][field.columnName] == null
-                ? "--"
-                : allInfo[group.tableName][0][field.columnName]
-            }}</span>
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
diff --git a/src/views/modules/shequ/cpts/xuqiu-info.vue b/src/views/modules/shequ/cpts/xuqiu-info.vue
index 2e75d5ae6..2c378f739 100644
--- a/src/views/modules/shequ/cpts/xuqiu-info.vue
+++ b/src/views/modules/shequ/cpts/xuqiu-info.vue
@@ -219,6 +219,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

From 1d6195be125f2bf0721c8e115f0625fe5b800ed9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:16:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/importRecord/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index 191bdc54f..f4fe8a58c 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <h2 type="success" size="small">导入记录</h2>
-      </div>
+
       <el-table
         :data="tableData"
         border

From c3b07fb011764305db1e8a6e579bdecaef837615 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 16 Mar 2022 17:33:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index f5b5b873e..dd5e23881 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -81,6 +81,7 @@
                   @click="handleOrder(scope.$index)"
                   type="text"
                   size="small"
+                  style="color: #1c6afd"
                   >预约</el-button
                 >
 
@@ -88,7 +89,7 @@
                   @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                  style="margin-right: 10px; color: #1c6afd"
                   >预约记录</el-button
                 >
               </template>
@@ -420,14 +421,14 @@ export default {
           top: 5px;
           right: 5px;
           font-size: 14px;
-          color: rgb(235, 192, 4);
+          color: #00a7a9;
           width: 50px;
           line-height: 30px;
           text-align: center;
           cursor: pointer;
           &:hover {
             // text-decoration: underline;
-            color: rgb(250, 208, 23);
+            color: #00a7a9;
           }
         }
         .item-name {