From 7fb28c7fd4633fcc6dcf432956f9920c6a7978eb Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 2 Nov 2022 16:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/activitiesAdd.vue              | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
index 9b01aa53..87ccb9df 100644
--- a/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
+++ b/project/tianfuxing/AppActivitiesManagement/components/activitiesAdd.vue
@@ -62,7 +62,7 @@
 
                 <el-form-item label="进场打卡时间" prop="intoTime">
                   <el-date-picker v-model="form.intoTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"></el-date-picker>
+                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" ></el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="进场得积分" prop="intoIntegral" style="width: 550px">
@@ -72,8 +72,9 @@
                 </el-form-item>
 
                 <el-form-item label="离场打卡时间" prop="exitTime">
+                  <!-- { start: formData.startTime, minTime: formData.startTime} -->
                   <el-date-picker v-model="form.exitTime" type="datetimerange" start-placeholder="开始日期" :picker-options="timeOption"
-                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00']"></el-date-picker>
+                  end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                 </el-form-item>
 
                 <el-form-item label="离场得积分" prop="exitIntegral" style="width: 550px">
@@ -115,6 +116,7 @@
 <script>
 import AMapLoader from '@amap/amap-jsapi-loader'
 import { mapState } from "vuex";
+import dayjs from "dayjs";
 export default {
   name: "activitiesAdd",
   props: {
@@ -281,9 +283,6 @@ export default {
           this.form = res.data
           this.form.intoTime = [res.data.intoBegintime,res.data.intoEndtime]
           this.form.exitTime = [res.data.exitBegintime,res.data.exitEndtime]
-          // this.form.intoTime[1] = res.data.intoEndtime 
-          // this.form.exitTime[0] = res.data.exitBegintime
-          // this.form.exitTime[1] = res.data.exitEndtime
           this.info = res.data
         }
       })
@@ -301,18 +300,24 @@ export default {
 
     confirm() {
       this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`/appactivityinfo/addOrUpdate`,{
-              ...this.form
-            }).then(res => {
-              if(res.code == 0) {
-                this.$message.success(this.id ? '编辑成功' : '新增成功')
-                this.cancel(true)
-              }
-            }).catch((err) => {
-              console.log(err);
-            })
+        if (valid) {
+          let intoEnd = new Date(this.form.intoEndtime).getTime()
+          let exitBegin = new Date(this.form.exitBegintime).getTime()
+          console.log(intoEnd, exitBegin,'哈哈哈');
+          if(exitBegin <= intoEnd) {
+            return this.$message.error('离场的开始时间不能小于且等于进场的结束时间')
           }
+          this.instance.post(`/appactivityinfo/addOrUpdate`,{
+            ...this.form
+          }).then(res => {
+            if(res.code == 0) {
+              this.$message.success(this.id ? '编辑成功' : '新增成功')
+              this.cancel(true)
+            }
+          }).catch(err => {
+            console.log(err);
+          })
+        }
       })
     },
   },