Merge branch 'master' of https://gitlab.ezijing.com/webapp/x-training-new

src/modules/market-tools/components/mail/MailStepTwo.vue

@@ -6,7 +6,13 @@
       <template #trigger_con>
         <div v-if="data.index == 0">
           在 &nbsp;&nbsp;
-          <el-date-picker v-model="data.date" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker
+            v-model="times"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
+          >
           </el-date-picker>
           &nbsp;&nbsp;
           <el-time-picker v-model="data.time" arrow-control placeholder="选择时间" size="mini" value-format="HH:mm:ss">
@@ -32,6 +38,15 @@ export default {
 
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now()
+        }
+      },
+      times: '',
+      times2: '',
+      caseId: '',
+      showIndex: 0,
       // tab切换列表
       tabList: [
         {

src/modules/market-tools/components/mobileSms/SmsStepTwo.vue

@@ -6,7 +6,13 @@
       <template #trigger_con>
         <div v-if="data.index === 0">
           在 &nbsp;&nbsp;
-          <el-date-picker v-model="data.triggerDate" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd">
+          <el-date-picker
+            v-model="triggerDate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
+          >
           </el-date-picker>
           &nbsp;&nbsp;
           <el-time-picker
@@ -27,14 +33,13 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+            :picker-options="pickerOptions"
           >
           </el-date-picker>
           &nbsp;&nbsp;时间范围内
           <br />
           <br />
-          &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;
-          <el-select v-model="data.times_every">
+          <el-select v-model="times_every">
             <el-option v-for="it in timesList" :key="it.value" :label="it.label" :value="it.value"> </el-option>
           </el-select>
           &nbsp;&nbsp;&nbsp;
@@ -121,7 +126,11 @@ export default {
 
   data() {
     return {
-      // 选项
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now()
+        }
+      },
       timesList: [
         {
           value: '每日',