Merge remote-tracking branch 'origin/dev_shehuizuzhi_ljj' into dev

src/views/modules/communityService/shzz/index.vue

@@ -50,8 +50,22 @@
                 </div>
               </div>
             </el-col>
+            <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.serviceTimeStr"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入">
+                  </el-input>
+                </div>
+              </div>
+            </el-col>
           </el-row>
-          <el-row>
+          <!--          <el-row>
                       <el-col :span="24">
                         <div class="resi-cell">
                           <div class="resi-cell-label">服务时间</div>
@@ -63,23 +77,24 @@
                                       clearable
                                       placeholder="请输入">
                             </el-input>
-<!--                  <el-date-picker v-model="fmData.serviceTime"
+          &lt;!&ndash;                  <el-date-picker v-model="fmData.serviceTime"
                                             type="daterange"
                                             range-separator="至"
                                             start-placeholder="开始日期"
                                             end-placeholder="结束日期"
                                             value-format="yyyy-MM-dd">
-                  </el-date-picker>-->
+                            </el-date-picker>&ndash;&gt;
                           </div>
                         </div>
                       </el-col>
-          </el-row>
+                    </el-row>-->
         </el-row>
         <el-row class="resi-search">
           <el-col :span="24">
             <el-button type="primary"
                        size="small"
-                       @click="handleSearch">查询</el-button>
+                       @click="handleSearch">查询
+            </el-button>
           </el-col>
         </el-row>
       </el-card>
@@ -89,11 +104,13 @@
       <div class="resi-row-btn">
         <el-button type="success"
                    size="small"
-                   @click="handleAdd">新增</el-button>
+                   @click="handleAdd">新增
+        </el-button>
         <el-button class="diy-button--search"
                    style="margin-left:10px"
                    size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
+                   @click="handleExportModule('room')">下载模板
+        </el-button>
         <el-upload ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -109,12 +126,14 @@
                      size="small"
                      :loading="importLoading">{{
               importBtnTitle
-          }}</el-button>
+            }}
+          </el-button>
         </el-upload>
 
         <el-button @click="handleChu"
                    type="danger"
-                   size="small">excel导出</el-button>
+                   size="small">导出
+        </el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -148,7 +167,8 @@
           <template slot-scope="scope">
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
-                       size="small">查看</el-button>
+                       size="small">查看
+            </el-button>
             <!--            <el-button type="text"
                                    style="color:#00A7A9;"
                                    size="small"
@@ -157,7 +177,8 @@
             <el-button @click="handleEdit(scope.$index)"
                        type="text"
                        size="small"
-                       style="margin-right: 10px; color: #00a7a9">编辑</el-button>
+                       style="margin-right: 10px; color: #00a7a9">编辑
+            </el-button>
 
             <el-popconfirm title="删除之后无法回复，确认删除？"
                            @onConfirm="handleDel(scope.row, scope.$index)"
@@ -165,7 +186,8 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         style="color: #d51010">删除</el-button>
+                         style="color: #d51010">删除
+              </el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
@@ -242,7 +264,7 @@ export default {
         serviceTimeStr: "",
       },
 
-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
       importLoading: false,
 
       //积分记录
@@ -516,10 +538,12 @@ export default {
     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;
@@ -529,16 +553,20 @@ export default {
 .resi-card-table {
   margin-top: 20px;
 }
+
 .resi-row-btn {
   margin-bottom: 13px;
+
   .upload-btn {
     display: inline-block;
     margin: 0 10px;
   }
 }
+
 .resi-other {
   width: 100%;
   display: flex;
+
   .resi-other-title {
     width: 100px;
     box-sizing: border-box;
@@ -549,6 +577,7 @@ export default {
     color: #333;
     text-align: center;
   }
+
   .tabs-other-info {
     // padding-left: 60px;
   }
@@ -563,6 +592,7 @@ export default {
   position: relative;
   overflow: visible;
 }
+
 .resi-down {
   position: absolute;
   left: 50%;
@@ -577,30 +607,37 @@ export default {
   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;
@@ -608,25 +645,31 @@ export default {
     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;
   }