diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index af275e9dc..f92de0974 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -2,179 +2,217 @@
   <div>
     <div>
       <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="dataForm"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="form"
+          ref="ref_form"
+          :inline="true"
+          :model="dataForm"
+          :rules="dataRule"
+          :disabled="formType === 'detail'"
+          class="form"
       >
+
+        <el-form-item label="头像" label-width="150px"
+                      prop="imageList"
+                      style="display: block">
+          <div class="imsg-list">
+            <div v-for="(item, index) in dataForm.imageList" :key="index" class="imgs-item">
+              <el-image
+                  style="width: 100px; height: 100px"
+                  :src="item"
+                  fit="fill"
+                  :preview-src-list="dataForm.imageList"></el-image>
+              <i class="el-icon-delete" @click="handleDelimg(item, index)"></i>
+            </div>
+            <el-upload class="avatar-uploader"
+                       v-if="dataForm.imageList.length < 1 && !disabled"
+                       :action="uploadUlr"
+                       :data="{customerId:customerId}"
+                       :show-file-list="false"
+                       :disabled="disabled"
+                       :on-progress="handleProgress"
+                       :on-success="handleImgSuccess"
+                       :before-upload="beforeImgUpload"
+                       accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
+              <el-progress v-if="uploading" :width="100" type="circle" :percentage="unloadPencent"></el-progress>
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+
+            </el-upload>
+          </div>
+        </el-form-item>
         <el-form-item
-          label="社会组织名称	"
-          prop="societyName"
-          label-width="150px"
-          style="display: block"
+            label="组织名称	"
+            prop="societyName"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入社会组织名称	"
-            v-model="dataForm.societyName"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入组织名称	"
+              v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="服务事项"
-          prop="serviceMatters"
-          label-width="150px"
-          style="display: block"
+            label="服务内容"
+            prop="serviceMatters"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="1000"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入服务事项，不超过1000字"
-            v-model="dataForm.serviceMatters"
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务内容，不超过1000字"
+              v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
 
-        <el-form-item
-          label="负责人姓名	"
-          prop="personInCharge"
-          label-width="150px"
-          style="display: block"
+<!--        <el-form-item
+            label="负责人姓名	"
+            prop="personInCharge"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入负责人姓名	"
-            v-model="dataForm.personInCharge"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入负责人姓名	"
+              v-model="dataForm.personInCharge"
           >
           </el-input>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item
-          label="负责人电话	"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
+            label="服务电话	"
+            prop="mobile"
+            label-width="150px"
+            style="display: block"
         >
           <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入负责人电话	"
-            v-model="dataForm.mobile"
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入服务电话	"
+              v-model="dataForm.mobile"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="服务时间	"
-          prop="serviceTime"
-          label-width="150px"
-          style="display: block"
+            label="服务时间	"
+            prop="serviceTimeStr"
+            label-width="150px"
+            style="display: block"
         >
-          <el-date-picker
-            v-model="dataForm.serviceTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+          <el-input
+              class="item_width_1"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入服务时间	"
+              v-model="dataForm.serviceTimeStr"
+          >
+          </el-input>
+<!--          <el-date-picker
+              v-model="dataForm.serviceTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker>-->
         </el-form-item>
 
         <el-form-item
-          label="绑定管理员"
-          prop="adminStaffId"
-          label-width="150px"
-          style="display: block"
+            label="绑定管理员"
+            prop="adminStaffId"
+            label-width="150px"
+            style="display: block"
         >
           <el-select
-            class="item_width_1"
-            v-model="dataForm.adminStaffId"
-            placeholder="请选择"
-            clearable
-            filterable
+              class="item_width_1"
+              v-model="dataForm.adminStaffId"
+              placeholder="请选择"
+              clearable
+              filterable
           >
             <el-option
