Merge branch 'dev-shujirizhi' into test

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

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