日期组件修改

src/views/modules/shequzhili/xiangmu/index.vue

@@ -19,30 +19,31 @@
             >
             </el-input>
           </el-form-item>
-
-          <el-form-item label="转项目时间" prop="date">
-            <el-date-picker
-              v-model="fmData.startDate"
-              size="small"
-              :picker-options="startPickerOptions"
-              class="u-item-width-daterange"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="开始时间"
-            >
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker
-              v-model="fmData.endDate"
-              :picker-options="endPickerOptions"
-              size="small"
-              type="date"
-              class="u-item-width-daterange u-data-tag"
-              value-format="yyyy-MM-dd"
-              placeholder="结束时间"
-            >
-            </el-date-picker>
-          </el-form-item>
+          <el-form-item label="转项目时间" prop="startDate">
+              <el-date-picker
+                v-model="fmData.startDate"
+                :picker-options="startPickerOptions"
+                class="u-item-width-daterange"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd"
+                placeholder="开始时间"
+              >
+              </el-date-picker>
+              <span class="u-data-tag">至</span>
+              <el-date-picker
+                v-model="fmData.endDate"
+                :picker-options="endPickerOptions"
+                class="u-item-width-daterange u-data-tag"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                value="yyyy-MM-dd"
+                placeholder="结束时间"
+              >
+              </el-date-picker>
+            </el-form-item>
 
           <el-form-item label="状态" prop="status">
             <el-select
@@ -288,11 +289,11 @@ export default {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
       if (this.fmData.startDate) {
-        let startDate = new Date(this.fmData.startDate);
+        let startTime = new Date(this.fmData.startDate);
         return (
           time.getTime() > nowData ||
-          time.getTime() < startDate ||
-          time.getTime() === startDate
+          time.getTime() < startTime ||
+          time.getTime() === startTime
         );
       } else {
         return time.getTime() > nowData;
@@ -328,7 +329,6 @@ export default {
         status: "",
         startDate: "",
         endDate: "",
-        date: ["", ""],
       },
 
       importBtnTitle: "导入",
@@ -357,13 +357,11 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {
-    "fmData.date": function (val) {
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startDate = val[0].split("-").join("");
-        this.fmData.endDate = val[1].split("-").join("");
-      } else {
-        this.fmData.startDate = "";
-        this.fmData.endDate = "";
+    "fmData.endDate": function (val) {
+      if (val && val != "") {
+        console.log(val);
+        let arrayTemp = val.split(" ");
+        this.fmData.endDate = arrayTemp[0] + " 23:59:59";
       }
     },
   },