-              v-for="item in staffList"
-              :key="item.staffId"
-              :label="item.staffName"
-              :value="item.staffId"
+                v-for="item in staffList"
+                :key="item.staffId"
+                :label="item.staffName"
+                :value="item.staffId"
             >
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="位置坐标"
-          prop="longitude"
-          label-width="150px"
-          style="display: block"
-        >
-          <div style="width: 500px">
-            <el-input
-              class="item_width_4"
-              maxlength="50"
-              placeholder="请输入关键字"
-              v-model="dataForm.address"
-            >
-            </el-input>
-            <el-button
-              style="margin-left: 10px"
-              type="primary"
-              size="small"
-              @click="handleSearchMap"
-              >查询</el-button
-            >
-            <div id="app" class="div_map"></div>
-            <div style="margin-top: 10px">
-              <span>经度</span>
-              <el-input
-                class="item_width_3"
-                maxlength="50"
-                placeholder="请输入经度"
-                v-model="dataForm.longitude"
-              >
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input
-                class="item_width_3"
-                maxlength="50"
-                placeholder="请输入纬度"
-                v-model="dataForm.latitude"
-              >
-              </el-input>
-            </div>
-          </div>
-        </el-form-item>
+        <!--        <el-form-item
+                  label="位置坐标"
+                  prop="longitude"
+                  label-width="150px"
+                  style="display: block"
+                >
+                  <div style="width: 500px">
+                    <el-input
+                      class="item_width_4"
+                      maxlength="50"
+                      placeholder="请输入关键字"
+                      v-model="dataForm.address"
+                    >
+                    </el-input>
+                    <el-button
+                      style="margin-left: 10px"
+                      type="primary"
+                      size="small"
+                      @click="handleSearchMap"
+                      >查询</el-button
+                    >
+                    <div id="app" class="div_map"></div>
+                    <div style="margin-top: 10px">
+                      <span>经度</span>
+                      <el-input
+                        class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入经度"
+                        v-model="dataForm.longitude"
+                      >
+                      </el-input>
+                      <span style="margin-left: 20px">纬度</span>
+                      <el-input
+                        class="item_width_3"
+                        maxlength="50"
+                        placeholder="请输入纬度"
+                        v-model="dataForm.latitude"
+                      >
+                      </el-input>
+                    </div>
+                  </div>
+                </el-form-item>-->
       </el-form>
     </div>
     <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
       <el-button
-        v-if="formType != 'detail'"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
+          v-if="formType != 'detail'"
+          type="primary"
+          :disabled="btnDisable"
+          @click="handleComfirm"
+      >确 定
+      </el-button
       >
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-import { Loading } from "element-ui"; // 引入Loading服务
-import { requestPost } from "@/js/dai/request";
+import {mapGetters} from "vuex";
+import {Loading} from "element-ui"; // 引入Loading服务
+import {requestPost} from "@/js/dai/request";
 
 var map;
 var search;
