充值日期显示时间戳问题

支付成功失败 跳转查询订单页面 搜索数据

@@ -44,7 +44,7 @@
             <el-table-column prop="paytypeaddress" label="水表编号" width="200">
             </el-table-column>
 
-            <el-table-column prop="paytime" label="充值日期" width="160">
+            <el-table-column prop="paytime" :formatter="dateForma" label="充值日期" width="160">
             </el-table-column>
 
             <el-table-column prop="payfees"  label="充值金额" width="100">
@@ -90,6 +90,7 @@
 <script>
     import { getOrder,addOrder,ediOrder,remove} from '../../api/empt/PayOrder';
     import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
+    import moment from 'moment'
     export default {
         components: {ElButton},
         data() {
@@ -146,12 +147,15 @@
                 this.QueryOrder();
             },
             QueryOrder(){
-
                 // 清空后为null 问题
                 var payTimes = '';
                 if (this.filters.payTime!==null){
                     payTimes = this.filters.payTime[0]+','+this.filters.payTime[1]
                 }
+                if (this.$route.params.orderNumber != undefined){
+                    this.filters.orderNumber =  this.$route.params.orderNumber;
+                }
+
                 let params = {
                     pageNum: this.pageNum,
                     pageSize: this.pageSize,
@@ -200,9 +204,15 @@
                 }).catch();
             },
 
-            Pay(row){
-                this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
-            },
+            dateForma:function(row,column){
+
+                var date = row[column.property];
+
+                if(date == undefined){return ''};
+
+                return moment(date).format("YYYY-MM-DD HH:mm:ss")
+
+            }
         },
 
     }

@@ -9,7 +9,7 @@
                     <br/>
                     <el-form :inline="true" :model="filters">
                         <el-form-item prop="roomNumber">
-                            <el-input style="width: 700px" v-model="filters.roomNumber" placeholder="房间号"></el-input>
+                            <el-input style="width: 700px" v-model="filters.roomNumber" placeholder="房间号" required></el-input>
                             <br/><br/>
                             <el-button style="width: 150px" type="primary" v-on:click="getdefaultData()">查询</el-button>
                         </el-form-item>
@@ -71,7 +71,6 @@
                             </el-form-item>
                         </el-col>
                     </el-form>
-
                     <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button>
                 </el-col>
             </el-row>
@@ -153,6 +152,7 @@
                     roomNumber: this.filters.roomNumber
                 };
                 this.loading=true;
+
                 getList(para).then((res) => {
                     let resData = res.data;
                     if (resData.length > 0) {
@@ -175,8 +175,6 @@
                             }
                         });
                     }
-
-
                     this.loading = false;
                     //NProgress.done();
                 }).catch((error) => {
@@ -223,22 +221,13 @@
                                                 if (resultMessage.success === "Y"){
                                                     _this.dialogVisible=false;
                                                     alert("充值成功")
-                                                    // 支付成功后修改订单状态
-                                                    let paras = { ordernumber: resultMessage.orderNumber,reamke3: "1"};
-                                                    ediOrder(paras).then((res) => {
-
-                                                    }).catch((error) => {
-                                                        alert(error);
-                                                    });
+                                                    //带参数跳转
+                                                    _this.$router.push({name:'订单查询',params:{orderNumber:resultMessage.orderNumber}});
                                                 }else {
                                                     _this.dialogVisible=false;
                                                     alert("充值失败")
-                                                    let paras = { ordernumber: resultMessage.orderNumber,reamke3: "0"};
-                                                    ediOrder(paras).then((res) => {
-
-                                                    }).catch((error) => {
-                                                        alert(error);
-                                                    });
+                                                    //带参数跳转
+                                                    _this.$router.push({path:'订单查询',params:{orderNumber:resultMessage.orderNumber}});
                                                 }
                                             }
                                         }