Merge branch 'dev-shujirizhi' into dev

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

@@ -387,6 +387,9 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-textarea__inner {
+    padding-bottom: 20px;
+  }
   ::v-deep .el-input__count {
     right: 20px;
     line-height: 12px;

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

@@ -463,6 +463,9 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-textarea__inner {
+    padding-bottom: 20px;
+  }
   ::v-deep .el-input__count {
     right: 20px;
     line-height: 12px;

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

@@ -358,6 +358,9 @@ export default {
 <style  lang="scss" scoped>
 .item_width_1 {
   width: 560px;
+  ::v-deep .el-textarea__inner {
+    padding-bottom: 20px;
+  }
   ::v-deep .el-input__count {
     right: 20px;
     line-height: 12px;