From 24272570465cd8064075edd07f615cd6177d0419 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 10:42:27 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=20=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E7=AD=89=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 412 +++++++++++-------
 .../modules/communityService/shzz/index.vue   |   4 +-
 2 files changed, 264 insertions(+), 152 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index af275e9dc..eb0aee65c 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -2,179 +2,209 @@
   <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,.pdf,.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"
+            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
-          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="serviceTime"
+            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"
+              v-model="dataForm.serviceTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
           >
           </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 +215,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: "",
@@ -206,6 +241,7 @@ export default {
         address: "",
         longitude: "",
         latitude: "",
+        imageList: [],
       },
     };
   },
@@ -214,7 +250,7 @@ export default {
     dataRule() {
       return {
         societyName: [
-          { required: true, message: "社会组织名称	不能为空", trigger: "blur" },
+          {required: true, message: "社会组织名称	不能为空", trigger: "blur"},
           {
             min: 1,
             max: 50,
@@ -222,21 +258,27 @@ export default {
             trigger: "blur",
           },
         ],
+        imageList: [
+          {required: true, message: "头像不能为空", trigger: "blur"},
+        ],
         serviceMatters: [
-          { required: true, message: "服务事项不能为空", trigger: "blur" },
+          {required: true, message: "服务事项不能为空", trigger: "blur"},
         ],
         personInCharge: [
-          { required: true, message: "负责人姓名不能为空", trigger: "blur" },
+          {required: true, message: "负责人姓名不能为空", trigger: "blur"},
         ],
-        adminStaffId: [
+        /*adminStaffId: [
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
-        ],
+        ],*/
         mobile: [
-          { required: true, message: "负责人电话不能为空", trigger: "blur" },
+          {required: true, message: "负责人电话不能为空", trigger: "blur"},
         ],
-        longitude: [
-          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        serviceTime: [
+          {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
+        /*longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],*/
       };
     },
   },
@@ -251,7 +293,7 @@ export default {
   },
 
   async mounted() {
-    this.initMap();
+    //this.initMap();
 
     await this.loadAgency();
     this.loadStaff();
@@ -270,7 +312,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 +349,56 @@ 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) {
+      console.log('percentage', event, file.percentage)
+      this.uploading = true
+      this.unloadPencent = Number(file.percentage.toFixed(0))
+    },
+    handleImgSuccess(res, file) {
+      if (res.code === 0 && res.msg === 'success') {
 
+        console.log('res.data.url', res.data.url)
+        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();
@@ -342,8 +414,12 @@ export default {
 
       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));
@@ -356,7 +432,7 @@ export default {
       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 +451,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) => {
@@ -415,7 +491,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({
@@ -471,17 +547,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 +573,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..8112c8c5f 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -139,10 +139,10 @@
             <el-button @click="handleWatch(scope.$index)"
                        type="text"
                        size="small">查看</el-button>
-            <el-button type="text"
+<!--            <el-button type="text"
                        style="color:#00A7A9;"
                        size="small"
-                       @click="handleScore(scope.row)">积分记录</el-button>
+                       @click="handleScore(scope.row)">积分记录</el-button>-->
 
             <el-button @click="handleEdit(scope.$index)"
                        type="text"

From 688287c54bc0b5f052348dc2e47c93529345363e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 10:45:17 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0=20=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E7=AD=89=E8=B0=83=E6=95=B4=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 8112c8c5f..4c9cb6275 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -128,9 +128,9 @@
                          label="负责人电话"> </el-table-column>
         <el-table-column prop="serviceTime"
                          label="服务时间"> </el-table-column>
-        <el-table-column prop="score"
+<!--        <el-table-column prop="score"
                          width="80"
-                         label="积分"> </el-table-column>
+                         label="积分"> </el-table-column>-->
         <el-table-column fixed="right"
                          label="操作"
                          align="center"

From 2369d228368f6e1892d0b9230e33bd271a13540c Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 23 Aug 2022 17:24:30 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 37 ++++++++++++-------
 .../modules/communityService/shzz/index.vue   | 19 +++++++---
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index eb0aee65c..bcd5c95be 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -39,7 +39,7 @@
           </div>
         </el-form-item>
         <el-form-item
-            label="社会组织名称	"
+            label="组织名称	"
             prop="societyName"
             label-width="150px"
             style="display: block"
@@ -48,14 +48,14 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入社会组织名称	"
+              placeholder="请输入组织名称	"
               v-model="dataForm.societyName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-            label="服务事项"
+            label="服务内容"
             prop="serviceMatters"
             label-width="150px"
             style="display: block"
@@ -66,7 +66,7 @@
               maxlength="1000"
               show-word-limit
               :rows="3"
-              placeholder="请输入服务事项，不超过1000字"
+              placeholder="请输入服务内容，不超过1000字"
               v-model="dataForm.serviceMatters"
           ></el-input>
         </el-form-item>
@@ -88,7 +88,7 @@
         </el-form-item>
 
         <el-form-item
-            label="负责人电话	"
+            label="服务电话	"
             prop="mobile"
             label-width="150px"
             style="display: block"
@@ -97,7 +97,7 @@
               class="item_width_1"
               maxlength="50"
               show-word-limit
-              placeholder="请输入负责人电话	"
+              placeholder="请输入服务电话	"
               v-model="dataForm.mobile"
           >
           </el-input>
@@ -105,11 +105,19 @@
 
         <el-form-item
             label="服务时间	"
-            prop="serviceTime"
+            prop="serviceTimeStr"
             label-width="150px"
             style="display: block"
         >
-          <el-date-picker
+          <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="至"
@@ -117,7 +125,7 @@
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd"
           >
-          </el-date-picker>
+          </el-date-picker>-->
         </el-form-item>
 
         <el-form-item
@@ -236,6 +244,7 @@ export default {
         mobile: "",
         serviceStartTime: "",
         serviceEndTime: "",
+        serviceTimeStr: "",
         serviceTime: ["", ""],
         adminStaffId: "",
         address: "",
@@ -250,11 +259,11 @@ 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",
           },
         ],
@@ -262,7 +271,7 @@ export default {
           {required: true, message: "头像不能为空", trigger: "blur"},
         ],
         serviceMatters: [
-          {required: true, message: "服务事项不能为空", trigger: "blur"},
+          {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
         personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
@@ -271,9 +280,9 @@ export default {
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
         mobile: [
-          {required: true, message: "负责人电话不能为空", trigger: "blur"},
+          {required: true, message: "服务电话不能为空", trigger: "blur"},
         ],
-        serviceTime: [
+        serviceTimeStr: [
           {required: true, message: "服务时间不能为空", trigger: "blur"},
         ],
         /*longitude: [
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 4c9cb6275..a50590d92 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -57,13 +57,19 @@
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
-                  <el-date-picker v-model="fmData.serviceTime"
+                  <el-input v-model="fmData.serviceTimeStr"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入">
+                  </el-input>
+<!--                  <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>-->
                 </div>
               </div>
             </el-col>
@@ -116,17 +122,17 @@
                          align="center"
                          width="50" />
         <el-table-column prop="societyName"
-                         label="社会组织名称">
+                         label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
-                         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="serviceTimeStr"
                          label="服务时间"> </el-table-column>
 <!--        <el-table-column prop="score"
                          width="80"
@@ -229,6 +235,7 @@ export default {
         serviceStartTime: "",
         serviceEndTime: "",
         serviceTime: "",
+        serviceTimeStr: "",
       },
 
       importBtnTitle: "excel导入",

From fb980eef5fed85f92f5bc217012385436ce63c88 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 11:17:39 +0800
Subject: [PATCH 04/19] worklog

---
 .../communityService/worklog/index.vue        | 1040 +++++++++++++++++
 .../worklog/workLogDetail.vue                 |  209 ++++
 2 files changed, 1249 insertions(+)
 create mode 100644 src/views/modules/communityService/worklog/index.vue
 create mode 100644 src/views/modules/communityService/worklog/workLogDetail.vue

diff --git a/src/views/modules/communityService/worklog/index.vue b/src/views/modules/communityService/worklog/index.vue
new file mode 100644
index 000000000..470ce4fa9
--- /dev/null
+++ b/src/views/modules/communityService/worklog/index.vue
@@ -0,0 +1,1040 @@
+<template>
+    <div v-if="pageLoading" class="resi-container">
+        <el-card ref="searchCard" class="search-card">
+            <div class="">
+                <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px"
+                         class="demo-form-inline">
+                    <div>
+                        <el-form-item label="所属网格"
+                                      prop="gridId">
+                          <el-select v-model="searchForm.gridId"
+                                     filterable
+                                     placeholder="请选择"
+                                     clearable>
+                            <el-option v-for="item in optionsG"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value">
+                            </el-option>
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="服务类型"
+                                      prop="serviceType">
+                            <el-select v-model="searchForm.serviceType"
+                                       filterable
+                                       placeholder="请选择"
+                                       clearable>
+                                <el-option v-for="item in serviceTypeList"
+                                           :key="item.serviceType"
+                                           :label="item.serviceTypeName"
+                                           :value="item.serviceType">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="申请人" prop="name">
+                            <el-input v-model="searchForm.applicantName" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                        <el-form-item label="住址" prop="mobile">
+                            <el-input v-model="searchForm.applicantAddress" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                    </div>
+                    <div>
+                        <el-form-item label="服务内容" prop="idCard">
+                            <el-input v-model="searchForm.serviceContent" placeholder="请输入" class="input-width"
+                                      clearable></el-input>
+                        </el-form-item>
+                        <el-form-item label="联系电话" prop="address">
+                            <el-input v-model="searchForm.applicantMobile" 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('searchForm')">重置
+                            </el-button>
+                        </el-form-item>
+                    </div>
+
+                </el-form>
+            </div>
+        </el-card>
+        <el-card class="resi-card-table">
+
+            <div class="resi-row-btn">
+                <el-button class="diy-button--add"
+                           style="margin-left: 0"
+                           size="small"
+                           @click="handleAdd">新增
+                </el-button>
+                <el-button
+                        class="diy-button--export"
+                        size="small"
+                        @click="handleExportModule('room')">下载模板
+                </el-button>
+                <el-upload
+                        ref="upload"
+                        class="upload-demo"
+                        action="uploadUlr"
+                        :limit="1"
+                        :accept="'.xls,.xlsx'"
+                        :with-credentials="true"
+                        :show-file-list="false"
+                        :auto-upload="true"
+                        :on-success="handleExcelSuccess"
+                        :before-upload="beforeExcelUpload"
+                        :http-request="uploadHttpRequest">
+                    <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}
+                    </el-button>
+                </el-upload>
+                <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{
+                    exportBtnTitle }}
+                </el-button>
+            </div>
+
+            <el-table
+                    :data="tableData"
+                    row-key="id"
+                    v-loading="tableLoading"
+                    border
+                    style="width: 100%"
+                    class="resi-table">
+                <el-table-column label="序号" type="index" align="center" width="50">
+                </el-table-column>
+                <el-table-column
+                        prop="gridName"
+                        label="所属网格"
+                        align="center"
+                        width="100"/>
+                <el-table-column
+                        prop="serviceTypeName"
+                        label="服务类型"
+                        align="center"
+                        min-width="180"/>
+                <el-table-column
+                        prop="principalName"
+                        label="申请人"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="applicantAddress"
+                        label="住址"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="serviceContent"
+                        label="服务内容"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="applicantMobile"
+                        label="联系电话"
+                        align="center"
+                        min-width="160"/>
+                <el-table-column
+                        prop="principalName"
+                        label="责任人"
+                        align="center"
+                        width="100"/>
+                <el-table-column
+                        prop="serviceTime"
+                        label="服务时间"
+                        align="center"
+                        show-overflow-tooltip
+                        min-width="180"/>
+                <el-table-column
+                        prop="remark"
+                        label="备注"
+                        align="center"
+                        width="100"/>
+                <el-table-column fixed="right" label="操作" align="center" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                                @click="handleLook(scope.row)"
+                                type="text"
+                                size="small"
+                                class="btn-color-look">查看</el-button>
+                        <el-button
+                                @click="handleEdit(scope.row, 'edit')"
+                                type="text"
+                                size="small"
+                                class="btn-color-edit">修改</el-button>
+                        <el-popconfirm
+                                title="删除之后无法恢复，确认删除？"
+                                @onConfirm="handleDel(scope.row)">
+                            <el-button
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    class="btn-color-del">删除</el-button>
+                        </el-popconfirm>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="currentPage"
+                        :page-sizes="[20, 50, 100, 200]"
+                        :page-size="pageSize"
+                        layout="sizes, prev, pager, next, total"
+                        :total="total">
+                </el-pagination>
+            </div>
+        </el-card>
+
+        <el-dialog title=""
+                   :visible.sync="dialogVisible"
+                   width="50%"
+                   top="5vh"
+                   append-to-body
+                   class="dialog-h"
+                   :close-on-click-modal="false"
+                   :before-close="handlerCancle">
+            <el-form v-if="dialogVisible"
+                     label-width="120px"
+                     :model="workLogDetail"
+                     ref="ruleForm"
+                     class="form-wr dialog-h-content scroll-h">
+                <el-form-item label="所属网格"
+                              prop="gridId">
+                    <el-input v-if="disabled"
+                              v-model="workLogDetail.gridName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                    <el-select v-else
+                               v-model="workLogDetail.gridId"
+                               filterable
+                               placeholder="请选择"
+                               class="input-width"
+                               clearable
+                               :disabled="disabled"
+                               @change="handleGridChange">
+                        <el-option v-for="item in disabled ? optionsG : optionsEditG"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="需求类型"
+                              prop="serviceType">
+                    <el-input v-if="disabled"
+                              v-model="workLogDetail.serviceTypeName"
+                              :disabled="disabled"
+                              class="input-width-min"></el-input>
+                    <el-cascader v-else
+                                 v-model="workLogDetail.serviceType"
+                                 :options="demandOptions"
+                                 :disabled="disabled"
+                                 clearable
+                                 class="input-width"
+                                 @change="handleCateSlect"></el-cascader>
+                </el-form-item>
+                <el-form-item label="上报类型"
+                              prop="reportType">
+                    <el-input v-if="disabled"
+                              v-model="form.reportTypeName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                </el-form-item>
+                <el-form-item label="上报人"
+                              prop="reportUserName">
+                    <el-input v-model="form.reportUserName"
+                              :disabled="disabled"
+                              placeholder="请输入"
+                              class="input-width"
+                              clearable></el-input>
+                </el-form-item>
+                <el-form-item label="上报人手机号"
+                              prop="reportUserMobile">
+                    <el-input v-model="form.reportUserMobile"
+                              :disabled="disabled"
+                              placeholder="请输入"
+                              class="input-width"
+                              maxlength="11"
+                              clearable></el-input>
+                </el-form-item>
+                <el-form-item label="上报时间"
+                              prop="reportTime">
+                    <el-date-picker v-model="form.reportTime"
+                                    type="datetime"
+                                    class="input-width"
+                                    clearable
+                                    :disabled="disabled"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="需求人"
+                              prop="demandUserId">
+                    <el-input v-if="disabled"
+                              v-model="form.demandUserName"
+                              :disabled="disabled"
+                              class="input-width"></el-input>
+                    <el-select v-else
+                               v-model="selectDemandUser"
+                               class="input-width"
+                               filterable
+                               :disabled="disabled"
+                               placeholder="请选择"
+                               clearable
+                               @change="handleDemandChange">
+                        <el-option v-for="item in demandUserList"
+                                   :key="item.demandUserId"
+                                   :label="item.label"
+                                   :value="item">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="服务时间"
+                              prop="wantServiceTime">
+                    <el-date-picker v-model="form.wantServiceTime"
+                                    type="datetime"
+                                    class="input-width"
+                                    clearable
+                                    :disabled="disabled"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="需求内容"
+                              prop="content">
+                    <el-input v-model="form.content"
+                              :autosize="{ minRows: 2, maxRows: 10 }"
+                              :disabled="disabled"
+                              type="textarea"
+                              clearable
+                              class="input-width-textarea"
+                              placeholder="请输入内容"></el-input>
+                </el-form-item>
+                <el-form-item v-if="
+            addType == 'finish' ||
+            (addType == 'look' && form.serviceShowFlag)
+          "
+                              label="服务方"
+                              prop="serviceType">
+                    <template v-if="disabled && addType !== 'appoint'">
+                        <el-input v-model="form.serviceShowName"
+                                  :disabled="disabled"
+                                  class="input-width"></el-input>
+                    </template>
+                    <template v-else>
+                        <el-select v-model="form.serviceType"
+                                   class="input-width-small"
+                                   placeholder="请选择"
+                                   clearable
+                                   :disabled="disabled && addType !== 'appoint'"
+                                   @change="handleServiceChange('add', $event)">
+                            <el-option v-for="item in serviceOptions"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value">
+                            </el-option>
+                        </el-select>
+                        -
+                        <el-select v-model="form.serverId"
+                                   class="input-width-middle"
+                                   filterable
+                                   placeholder="请选择"
+                                   clearable
+                                   :disabled="disabled && addType !== 'appoint'">
+                            <el-option v-for="item in serviceOptiondList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </template>
+                </el-form-item>
+                <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
+                              label="取消时间"
+                              prop="cancelTime">
+                    <span>{{ form.cancelTime }}</span>
+                </el-form-item>
+                <template v-if="
+            (addType == 'finish' && form.reportType != 'self_help') ||
+            (addType == 'look' && form.status == 'finished')
+          ">
+                    <el-form-item label="实际服务时间"
+                                  prop="serviceStartTime">
+                        <el-date-picker v-model="finishServiceTime"
+                                        class="input-width-min"
+                                        clearable
+                                        :disabled="disabled && addType != 'finish'"
+                                        type="datetimerange"
+                                        range-separator="至"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        @change="handelBlurServiceTime">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="完成情况"
+                                  prop="finishResult">
+                        <el-radio v-model="form.finishResult"
+                                  label="resolved"
+                                  :disabled="disabled && addType != 'finish'">已解决</el-radio>
+                        <el-radio v-model="form.finishResult"
+                                  label="unresolved"
+                                  :disabled="disabled && addType != 'finish'">未解决</el-radio>
+                    </el-form-item>
+                    <el-form-item label="评价"
+                                  prop="score"
+                                  class="form-score">
+                        <el-rate v-model="form.score"
+                                 :allow-half="true"
+                                 :disabled="disabled && addType != 'finish'"></el-rate>
+                    </el-form-item>
+                    <el-form-item label="备注"
+                                  prop="finishDesc">
+                        <el-input v-model="form.finishDesc"
+                                  :autosize="{ minRows: 2, maxRows: 10 }"
+                                  :disabled="disabled && addType != 'finish'"
+                                  type="textarea"
+                                  clearable
+                                  class="input-width-textarea"
+                                  placeholder="请输入内容"></el-input>
+                    </el-form-item>
+                </template>
+                <template v-if="addType == 'finish' && form.reportType == 'self_help'">
+                    <el-form-item label="实际服务时间"
+                                  prop="serviceStartTime">
+                        <el-date-picker v-model="finishServiceTime"
+                                        class="input-width-min"
+                                        clearable
+                                        :disabled="disabled && addType != 'finish'"
+                                        type="datetimerange"
+                                        range-separator="至"
+                                        start-placeholder="开始日期"
+                                        end-placeholder="结束日期"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        @change="handelBlurServiceTime">
+                        </el-date-picker>
+                    </el-form-item>
+                </template>
+            </el-form>
+            <div class="resi-btns">
+                <el-button size="small"
+                           @click="handlerCancle">{{
+                    addType != "look" ? "取消" : "关闭"
+                    }}</el-button>
+<!--                <el-button v-if="addType != 'look'"-->
+<!--                           type="primary"-->
+<!--                           size="small"-->
+<!--                           :loading="btnLoading"-->
+<!--                           @click="handleSubmit">提交</el-button>-->
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+
+    import workLogDetail from './workLogDetail'
+    import axios from 'axios'
+    import {mapGetters} from 'vuex'
+
+    export default {
+        components: {},
+        data() {
+            return {
+                uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+                importBtnTitle: '导入',
+                importLoading: false,
+                exportBtn: false,
+                exportBtnTitle: '导出',
+                tableLoading: false,
+                btnLoading: false,
+                uploading: false,
+                disabled: false,
+                pageLoading: false,
+                dialogVisible: false,
+                currentPage: 1,
+                pageSize: 20,
+                total: null,
+                tableData: [],
+                searchH: 0,
+                unloadPencent: 0,
+                addLevel: '1',
+                addType: 'add',
+                value: '',
+                optionsEditG: [],
+                optionsG: [],
+                optionsC: [],
+                optionsEditC: [],
+                options: [
+                    {
+                        label: '是',
+                        value: 1
+                    }, {
+                        label: '否',
+                        value: 2
+                    }
+                ],
+                demandOptions: [],
+                partyOrgRange: [],
+                timeRangePay: [],
+                timeRange: [],
+                customerId: '',
+                searchForm: {
+                    gridId: '',
+                    serviceType: '',
+                    applicantName: '',
+                    applicantAddress: '',
+                    serviceContent: '',
+                    applicantMobile: ''
+                },
+                partyProps: {
+                    label: 'partyOrgName',
+                    value: 'id',
+                    checkStrictly: true
+                },
+                workLogDetail: {
+                    gridId: '',
+                    gridName: ''
+                },
+                serviceTypeList: []
+            }
+        },
+        computed: {
+        },
+        async created() {
+            this.customerId = localStorage.getItem('customerId')
+            this.getTableData()
+            this.getGridList('query')
+            this.getServiceType()
+            this.pageLoading = true
+
+        },
+        mounted() {
+            this.$nextTick(() => {
+                this.searchH = this.$refs.searchCard.$el.offsetHeight
+            })
+        },
+        methods: {
+            handleSizeChange(val) {
+                this.pageSize = val
+                this.getTableData()
+            },
+            handleCurrentChange(val) {
+                this.currentPage = val
+                this.getTableData()
+            },
+            handlePartyChange(val) {
+                this.searchForm.partyOrgId = val[val.length - 1]
+            },
+            handleFilterSpan(row, item) {
+                let _val = ''
+                if (item.options && item.options.length > 0) {
+                    item.options.forEach((n) => {
+                        if (n.value === row[item.columnName]) _val = n.label
+                    })
+                }
+                return _val || row[item.columnName]
+            },
+            handleTimeChange(val) {
+                if (val.length > 0) {
+                    this.searchForm.rdsjStartDate = val[0]
+                    this.searchForm.rdsjEndDate = val[1]
+                } else {
+                    this.searchForm.rdsjStartDate = ''
+                    this.searchForm.rdsjEndDate = ''
+                }
+
+            },
+            handleTimeChangePay(val) {
+                if (val.length > 0) {
+                    this.searchForm.payStatrDate = val[0]
+                    this.searchForm.payEndDate = val[1]
+                } else {
+                    this.searchForm.payStatrDate = ''
+                    this.searchForm.payEndDate = ''
+                }
+
+            },
+            // 上传大图标成功
+            handleExcelSuccess(res, file) {
+                if (res.code === 0 && res.msg === 'success') {
+
+                } else {
+                    this.$message.error(res.msg)
+                }
+            },
+            handleProgress(event, file, fileList) {
+                this.uploading = true
+                this.unloadPencent = Number(file.percentage.toFixed(0))
+            },
+            download(data, fileName) {
+                if (!data) {
+                    return
+                }
+                var csvData = new Blob([data])
+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                    window.navigator.msSaveOrOpenBlob(csvData, fileName)
+                }
+                else {
+                    var a = document.createElement('a')
+                    document.body.appendChild(a)
+                    a.style = 'display: none'
+                    var url = window.URL.createObjectURL(csvData)
+                    a.href = url
+                    a.download = fileName
+                    a.click()
+                    a.remove()
+                    window.URL.revokeObjectURL(url)
+                }
+            },
+            async getServiceType(){
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/serviceTypePage'
+                let params = {
+                    pageNo: 1,
+                    pageSize: 10000
+                }
+                await this.$http
+                    .post(url, params)
+                    .then(({ data: res }) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg);
+                        } else {
+                            this.serviceTypeList = res.data.list
+                            console.log('serviceTypeList:',this.serviceTypeList)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error("网络错误");
+                    });
+            },
+            async handleExportModule() {
+                let url = "/resi/partymember/icPartyMember/downloadTemplate"
+                let params = {}
+                await this.$http({
+                    method: 'POST',
+                    url,
+                    responseType: 'blob',
+                    data: params
+                })
+                    .then(res => {
+                        console.log('res-------dd', res)
+                        if (res.headers["content-disposition"]) {
+                            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+                            this.download(res.data, fileName)
+
+                        } else this.$message.error('下载失败')
+                    })
+                    .catch(err => {
+                        console.log('err', err)
+                        return this.$message.error('网络错误')
+                    })
+            },
+            beforeExcelUpload(file) {
+                console.log('file', file)
+                const isType = file.type === 'application/vnd.ms-excel'
+                const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                const fileType = isType || isTypeComputer
+                const isLt1M = (file.size / 1024 / 1024) < 10
+                if (!fileType) {
+                    this.$message.error('上传文件只能是xls/xlsx格式！')
+                }
+
+                if (!isLt1M) {
+                    this.$message.error('上传文件大小不能超过 10MB!')
+                }
+                return fileType && isLt1M
+            },
+            async uploadHttpRequest(file) {
+                this.importLoading = true
+                this.importBtnTitle = '正在上传中...'
+                this.$message({
+                    showClose: true,
+                    message: '导入中，请到系统管理-导入记录中查看进度',
+                    duration: 0
+                })
+                const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+                formData.append('file', file.file) //添加文件对象
+                this.$http
+                    .post('/resi/partymember/icPartyMember/import', formData).then(res => {
+                    console.log('res-up', res)
+                    if (res.data.code == 0 && res.data.msg == 'success') {
+                        // this.$message.success('导入成功')
+                        this.getTableData()
+                    } else {
+                        this.$message.error(res.data.msg)
+                    }
+                }).catch(err => {
+                    console.log('失败', err)
+                    file.onError() //上传失败的文件会从文件列表中删除
+                    // this.$message.error('导入失败')
+                })
+
+                this.importLoading = false
+                this.importBtnTitle = '导入'
+                this.$refs.upload.clearFiles()
+            },
+            async handleExport() {
+                this.exportBtn = true
+                this.exportBtnTitle = '正在导出...'
+                let params = {
+                    agencyId: this.$store.state.user.agencyId,
+                    pageSize: 9999,
+                    pageNo: this.currentPage
+                }
+                // .post('epmetuser/icresiuser/exportExcel', params)
+                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate'
+                await axios({
+                    // url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icPartyMember/export',
+                    url: url,
+                    // url: 'epmetuser/icresiuser/exportExcel',
+                    method: 'post',
+                    data: params,
+                    responseType: 'blob'
+                })
+                    .then(res => {
+                        console.log('resllll', 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)
+                        this.$message.error('获取导出失败')
+                    })
+                this.exportBtn = false
+                this.exportBtnTitle = '导出'
+            },
+            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
+            },
+            handleImgSuccess(res, file) {
+                if (res.code === 0 && res.msg === 'success') {
+
+                    console.log('res.data.url', res.data.url)
+                    this.uploading = false
+                    this.unloadPencent = 0
+                    this.form.imageList.push(res.data.url)
+
+                } else {
+                    this.$message.error(res.msg)
+                }
+            },
+            handleDelimg(item, index) {
+                this.form.imageList.splice(index, 1)
+            },
+            handleSearch(val) {
+                console.log('searchhh--', val)
+                this.currentPage = 1
+                this.getTableData()
+            },
+            resetForm(formName) {
+                this.timeRangePay = []
+                this.timeRange = []
+                this.searchForm.payStatrDate = ''
+                this.searchForm.payEndDate = ''
+                this.searchForm.rdsjStartDate = ''
+                this.searchForm.rdsjEndDate = ''
+                this.$refs[formName].resetFields()
+                this.handleSearch()
+            },
+            handleAdd() {
+                this.dialogVisible = true
+            },
+
+            handlerCancle() {
+                this.detailInfo = {}
+                this.disabled = false
+                this.dialogVisible = false
+            },
+            async handleLook(row) {
+                this.disabled = true
+                this.$nextTick(() => {
+                    this.$refs.ref_detail.initForm(row)
+                })
+                // await this.getDetail(row.applicantId)
+            },
+            async handleEdit(row, addType) {
+                await this.getDetail(row.id)
+                this.dialogVisible = true
+            },
+
+            handleDel(row) {
+                let params = {
+                    ids: [row.applicantId]
+                }
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete'
+                // let url = '/heart/workdiaryService/record/delete'
+                this.$http
+                    .post(url, params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.$message.success('删除成功')
+                            this.getTableData()
+                        }
+                    })
+                    .catch((err) => {
+                        return this.$message.error('网络错误')
+                    })
+            },
+            async getDetail(id) {
+                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/'
+                // let url = '/heart/workdiaryService/record/'
+                this.$http
+                    .post(url+id)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.workLogDetail = {...res.data}
+                            this.dialogVisible = true
+                        }
+                    })
+                    .catch((err) => {
+                        console.log('row4', err)
+                        return this.$message.error('网络错误')
+                    })
+            },
+            /*async getGridList(type, agencyId) {
+                const {user} = await this.$store.state
+                console.log('user---ppp', user)
+                // addorupdate  query
+                await this.$http
+                    .get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: agencyId || user.agencyId}})
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            console.log('获取查询详情成功', res.data)
+
+                            this.optionsG = this.deepArrTOnull(res.data)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+            },*/
+          async getGridList (type, agencyId) {
+            const { user } = await this.$store.state;
+            await this.$http
+                    .post("/gov/org/customergrid/gridoption", {
+                      agencyId: agencyId || user.agencyId,
+                      purpose: type,
+                    })
+                    .then(({ data: res }) => {
+                      if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                      } else {
+                        if (type === "query") this.optionsG = res.data;
+                        else this.optionsEditG = res.data;
+                      }
+                    })
+                    .catch(() => {
+                      return this.$message.error("网络错误");
+                    });
+          },
+            deepArrTOnull(arr) {
+                let a = []
+                a = arr.map(item => {
+                    return {
+                        ...item,
+                        children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
+                    }
+                })
+                return a
+            },
+            async getCateList(type) {
+                const {user} = await this.$store.state
+                console.log('user---ppp', user)
+                const params = {
+                    customerId: this.customerId,
+                    type
+                }
+                // addorupdate  query
+                await this.$http
+                    .post('/resi/partymember/stylecategorydict/select-list', params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            console.log('获取查询详情成功', res.data)
+
+                            if (type === 'query') this.optionsC = res.data
+                            else this.optionsEditC = res.data
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+            },
+            async getTableData() {
+                this.tableLoading = true
+                const {user} = await this.$store.state
+                let params = {
+                    ...this.searchForm,
+                    pageNo: this.currentPage,
+                    pageSize: this.pageSize
+                }
+                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page'
+                await this.$http
+                    // .post('/resi/partymember/icPartyMember/page', params)
+                    .post(url, params)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        } else {
+                            this.tableData = res.data.list
+                            this.total = res.data.total
+                            console.log(this.tableData)
+                        }
+                    })
+                    .catch(() => {
+                        return this.$message.error('网络错误')
+                    })
+                this.tableLoading = false
+            }
+
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    @import "@/assets/scss/buttonstyle.scss";
+
+    .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-table {
+        ::v-deep .el-button--text {
+            text-decoration: underline;
+        }
+
+        ::v-deep .btn-color-del {
+            margin-left: 10px;
+            color: rgba(213, 16, 16, 1);
+        }
+
+        ::v-deep .btn-color-edit {
+            color: rgba(0, 167, 169, 1);
+        }
+    }
+
+    .form-wr {
+        .input-width {
+            width: 260px;
+
+        }
+
+        .input-width-textarea {
+            width: 500px;
+        }
+
+        .imsg-list {
+            display: flex;
+            align-items: center;
+
+            .imgs-item {
+                position: relative;
+                margin-right: 10px;
+
+                .el-icon-delete {
+                    position: absolute;
+                    top: 0;
+                    right: 0;
+                    font-size: 18px;
+                    color: red;
+                    z-index: 3;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
+    .div-content {
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+</style>
+
+<style lang="scss" scoped>
+    .resi-row-btn {
+        display: flex;
+        margin-bottom: 13px;
+        ::v-deep .el-button {
+            margin-left: 10px;
+            border: 0;
+        }
+        ::v-deep .el-select {
+            margin-right: 10px;
+        }
+        .el-button--success {
+            background: rgba(34, 193, 195, 1);
+        }
+        .el-button {
+            /*margin-right: 10px;*/
+            border: 0;
+        }
+        .el-button--warning {
+            background: rgba(254, 179, 73, 1);
+        }
+        .el-button--danger {
+            background: rgba(254, 98, 82, 1);
+        }
+    }
+    .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;
+        }
+    }
+    .resi-btns {
+        margin-top: 20px;
+        text-align: center;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
new file mode 100644
index 000000000..a8dc01dc2
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="workLogDetail"
+               class="form">
+
+        <el-form-item label="需求类型"
+                      prop="serviceType">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.serviceTypeName"
+                    :disabled="disabled"
+                    class="input-width-min"></el-input>
+          <el-cascader v-else
+                       v-model="workLogDetail.serviceType"
+                       :options="demandOptions"
+                       :disabled="disabled"
+                       clearable
+                       class="input-width"
+                       @change="handleCateSlect"></el-cascader>
+        </el-form-item>
+        <el-form-item label="所属网格"
+                      prop="gridId">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.gridName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+          <el-select v-else
+                     v-model="workLogDetail.gridId"
+                     filterable
+                     placeholder="请选择"
+                     class="input-width"
+                     clearable
+                     :disabled="disabled"
+                     @change="handleGridChange">
+            <el-option v-for="item in disabled ? optionsG : optionsEditG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上报类型"
+                      prop="reportType">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.reportTypeName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+        </el-form-item>
+        <el-form-item label="申请人"
+                      prop="applicantName">
+          <el-input v-model="workLogDetail.applicantName"
+                    :disabled="disabled"
+                    placeholder="请输入"
+                    class="input-width"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="上报人手机号"
+                      prop="reportUserMobile">
+          <el-input v-model="workLogDetail.reportUserMobile"
+                    :disabled="disabled"
+                    placeholder="请输入"
+                    class="input-width"
+                    maxlength="11"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="上报时间"
+                      prop="reportTime">
+          <el-date-picker v-model="workLogDetail.reportTime"
+                          type="datetime"
+                          class="input-width"
+                          clearable
+                          :disabled="disabled"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="需求人"
+                      prop="demandUserId">
+          <el-input v-if="disabled"
+                    v-model="workLogDetail.demandUserName"
+                    :disabled="disabled"
+                    class="input-width"></el-input>
+          <el-select v-else
+                     v-model="selectDemandUser"
+                     class="input-width"
+                     filterable
+                     :disabled="disabled"
+                     placeholder="请选择"
+                     clearable
+                     @change="handleDemandChange">
+            <el-option v-for="item in demandUserList"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="服务时间"
+                      prop="wantServiceTime">
+          <el-date-picker v-model="workLogDetail.wantServiceTime"
+                          type="datetime"
+                          class="input-width"
+                          clearable
+                          :disabled="disabled"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="需求内容"
+                      prop="content">
+          <el-input v-model="workLogDetail.content"
+                    :autosize="{ minRows: 2, maxRows: 10 }"
+                    :disabled="disabled"
+                    type="textarea"
+                    clearable
+                    class="input-width-textarea"
+                    placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      workLogDetail: {},
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+    handleCancle () {
+
+      this.$emit('diaClose')
+
+    },
+
+    async initForm (row) {
+      this.startLoading()
+      this.formData = { ...row }
+      this.endLoading()
+
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style scoped>
+.detail_span {
+  width: 500px;
+  font-weight: bold;
+  text-align: left;
+  margin: 0 0;
+  font-size: 16px;
+}
+
+.form {
+  margin-top: 30px;
+}
+</style>
+
+

From 60fa7ac723de14f3b4fdebf6ef6eef66d3f672fa Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 14:23:42 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/workLog/edit.vue | 176 ++++++++++++
 src/views/modules/workSys/workLog/list.vue | 295 +++++++++++++++++++++
 2 files changed, 471 insertions(+)
 create mode 100644 src/views/modules/workSys/workLog/edit.vue
 create mode 100644 src/views/modules/workSys/workLog/list.vue

diff --git a/src/views/modules/workSys/workLog/edit.vue b/src/views/modules/workSys/workLog/edit.vue
new file mode 100644
index 000000000..59311cbae
--- /dev/null
+++ b/src/views/modules/workSys/workLog/edit.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="title"
+             :width="diaWidth+'%'"
+             :close-on-click-modal="false"
+             :before-close="handleClose"
+             :close-on-press-escape="false">
+    <el-form :inline="false"
+             :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             :label-width="'120px'">
+      <div style="margin-top:20px">
+
+        <el-form-item label="分类名称"
+                      prop="serviceTypeName">
+          <el-tooltip class="item"
+                      effect="dark"
+                      content="请输入1-10个字"
+                      placement="bottom-start">
+            <el-input class="item_width_1"
+                      :maxlength="10"
+                      :minlength="1"
+                      v-model="dataForm.serviceTypeName"
+                      placeholder="分类名称"></el-input>
+          </el-tooltip>
+        </el-form-item>
+        <!-- <el-form-item label="排序"
+                      prop="sort">
+          <el-input-number v-model="dataForm.sort"
+                           :min="1"
+                           label="描述文字"></el-input-number>
+        </el-form-item> -->
+      </div>
+
+    </el-form>
+    <!-- <template slot="footer">
+      <el-button @click="visible = false;resetData()">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="saveForm()">{{ $t('confirm') }}</el-button>
+    </template> -->
+     <div class="resi-btns">
+        <el-button size="small"
+                   @click="visible = false;resetData()">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   @click="saveForm">提交</el-button>
+      </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { requestPost } from '@/js/dai/request'
+export default {
+  data () {
+    return {
+      visible: false,
+      title: '分类信息',
+
+      customerId: '',
+      parentid: '', // 父级分类Id
+      id: '', // 当前操作分类Id
+      type: '', // 操作类型(add:新增  edit:编辑)
+
+      dataForm: {
+        serviceTypeName: '', // 分类名称
+        sort: 0,
+        type: '', // 操作类型(add:新增  edit:编辑)
+        level: ''
+      },
+
+      url: ''
+
+    }
+  },
+  created () {
+    // this.queryFunctionList()
+  },
+  computed: {
+
+    dataRule () {
+      return {
+        serviceTypeName: [
+          { required: true, message: '分类名称不能为空', trigger: 'blur' },
+          { min: 2, max: 20, message: '分类名称长度在 2 到 20 个字符', trigger: 'blur' }
+        ]
+      }
+    },
+    diaWidth () {
+      console.log(this.resolution)
+      return this.resolution === 'small' ? 70 : 50
+    },
+
+    ...mapGetters(['clientHeight', 'resolution'])
+  },
+  methods: {
+    // 初始化  customerId,parentid ,level,排序
+    initAdd (customerId, parentid, level, sort) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentid = parentid
+      this.type = 'add'
+      this.dataForm.level = level
+      this.dataForm.sort = sort
+      this.url = '/heart/workdiaryService/serviceType/save'
+    },
+
+    // 初始化  customerId,parentid,dateform,level
+    initEdit (customerId, parentid, dataForm) {
+      this.visible = true
+      this.customerId = customerId
+      this.parentid = parentid
+      this.type = 'edit'
+      this.dataForm = dataForm
+
+      this.url = '/heart/workdiaryService/serviceType/update'
+    },
+
+    async saveForm () {
+      await this.$refs['dataForm'].validate((valid, messageObj) => {
+        if (!valid) {
+          window.app.util.validateRule(messageObj)
+          return false
+        }
+      })
+
+      let params = {
+        customerId: this.customerId,
+        id: this.dataForm.id,
+        serviceTypeName: this.dataForm.serviceTypeName
+      }
+
+      const { data, code, msg } = await requestPost(this.url, params)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '保存成功'
+        })
+        this.resetData()
+        this.visible = false
+        this.$emit('editDiaOK')
+      } else {
+        // this.$message.error(msg)
+      }
+    },
+    handleClose () {
+      this.visible = false
+    },
+    resetData () {
+      this.dataForm = {
+        serviceTypeName: '', // 分类名称
+        sort: 0,
+        type: ''// 操作类型(add:新增  edit:编辑)
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+.item_width_1 {
+  width: 400px;
+}
+.item_width_2 {
+  width: 700px;
+}
+.block {
+  display: block;
+}
+.btn_reset {
+  vertical-align: bottom;
+  margin-left: 10px;
+}
+</style>
diff --git a/src/views/modules/workSys/workLog/list.vue b/src/views/modules/workSys/workLog/list.vue
new file mode 100644
index 000000000..453a46bbb
--- /dev/null
+++ b/src/views/modules/workSys/workLog/list.vue
@@ -0,0 +1,295 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card-table">
+      <div class="mod-sys__menu">
+        <div class="resi-row-btn">
+          <el-button class="diy-button--add"
+                    size="small"
+                    @click="addShow()">新增</el-button>
+        </div>
+        <el-table v-loading="dataListLoading"
+                  :data="dataList"
+                  :default-expand-all="false"
+                  row-key="id"
+                  :height="tableHeight"
+                  border
+                  style="width: 100%;" class="resi-table">
+          <el-table-column prop="serviceTypeName"
+                          label="分类名称"
+                          align="center"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+          <el-table-column prop="stateShow"
+                          label="状态"
+                          align="center"
+                          header-align="center"
+                          min-width="150"></el-table-column>
+
+          <!-- <el-table-column prop="sort"
+                            :label="$t('menu.sort')"
+                            header-align="center"
+                            align="center"></el-table-column> -->
+
+          <el-table-column label="操作"
+                          fixed="right"
+                          header-align="center"
+                          align="center"
+                          width="350">
+            <template slot-scope="scope">
+
+              <el-button type="text"
+                        size="small"
+                         class="div-table-button--detail"
+                        @click="disableCategory(scope.row)">{{ scope.row.btnShow}}</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="div-table-button--edit"
+                        @click="editShow(scope.row)">修改</el-button>
+              <el-button type="text"
+                        size="small"
+                        class="div-table-button--delete"
+                        @click="deleteCategory(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+    </el-card>
+
+
+    <elegant-edit ref="ref_edit"
+                   @editDiaOK="editDiaOK">
+
+    </elegant-edit>
+
+  </div>
+</template>
+
+<script>
+
+import { requestPost } from '@/js/dai/request'
+import elegantEdit from './edit.vue'
+import { mapGetters } from 'vuex'
+export default {
+
+  data () {
+    return {
+      customerId: '', // 客户id，父组件传
+      customerName: '', // 客户名称，父组件传
+
+      tableParams: {
+        customerId: '',
+        pageNo:1,
+        pageSize:10000
+      },
+      // tableHeight: 500,
+      search: '',
+      dataList: [],
+
+      dataListLoading: false
+
+    }
+  },
+
+  computed: {
+    tables () {
+      const search = this.search
+      if (search) {
+        console.log('this.dataList', this.dataList)
+        return this.dataList.filter(dataNews => {
+          return Object.keys(dataNews).some(key => {
+            return String(dataNews[key]).toLowerCase().indexOf(search) > -1
+          })
+        })
+      }
+      console.log('this.dataList', this.dataList)
+      return this.dataList
+    },
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  components: {
+    elegantEdit
+  },
+  created() {
+    const { user } = this.$store.state
+    console.log('user----', user)
+    this.initData(user.customerId, user.customerName)
+  },
+  mounted() {
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
+    //   console.log('tableHeight', this.tableHeight)
+    // })
+  },
+  methods: {
+    cellStyle ({ row, column, rowIndex, columnIndex }) {
+      // 状态列字体颜色
+      if (row.state === 'enable' && columnIndex === 1) {
+        return 'color: #EA1B29'
+      } else if (row.state === 'disable' && columnIndex === 1) {
+        return 'color: #0CB618'
+      } else {
+        return 'color: #1a1a1b'
+      }
+    },
+    initData (customerId, customerName) {
+      this.customerId = customerId
+      this.customerName = customerName
+
+      this.loadData()
+    },
+
+    // 加载列表数据
+    async loadData () {
+      this.dataListLoading = true
+      // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/customercategorylist'
+      const url = '/heart/workdiaryService/serviceType/page'
+
+      this.tableParams.customerId = this.customerId
+
+      const { data, code, msg } = await requestPost(url, this.tableParams)
+      this.dataListLoading = false
+      if (code === 0) {
+        this.dataList = data.list || []
+        this.dataList.forEach(element => {
+          element.state = element.enabled ? 'enable' : 'disable'
+          element.btnShow = element.enabled ? '禁用' : '启用'
+          element.stateShow = element.enabled ? '启用' : '禁用'
+          element.level = 'l1'
+        })
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+
+    // 开启/启用
+    disableCategory (row) {
+      this.$confirm('确认' + row.btnShow + '当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/heart/workdiaryService/serviceType/update'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/isdisablecategory'
+        const param = {
+          customerId: this.customerId,
+          id: row.id,
+          enabled: row.state !== 'enable'? 1:0
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+    // 删除
+    deleteCategory (row) {
+      this.$confirm('确认删除当前分类?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const url = '/heart/workdiaryService/serviceType/delete'
+        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory'
+        const param = {
+          customerId: this.customerId,
+          ids: [row.id]
+        }
+        window.app.ajax.post(url, param,
+          (data, rspMsg) => {
+            this.$message.success('操作成功')
+            this.loadData()
+          },
+          (rspMsg, data) => {
+            this.$message.error(rspMsg)
+          })
+      }).catch(() => {
+
+      })
+    },
+
+    // 新增  customerId,parentid,id,type,level,num
+    addShow () {
+      const sort = this.dataList.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, '', 'l1', sort)
+    },
+    // 新增二级分类  customerId,parentid,id,type,level，num
+    showAddLevel2 (row) {
+      const sort = row.children.length + 1
+      this.$refs['ref_edit'].initAdd(this.customerId, row.id, 'l2', sort)
+    },
+    // 编辑 customerId,parentid,dateform
+    editShow (row) {
+      this.$refs['ref_edit'].initEdit(this.customerId, row.id, row)
+    },
+
+    // 取消
+    diaCancel () {
+      this.$emit('cancleBack')
+    },
+
+    editDiaOK () {
+      this.loadData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table {
+    th  {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+    }
+
+    .cell {
+
+      span:nth-of-type(3) {
+        display: inline-block;
+        width: 90%;
+        word-break: break-all;
+      }
+    }
+  }
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  ::v-deep .el-select {
+    margin-right: 10px;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+</style>

From c3a4843001d5b5483cb40b08b60cec6112bb9875 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 24 Aug 2022 14:28:39 +0800
Subject: [PATCH 06/19] worklog

---
 .../communityService/worklog/index.vue        | 1040 -----------------
 .../communityService/worklog/workLog.vue      |  762 ++++++++++++
 .../worklog/workLogDetail.vue                 |  158 +--
 .../communityService/worklog/workLogForm.vue  |  467 ++++++++
 4 files changed, 1278 insertions(+), 1149 deletions(-)
 delete mode 100644 src/views/modules/communityService/worklog/index.vue
 create mode 100644 src/views/modules/communityService/worklog/workLog.vue
 create mode 100644 src/views/modules/communityService/worklog/workLogForm.vue

diff --git a/src/views/modules/communityService/worklog/index.vue b/src/views/modules/communityService/worklog/index.vue
deleted file mode 100644
index 470ce4fa9..000000000
--- a/src/views/modules/communityService/worklog/index.vue
+++ /dev/null
@@ -1,1040 +0,0 @@
-<template>
-    <div v-if="pageLoading" class="resi-container">
-        <el-card ref="searchCard" class="search-card">
-            <div class="">
-                <el-form ref="searchForm" :inline="true" :model="searchForm" size="small" label-width="100px"
-                         class="demo-form-inline">
-                    <div>
-                        <el-form-item label="所属网格"
-                                      prop="gridId">
-                          <el-select v-model="searchForm.gridId"
-                                     filterable
-                                     placeholder="请选择"
-                                     clearable>
-                            <el-option v-for="item in optionsG"
-                                       :key="item.value"
-                                       :label="item.label"
-                                       :value="item.value">
-                            </el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="服务类型"
-                                      prop="serviceType">
-                            <el-select v-model="searchForm.serviceType"
-                                       filterable
-                                       placeholder="请选择"
-                                       clearable>
-                                <el-option v-for="item in serviceTypeList"
-                                           :key="item.serviceType"
-                                           :label="item.serviceTypeName"
-                                           :value="item.serviceType">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="申请人" prop="name">
-                            <el-input v-model="searchForm.applicantName" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                        <el-form-item label="住址" prop="mobile">
-                            <el-input v-model="searchForm.applicantAddress" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                    </div>
-                    <div>
-                        <el-form-item label="服务内容" prop="idCard">
-                            <el-input v-model="searchForm.serviceContent" placeholder="请输入" class="input-width"
-                                      clearable></el-input>
-                        </el-form-item>
-                        <el-form-item label="联系电话" prop="address">
-                            <el-input v-model="searchForm.applicantMobile" 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('searchForm')">重置
-                            </el-button>
-                        </el-form-item>
-                    </div>
-
-                </el-form>
-            </div>
-        </el-card>
-        <el-card class="resi-card-table">
-
-            <div class="resi-row-btn">
-                <el-button class="diy-button--add"
-                           style="margin-left: 0"
-                           size="small"
-                           @click="handleAdd">新增
-                </el-button>
-                <el-button
-                        class="diy-button--export"
-                        size="small"
-                        @click="handleExportModule('room')">下载模板
-                </el-button>
-                <el-upload
-                        ref="upload"
-                        class="upload-demo"
-                        action="uploadUlr"
-                        :limit="1"
-                        :accept="'.xls,.xlsx'"
-                        :with-credentials="true"
-                        :show-file-list="false"
-                        :auto-upload="true"
-                        :on-success="handleExcelSuccess"
-                        :before-upload="beforeExcelUpload"
-                        :http-request="uploadHttpRequest">
-                    <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}
-                    </el-button>
-                </el-upload>
-                <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{
-                    exportBtnTitle }}
-                </el-button>
-            </div>
-
-            <el-table
-                    :data="tableData"
-                    row-key="id"
-                    v-loading="tableLoading"
-                    border
-                    style="width: 100%"
-                    class="resi-table">
-                <el-table-column label="序号" type="index" align="center" width="50">
-                </el-table-column>
-                <el-table-column
-                        prop="gridName"
-                        label="所属网格"
-                        align="center"
-                        width="100"/>
-                <el-table-column
-                        prop="serviceTypeName"
-                        label="服务类型"
-                        align="center"
-                        min-width="180"/>
-                <el-table-column
-                        prop="principalName"
-                        label="申请人"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="applicantAddress"
-                        label="住址"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="serviceContent"
-                        label="服务内容"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="applicantMobile"
-                        label="联系电话"
-                        align="center"
-                        min-width="160"/>
-                <el-table-column
-                        prop="principalName"
-                        label="责任人"
-                        align="center"
-                        width="100"/>
-                <el-table-column
-                        prop="serviceTime"
-                        label="服务时间"
-                        align="center"
-                        show-overflow-tooltip
-                        min-width="180"/>
-                <el-table-column
-                        prop="remark"
-                        label="备注"
-                        align="center"
-                        width="100"/>
-                <el-table-column fixed="right" label="操作" align="center" width="200">
-                    <template slot-scope="scope">
-                        <el-button
-                                @click="handleLook(scope.row)"
-                                type="text"
-                                size="small"
-                                class="btn-color-look">查看</el-button>
-                        <el-button
-                                @click="handleEdit(scope.row, 'edit')"
-                                type="text"
-                                size="small"
-                                class="btn-color-edit">修改</el-button>
-                        <el-popconfirm
-                                title="删除之后无法恢复，确认删除？"
-                                @onConfirm="handleDel(scope.row)">
-                            <el-button
-                                    slot="reference"
-                                    type="text"
-                                    size="small"
-                                    class="btn-color-del">删除</el-button>
-                        </el-popconfirm>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div>
-                <el-pagination
-                        @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
-                        :current-page.sync="currentPage"
-                        :page-sizes="[20, 50, 100, 200]"
-                        :page-size="pageSize"
-                        layout="sizes, prev, pager, next, total"
-                        :total="total">
-                </el-pagination>
-            </div>
-        </el-card>
-
-        <el-dialog title=""
-                   :visible.sync="dialogVisible"
-                   width="50%"
-                   top="5vh"
-                   append-to-body
-                   class="dialog-h"
-                   :close-on-click-modal="false"
-                   :before-close="handlerCancle">
-            <el-form v-if="dialogVisible"
-                     label-width="120px"
-                     :model="workLogDetail"
-                     ref="ruleForm"
-                     class="form-wr dialog-h-content scroll-h">
-                <el-form-item label="所属网格"
-                              prop="gridId">
-                    <el-input v-if="disabled"
-                              v-model="workLogDetail.gridName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                    <el-select v-else
-                               v-model="workLogDetail.gridId"
-                               filterable
-                               placeholder="请选择"
-                               class="input-width"
-                               clearable
-                               :disabled="disabled"
-                               @change="handleGridChange">
-                        <el-option v-for="item in disabled ? optionsG : optionsEditG"
-                                   :key="item.value"
-                                   :label="item.label"
-                                   :value="item.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="需求类型"
-                              prop="serviceType">
-                    <el-input v-if="disabled"
-                              v-model="workLogDetail.serviceTypeName"
-                              :disabled="disabled"
-                              class="input-width-min"></el-input>
-                    <el-cascader v-else
-                                 v-model="workLogDetail.serviceType"
-                                 :options="demandOptions"
-                                 :disabled="disabled"
-                                 clearable
-                                 class="input-width"
-                                 @change="handleCateSlect"></el-cascader>
-                </el-form-item>
-                <el-form-item label="上报类型"
-                              prop="reportType">
-                    <el-input v-if="disabled"
-                              v-model="form.reportTypeName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                </el-form-item>
-                <el-form-item label="上报人"
-                              prop="reportUserName">
-                    <el-input v-model="form.reportUserName"
-                              :disabled="disabled"
-                              placeholder="请输入"
-                              class="input-width"
-                              clearable></el-input>
-                </el-form-item>
-                <el-form-item label="上报人手机号"
-                              prop="reportUserMobile">
-                    <el-input v-model="form.reportUserMobile"
-                              :disabled="disabled"
-                              placeholder="请输入"
-                              class="input-width"
-                              maxlength="11"
-                              clearable></el-input>
-                </el-form-item>
-                <el-form-item label="上报时间"
-                              prop="reportTime">
-                    <el-date-picker v-model="form.reportTime"
-                                    type="datetime"
-                                    class="input-width"
-                                    clearable
-                                    :disabled="disabled"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="需求人"
-                              prop="demandUserId">
-                    <el-input v-if="disabled"
-                              v-model="form.demandUserName"
-                              :disabled="disabled"
-                              class="input-width"></el-input>
-                    <el-select v-else
-                               v-model="selectDemandUser"
-                               class="input-width"
-                               filterable
-                               :disabled="disabled"
-                               placeholder="请选择"
-                               clearable
-                               @change="handleDemandChange">
-                        <el-option v-for="item in demandUserList"
-                                   :key="item.demandUserId"
-                                   :label="item.label"
-                                   :value="item">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="服务时间"
-                              prop="wantServiceTime">
-                    <el-date-picker v-model="form.wantServiceTime"
-                                    type="datetime"
-                                    class="input-width"
-                                    clearable
-                                    :disabled="disabled"
-                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="需求内容"
-                              prop="content">
-                    <el-input v-model="form.content"
-                              :autosize="{ minRows: 2, maxRows: 10 }"
-                              :disabled="disabled"
-                              type="textarea"
-                              clearable
-                              class="input-width-textarea"
-                              placeholder="请输入内容"></el-input>
-                </el-form-item>
-                <el-form-item v-if="
-            addType == 'finish' ||
-            (addType == 'look' && form.serviceShowFlag)
-          "
-                              label="服务方"
-                              prop="serviceType">
-                    <template v-if="disabled && addType !== 'appoint'">
-                        <el-input v-model="form.serviceShowName"
-                                  :disabled="disabled"
-                                  class="input-width"></el-input>
-                    </template>
-                    <template v-else>
-                        <el-select v-model="form.serviceType"
-                                   class="input-width-small"
-                                   placeholder="请选择"
-                                   clearable
-                                   :disabled="disabled && addType !== 'appoint'"
-                                   @change="handleServiceChange('add', $event)">
-                            <el-option v-for="item in serviceOptions"
-                                       :key="item.value"
-                                       :label="item.label"
-                                       :value="item.value">
-                            </el-option>
-                        </el-select>
-                        -
-                        <el-select v-model="form.serverId"
-                                   class="input-width-middle"
-                                   filterable
-                                   placeholder="请选择"
-                                   clearable
-                                   :disabled="disabled && addType !== 'appoint'">
-                            <el-option v-for="item in serviceOptiondList"
-                                       :key="item.value"
-                                       :label="item.label"
-                                       :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </template>
-                </el-form-item>
-                <el-form-item v-if="addType == 'look' && form.status == 'canceled'"
-                              label="取消时间"
-                              prop="cancelTime">
-                    <span>{{ form.cancelTime }}</span>
-                </el-form-item>
-                <template v-if="
-            (addType == 'finish' && form.reportType != 'self_help') ||
-            (addType == 'look' && form.status == 'finished')
-          ">
-                    <el-form-item label="实际服务时间"
-                                  prop="serviceStartTime">
-                        <el-date-picker v-model="finishServiceTime"
-                                        class="input-width-min"
-                                        clearable
-                                        :disabled="disabled && addType != 'finish'"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        @change="handelBlurServiceTime">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="完成情况"
-                                  prop="finishResult">
-                        <el-radio v-model="form.finishResult"
-                                  label="resolved"
-                                  :disabled="disabled && addType != 'finish'">已解决</el-radio>
-                        <el-radio v-model="form.finishResult"
-                                  label="unresolved"
-                                  :disabled="disabled && addType != 'finish'">未解决</el-radio>
-                    </el-form-item>
-                    <el-form-item label="评价"
-                                  prop="score"
-                                  class="form-score">
-                        <el-rate v-model="form.score"
-                                 :allow-half="true"
-                                 :disabled="disabled && addType != 'finish'"></el-rate>
-                    </el-form-item>
-                    <el-form-item label="备注"
-                                  prop="finishDesc">
-                        <el-input v-model="form.finishDesc"
-                                  :autosize="{ minRows: 2, maxRows: 10 }"
-                                  :disabled="disabled && addType != 'finish'"
-                                  type="textarea"
-                                  clearable
-                                  class="input-width-textarea"
-                                  placeholder="请输入内容"></el-input>
-                    </el-form-item>
-                </template>
-                <template v-if="addType == 'finish' && form.reportType == 'self_help'">
-                    <el-form-item label="实际服务时间"
-                                  prop="serviceStartTime">
-                        <el-date-picker v-model="finishServiceTime"
-                                        class="input-width-min"
-                                        clearable
-                                        :disabled="disabled && addType != 'finish'"
-                                        type="datetimerange"
-                                        range-separator="至"
-                                        start-placeholder="开始日期"
-                                        end-placeholder="结束日期"
-                                        value-format="yyyy-MM-dd HH:mm:ss"
-                                        @change="handelBlurServiceTime">
-                        </el-date-picker>
-                    </el-form-item>
-                </template>
-            </el-form>
-            <div class="resi-btns">
-                <el-button size="small"
-                           @click="handlerCancle">{{
-                    addType != "look" ? "取消" : "关闭"
-                    }}</el-button>
-<!--                <el-button v-if="addType != 'look'"-->
-<!--                           type="primary"-->
-<!--                           size="small"-->
-<!--                           :loading="btnLoading"-->
-<!--                           @click="handleSubmit">提交</el-button>-->
-            </div>
-        </el-dialog>
-
-    </div>
-</template>
-
-<script>
-
-    import workLogDetail from './workLogDetail'
-    import axios from 'axios'
-    import {mapGetters} from 'vuex'
-
-    export default {
-        components: {},
-        data() {
-            return {
-                uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-                importBtnTitle: '导入',
-                importLoading: false,
-                exportBtn: false,
-                exportBtnTitle: '导出',
-                tableLoading: false,
-                btnLoading: false,
-                uploading: false,
-                disabled: false,
-                pageLoading: false,
-                dialogVisible: false,
-                currentPage: 1,
-                pageSize: 20,
-                total: null,
-                tableData: [],
-                searchH: 0,
-                unloadPencent: 0,
-                addLevel: '1',
-                addType: 'add',
-                value: '',
-                optionsEditG: [],
-                optionsG: [],
-                optionsC: [],
-                optionsEditC: [],
-                options: [
-                    {
-                        label: '是',
-                        value: 1
-                    }, {
-                        label: '否',
-                        value: 2
-                    }
-                ],
-                demandOptions: [],
-                partyOrgRange: [],
-                timeRangePay: [],
-                timeRange: [],
-                customerId: '',
-                searchForm: {
-                    gridId: '',
-                    serviceType: '',
-                    applicantName: '',
-                    applicantAddress: '',
-                    serviceContent: '',
-                    applicantMobile: ''
-                },
-                partyProps: {
-                    label: 'partyOrgName',
-                    value: 'id',
-                    checkStrictly: true
-                },
-                workLogDetail: {
-                    gridId: '',
-                    gridName: ''
-                },
-                serviceTypeList: []
-            }
-        },
-        computed: {
-        },
-        async created() {
-            this.customerId = localStorage.getItem('customerId')
-            this.getTableData()
-            this.getGridList('query')
-            this.getServiceType()
-            this.pageLoading = true
-
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.searchH = this.$refs.searchCard.$el.offsetHeight
-            })
-        },
-        methods: {
-            handleSizeChange(val) {
-                this.pageSize = val
-                this.getTableData()
-            },
-            handleCurrentChange(val) {
-                this.currentPage = val
-                this.getTableData()
-            },
-            handlePartyChange(val) {
-                this.searchForm.partyOrgId = val[val.length - 1]
-            },
-            handleFilterSpan(row, item) {
-                let _val = ''
-                if (item.options && item.options.length > 0) {
-                    item.options.forEach((n) => {
-                        if (n.value === row[item.columnName]) _val = n.label
-                    })
-                }
-                return _val || row[item.columnName]
-            },
-            handleTimeChange(val) {
-                if (val.length > 0) {
-                    this.searchForm.rdsjStartDate = val[0]
-                    this.searchForm.rdsjEndDate = val[1]
-                } else {
-                    this.searchForm.rdsjStartDate = ''
-                    this.searchForm.rdsjEndDate = ''
-                }
-
-            },
-            handleTimeChangePay(val) {
-                if (val.length > 0) {
-                    this.searchForm.payStatrDate = val[0]
-                    this.searchForm.payEndDate = val[1]
-                } else {
-                    this.searchForm.payStatrDate = ''
-                    this.searchForm.payEndDate = ''
-                }
-
-            },
-            // 上传大图标成功
-            handleExcelSuccess(res, file) {
-                if (res.code === 0 && res.msg === 'success') {
-
-                } else {
-                    this.$message.error(res.msg)
-                }
-            },
-            handleProgress(event, file, fileList) {
-                this.uploading = true
-                this.unloadPencent = Number(file.percentage.toFixed(0))
-            },
-            download(data, fileName) {
-                if (!data) {
-                    return
-                }
-                var csvData = new Blob([data])
-                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-                    window.navigator.msSaveOrOpenBlob(csvData, fileName)
-                }
-                else {
-                    var a = document.createElement('a')
-                    document.body.appendChild(a)
-                    a.style = 'display: none'
-                    var url = window.URL.createObjectURL(csvData)
-                    a.href = url
-                    a.download = fileName
-                    a.click()
-                    a.remove()
-                    window.URL.revokeObjectURL(url)
-                }
-            },
-            async getServiceType(){
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/serviceTypePage'
-                let params = {
-                    pageNo: 1,
-                    pageSize: 10000
-                }
-                await this.$http
-                    .post(url, params)
-                    .then(({ data: res }) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg);
-                        } else {
-                            this.serviceTypeList = res.data.list
-                            console.log('serviceTypeList:',this.serviceTypeList)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error("网络错误");
-                    });
-            },
-            async handleExportModule() {
-                let url = "/resi/partymember/icPartyMember/downloadTemplate"
-                let params = {}
-                await this.$http({
-                    method: 'POST',
-                    url,
-                    responseType: 'blob',
-                    data: params
-                })
-                    .then(res => {
-                        console.log('res-------dd', res)
-                        if (res.headers["content-disposition"]) {
-                            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-                            this.download(res.data, fileName)
-
-                        } else this.$message.error('下载失败')
-                    })
-                    .catch(err => {
-                        console.log('err', err)
-                        return this.$message.error('网络错误')
-                    })
-            },
-            beforeExcelUpload(file) {
-                console.log('file', file)
-                const isType = file.type === 'application/vnd.ms-excel'
-                const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-                const fileType = isType || isTypeComputer
-                const isLt1M = (file.size / 1024 / 1024) < 10
-                if (!fileType) {
-                    this.$message.error('上传文件只能是xls/xlsx格式！')
-                }
-
-                if (!isLt1M) {
-                    this.$message.error('上传文件大小不能超过 10MB!')
-                }
-                return fileType && isLt1M
-            },
-            async uploadHttpRequest(file) {
-                this.importLoading = true
-                this.importBtnTitle = '正在上传中...'
-                this.$message({
-                    showClose: true,
-                    message: '导入中，请到系统管理-导入记录中查看进度',
-                    duration: 0
-                })
-                const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-                formData.append('file', file.file) //添加文件对象
-                this.$http
-                    .post('/resi/partymember/icPartyMember/import', formData).then(res => {
-                    console.log('res-up', res)
-                    if (res.data.code == 0 && res.data.msg == 'success') {
-                        // this.$message.success('导入成功')
-                        this.getTableData()
-                    } else {
-                        this.$message.error(res.data.msg)
-                    }
-                }).catch(err => {
-                    console.log('失败', err)
-                    file.onError() //上传失败的文件会从文件列表中删除
-                    // this.$message.error('导入失败')
-                })
-
-                this.importLoading = false
-                this.importBtnTitle = '导入'
-                this.$refs.upload.clearFiles()
-            },
-            async handleExport() {
-                this.exportBtn = true
-                this.exportBtnTitle = '正在导出...'
-                let params = {
-                    agencyId: this.$store.state.user.agencyId,
-                    pageSize: 9999,
-                    pageNo: this.currentPage
-                }
-                // .post('epmetuser/icresiuser/exportExcel', params)
-                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate'
-                await axios({
-                    // url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icPartyMember/export',
-                    url: url,
-                    // url: 'epmetuser/icresiuser/exportExcel',
-                    method: 'post',
-                    data: params,
-                    responseType: 'blob'
-                })
-                    .then(res => {
-                        console.log('resllll', 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)
-                        this.$message.error('获取导出失败')
-                    })
-                this.exportBtn = false
-                this.exportBtnTitle = '导出'
-            },
-            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
-            },
-            handleImgSuccess(res, file) {
-                if (res.code === 0 && res.msg === 'success') {
-
-                    console.log('res.data.url', res.data.url)
-                    this.uploading = false
-                    this.unloadPencent = 0
-                    this.form.imageList.push(res.data.url)
-
-                } else {
-                    this.$message.error(res.msg)
-                }
-            },
-            handleDelimg(item, index) {
-                this.form.imageList.splice(index, 1)
-            },
-            handleSearch(val) {
-                console.log('searchhh--', val)
-                this.currentPage = 1
-                this.getTableData()
-            },
-            resetForm(formName) {
-                this.timeRangePay = []
-                this.timeRange = []
-                this.searchForm.payStatrDate = ''
-                this.searchForm.payEndDate = ''
-                this.searchForm.rdsjStartDate = ''
-                this.searchForm.rdsjEndDate = ''
-                this.$refs[formName].resetFields()
-                this.handleSearch()
-            },
-            handleAdd() {
-                this.dialogVisible = true
-            },
-
-            handlerCancle() {
-                this.detailInfo = {}
-                this.disabled = false
-                this.dialogVisible = false
-            },
-            async handleLook(row) {
-                this.disabled = true
-                this.$nextTick(() => {
-                    this.$refs.ref_detail.initForm(row)
-                })
-                // await this.getDetail(row.applicantId)
-            },
-            async handleEdit(row, addType) {
-                await this.getDetail(row.id)
-                this.dialogVisible = true
-            },
-
-            handleDel(row) {
-                let params = {
-                    ids: [row.applicantId]
-                }
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete'
-                // let url = '/heart/workdiaryService/record/delete'
-                this.$http
-                    .post(url, params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.$message.success('删除成功')
-                            this.getTableData()
-                        }
-                    })
-                    .catch((err) => {
-                        return this.$message.error('网络错误')
-                    })
-            },
-            async getDetail(id) {
-                let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/'
-                // let url = '/heart/workdiaryService/record/'
-                this.$http
-                    .post(url+id)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.workLogDetail = {...res.data}
-                            this.dialogVisible = true
-                        }
-                    })
-                    .catch((err) => {
-                        console.log('row4', err)
-                        return this.$message.error('网络错误')
-                    })
-            },
-            /*async getGridList(type, agencyId) {
-                const {user} = await this.$store.state
-                console.log('user---ppp', user)
-                // addorupdate  query
-                await this.$http
-                    .get('/resi/partymember/icPartyOrg/getSearchTreelist', {params: {agencyId: agencyId || user.agencyId}})
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            console.log('获取查询详情成功', res.data)
-
-                            this.optionsG = this.deepArrTOnull(res.data)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-            },*/
-          async getGridList (type, agencyId) {
-            const { user } = await this.$store.state;
-            await this.$http
-                    .post("/gov/org/customergrid/gridoption", {
-                      agencyId: agencyId || user.agencyId,
-                      purpose: type,
-                    })
-                    .then(({ data: res }) => {
-                      if (res.code !== 0) {
-                        return this.$message.error(res.msg);
-                      } else {
-                        if (type === "query") this.optionsG = res.data;
-                        else this.optionsEditG = res.data;
-                      }
-                    })
-                    .catch(() => {
-                      return this.$message.error("网络错误");
-                    });
-          },
-            deepArrTOnull(arr) {
-                let a = []
-                a = arr.map(item => {
-                    return {
-                        ...item,
-                        children: (item.children.length > 0 && this.deepArrTOnull(item.children)) || null
-                    }
-                })
-                return a
-            },
-            async getCateList(type) {
-                const {user} = await this.$store.state
-                console.log('user---ppp', user)
-                const params = {
-                    customerId: this.customerId,
-                    type
-                }
-                // addorupdate  query
-                await this.$http
-                    .post('/resi/partymember/stylecategorydict/select-list', params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            console.log('获取查询详情成功', res.data)
-
-                            if (type === 'query') this.optionsC = res.data
-                            else this.optionsEditC = res.data
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-            },
-            async getTableData() {
-                this.tableLoading = true
-                const {user} = await this.$store.state
-                let params = {
-                    ...this.searchForm,
-                    pageNo: this.currentPage,
-                    pageSize: this.pageSize
-                }
-                const url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page'
-                await this.$http
-                    // .post('/resi/partymember/icPartyMember/page', params)
-                    .post(url, params)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        } else {
-                            this.tableData = res.data.list
-                            this.total = res.data.total
-                            console.log(this.tableData)
-                        }
-                    })
-                    .catch(() => {
-                        return this.$message.error('网络错误')
-                    })
-                this.tableLoading = false
-            }
-
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-    @import "@/assets/scss/buttonstyle.scss";
-
-    .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-table {
-        ::v-deep .el-button--text {
-            text-decoration: underline;
-        }
-
-        ::v-deep .btn-color-del {
-            margin-left: 10px;
-            color: rgba(213, 16, 16, 1);
-        }
-
-        ::v-deep .btn-color-edit {
-            color: rgba(0, 167, 169, 1);
-        }
-    }
-
-    .form-wr {
-        .input-width {
-            width: 260px;
-
-        }
-
-        .input-width-textarea {
-            width: 500px;
-        }
-
-        .imsg-list {
-            display: flex;
-            align-items: center;
-
-            .imgs-item {
-                position: relative;
-                margin-right: 10px;
-
-                .el-icon-delete {
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    font-size: 18px;
-                    color: red;
-                    z-index: 3;
-                    cursor: pointer;
-                }
-            }
-        }
-    }
-
-    .div-content {
-        width: 100%;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-</style>
-
-<style lang="scss" scoped>
-    .resi-row-btn {
-        display: flex;
-        margin-bottom: 13px;
-        ::v-deep .el-button {
-            margin-left: 10px;
-            border: 0;
-        }
-        ::v-deep .el-select {
-            margin-right: 10px;
-        }
-        .el-button--success {
-            background: rgba(34, 193, 195, 1);
-        }
-        .el-button {
-            /*margin-right: 10px;*/
-            border: 0;
-        }
-        .el-button--warning {
-            background: rgba(254, 179, 73, 1);
-        }
-        .el-button--danger {
-            background: rgba(254, 98, 82, 1);
-        }
-    }
-    .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;
-        }
-    }
-    .resi-btns {
-        margin-top: 20px;
-        text-align: center;
-    }
-</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
new file mode 100644
index 000000000..17f0079c2
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -0,0 +1,762 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select v-model="workLog.gridId"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in optionsG"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="服务类型"
+                        prop="serviceType">
+            <el-select v-model="workLog.serviceType"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in serviceTypeList"
+                         :key="item.id"
+                         :label="item.serviceTypeName"
+                         :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="申请人"
+                        prop="applicantName">
+            <el-input v-model="workLog.applicantName"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="住址"
+                        prop="applicantAddress">
+            <el-input v-model="workLog.applicantAddress"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="服务内容"
+                        prop="serviceContent">
+            <el-input v-model="workLog.serviceContent"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        prop="applicantMobile">
+            <el-input v-model="workLog.applicantMobile"
+                      class="item_width_1"
+                      clearable
+                      size="small"
+                      placeholder="请输入内容">
+            </el-input>
+          </el-form-item>
+          <el-button style="margin-left:10px"
+                     class="diy-button--search"
+                     size="small"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     class="diy-button--reset"
+                     size="small"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @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"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     class="diy-button--delete"
+                     size="small">导入</el-button>
+        </el-upload>
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="gridName"
+                         header-align="center"
+                         align="center"
+                         label="场所名称"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="serviceTypeName"
+                         header-align="center"
+                         align="center"
+                         label="服务类型"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="applicantName"
+                         header-align="center"
+                         align="center"
+                         label="申请人"
+                         show-overflow-tooltip
+                         max-width="100">
+        </el-table-column>
+        <el-table-column prop="applicantAddress"
+                         header-align="center"
+                         align="center"
+                         label="住址"
+                         width="80">
+        </el-table-column>
+        <el-table-column prop="serviceContent"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="服务内容"
+                         mix-width="230">
+        </el-table-column>
+        <el-table-column prop="applicantMobile"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="联系电话"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="principalName"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="责任人"
+                         width="130">
+        </el-table-column>
+        <el-table-column prop="serviceTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="服务时间"
+                         width="130">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         width="130">
+        </el-table-column>
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="200"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[10, 20, 50]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               :destroy-on-close="true"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="editDiaClose">
+      <ggfw-form ref="ref_form"
+                 :typeList="typeList"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></ggfw-form>
+    </el-dialog>
+
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <ggfw-detail ref="ref_detail"
+                   @diaClose="diaClose"></ggfw-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import workLogForm from './workLogForm'
+import workLogDetail from './workLogDetail'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      agencyId: '',
+
+      unitList: [],//单位list
+      serviceList: [],//服务list
+      typeList: [],//分类list
+      formData: {
+        name: '',
+        category: ''
+      },
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增单位',
+      detailShow: false,
+
+      //完成情况
+      finishDiaTitle: '区域化党建单位完成情况',
+      finishDiaShow: false,
+      //积分记录
+      scoreDiaTitle: '积分记录',
+      scoreDiaShow: false,
+
+      files: "",
+      fileName: "",
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/icPublicService/import',
+      optionsG: [],
+      optionsEditG: [],
+      workLog: {
+        gridId: '',
+        serviceType: '',
+        applicantName: '',
+        applicantAddress: '',
+        applicantMobile: '',
+        serviceContent: ''
+      },
+      serviceTypeList: [],
+
+    }
+  },
+  components: {
+    workLogDetail, workLogForm
+  },
+  async created () {
+    this.getGridList("query");
+    this.getServiceTypeList();
+  },
+  async mounted () {
+    //获取服务事项
+    await this.loadService()
+
+    //获取分类
+    await this.loadType()
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+    async getGridList (type, agencyId) {
+      const { user } = await this.$store.state;
+      await this.$http
+              .post("/gov/org/customergrid/gridoption", {
+                agencyId: agencyId || user.agencyId,
+                purpose: type,
+              })
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  console.log("获取查询详情成功", res.data);
+
+                  if (type === "query") this.optionsG = res.data;
+                  else this.optionsEditG = res.data;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
+    async getServiceTypeList () {
+      let url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/serviceType/page'
+      // let url = '/heart/workdiaryService/serviceType/page'
+      let params = {
+        pageNo: 1,
+        pageSize: 10000
+      }
+      await this.$http
+              .post(url, params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                } else {
+                  this.serviceTypeList = res.data.list;
+                }
+              })
+              .catch(() => {
+                return this.$message.error("网络错误");
+              });
+    },
+    async handleExportModule () {
+      // let url = "/heart/workdiaryService/record/downloadTemplate";
+      let url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/downloadTemplate";
+
+      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("网络错误");
+        });
+    },
+
+    //获取服务事项下拉框
+    async loadService () {
+      const url = "/gov/org/coverage/dict-select-list/public_service"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
+      let params = {
+        // parentCategoryCode: '1010'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.serviceList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    //获取分类
+    async loadType () {
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'party_unit_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.typeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/gov/org/icPublicService/list"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/page"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.workLog
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    editDiaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+    diaClose () {
+      this.detailShow = false
+      this.finishDiaShow = false
+      this.scoreDiaShow = false
+    },
+
+    handleDetail (row) {
+      this.detailShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    //完成情况
+    handleFinish (row) {
+      this.finishDiaTitle = row.name + '完成情况'
+      this.finishDiaShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_finish.initTable(row)
+      })
+    },
+    //积分记录
+    handleScore (row) {
+      this.scoreDiaShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_score.initForm(row.icPublicServiceId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = 'edit'
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.icPublicServiceId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteUnit(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteUnit (row) {
+      // const url = "/heart/workdiaryService/record/delete"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/delete"
+      let params = {
+        ids: [row.applicantId]
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        name: '',
+        category: ''
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '工作日志'
+
+      // const url = "/heart/workdiaryService/record/export"
+      const url = "http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/export"
+      let params = {
+        ...this.workLog
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      this.loading = true
+
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      // var url = '/heart/workdiaryService/record/import'
+      var url = 'http://yapi.elinkservice.cn/mock/245/heart/workdiaryService/record/import'
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      const { data, code, msg } = await requestPost(url, fileFormData)
+      if (code === 0) {
+        this.$message({
+          showClose: true,
+          message: "导入中，请到系统管理-导入记录中查看进度",
+          duration: 0,
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 350 + this.iframeHeight : this.clientHeight - 350
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_main {
+  width: 100%;
+}
+
+.div_search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 30px 20px 5px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+}
+
+.item_width_1 {
+  width: 260px;
+}
+.item_width_2 {
+  width: 620px;
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  // padding: 23px 30px 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
diff --git a/src/views/modules/communityService/worklog/workLogDetail.vue b/src/views/modules/communityService/worklog/workLogDetail.vue
index a8dc01dc2..917d571be 100644
--- a/src/views/modules/communityService/worklog/workLogDetail.vue
+++ b/src/views/modules/communityService/worklog/workLogDetail.vue
@@ -4,120 +4,65 @@
 
       <el-form ref="ref_form"
                :inline="true"
-               :model="workLogDetail"
+               :model="formData"
                class="form">
 
-        <el-form-item label="需求类型"
-                      prop="serviceType">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.serviceTypeName"
-                    :disabled="disabled"
-                    class="input-width-min"></el-input>
-          <el-cascader v-else
-                       v-model="workLogDetail.serviceType"
-                       :options="demandOptions"
-                       :disabled="disabled"
-                       clearable
-                       class="input-width"
-                       @change="handleCateSlect"></el-cascader>
+        <el-form-item label="服务类型"
+                      prop="serviceTypeName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.serviceTypeName}}</span>
+
         </el-form-item>
         <el-form-item label="所属网格"
-                      prop="gridId">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.gridName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
-          <el-select v-else
-                     v-model="workLogDetail.gridId"
-                     filterable
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable
-                     :disabled="disabled"
-                     @change="handleGridChange">
-            <el-option v-for="item in disabled ? optionsG : optionsEditG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="上报类型"
-                      prop="reportType">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.reportTypeName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
+                      prop="gridName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.gridName}}</span>
+
         </el-form-item>
         <el-form-item label="申请人"
-                      prop="applicantName">
-          <el-input v-model="workLogDetail.applicantName"
-                    :disabled="disabled"
-                    placeholder="请输入"
-                    class="input-width"
-                    clearable></el-input>
+                      prop="applicantName"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.areaCovered}}</span>
+
+        </el-form-item>
+        <el-form-item label="住址"
+                      prop="capacity"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantAddress}}</span>
         </el-form-item>
-        <el-form-item label="上报人手机号"
-                      prop="reportUserMobile">
-          <el-input v-model="workLogDetail.reportUserMobile"
-                    :disabled="disabled"
-                    placeholder="请输入"
-                    class="input-width"
-                    maxlength="11"
-                    clearable></el-input>
+        <el-form-item label="服务内容："
+                      prop="principal"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantContent}}</span>
         </el-form-item>
-        <el-form-item label="上报时间"
-                      prop="reportTime">
-          <el-date-picker v-model="workLogDetail.reportTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
-          </el-date-picker>
+        <el-form-item label="联系电话："
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.applicantMobile}}</span>
         </el-form-item>
-        <el-form-item label="需求人"
-                      prop="demandUserId">
-          <el-input v-if="disabled"
-                    v-model="workLogDetail.demandUserName"
-                    :disabled="disabled"
-                    class="input-width"></el-input>
-          <el-select v-else
-                     v-model="selectDemandUser"
-                     class="input-width"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     clearable
-                     @change="handleDemandChange">
-            <el-option v-for="item in demandUserList"
-                       :key="item.demandUserId"
-                       :label="item.label"
-                       :value="item">
-            </el-option>
-          </el-select>
+        <el-form-item label="负责人："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.principalName}}</span>
         </el-form-item>
-        <el-form-item label="服务时间"
-                      prop="wantServiceTime">
-          <el-date-picker v-model="workLogDetail.wantServiceTime"
-                          type="datetime"
-                          class="input-width"
-                          clearable
-                          :disabled="disabled"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
-          </el-date-picker>
+        <el-form-item label="服务时间："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.serviceTime}}</span>
         </el-form-item>
-        <el-form-item label="需求内容"
-                      prop="content">
-          <el-input v-model="workLogDetail.content"
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                    :disabled="disabled"
-                    type="textarea"
-                    clearable
-                    class="input-width-textarea"
-                    placeholder="请输入内容"></el-input>
+        <el-form-item label="备注："
+                      style="display: block"
+                      prop="address"
+                      label-width="150px">
+          <span>{{formData.remark}}</span>
         </el-form-item>
       </el-form>
 
@@ -125,7 +70,6 @@
     <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-
     </div>
   </div>
 </template>
@@ -134,9 +78,6 @@
 
 import { Loading } from 'element-ui' // 引入Loading服务
 
-var map
-var search
-var markers
 var infoWindowList
 var geocoder // 新建一个正逆地址解析类
 
@@ -144,12 +85,11 @@ let loading // 加载动画
 export default {
   data () {
     return {
-      workLogDetail: {},
+      formData: {},
     }
   },
   components: {},
   mounted () {
-    this.initMap()
   },
 
   methods: {
diff --git a/src/views/modules/communityService/worklog/workLogForm.vue b/src/views/modules/communityService/worklog/workLogForm.vue
new file mode 100644
index 000000000..6765d69e9
--- /dev/null
+++ b/src/views/modules/communityService/worklog/workLogForm.vue
@@ -0,0 +1,467 @@
+<template>
+  <div>
+
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+
+        <el-form-item label="场所名称"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入场所名称"
+                    v-model="formData.name">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="场所类型"
+                      prop="category"
+                      label-width="150px"
+                      style="display: block">
+          <el-select class="item_width_1"
+                     v-model="formData.category"
+                     placeholder="请选择"
+                     filterable
+                     clearable>
+            <el-option v-for="item in serviceList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="占地面积"
+                      style="display: block"
+                      prop="areaCovered"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="formData.areaCovered"
+                           :precision="2"
+                           :step="0.01"
+                           :min="0"
+                           :max="9600000"
+                           label="占地面积"></el-input-number>平方公里
+        </el-form-item>
+        <el-form-item label="容纳人数"
+                      style="display: block"
+                      prop="capacity"
+                      label-width="150px">
+          <el-input-number class="item_width_4"
+                           v-model="formData.capacity"
+                           :min="0"
+                           :max="9999"
+                           label="容纳人数"></el-input-number>
+        </el-form-item>
+
+        <el-form-item label="负责人"
+                      style="display: block"
+                      label-width="150px"
+                      prop="principal">
+          <el-input v-model="formData.principal"
+                    class="item_width_1"
+                    placeholder="请输入负责人姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话"
+                      style="display: block"
+                      label-width="150px"
+                      prop="mobile">
+          <el-input v-model="formData.mobile"
+                    class="item_width_1"
+                    placeholder="请输入联系电话"></el-input>
+        </el-form-item>
+        <el-form-item label="地址"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <div class="item_width_1">
+            <el-input style="width:420px"
+                      :placeholder="'请输入所在地址'"
+                      v-model="formData.address">
+            </el-input>
+            <el-button style="margin-left: 10px"
+                       type="default"
+                       size="small"
+                       @click="handleSearchMap">查询</el-button>
+            <div id="app"
+                 class="div_map"></div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 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'
+
+
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      icPublicServiceId: '',
+      keyWords: '',
+      formData: {
+        name: '',//场所名称
+        category: '',
+        areaCovered: '',//占地面积
+        capacity: '',//容纳人数
+        address: '', //详细地址
+        longitude: 36.0722275, //经度
+        latitude: 120.38945519, //纬度
+        principal: '',
+        mobile: ''
+      },
+      serviceList: [],//服务list
+      publicServiceData: {},
+    }
+  },
+  components: {},
+  mounted () {
+  },
+
+  methods: {
+
+    async initForm (type, icPublicServiceId) {
+      this.startLoading()
+      this.$refs.ref_form.resetFields();
+
+      //获取服务事项
+      await this.loadService()
+
+      this.formType = type
+      if (icPublicServiceId) {
+        this.icPublicServiceId = icPublicServiceId
+        this.formData.icPublicServiceId = icPublicServiceId
+        await this.loadFormData()
+      } else {
+        // map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
+        // this.setMarker(36.0722275, 120.38945519)
+      }
+
+      this.endLoading()
+
+    },
+
+    //获取服务事项下拉框
+    async loadService () {
+      const url = "/gov/org/coverage/dict-select-list/public_service"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/public_service"
+      let params = {
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.serviceList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      const url = '/gov/org/icPublicService/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail'
+      let params = {
+        icPublicServiceId: this.icPublicServiceId
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log(data)
+        if (null != data) {
+          data: this.publicServiceData
+        }
+
+        this.formData = { ...data }
+        // let { latitude, longitude } = this.$store.state.user;
+        // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude;
+        // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude;
+        if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== '') {
+          map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
+          this.setMarker(this.formData.latitude, this.formData.longitude)
+        }
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addUnit()
+        }
+
+      })
+
+
+    },
+    async addUnit () {
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/org/icPublicService/add'
+      } else {
+        url = '/gov/org/icPublicService/edit'
+      }
+      const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(internalMsg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(latitude, longitude);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('app'), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45 // 设置地图旋转角度
+      })
+
+      search = new window.TMap.service.Search({ pageSize: 10 })
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: []
+      })
+      infoWindowList = Array(10)
+
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      // this.handleMoveCenter()
+      this.convert()
+    },
+
+    setMarker (lat, lng) {
+      markers.setGeometries([])
+      markers.add([
+        {
+          id: '4',
+          styleId: 'marker',
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: 'marker4'
+          }
+        }
+      ])
+    },
+
+    handleSearchMap () {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close()
+      })
+      infoWindowList.length = 0
+      markers.setGeometries([])
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.formData.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.formData.latitude = lat
+            this.formData.longitude = lng
+            this.convert()
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.formData.latitude = lat
+      this.formData.longitude = lng
+      this.setMarker(lat, lng)
+      this.convert(lat, lng)
+    },
+
+    convert (lat, lng) {
+      markers.setGeometries([]);
+      // var input = document.getElementById('location').value.split(',');
+      let location
+      if (lat && lng) {
+        location = new TMap.LatLng(lat, lng);
+      } else {
+        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+      }
+
+      // map.setCenter(location);
+      markers.updateGeometries([
+        {
+          id: 'main', // 点标注数据数组
+          position: location,
+        },
+      ]);
+      geocoder
+        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
+        .then((result) => {
+          console.log(this.formData)
+          // this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
+          this.formData.address = this.formData.address !== '' && this.formData.address !== null && (this.formData.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address
+          // 显示搜索到的地址
+        });
+    },
+
+
+    resetData () {
+      this.icPublicServiceId = ''
+      this.keyWords = ''
+      this.formData = {
+        name: '',
+        category: '',
+        areaCovered: '',
+        capacity: '',
+        address: '', //详细地址
+        longitude: '', //经度
+        latitude: '' //纬度
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+
+        name: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' },
+        ],
+        category: [
+          { required: true, message: '场所类别不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '地址不能为空', trigger: 'blur' }
+        ],
+        /*longitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ],
+        latitude: [
+          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        ]*/
+      }
+    },
+
+  },
+  props: {
+
+    typeList: {
+      type: Array,
+      default: []
+    },
+
+  }
+}
+</script>
+<style scoped>
+.div_map {
+  position: relative;
+}
+.div_searchmap {
+  z-index: 5000;
+  position: absolute;
+  top: 5px;
+  left: 5px;
+}
+</style>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>

