Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

src/views/main-content.vue

@@ -81,7 +81,7 @@
       :visible.sync="dialogFormVisible" 
       :close-on-click-modal="false"
       top="5vh"
-      width="70%"
+      width="950px"
       class="dialog-h"
       append-to-body>
       <work-form v-if="formType == 'work_diary'" ref="ref_form" 

src/views/modules/base/collect.vue

@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
          <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item label="所在社区" prop="orgId">
+           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
             <el-select
                   v-model.trim="fmData.orgId"
                   placeholder="所在社区"
@@ -83,7 +83,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 3">未接种</span>
+            <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->

src/views/modules/communityService/ninePlaces/team/team.vue

@@ -4,7 +4,7 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'90px'">
         <div>
 
           <el-form-item label="负责人"
@@ -470,7 +470,7 @@ export default {
 }
 
 .item_width_1 {
-  width: 230px;
+  width: 170px;
 }
 
 .div_table {

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

@@ -163,6 +163,7 @@ export default {
 
   methods: {
     handleTime() {
+      if (!this.formData.remindTime) return
        var startAt = new Date(this.formData.remindTime) * 1000 /1000;
         if(startAt < Date.now()) {
             this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
@@ -386,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

@@ -210,6 +210,7 @@ export default {
 
   methods: {
     handleTime () {
+      if (!this.formData.remindTime) return
       var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
       if (startAt < Date.now()) {
         this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
@@ -462,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

@@ -151,6 +151,7 @@ export default {
 
     },
     handleTime() {
+      if (!this.formData.remindTime) return
        var startAt = new Date(this.formData.remindTime) * 1000 /1000;
         if(startAt < Date.now()) {
             this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
@@ -357,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;