Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/propaganda/index.vue

@@ -15,15 +15,17 @@
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
           @change="changecreateTimeStart"
+          :picker-options="pickerStartTime"
         >
         </el-date-picker
-        >-
+        > -
         <el-date-picker
           v-model="queryParams.createTimeEnd"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
           @change="changecreateTimeEnd"
+          :picker-options="pickerEndTime"
         >
         </el-date-picker>
       </el-form-item>
@@ -748,9 +750,31 @@ export default {
 
 
         ],
-      }
+      },
     };
   },
+  computed: {
+    pickerStartTime() {
+      return {
+        disabledDate: (time) => {
+          if (this.queryParams.createTimeEnd) {
+            let edtTime = this.queryParams.createTimeEnd.replace(/-/g, "/");
+            return time.getTime() > new Date(edtTime);
+          }
+        },
+      };
+    },
+    pickerEndTime() {
+      return {
+        disabledDate: (time) => {
+          if (this.queryParams.createTimeStart) {
+            let startTime = this.queryParams.createTimeStart.replace(/-/g, "/");
+            return time.getTime() < new Date(startTime);
+          }
+        },
+      };
+    },
+  },
   created() {
     this.Departmentlist();
     this.getList();