Merge branch 'crm_17.0' into debug

src/views/roadshow_manage/compononts/sellerAddAct.vue

@@ -75,14 +75,23 @@
         </el-form-item>
         <el-form-item label="结束时间" prop="selectResearchers[0].endTime" :rules="[{ required: true, message: '请选择结束时间', trigger: 'blur' }]">
           <el-col :span="12">
-            <date-picker format="MM.DD(ddd)" v-model="formData.selectResearchers[0].endDate" style="width: 100% !important" :clearable="false" :editable="false">
+            <date-picker format="MM.DD(ddd)" v-model="formData.selectResearchers[0].endDate" style="width: 100% !important" :clearable="false" :editable="false" @change="endTimeChange">
               <template #icon-calendar>
                 <i class="el-icon-date"></i>
               </template>
             </date-picker>
           </el-col>
           <el-col :span="12">
-            <date-picker format="HH:mm" type="time" :show-second="false" v-model="formData.selectResearchers[0].endTime" style="width: 100% !important" :clearable="false" :editable="false">
+            <date-picker
+              format="HH:mm"
+              type="time"
+              :show-second="false"
+              v-model="formData.selectResearchers[0].endTime"
+              style="width: 100% !important"
+              :clearable="false"
+              :editable="false"
+              @change="endTimeChange"
+            >
               <template #icon-calendar>
                 <i class="el-icon-time"></i>
               </template>
@@ -181,7 +190,7 @@ export default {
       if (res.Ret === 200) {
         this.cancel();
         this.$emit("updateList");
-        confirmDiaLink("添加成功，已加入销售员日历", "可前往【我的日历】-【活动】查看", {act_tab:6});
+        confirmDiaLink("添加成功，已加入销售员日历", "可前往【我的日历】-【活动】查看", { act_tab: 6 });
       }
     },
     findResearcherName() {
@@ -259,6 +268,25 @@ export default {
       row.endDate = end;
       row.endTime = end;
     },
+    // 结束时间的判断
+    endTimeChange() {
+      const { startDate, startTime, endDate, endTime } = this.formData.selectResearchers[0];
+
+      if (!startDate || !startTime || !endDate || !endTime) return;
+
+      const start = new Date(startDate);
+      start.setHours(new Date(startTime).getHours(), new Date(startTime).getMinutes(), 0, 0);
+
+      const end = new Date(endDate);
+      end.setHours(new Date(endTime).getHours(), new Date(endTime).getMinutes(), 0, 0);
+
+      if (end <= start) {
+        this.$message.warning("结束时间不能早于或等于开始时间");
+        const newEnd = new Date(start.getTime() + 60 * 60 * 1000); // 自动+1小时
+        this.formData.selectResearchers[0].endDate = newEnd;
+        this.formData.selectResearchers[0].endTime = newEnd;
+      }
+    },
   },
   created() {
     this.initDefaultTime();