Merge branch 'dev-shujirizhi' into dev

src/views/modules/secretaryLog/difficulty/difficultyForm.vue

@@ -15,9 +15,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入内容"
                     v-model="formData.content"></el-input>
@@ -29,9 +29,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入解决方式"
                     v-model="formData.resolveWay"></el-input>
@@ -72,9 +72,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入备注"
                     v-model="formData.remark"></el-input>
@@ -386,6 +386,10 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-input__count {
+    right: 20px;
+    line-height: 12px;
+  }
 }
 .item_width_2 {
   width: 220px;

src/views/modules/secretaryLog/humanisticCare/careForm.vue

@@ -58,9 +58,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入关怀事项"
                     v-model="formData.content"></el-input>
@@ -142,7 +142,8 @@
     <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'look'" size="small"
+      <el-button v-if="formType != 'look'"
+                 size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -177,7 +178,7 @@ export default {
 
       btnDisable: false,
       pickerOptions: {
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() <= Date.now() - 8.64e7;
         }
       },
@@ -186,7 +187,7 @@ export default {
         content: '',//关怀事项	
         concernType: '',//关怀类型	
         resiName: '',//关怀人员	
-        status: '',//状态	0未完成 1已完成
+        status: 0,//状态	0未完成 1已完成
         phone: '',//电话
         address: '',//地址
         scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm	
@@ -208,11 +209,11 @@ export default {
   },
 
   methods: {
-    handleTime() {
-       var startAt = new Date(this.formData.remindTime) * 1000 /1000;
-        if(startAt < Date.now()) {
-            this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
-        }
+    handleTime () {
+      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
+      if (startAt < Date.now()) {
+        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
+      }
     },
     async initForm (type, careId) {
       this.startLoading()
@@ -385,7 +386,7 @@ export default {
         content: '',//关怀事项	
         concernType: '',//关怀类型	
         resiName: '',//关怀人员	
-        status: '',//状态	0未完成 1已完成
+        status: 0,//状态	0未完成 1已完成
         phone: '',//电话
         address: '',//地址
         scheduledTime: '',//预计关怀时间yyyy-mm-dd hh:mm	
@@ -461,6 +462,10 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-input__count {
+    right: 20px;
+    line-height: 12px;
+  }
 }
 .item_width_2 {
   width: 220px;

src/views/modules/secretaryLog/humanisticCare/careList.vue

@@ -448,7 +448,7 @@ export default {
 
     //导出表格
     async handleExport (row) {
-      let title = '人员关怀'
+      let title = '人员关怀详情'
 
       let url = `/gov/project/memoConcern/${row.id}/exportWord`
       let params = {}

src/views/modules/secretaryLog/workLog/form.vue

@@ -14,9 +14,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     :disabled="disabled"
                     placeholder="请输入内容"
@@ -29,9 +29,9 @@
                       style="display: block">
           <el-input class="item_width_1"
                     type="textarea"
-                    maxlength="100"
+                    maxlength="1000"
                     show-word-limit
-                    :rows="4"
+                    :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     :disabled="disabled"
                     placeholder="请输入工作事项"
@@ -357,6 +357,10 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-input__count {
+    right: 20px;
+    line-height: 12px;
+  }
 }
 .item_width_2 {
   width: 220px;