From f6a88767966d13be00a818b1c69cb8cf310cc9c9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 15:07:50 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/shzz/cpts/edit.vue       | 10 ++--
 .../modules/communityService/shzz/index.vue   | 53 ++++++++++++++++---
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index bcd5c95be..8acdd3a6e 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -31,7 +31,7 @@
                        :on-progress="handleProgress"
                        :on-success="handleImgSuccess"
                        :before-upload="beforeImgUpload"
-                       accept=".jpg,.jpeg,.png,.gif,.bmp,.pdf,.JPG,.JPEG,.PBG,.GIF,.BMP">
+                       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>
 
@@ -71,7 +71,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item
+<!--        <el-form-item
             label="负责人姓名	"
             prop="personInCharge"
             label-width="150px"
@@ -85,7 +85,7 @@
               v-model="dataForm.personInCharge"
           >
           </el-input>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item
             label="服务电话	"
@@ -273,9 +273,9 @@ export default {
         serviceMatters: [
           {required: true, message: "服务内容不能为空", trigger: "blur"},
         ],
-        personInCharge: [
+        /*personInCharge: [
           {required: true, message: "负责人姓名不能为空", trigger: "blur"},
-        ],
+        ],*/
         /*adminStaffId: [
           { required: true, message: "绑定管理员不能为空", trigger: "blur" },
         ],*/
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a50590d92..a130cf446 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -21,7 +21,7 @@
               </div>
             </el-col>
 
-            <el-col :span="8">
+<!--            <el-col :span="8">
               <div class="resi-cell">
                 <div class="resi-cell-label">负责人</div>
                 <div class="resi-cell-value"
@@ -34,11 +34,11 @@
                   </el-input>
                 </div>
               </div>
-            </el-col>
+            </el-col>-->
 
             <el-col :span="8">
               <div class="resi-cell">
-                <div class="resi-cell-label">联系电话</div>
+                <div class="resi-cell-label">服务电话</div>
                 <div class="resi-cell-value"
                      :class="'resi-cell-value-radio'">
                   <el-input v-model="fmData.mobile"
@@ -90,6 +90,10 @@
         <el-button type="success"
                    size="small"
                    @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"
@@ -127,9 +131,9 @@
         <el-table-column prop="serviceMatters"
                          label="服务内容">
         </el-table-column>
-        <el-table-column prop="personInCharge"
+<!--        <el-table-column prop="personInCharge"
                          label="负责人">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="mobile"
                          label="服务电话"> </el-table-column>
         <el-table-column prop="serviceTimeStr"
@@ -302,7 +306,7 @@ export default {
       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",
@@ -455,6 +459,43 @@ export default {
 
       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>

From 1dabe36d7b6439d99aa7f14e2be2bc234332ed7e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 15:28:44 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/workLog/list.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/modules/workSys/workLog/list.vue b/src/views/modules/workSys/workLog/list.vue
index 453a46bbb..f53cc086c 100644
--- a/src/views/modules/workSys/workLog/list.vue
+++ b/src/views/modules/workSys/workLog/list.vue
@@ -202,12 +202,7 @@ export default {
         type: 'warning'
       }).then(() => {
         const url = '/heart/workdiaryService/serviceType/delete'
-        // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/gov/issue/issueprojectcategorydict/delcategory'
-        const param = {
-          customerId: this.customerId,
-          ids: [row.id]
-        }
-        window.app.ajax.post(url, param,
+        window.app.ajax.post(url, [row.id],
           (data, rspMsg) => {
             this.$message.success('操作成功')
             this.loadData()

From e2f43eabaac7728ff408e5451edc64ab49ce90fc Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:03:56 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/cpts/edit.vue      | 12 +++++++++---
 src/views/modules/communityService/shzz/index.vue    |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 8acdd3a6e..993ca6ab8 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -294,6 +294,7 @@ export default {
   props: {},
   watch: {
     "dataForm.serviceTime": function (val) {
+      console.log("watch start"+val+'_'+Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.serviceStartTime = val[0];
         this.dataForm.serviceEndTime = val[1];
@@ -440,7 +441,7 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-
+      console.log("======loadAgency")
       const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {
@@ -490,6 +491,7 @@ export default {
     },
 
     async submit() {
+
       let url = "";
       if (this.formType === "add") {
         url = "/heart/societyorg/add";
@@ -522,6 +524,9 @@ export default {
     },
     resetData() {
       this.societyId = ""; //小区ID
+      this.$refs.ref_form.resetFields();
+      this.propertyFormShow = false;
+     /*
       this.dataForm = {
         societyName: "",
         serviceMatters: "",
@@ -534,8 +539,9 @@ export default {
         address: "",
         longitude: "",
         latitude: "",
-      };
-      this.propertyFormShow = false;
+        imageList:[]
+      };*/
+
     },
     // 开启加载动画
     startLoading() {
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a130cf446..333e082db 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -258,6 +258,7 @@ export default {
   },
   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];

From 10c6828e70dd3e72ff9c8a581505dcf998c32008 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:10:56 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 333e082db..e9a6c504d 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -114,7 +114,7 @@
 
         <el-button @click="handleChu"
                    type="danger"
-                   size="small">excel导出</el-button>
+                   size="small">导出</el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -242,7 +242,7 @@ export default {
         serviceTimeStr: "",
       },
 
-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
       importLoading: false,
 
       //积分记录

From c818dd6114a122794f5187a89745f739f648bbf0 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 24 Aug 2022 16:26:53 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/index.vue   | 281 ++++++++++--------
 1 file changed, 162 insertions(+), 119 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index e9a6c504d..46c1405c9 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -21,20 +21,20 @@
               </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.personInCharge"
+                                        class="resi-cell-input"
+                                        size="small"
+                                        clearable
+                                        placeholder="请输入">
+                              </el-input>
+                            </div>
+                          </div>
+                        </el-col>-->
 
             <el-col :span="8">
               <div class="resi-cell">
@@ -50,9 +50,7 @@
                 </div>
               </div>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <div class="resi-cell">
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value"
@@ -63,23 +61,40 @@
                             clearable
                             placeholder="请输入">
                   </el-input>
-<!--                  <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-col :span="24">
+                        <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>
+          &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>&ndash;&gt;
+                          </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>
+                       @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"
@@ -108,13 +125,15 @@
           <el-button type="warning"
                      size="small"
                      :loading="importLoading">{{
-            importBtnTitle
-          }}</el-button>
+              importBtnTitle
+            }}
+          </el-button>
         </el-upload>
 
         <el-button @click="handleChu"
                    type="danger"
-                   size="small">导出</el-button>
+                   size="small">导出
+        </el-button>
       </div>
       <el-table :data="tableData"
                 border
@@ -124,23 +143,23 @@
         <el-table-column label="序号"
                          type="index"
                          align="center"
-                         width="50" />
+                         width="50"/>
         <el-table-column prop="societyName"
                          label="组织名称">
         </el-table-column>
         <el-table-column prop="serviceMatters"
                          label="服务内容">
         </el-table-column>
-<!--        <el-table-column prop="personInCharge"
-                         label="负责人">
-        </el-table-column>-->
+        <!--        <el-table-column prop="personInCharge"
+                                 label="负责人">
+                </el-table-column>-->
         <el-table-column prop="mobile"
-                         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>-->
+                         label="服务时间"></el-table-column>
+        <!--        <el-table-column prop="score"
+                                 width="80"
+                                 label="积分"> </el-table-column>-->
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
@@ -148,16 +167,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)"
@@ -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>
@@ -210,16 +232,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,
 
@@ -251,14 +273,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))
+      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];
@@ -268,28 +290,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) {
@@ -301,7 +323,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    uploadHttpRequest (file) {
+    uploadHttpRequest(file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
@@ -312,55 +334,55 @@ export default {
         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 = "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);
+          });
       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 () {
+    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",
@@ -371,50 +393,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,
       });
 
@@ -426,10 +448,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,
@@ -438,29 +460,29 @@ 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 () {
+    async handleExportModule() {
       let url = "/heart/societyorg/import-template-download";
 
       let params = {};
@@ -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;
   }

From 989cf77b313f5a4715400e4cb31aa7e812d65bae Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 25 Aug 2022 16:50:31 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E9=A1=B5=20=E4=B8=8B=E6=8B=89=E6=94=AF=E6=8C=81=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 842806954..abff9a4ea 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -48,6 +48,7 @@
                   v-model.trim="form.VILLAGE_ID"
                   placeholder="请选择小区"
                   size="small"
+                  filterable
                   clearable
                   class="resi-cell-select"
                   @clear="handleClearVillage"
@@ -65,6 +66,7 @@
                   v-model.trim="form.BUILD_ID"
                   placeholder="楼号"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"
@@ -85,6 +87,7 @@
                   :disabled="changeBDisabled"
                   placeholder="单元"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"
@@ -104,6 +107,7 @@
                   :disabled="changeDDisabled"
                   placeholder="房号"
                   size="small"
+                  filterable
                   clearable
                   style="width: 120px;"
                   class="resi-cell-select"

From ec944c3e24e059b22d20d3156f8ef5845d509773 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:11:41 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/index.vue   | 179 ++++++++----------
 1 file changed, 78 insertions(+), 101 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 46c1405c9..fe7fe4566 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -1,108 +1,85 @@
 <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-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-col :span="24">
-                        <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>
-          &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>&ndash;&gt;
-                          </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="searchForm" :inline="true" :model="searchForm" 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('searchForm')">重置</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>

From 9631254a94b3fe60ec3aafc1ba023cff206f49ba Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:19:49 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index fe7fe4566..a21c87ebb 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -318,7 +318,7 @@ export default {
 
             this.getTableData();
             if (res.data.code == 0) {
-              return this.$message.success(res.data.data || '导入成功');
+              return this.$message.success(res.data.data || '导入中，请到系统管理-导入记录中查看进度');
             } else {
               return this.$message.error(res.data.msg);
             }

From 25934a91a4d54ffc5b7031290346fca2dd94bb74 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:41:32 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/cpts/edit.vue | 2 ++
 src/views/modules/communityService/shzz/index.vue     | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 993ca6ab8..92802a0ba 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -402,12 +402,14 @@ export default {
         this.uploading = false
         this.unloadPencent = 0
         this.dataForm.imageList.push(res.data.url)
+        console.log('handleImgSuccess after',this.dataForm.imageList)
       } else {
         this.$message.error(res.msg)
       }
     },
     handleDelimg(item, index) {
       this.dataForm.imageList.splice(index, 1)
+      console.log('handleDelimg after',this.dataForm.imageList)
     },
     handleMoveCenter() {
       //修改地图中心点
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index a21c87ebb..0b2d8729d 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card class="resi-card">
       <div class="">
-        <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
+        <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>
@@ -14,7 +14,7 @@
           </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('searchForm')">重置</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('fmData')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -349,7 +349,10 @@ export default {
       this.pageNo = 1;
       this.getTableData();
     },
-
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
     async handleAdd() {
       this.formShow = true;
       await nextTick();

From 32fd9bfae7496d30886ea8546b616e6a6552e530 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 14:42:18 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/cpts/edit.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
index 92802a0ba..f92de0974 100644
--- a/src/views/modules/communityService/shzz/cpts/edit.vue
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -294,7 +294,6 @@ export default {
   props: {},
   watch: {
     "dataForm.serviceTime": function (val) {
-      console.log("watch start"+val+'_'+Array.isArray(val))
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.serviceStartTime = val[0];
         this.dataForm.serviceEndTime = val[1];
@@ -391,25 +390,20 @@ export default {
       return isPNG && isLt1M
     },
     handleProgress(event, file, fileList) {
-      console.log('percentage', event, file.percentage)
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
     handleImgSuccess(res, file) {
       if (res.code === 0 && res.msg === 'success') {
-
-        console.log('res.data.url', res.data.url)
         this.uploading = false
         this.unloadPencent = 0
         this.dataForm.imageList.push(res.data.url)
-        console.log('handleImgSuccess after',this.dataForm.imageList)
       } else {
         this.$message.error(res.msg)
       }
     },
     handleDelimg(item, index) {
       this.dataForm.imageList.splice(index, 1)
-      console.log('handleDelimg after',this.dataForm.imageList)
     },
     handleMoveCenter() {
       //修改地图中心点
@@ -425,7 +419,6 @@ export default {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
-      console.log(row);
       this.dataForm.imageList = []
       if (row) {
         this.dataForm = {...this.dataForm, ...row};
@@ -443,7 +436,6 @@ export default {
     async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
-      console.log("======loadAgency")
       const {data, code, msg} = await requestPost(url, params);
 
       if (code === 0) {

From c0149db1024ac6e7c95e566ab0ff1eaff253bd73 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:04:44 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 0b2d8729d..141df65fe 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -317,11 +317,11 @@ export default {
             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);
-            }
+            this.$message({
+              showClose: true,
+              message: '导入中，请到系统管理-导入记录中查看进度',
+              duration: 0
+            })
           })
           .catch((err) => {
             console.log("失败", err);

From 1914822e4956adb9b746b0d26eba647cbaba930f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:07:03 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8F=90=E7=A4=BA123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityService/shzz/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 141df65fe..89a559968 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -313,7 +313,7 @@ export default {
       })
           .then((res) => {
             this.importLoading = false;
-            this.importBtnTitle = "excel导入";
+            this.importBtnTitle = "导入";
             console.log("resresresresresresres", res);
 
             this.getTableData();

From 879fbdb40adb0394d2d9dd38050197c22b6eb63f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 26 Aug 2022 15:07:03 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 141df65fe..9eb8398f2 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -99,7 +99,7 @@
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
-          <el-button type="warning"
+          <el-button class="diy-button--delete"
                      size="small"
                      :loading="importLoading">{{
               importBtnTitle
@@ -108,7 +108,7 @@
         </el-upload>
 
         <el-button @click="handleChu"
-                   type="danger"
+                   class="diy-button--reset"
                    size="small">导出
         </el-button>
       </div>
@@ -313,7 +313,7 @@ export default {
       })
           .then((res) => {
             this.importLoading = false;
-            this.importBtnTitle = "excel导入";
+            this.importBtnTitle = "导入";
             console.log("resresresresresresres", res);
 
             this.getTableData();