Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppWalkask/add.vue

@@ -19,7 +19,7 @@
           <u-form-item label="走访时间" prop="visitTime" required :right-icon="id ? '' : 'arrow-right'" class="realitys">
             <u-input v-model="forms.visitTime" disabled placeholder="请选择走访时间" @click="showVisitTime = true" />
 
-            <u-calendar v-model="showVisitTime" mode="date" @change="change"></u-calendar>
+            <u-picker v-model="showVisitTime" :params="params" mode="time" @confirm="change"></u-picker>
           </u-form-item>
 
           <div class="line"></div>
@@ -93,6 +93,14 @@ export default {
       name: '',
       optionId: '',
       showVisitTime: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+      },
     }
   },
   computed: { ...mapState(['user']) },
@@ -206,7 +214,7 @@ export default {
     },
 
     change(e) {
-      this.forms.visitTime = e.result
+      this.forms.visitTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + '-' + e.minute + '-' + e.second
     },
 
     realityStstus(e) {

src/saas/AppWalkask/add.vue

@@ -12,7 +12,7 @@
           <u-form-item label="走访时间" prop="visitTime" required :right-icon="id ? '' : 'arrow-right'" class="realitys">
             <u-input v-model="forms.visitTime" disabled placeholder="请选择走访时间" @click="showVisitTime = true" />
 
-            <u-calendar v-model="showVisitTime" mode="date" @change="change"></u-calendar>
+            <u-picker v-model="showVisitTime" :params="params" mode="time" @confirm="change"></u-picker>
           </u-form-item>
 
           <div class="line"></div>
@@ -87,6 +87,14 @@ export default {
       name: '',
       optionId: '',
       showVisitTime: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+      },
     }
   },
   computed: { ...mapState(['user']) },
@@ -200,7 +208,7 @@ export default {
     },
 
     change(e) {
-      this.forms.visitTime = e.result
+      this.forms.visitTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + '-' + e.minute + '-' + e.second
     },
 
     realityStstus(e) {