From c65d8ea56b130c921706741217d78533590def19 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 10 Mar 2022 17:00:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87dd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   3 +
 src/views/components/scoreRecord.vue          |   7 +-
 src/views/modules/base/resi.vue               |   3 -
 .../communityService/sqzzz/cpts/edit.vue      |  11 +-
 .../modules/communityService/sqzzz/index.vue  | 230 +++++-------------
 5 files changed, 74 insertions(+), 180 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index cb8948ef..ac0d8a1d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -125,6 +125,9 @@ export default {
     padding: 20px 20px 0 20px;
   }
 }
+.name-a {
+  cursor: pointer;
+}
 .dialog-h {
   .el-dialog__body {
     position: relative;
diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue
index 62c02c52..fb618e21 100644
--- a/src/views/components/scoreRecord.vue
+++ b/src/views/components/scoreRecord.vue
@@ -54,12 +54,13 @@
                        header-align="center"
                        align="center"
                        label="需求人"
-                       width="100">
+                       width="120">
       </el-table-column>
       <el-table-column prop="content"
                        header-align="center"
                        align="center"
                        label="需求内容"
+                        :show-overflow-tooltip="true"
                        min-width="230">
       </el-table-column>
 
@@ -74,14 +75,14 @@
                        header-align="center"
                        align="center"
                        label="评价"
-                       width="80">
+                       width="120">
       </el-table-column>
 
       <el-table-column prop="point"
                        header-align="center"
                        align="center"
                        label="积分"
-                       width="80">
+                       width="100">
       </el-table-column>
 
     </el-table>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index f90b10eb..4cb51def 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1120,9 +1120,6 @@ export default {
     color: rgba(0, 167, 169, 1);
   }
 }
-.name-a {
-  cursor: pointer;
-}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 21da37de..e1b5d045 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="dialog-h-content scroll-h">
       <el-form
         ref="ref_form"
         :inline="true"
@@ -192,11 +192,12 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
       <el-button
         v-if="formType != 'detail'"
         type="primary"
+        size="small"
         :disabled="btnDisable"
         @click="handleComfirm"
         >确 定</el-button
@@ -487,8 +488,8 @@ export default {
 }
 
 .div_btn {
-  display: flex;
-  justify-content: flex-end;
+  // display: flex;
+  // justify-content: flex-end;
 }
 .el-tabs {
   margin: 0 20px;
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index c64bb3b1..ec857ce7 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,51 +1,35 @@
 <template>
-  <div>
-    <div class="resi-container">
-      <el-card class="resi-card">
-        <el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
-          <el-row class="resi-row" :gutter="20">
-            <el-col :span="8">
-              <div class="resi-cell">
-                <div class="resi-cell-label">组织名称</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
-                  <el-input
-                    v-model="fmData.organizationName"
-                    class="resi-cell-input"
-                    size="small"
-                    clearable
-                    placeholder="请输入"
-                  >
-                  </el-input>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="resi-cell">
-                <div class="resi-cell-label">创建时间</div>
-                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
-                  <el-date-picker
-                    v-model="fmData.createTime"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    value-format="yyyy-MM-dd"
-                  >
-                  </el-date-picker>
-                </div>
-              </div>
-            </el-col>
-
-            <el-col :span="4">
-              <el-button style="float:right;" type="primary" size="small" @click="handleSearch"
-                >查询</el-button
-              >
-            </el-col>
-          </el-row>
-        </el-row>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
+          <el-form-item label="组织名称" prop="organizationName">
+            <el-input
+              v-model="fmData.organizationName"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker
+              v-model="fmData.createTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      
       </el-card>
-    </div>
-
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button type="success" size="small" @click="handleAdd"
@@ -78,29 +62,34 @@
         border
         style="width: 100%"
         class="resi-table"
-        :max-height="maxTableHeight"
+        :height="maxTableHeight"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column prop="organizationName" label="组织名称">
+        <el-table-column prop="organizationName" label="组织名称" align="center">
+          <template slot-scope="scope">
+            <a  class="name-a" @click="handleWatch(scope.row)">
+              {{ scope.row.organizationName }}
+            </a>
+          </template>
         </el-table-column>
-        <el-table-column prop="organizationPersonCount" label="组织人数">
+        <el-table-column prop="organizationPersonCount" align="center" label="组织人数">
         </el-table-column>
-        <el-table-column prop="serviceItem" label="服务事项"> </el-table-column>
-        <el-table-column prop="score" width="80" label="积分">
+        <el-table-column prop="serviceItem" label="服务事项" align="center" :show-overflow-tooltip="true"> </el-table-column>
+        <el-table-column prop="score" width="100" align="center" label="积分">
         </el-table-column>
-        <el-table-column prop="principalName" label="负责人"> </el-table-column>
-        <el-table-column prop="principalPhone" label="联系电话">
+        <el-table-column prop="principalName" align="center" label="负责人"> </el-table-column>
+        <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
-        <el-table-column prop="organizationCreatedTime" label="创建时间">
+        <el-table-column prop="organizationCreatedTime" align="center" label="创建时间">
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right" label="操作" align="center" width="160">
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               @click="handleWatch(scope.$index)"
               type="text"
               size="small"
               >查看</el-button
-            >
+            > -->
             <el-button
               type="text"
               style="color: #1c6afd"
@@ -140,7 +129,7 @@
           :current-page.sync="pageNo"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -155,6 +144,7 @@
       :title="formTitle"
       width="850px"
       top="5vh"
+      class="dialog-h"
       @closed="handleClose"
     >
       <edit-form
@@ -170,7 +160,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :title="scoreDiaTitle"
-      width="1050px"
+      width="70%"
       top="5vh"
       @closed="diaClose"
     >
@@ -197,7 +187,7 @@ export default {
       openSearch: false,
 
       formShow: false,
-      formTitle: "",
+      formTitle: "组织信息",
 
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -222,7 +212,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 410;
+      return this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -340,7 +330,10 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
-
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
     async handleAdd() {
       this.formShow = true;
       await nextTick();
@@ -455,30 +448,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tabs-other-info {
-  .el-tabs__item {
-    // width: 50px;
-    height: 20px;
-    box-sizing: border-box;
-    margin-right: 7px;
-    padding: 0 10px !important;
-    font-size: 8px;
-    font-weight: 500;
-    color: #666666;
-    line-height: 20px;
-    background: #ebecf1;
-    border-radius: 2px;
-  }
-  .el-tabs__nav-wrap::after,
-  .el-tabs__active-bar {
-    display: none;
-  }
-  .el-tabs__nav-next,
-  .el-tabs__nav-prev {
-    line-height: 20px;
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
-
 .resi-card-table {
   margin-top: 20px;
 }
@@ -489,23 +465,6 @@ export default {
     margin: 0 10px;
   }
 }
-.resi-other {
-  width: 100%;
-  display: flex;
-  .resi-other-title {
-    width: 100px;
-    box-sizing: border-box;
-    margin-bottom: 10px;
-    // padding: 6px 12px 0 0;
-    font-size: 16px;
-    font-weight: 500;
-    color: #333;
-    text-align: center;
-  }
-  .tabs-other-info {
-    // padding-left: 60px;
-  }
-}
 
 .resi-btns {
   margin-top: 20px;
@@ -516,72 +475,5 @@ export default {
   position: relative;
   overflow: visible;
 }
-.resi-down {
-  position: absolute;
-  left: 50%;
-  bottom: -10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 46px;
-  height: 12px;
-  box-sizing: border-box;
-  margin-left: -23rpx;
-  cursor: pointer;
-  background: #ffffff;
-  border-radius: 0 0 10px 10px;
-  img {
-    display: block;
-  }
-}
-.resi-row-box {
-  // height: 104px;
-  overflow: hidden;
-  transition: height 0.5s;
-}
-.resi-row-more {
-  height: max-content;
-  transition: height 0.5s;
-}
-.resi-row {
-  margin-bottom: 20px;
-}
-.resi-search {
-  .el-col {
-    text-align: right;
-  }
-}
-.resi-cell {
-  display: flex;
-  align-items: center;
-  .resi-cell-label {
-    width: 70px;
-    box-sizing: border-box;
-    margin-right: 15px;
-    text-align: right;
-    // line-height: 32;
-  }
-  .resi-cell-value-radio {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-  }
-  .resi-cell-input {
-    width: 180px;
-  }
-  .resi-cell-select {
-    width: 180px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
+
 </style>