Merge branch 'dev-行程上报烟台1122' into dev

src/views/modules/base/epidemic/travelYantai/travelYantai.vue

@@ -193,7 +193,7 @@
                          label="返回方式"
                          width="100">
         </el-table-column>
-        <el-table-column prop="arriveDate"
+        <el-table-column prop="arriveTime"
                          header-align="center"
                          align="center"
                          label="来到本地时间"

src/views/modules/base/epidemic/travelYantai/travelYantaiDetail.vue

@@ -46,7 +46,7 @@
 
           <div class="info-prop">
             <span class="info-title-3">来到本地时间：</span>
-            <span>{{ formData.arriveDate||'--'  }}</span>
+            <span>{{ formData.arriveTime||'--'  }}</span>
           </div>
 
           <div class="info-prop">

src/views/modules/base/epidemic/travelYantai/travelYantaiForm.vue

@@ -134,12 +134,12 @@
 
         <el-form-item label="来到本地时间"
                       style="display: block"
-                      prop="arriveDate">
+                      prop="arriveTime">
           <el-date-picker class="item_width_4"
-                          v-model="formData.arriveDate"
+                          v-model="formData.arriveTime"
                           :picker-options="pickerOptions"
-                          format="yyyy-MM-dd"
+                          format="yyyy-MM-dd HH:mm:ss"
-                          value-format="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetime"
                           clearable
                           placeholder="选择时间">
@@ -475,7 +475,7 @@ export default {
         sourceAddressPathCode: '',
         comeAreaFull: '',//来源地--详细地址（必填）
 
-        arriveDate: '',//来到本地时间
+        arriveTime: '',//抵烟时间yyyy-MM-dd HH:mm:ss
         remark: '',//备注
 
         content: '',
@@ -582,7 +582,7 @@ export default {
         comeAreaFull: [
           { required: true, message: '来自地区详细地址不能为空', trigger: 'change' },
         ],
-        arriveDate: [
+        arriveTime: [
           { required: true, message: '来到本地时间不能为空', trigger: 'change' },
         ],
         comeMode: [
@@ -956,7 +956,7 @@ export default {
         sourceAddressPathCode: '',
         comeAreaFull: '',//来源地--详细地址（必填）
 
-        arriveDate: '',//来到本地时间
+        arriveTime: '',//来到本地时间
         remark: '',//备注
 
         content: '',