From 7c8516f5d63fb39dd404bb9de78c8a8f0c4baf02 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 18 Mar 2022 15:48:27 +0800
Subject: [PATCH 1/2] dd

---
 src/views/main-content.vue                    |  3 ++
 .../modules/base/community/communityTable.vue | 31 +++++++++++++++++--
 .../modules/secretaryLog/workLog/form.vue     |  4 +--
 .../modules/secretaryLog/workLog/index.vue    |  4 +--
 src/views/tips.vue                            |  2 +-
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 569b149f..5d3efcbd 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -134,6 +134,9 @@ export default {
     
     this.loopTips()
   },
+  destroyed() {
+    this.$store.dispatch('clearInter')
+  },
   computed: {
     msgList() {
       return this.$store.state.tipsList
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index e14dd753..91079e08 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -33,6 +33,10 @@
                  class="diy-button--reset"
                  size="small"
                  @click="resetSearch">重置</el-button>
+      <!-- <el-button style="margin-left:10px"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="resetSearch">重置</el-button> -->
     </div>
     <div class="div_btn">
       <el-button style=""
@@ -119,6 +123,11 @@
         <el-table-column prop="neighborHoodName"
                          label="小区名称"
                          min-width="100">
+          <template slot-scope="scope">
+            <a class="name-a" @click="handleDetail(scope.row)">
+              {{ scope.row.neighborHoodName }}
+            </a>
+          </template>
         </el-table-column>
         <el-table-column prop="agencyName"
                          label="所属组织"
@@ -157,9 +166,9 @@
                        size="small"
                        @click="handleToNextLevel(scope.row)">进入</el-button> -->
             <el-button type="text"
-                       class="div-table-button--detail"
+                       class="div-table-button--delete"
                        size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
+                       @click="handleDownQr(scope.row)">二维码</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
                        class="div-table-button--edit"
@@ -223,6 +232,7 @@ import CommunityForm from './communityForm'
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
+import axios from 'axios'
 
 let loading // 加载动画
 export default {
@@ -528,7 +538,22 @@ export default {
         this.$message.error(msg)
       }
     },
-
+    async handleDownQr(row) {
+      const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+      await axios({
+        method: 'POST',
+        url,
+        responseType: 'blob'
+      }).then(res => {
+        console.log('res----1r', res)
+        if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            this.download(res.data, fileName) //释放掉blob对象
+          } else this.$message.error('下载失败')
+          // this.download(res.data, '1.png')
+      })
+    },
     //导出表格
     async handleExport () {
       let title = this.agencyObj.label
diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue
index b203816a..51e27374 100644
--- a/src/views/modules/secretaryLog/workLog/form.vue
+++ b/src/views/modules/secretaryLog/workLog/form.vue
@@ -16,7 +16,7 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
                     :disabled="disabled"
                     placeholder="请输入内容"
                     v-model="formData.content"></el-input>
@@ -30,7 +30,7 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
                     :disabled="disabled"
                     placeholder="请输入工作事项"
                     v-model="formData.workType"></el-input>
diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue
index e448cb0c..04a33afd 100644
--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@@ -150,7 +150,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="70%"
+               width="50%"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
@@ -309,7 +309,7 @@ export default {
     },
 
     async deleteDifficulty (row) {
-      const url = "/gov/project/memoDifficulty/delete"
+      const url = "/gov/project/memoWorkDiary/delete"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/delete"
       let ids = [row.id]
       let params = {
diff --git a/src/views/tips.vue b/src/views/tips.vue
index 5b350bd5..b7b451d9 100644
--- a/src/views/tips.vue
+++ b/src/views/tips.vue
@@ -70,7 +70,7 @@ export default {
   }
   .tips-wr-desc {
     width: 100%;
-    height: 33px;
+    height: 32px;
     margin-top: 10px;
     padding-left: 20px;
     display: -webkit-box;

From fc1f1c9613a7ef5d3dfdee18b745b45983ed3c4a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 18 Mar 2022 16:40:44 +0800
Subject: [PATCH 2/2] dd

---
 .../secretaryLog/difficulty/difficultyForm.vue        | 11 ++++++++---
 .../modules/secretaryLog/humanisticCare/careForm.vue  |  9 ++++++++-
 src/views/modules/secretaryLog/workLog/form.vue       |  3 +++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
index 240a320a..3041886f 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
@@ -17,7 +17,8 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
+                    clearable
                     placeholder="请输入内容"
                     v-model="formData.content"></el-input>
         </el-form-item>
@@ -30,7 +31,8 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
+                    clearable
                     placeholder="请输入解决方式"
                     v-model="formData.resolveWay"></el-input>
         </el-form-item>
@@ -44,6 +46,7 @@
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
+                          clearable
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
@@ -56,6 +59,7 @@
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
+                          clearable
                           :picker-options="pickerOptions"
                           @change="handleTime"
                           placeholder="选择时间">
@@ -70,7 +74,8 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
+                    clearable
                     placeholder="请输入备注"
                     v-model="formData.remark"></el-input>
         </el-form-item>
diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
index 4c9fba45..27fff5c1 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
@@ -15,6 +15,7 @@
                       style="display: block">
           <el-input class="item_width_2"
                     placeholder="请输入关怀类型"
+                    clearable
                     v-model="formData.concernType">
           </el-input>
         </el-form-item>
@@ -25,6 +26,7 @@
                       style="display: block">
           <el-input class="item_width_2"
                     placeholder="请输入关怀人员"
+                    clearable
                     v-model="formData.resiName">
           </el-input>
         </el-form-item>
@@ -35,6 +37,7 @@
                       style="display: block">
           <el-input class="item_width_2"
                     placeholder="请输入电话"
+                    clearable
                     v-model="formData.phone">
           </el-input>
         </el-form-item>
@@ -44,6 +47,7 @@
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入地址"
+                    clearable
                     v-model="formData.address">
           </el-input>
         </el-form-item>
@@ -56,7 +60,8 @@
                     type="textarea"
                     maxlength="100"
                     show-word-limit
-                    :rows="3"
+                    :rows="4"
+                    clearable
                     placeholder="请输入关怀事项"
                     v-model="formData.content"></el-input>
         </el-form-item>
@@ -70,6 +75,7 @@
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
+                          clearable
                           placeholder="选择时间">
           </el-date-picker>
         </el-form-item>
@@ -82,6 +88,7 @@
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
+                          clearable
                           :picker-options="pickerOptions"
                           @change="handleTime"
                           placeholder="选择时间">
diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue
index 51e27374..56a4b6f6 100644
--- a/src/views/modules/secretaryLog/workLog/form.vue
+++ b/src/views/modules/secretaryLog/workLog/form.vue
@@ -17,6 +17,7 @@
                     maxlength="100"
                     show-word-limit
                     :rows="4"
+                    clearable
                     :disabled="disabled"
                     placeholder="请输入内容"
                     v-model="formData.content"></el-input>
@@ -31,6 +32,7 @@
                     maxlength="100"
                     show-word-limit
                     :rows="4"
+                    clearable
                     :disabled="disabled"
                     placeholder="请输入工作事项"
                     v-model="formData.workType"></el-input>
@@ -44,6 +46,7 @@
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
+                          clearable
                           :disabled="disabled"
                           :picker-options="pickerOptions"
                           @change="handleTime"