@@ -185,6 +223,11 @@ let loading; // 加载动画
 export default {
   data() {
     return {
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      btnLoading: false,
+      uploading: false,
+      disabled: false,
+      customerId: '',
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
       agencyId: "",
@@ -201,11 +244,13 @@ export default {
         mobile: "",
         serviceStartTime: "",
         serviceEndTime: "",
+        serviceTimeStr: "",
         serviceTime: ["", ""],
         adminStaffId: "",
         address: "",
         longitude: "",
         latitude: "",
+        imageList: [],
       },
     };
   },
@@ -214,29 +259,35 @@ export default {
     dataRule() {
       return {
         societyName: [
-          { required: true, message: "社会组织名称	不能为空", trigger: "blur" },
+          {required: true, message: "组织名称	不能为空", trigger: "blur"},
           {
             min: 1,
             max: 50,
-            message: "社会组织名称	长度在 1 到 50个字符",
+            message: "组织名称	长度在 1 到 50个字符",
             trigger: "blur",
           },
         ],
-        serviceMatters: [
-          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        imageList: [
+          {required: true, message: "头像不能为空", trigger: "blur"},
         ],
-        personInCharge: [
-          { required: true, message: "负责人姓名不能为空", trigger: "blur" },
+        serviceMatters: [
+          {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
-        adminStaffId: [
+        /*personInCharge: [
+          {required: true, message: "负责人姓名不能为空", trigger: "blur"},
+        ],*/
+        /*adminStaffId: [
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
-        ],
+        ],*/
         mobile: [
-          { required: true, message: "负责人电话不能为空", trigger: "blur" },
+          {required: true, message: "服务电话不能为空", trigger: "blur"},
         ],
-        longitude: [
-          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        serviceTimeStr: [
+          {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
+        /*longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],*/
       };
     },
   },
@@ -251,7 +302,7 @@ export default {
   },
 
   async mounted() {
-    this.initMap();
+    //this.initMap();
 
     await this.loadAgency();
     this.loadStaff();
@@ -270,7 +321,7 @@ export default {
         rotation: 45, // 设置地图旋转角度
       });
 
-      search = new window.TMap.service.Search({ pageSize: 10 });
+      search = new window.TMap.service.Search({pageSize: 10});
       // 新建一个地点搜索类
       markers = new TMap.MultiMarker({
         map: map,
@@ -307,26 +358,53 @@ export default {
       markers.setGeometries([]);
       // 在地图显示范围内以给定的关键字搜索地点
       search
-        .searchRectangle({
-          keyword: this.dataForm.address,
-          bounds: map.getBounds(),
-        })
-        .then((result) => {
-          let { data } = result;
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng },
-            } = data[0];
-            map.setCenter(new TMap.LatLng(lat, lng));
-            this.setMarker(lat, lng);
-            this.dataForm.latitude = lat;
-            this.dataForm.longitude = lng;
-          } else {
-            this.$message.error("未检索到相关位置坐标");
-          }
-        });
+          .searchRectangle({
+            keyword: this.dataForm.address,
+            bounds: map.getBounds(),
+          })
+          .then((result) => {
+            let {data} = result;
+            if (Array.isArray(data) && data.length > 0) {
+              const {
+                location: {lat, lng},
+              } = data[0];
+              map.setCenter(new TMap.LatLng(lat, lng));
+              this.setMarker(lat, lng);
+              this.dataForm.latitude = lat;
+              this.dataForm.longitude = lng;
+            } else {
+              this.$message.error("未检索到相关位置坐标");
+            }
+          });
     },
+    beforeImgUpload(file) {
+      const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
+      const isLt1M = file.size / 1024 / 1024 < 10
 
+      if (!isPNG) {
+        this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
+      }
+      if (!isLt1M) {
+        this.$message.error('上传图片大小不能超过 10MB!')
+      }
+      return isPNG && isLt1M
+    },
+    handleProgress(event, file, fileList) {
+      this.uploading = true
+      this.unloadPencent = Number(file.percentage.toFixed(0))
+    },
+    handleImgSuccess(res, file) {
+      if (res.code === 0 && res.msg === 'success') {
+        this.uploading = false
+        this.unloadPencent = 0
+        this.dataForm.imageList.push(res.data.url)
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    handleDelimg(item, index) {
+      this.dataForm.imageList.splice(index, 1)
+    },
     handleMoveCenter() {
       //修改地图中心点
       const center = map.getCenter();
@@ -341,9 +419,12 @@ export default {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
-      console.log(row);
+      this.dataForm.imageList = []
       if (row) {
-        this.dataForm = { ...this.dataForm, ...row };
+        this.dataForm = {...this.dataForm, ...row};
+        if (row.imgUrl) {
+          this.dataForm.imageList.push(row.imgUrl);
+        }
         this.societyId = this.dataForm.societyId;
         if (row.latitude && row.longitude) {
           map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
@@ -355,8 +436,7 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
+      const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
         this.agencyId = data.agencyId;
@@ -375,7 +455,7 @@ export default {
         pageSize: 100000,
       };
 
-      const { data, code, msg } = await requestPost(url, params);
+      const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
         this.staffList = data.staffList.map((item) => {
@@ -405,6 +485,7 @@ export default {
     },
 
     async submit() {
+
       let url = "";
       if (this.formType === "add") {
         url = "/heart/societyorg/add";
@@ -415,7 +496,7 @@ export default {
         this.dataForm.societyId = this.societyId;
       }
 
-      const { data, code, msg } = await requestPost(url, this.dataForm);
+      const {data, code, msg} = await requestPost(url, this.dataForm);
 
       if (code === 0) {
         this.$message({
@@ -437,6 +518,9 @@ export default {
     },
     resetData() {
       this.societyId = ""; //小区ID
+      this.$refs.ref_form.resetFields();
+      this.propertyFormShow = false;
+     /*
       this.dataForm = {
         societyName: "",
         serviceMatters: "",
@@ -449,8 +533,9 @@ export default {
         address: "",
         longitude: "",
         latitude: "",
-      };
-      this.propertyFormShow = false;
+        imageList:[]
+      };*/
+
     },
     // 开启加载动画
     startLoading() {
@@ -471,17 +556,20 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .item_width_1 {
   width: 500px;
 }
+
 .item_width_2 {
   width: 400px;
 }
+
 .item_width_3 {
   margin-left: 10px;
   width: 200px;
 }
+
 .item_width_4 {
   width: 200px;
 }
@@ -494,14 +582,47 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+
 .el-tabs {
   margin: 0 20px;
 }
+
 .el-upload__tip {
   color: rgb(155, 155, 155);
   margin: 0;
 }
+
 .form {
   margin-top: 30px;
 }
+
+.avatar-uploader {
+  ::v-deep
+  .el-upload {
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+
+  .avatar-uploader-icon {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+}
 </style>
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index f8ce4fb51..9eb8398f2 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -1,89 +1,93 @@
 <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.societyName"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </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.personInCharge"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </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.mobile"
-                            class="resi-cell-input"
-                            size="small"
-                            clearable
-                            placeholder="请输入">
-                  </el-input>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <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.serviceTime"
-                                  type="daterange"
-                                  range-separator="至"
-                                  start-placeholder="开始日期"
-                                  end-placeholder="结束日期"
-                                  value-format="yyyy-MM-dd">
-                  </el-date-picker>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-        </el-row>
-        <el-row class="resi-search">
-          <el-col :span="24">
-            <el-button type="primary"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-          </el-col>
-        </el-row>
-      </el-card>
-    </div>
+  <div class="resi-container">
+    <el-card class="resi-card">
+      <div class="">
+        <el-form ref="fmData" :inline="true" :model="fmData" class="demo-form-inline">
+          <el-form-item label="组织名称" prop="societyName">
+            <el-input v-model="fmData.societyName" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="服务电话" prop="mobile">
+            <el-input v-model="fmData.mobile" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="服务时间" prop="serviceTimeStr">
+            <el-input v-model="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('fmData')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!--        <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.societyName"
+                                  class="resi-cell-input"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入">
+                        </el-input>
+                      </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.mobile"
+                                  class="resi-cell-input"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入">
+                        </el-input>
+                      </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 class="resi-search">
+                <el-col :span="24">
+                  <el-button class="diy-button&#45;&#45;add"
+                             size="small"
+                             @click="handleSearch">查询
+                  </el-button>
+                </el-col>
+              </el-row>-->
+    </el-card>
 
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success"
+        <el-button class="diy-button--add"
                    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>
         <el-upload ref="upload"
                    class="upload-btn"
                    action="uploadUlr"
@@ -95,16 +99,18 @@
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
-          <el-button type="warning"
+          <el-button class="diy-button--delete"
                      size="small"
                      :loading="importLoading">{{
-            importBtnTitle
-          }}</el-button>
+              importBtnTitle
+            }}
+          </el-button>
         </el-upload>
 
         <el-button @click="handleChu"
-                   type="danger"
-                   size="small">excel导出</el-button>
+                   class="diy-button--reset"
+                   size="small">导出
+        </el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -114,23 +120,23 @@
         <el-table-column label="序号"
                          type="index"
                          align="center"
-                         width="50" />
+                         width="50"/>
         <el-table-column prop="societyName"
-                         label="社会组织名称">
+                         label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
-                         label="服务事项">
-        </el-table-column>
-        <el-table-column prop="personInCharge"
-                         label="负责人">
+                         label="服务内容">
         </el-table-column>
+        <!--        <el-table-column prop="personInCharge"
+                                 label="负责人">
+                </el-table-column>-->
         <el-table-column prop="mobile"
-                         label="负责人电话"> </el-table-column>
-        <el-table-column prop="serviceTime"
-                         label="服务时间"> </el-table-column>
-        <el-table-column prop="score"
-                         width="80"
-                         label="积分"> </el-table-column>
+                         label="服务电话"></el-table-column>
+        <el-table-column prop="serviceTimeStr"
+                         label="服务时间"></el-table-column>
+        <!--        <el-table-column prop="score"
+                                 width="80"
+                                 label="积分"> </el-table-column>-->
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
@@ -138,16 +144,18 @@
           <template slot-scope="scope">
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
-                       size="small">查看</el-button>
-            <el-button type="text"
-                       style="color:#00A7A9;"
-                       size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
+                       size="small">查看
+            </el-button>
+            <!--            <el-button type="text"
+                                   style="color:#00A7A9;"
+                                   size="small"
+                                   @click="handleScore(scope.row)">积分记录</el-button>-->
 
             <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)"
@@ -155,7 +163,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>
@@ -200,16 +209,16 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import {requestPost} from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 import editForm from "./cpts/edit";
 import axios from "axios";
 import scoreRecord from '../../../components/scoreRecord.vue'
 
 export default {
-  components: { editForm, scoreRecord },
-  data () {
+  components: {editForm, scoreRecord},
+  data() {
     return {
       openSearch: false,
 
@@ -229,9 +238,10 @@ export default {
         serviceStartTime: "",
         serviceEndTime: "",
         serviceTime: "",
+        serviceTimeStr: "",
       },
 
-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
       importLoading: false,
 
       //积分记录
@@ -240,13 +250,14 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       return this.clientHeight - 450;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
     "fmData.serviceTime": function (val) {
+      console.log("watch start" + val + '_' + Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.serviceStartTime = val[0];
         this.fmData.serviceEndTime = val[1];
@@ -256,28 +267,28 @@ export default {
       }
     },
   },
-  mounted () {
+  mounted() {
     this.getTableData();
   },
   methods: {
     // 上传大图标成功
-    handleExcelSuccess (res, file) {
+    handleExcelSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
         this.$message.error(res.msg);
       }
     },
-    handleProgress (event, file, fileList) {
+    handleProgress(event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload (file) {
+    beforeExcelUpload(file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
-        file.type ===
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+          file.type ===
+          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
       const fileType = isType || isTypeComputer;
       const isLt1M = file.size / 1024 / 1024 < 10;
       if (!fileType) {
@@ -289,66 +300,69 @@ export default {
       }
       return fileType && isLt1M;
     },
-    uploadHttpRequest (file) {
+    uploadHttpRequest(file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       axios({
-        url: window.SITE_CONFIG["apiURL"] + "/heart/societyorg/import",
+        url: window.SITE_CONFIG["apiURL"] + "/heart/societyorg/importV2",
         method: "post",
         data: formData,
         // responseType: "blob",
       })
-        .then((res) => {
-          this.importLoading = false;
-          this.importBtnTitle = "excel导入";
-          console.log("resresresresresresres", res);
-
-          this.getTableData();
-          if (res.data.code == 0) {
-            return this.$message.success(res.data.data || '导入成功');
-          } else {
-            return this.$message.error(res.data.msg);
-          }
-        })
-        .catch((err) => {
-          console.log("失败", err);
-        });
+          .then((res) => {
+            this.importLoading = false;
+            this.importBtnTitle = "导入";
+            console.log("resresresresresresres", res);
+
+            this.getTableData();
+            this.$message({
+              showClose: true,
+              message: '导入中，请到系统管理-导入记录中查看进度',
+              duration: 0
+            })
+          })
+          .catch((err) => {
+            console.log("失败", err);
+          });
       this.$refs.upload.clearFiles();
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleSearch (val) {
+    handleSearch(val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-
-    async handleAdd () {
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
+    async handleAdd() {
       this.formShow = true;
       await nextTick();
       console.log(this.$refs);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleChu () {
+    async handleChu() {
       const url = "/heart/societyorg/export";
-      const { pageSize, pageNo, fmData } = this;
+      const {pageSize, pageNo, fmData} = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -359,50 +373,50 @@ export default {
         },
         responseType: "blob",
       })
-        .then((res) => {
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          return this.$message.error("网络错误");
-        });
+          .then((res) => {
+            let fileName = window.decodeURI(
+                res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          })
+          .catch((err) => {
+            console.log("获取导出情失败", err);
+            return this.$message.error("网络错误");
+          });
     },
 
-    async handleWatch (rowIndex) {
+    async handleWatch(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
     },
 
-    async handleEdit (rowIndex) {
+    async handleEdit(rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url = "/heart/societyorg/del";
-      const { tableData } = this;
+      const {tableData} = this;
 
-      const { data, code, msg } = await requestPost(url, {
+      const {data, code, msg} = await requestPost(url, {
         societyId: tableData[rowIndex].societyId,
       });
 
@@ -414,10 +428,10 @@ export default {
       }
     },
 
-    async getTableData () {
+    async getTableData() {
       const url = "/heart/societyorg/getlist";
-      const { pageSize, pageNo, fmData } = this;
-      const { data, code, msg } = await requestPost(url, {
+      const {pageSize, pageNo, fmData} = this;
+      const {data, code, msg} = await requestPost(url, {
         pageSize,
         pageNo,
         ...fmData,
@@ -426,28 +440,65 @@ export default {
         console.log("列表请求成功！！！！！！！！！！！！！！");
         this.total = data.total || 0;
         this.tableData = data.list
-          ? data.list.map((item) => {
-            item.serviceTime =
-              item.serviceStartTime + "至" + item.serviceEndTime;
-            return item;
-          })
-          : [];
+            ? data.list.map((item) => {
+              item.serviceTime =
+                  item.serviceStartTime + "至" + item.serviceEndTime;
+              return item;
+            })
+            : [];
       } else {
       }
     },
 
     //积分记录
-    handleScore (row) {
+    handleScore(row) {
       this.scoreDiaShow = true
       this.$nextTick(() => {
         this.$refs.ref_score.initForm(row.societyId)
       })
     },
 
-    diaClose () {
+    diaClose() {
 
       this.scoreDiaShow = false
     },
+    async handleExportModule() {
+      let url = "/heart/societyorg/import-template-download";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+          .then((res) => {
+            // this.download(res.data, title + '.xls')
+            if (res.headers["content-disposition"]) {
+              let fileName = window.decodeURI(
+                  res.headers["content-disposition"].split(";")[1].split("=")[1]
+              );
+              console.log("filename", fileName);
+              let blob = new Blob([res.data], {
+                type: "application/vnd.ms-excel",
+              });
+              var url = window.URL.createObjectURL(blob);
+              var aLink = document.createElement("a");
+              aLink.style.display = "none";
+              aLink.href = url;
+              aLink.setAttribute("download", fileName);
+              document.body.appendChild(aLink);
+              aLink.click();
+              document.body.removeChild(aLink); //下载完成移除元素
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+            } else this.$message.error("下载失败");
+          })
+          .catch((err) => {
+            console.log("err", err);
+            return this.$message.error("网络错误");
+          });
+    },
+
   },
 };
 </script>
@@ -467,10 +518,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;
@@ -480,16 +533,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;
@@ -500,6 +557,7 @@ export default {
     color: #333;
     text-align: center;
   }
+
   .tabs-other-info {
     // padding-left: 60px;
   }
@@ -514,6 +572,7 @@ export default {
   position: relative;
   overflow: visible;
 }
+
 .resi-down {
   position: absolute;
   left: 50%;
@@ -528,30 +587,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;
@@ -559,25 +625,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;
   }