修改

src/views/oa/out/DataList.vue

@@ -23,12 +23,12 @@
         <el-input v-model="queryParams.destination" placeholder="请输入外出地点" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker v-model="queryParams.startTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+      <el-form-item label="开始时间" prop="startDate">
+            <el-date-picker v-model="queryParams.startDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
-          <el-form-item label="结束时间" prop="endTime">
+          <el-form-item label="结束时间" prop="endDate">
             <el-date-picker v-model="queryParams.endDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']" />
@@ -64,8 +64,8 @@
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="外出地点" align="center" prop="destination" min-width="150" />
-      <el-table-column label="外出开始时间" align="center" prop="startTime" min-width="120" />
-      <el-table-column label="外出结束时间" align="center" prop="endTime" min-width="120" />
+      <el-table-column label="外出开始时间" align="center" prop="startDate" min-width="150" />
+      <el-table-column label="外出结束时间" align="center" prop="endDate" min-width="150" />
       <el-table-column label="外出时长" align="center" prop="hour" min-width="100" />
       <el-table-column label="申请时间"  align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
@@ -137,8 +137,8 @@ export default {
         position: undefined,
         employeePhone: undefined,
         destination: undefined,
-        startTime: [],
-        endTime: [],
+        startDate: [],
+        endDate: [],
         auditStatus: undefined,
         createTime: []
       },

src/views/oa/out/detail.vue

@@ -51,7 +51,7 @@
           <div class="field-name">外出开始时间</div>
         </div>
         <div class="field-component">
-          <span :title="form.startTime">{{ form.startTime }}</span>
+          <span :title="form.startDate">{{ form.startDate }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -60,7 +60,7 @@
           <div class="field-name">外出结束时间</div>
         </div>
         <div class="field-component">
-          <span :title="form.endTime">{{ form.endTime }}</span>
+          <span :title="form.endDate">{{ form.endDate }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -77,7 +77,7 @@
           <div class="field-name">外出事由</div>
         </div>
         <div class="field-component">
-          <span :title="form.purpose">{{ form.purpose }}</span>
+          <span :title="form.reason">{{ form.reason }}</span>
         </div>
       </div>
 
@@ -129,9 +129,9 @@
               </label>
               <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
               <label style="color:#8a909c; font-weight: normal">{{ parseTime(item.createTime) }}</label>
-              <label v-if="item.endTime" style="margin-left: 30px;font-weight: normal">审批时间：</label>
-              <label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{
-                parseTime(item.endTime)
+              <label v-if="item.endDate" style="margin-left: 30px;font-weight: normal">审批时间：</label>
+              <label v-if="item.endDate" style="color:#8a909c;font-weight: normal"> {{
+                parseTime(item.endDate)
                 }}</label>
               <!-- <label v-if="item.durationInMillis" style="margin-left: 30px;font-weight: normal">耗时：</label>
               <label v-if="item.durationInMillis" style="color:#8a909c;font-weight: normal">

src/views/oa/out/edit.vue

@@ -16,21 +16,21 @@
       <el-form-item label="外出地点" prop="destination">
         <el-input maxlength="20" v-model="form.destination" placeholder='外出地点'></el-input>
       </el-form-item>
-      <el-form-item label="外出开始时间" prop="startTime">
-        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="09:00:00" v-model="form.startTime" type="datetime" placeholder="选择时间"
+      <el-form-item label="外出开始时间" prop="startDate">
+        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="09:00:00" v-model="form.startDate" type="datetime" placeholder="选择时间"
           style="width: 100%;" @change="upHour">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="外出结束时间" prop="endTime">
-        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="18:00:00" v-model="form.endTime" type="datetime" placeholder="选择时间"
+      <el-form-item label="外出结束时间" prop="endDate">
+        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="18:00:00" v-model="form.endDate" type="datetime" placeholder="选择时间"
           style="width: 100%;" @change="upHour">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="外出时长">
         <el-input v-model="form.hour" placeholder='外出时长' oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
       </el-form-item>
-      <el-form-item label="外出事由" prop="purpose">
-        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.purpose" placeholder="请输入备注" />
+      <el-form-item label="外出事由" prop="reason">
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason" placeholder="请输入备注" />
       </el-form-item>
       <el-form-item label="附件">
         <el-upload :action="fileUrl" :headers="headers" :file-list="files" :on-success="handleFileSuccessCite"
@@ -148,10 +148,10 @@ export default {
 
 
         destination: undefined,
-        startTime: undefined,
-        endTime: undefined,
+        startDate: undefined,
+        endDate: undefined,
         hour: undefined,
-        purpose: undefined,
+        reason: undefined,
         fileIdList: undefined,
         remarks: undefined,
         peopleList: '',
@@ -160,13 +160,13 @@ export default {
         destination: [
           { required: true, message: '请填写外出地点', trigger: 'change' },
         ],
-        startTime: [
+        startDate: [
           { required: true, message: '请选择开始时间', trigger: 'change' }
         ],
-        endTime: [
+        endDate: [
           { required: true, message: '请选择结束时间', trigger: 'change' }
         ],
-        purpose: [
+        reason: [
           { required: true, message: '请输入外出原因', trigger: 'blur' }
         ],
         peopleList: [
@@ -202,18 +202,18 @@ export default {
   },
   methods: {
     upHour() {
-      if (this.form.startTime && this.form.endTime) {
+      if (this.form.startDate && this.form.endDate) {
         let Hours = this.calLeaveDays();
         this.form.hour = Math.ceil(Hours);
         if (Hours < 0) {
-          this.form.startTime = "";
-          this.form.endTime = "";
+          this.form.startDate = "";
+          this.form.endDate = "";
           this.form.hour = "";
           this.$message.warning("开始时间小于结束时间，请重新选择！");
           return;
         } else if (Hours == 0) {
-          this.form.startTime = "";
-          this.form.endTime = "";
+          this.form.startDate = "";
+          this.form.endDate = "";
           this.form.hour = "";
           this.$message.warning("外出时间为0，请重新选择！");
           return;
@@ -224,8 +224,8 @@ export default {
     calLeaveDays() {
       var start_time = new Date();
       var end_time = new Date();
-      start_time = new Date(this.form.startTime);
-      end_time = new Date(this.form.endTime );
+      start_time = new Date(this.form.startDate);
+      end_time = new Date(this.form.endDate );
       console.log(start_time);
       console.log(end_time);
       //转成毫秒数，两个日期相减