修改

src/views/TMS/components/domesticMine/wagonLoadMine.vue

@@ -3,7 +3,17 @@
   <div class="homeworkPath">
     <div class="top">
       <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+     
+        <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick(0)">
@@ -35,10 +45,13 @@
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "wagonload",
   data() {
     return {
+      startTime:null,
+      endTime:null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -48,9 +61,30 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=3&con=" +
-        this.input;
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+             this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=3&con=" +
+            this.input + "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=3&con=" +
+            this.input;
+        }
     },
     btnclick(index) {
       if(index == 0){
@@ -60,8 +94,6 @@ export default {
       }
     },
     click(resultId) {
-      console.log("点击了")
-      console.log(resultId)
       this.$router.push("/wagonLoadEdit/" + resultId);
     },
     deleteclick(scope) {
@@ -98,16 +130,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .homeworkPath {
-  .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+   .top {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedEmergency/wagonLoadEmergency.vue

@@ -2,7 +2,22 @@
   <!-- 装车作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input class="el-input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-input
+        class="el-input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick(0)">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -13,7 +28,10 @@
     <dilTable v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="100">
         <template slot-scope="scope">
-          <el-button @click="onclick(2,scope.row.resultId)" type="text" size="small"
+          <el-button
+            @click="onclick(2, scope.row.resultId)"
+            type="text"
+            size="small"
             >修改</el-button
           >
           <el-button
@@ -28,10 +46,13 @@
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "wagonload",
   data() {
     return {
+      startTime:null,
+      endTime:null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -40,14 +61,37 @@ export default {
     };
   },
   methods: {
-    onclick(num,resultId) {
+    onclick(num, resultId) {
       if (num == 0) {
-        this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2&con="+this.input
+        let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+             this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2&con=" +
+            this.input + "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=2&con=" +
+            this.input;
+        }
       } else if (num == 1) {
-        this.$router.push("/addWagonLoadEmergency")
+        this.$router.push("/addWagonLoadEmergency");
       } else if (num == 2) {
         // console.log("resultId",resultId);
-         this.$router.push("/editWagonLoadEmergency/" + resultId)
+        this.$router.push("/editWagonLoadEmergency/" + resultId);
       }
     },
     deleteclick(resultId) {
@@ -84,15 +128,15 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-     padding: 1.25rem 0.375rem;
-     .el-input{
-       width: 20%;
-       margin-right: 40rpx;
-     }
-     .btn{
-       width: 5.5%;
-       margin-left: 0.25rem;
-     }
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
 </style>

src/views/TMS/components/importedMine/wagonLoad.vue

@@ -9,6 +9,15 @@
         clearable
       >
       </el-input>
+        <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -37,10 +46,13 @@
 
 
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "wagonload",
   data() {
     return {
+      startTime:null,
+      endTime:null,
       input: "",
       option: {
         // 表格请求数据的地址
@@ -57,9 +69,30 @@ export default {
       this.option.requestUrl = "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&i=" + new Date()  
     },
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
-        this.input;
+       let startTime = null;
+        let endTime = null;
+        if (this.startTime) {
+          startTime = sjTime(this.startTime);
+        }
+        if (this.endTime) {
+          endTime = sjTime(this.endTime);
+        }
+        if (startTime && endTime) {
+          if (startTime < endTime) {
+             this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+            this.input + "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.option.requestUrl =
+            "/api/v1/tms/getTmstrainWagonLoad?apiId=58&resultType=1&con=" +
+            this.input;
+        }
     },
     btnclick() {
       this.$router.push("/addWagonLoad");