朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 ef8cc2a8b6ef3b231125412356f8151d557aa08f 1 个父辈 1b93f7fe

充值日期显示时间戳问题 

支付成功失败 跳转查询订单页面 搜索数据
内嵌 并排对比
正在显示 2 个修改的文件 包含 23 行增加 和 24 行删除
@@ -44,10 +44,10 @@ @@ -44,10 +44,10 @@
44 <el-table-column prop="paytypeaddress" label="水表编号" width="200"> 44 <el-table-column prop="paytypeaddress" label="水表编号" width="200">
45 </el-table-column> 45 </el-table-column>
46 46
47 - <el-table-column prop="paytime" label="充值日期" width="160"> 47 + <el-table-column prop="paytime" :formatter="dateForma" label="充值日期" width="160">
48 </el-table-column> 48 </el-table-column>
49 49
50 - <el-table-column prop="payfees" label="充值金额" width="100"> 50 + <el-table-column prop="payfees" label="充值金额" width="100">
51 </el-table-column> 51 </el-table-column>
52 52
53 <el-table-column prop="paytype" label="充值类型" width="100"> 53 <el-table-column prop="paytype" label="充值类型" width="100">
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@
90 <script> 90 <script>
91 import { getOrder,addOrder,ediOrder,remove} from '../../api/empt/PayOrder'; 91 import { getOrder,addOrder,ediOrder,remove} from '../../api/empt/PayOrder';
92 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue"; 92 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
  93 + import moment from 'moment'
93 export default { 94 export default {
94 components: {ElButton}, 95 components: {ElButton},
95 data() { 96 data() {
@@ -146,12 +147,15 @@ @@ -146,12 +147,15 @@
146 this.QueryOrder(); 147 this.QueryOrder();
147 }, 148 },
148 QueryOrder(){ 149 QueryOrder(){
149 -  
150 // 清空后为null 问题 150 // 清空后为null 问题
151 var payTimes = ''; 151 var payTimes = '';
152 if (this.filters.payTime!==null){ 152 if (this.filters.payTime!==null){
153 payTimes = this.filters.payTime[0]+','+this.filters.payTime[1] 153 payTimes = this.filters.payTime[0]+','+this.filters.payTime[1]
154 } 154 }
  155 + if (this.$route.params.orderNumber != undefined){
  156 + this.filters.orderNumber = this.$route.params.orderNumber;
  157 + }
  158 +
155 let params = { 159 let params = {
156 pageNum: this.pageNum, 160 pageNum: this.pageNum,
157 pageSize: this.pageSize, 161 pageSize: this.pageSize,
@@ -200,9 +204,15 @@ @@ -200,9 +204,15 @@
200 }).catch(); 204 }).catch();
201 }, 205 },
202 206
203 - Pay(row){  
204 - this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})  
205 - }, 207 + dateForma:function(row,column){
  208 +
  209 + var date = row[column.property];
  210 +
  211 + if(date == undefined){return ''};
  212 +
  213 + return moment(date).format("YYYY-MM-DD HH:mm:ss")
  214 +
  215 + }
206 }, 216 },
207 217
208 } 218 }
@@ -7,9 +7,9 @@ @@ -7,9 +7,9 @@
7 <h2 style="width: 150px" type="primary">&nbsp;&nbsp;查询房间号</h2> 7 <h2 style="width: 150px" type="primary">&nbsp;&nbsp;查询房间号</h2>
8 </div> 8 </div>
9 <br/> 9 <br/>
10 - <el-form :inline="true" :model="filters"> 10 + <el-form :inline="true" :model="filters">
11 <el-form-item prop="roomNumber"> 11 <el-form-item prop="roomNumber">
12 - <el-input style="width: 700px" v-model="filters.roomNumber" placeholder="房间号"></el-input> 12 + <el-input style="width: 700px" v-model="filters.roomNumber" placeholder="房间号" required></el-input>
13 <br/><br/> 13 <br/><br/>
14 <el-button style="width: 150px" type="primary" v-on:click="getdefaultData()">查询</el-button> 14 <el-button style="width: 150px" type="primary" v-on:click="getdefaultData()">查询</el-button>
15 </el-form-item> 15 </el-form-item>
@@ -71,7 +71,6 @@ @@ -71,7 +71,6 @@
71 </el-form-item> 71 </el-form-item>
72 </el-col> 72 </el-col>
73 </el-form> 73 </el-form>
74 -  
75 <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button> 74 <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button>
76 </el-col> 75 </el-col>
77 </el-row> 76 </el-row>
@@ -153,6 +152,7 @@ @@ -153,6 +152,7 @@
153 roomNumber: this.filters.roomNumber 152 roomNumber: this.filters.roomNumber
154 }; 153 };
155 this.loading=true; 154 this.loading=true;
  155 +
156 getList(para).then((res) => { 156 getList(para).then((res) => {
157 let resData = res.data; 157 let resData = res.data;
158 if (resData.length > 0) { 158 if (resData.length > 0) {
@@ -175,8 +175,6 @@ @@ -175,8 +175,6 @@
175 } 175 }
176 }); 176 });
177 } 177 }
178 -  
179 -  
180 this.loading = false; 178 this.loading = false;
181 //NProgress.done(); 179 //NProgress.done();
182 }).catch((error) => { 180 }).catch((error) => {
@@ -223,22 +221,13 @@ @@ -223,22 +221,13 @@
223 if (resultMessage.success === "Y"){ 221 if (resultMessage.success === "Y"){
224 _this.dialogVisible=false; 222 _this.dialogVisible=false;
225 alert("充值成功") 223 alert("充值成功")
226 - // 支付成功后修改订单状态  
227 - let paras = { ordernumber: resultMessage.orderNumber,reamke3: "1"};  
228 - ediOrder(paras).then((res) => {  
229 -  
230 - }).catch((error) => {  
231 - alert(error);  
232 - }); 224 + //带参数跳转
  225 + _this.$router.push({name:'订单查询',params:{orderNumber:resultMessage.orderNumber}});
233 }else { 226 }else {
234 _this.dialogVisible=false; 227 _this.dialogVisible=false;
235 alert("充值失败") 228 alert("充值失败")
236 - let paras = { ordernumber: resultMessage.orderNumber,reamke3: "0"};  
237 - ediOrder(paras).then((res) => {  
238 -  
239 - }).catch((error) => {  
240 - alert(error);  
241 - }); 229 + //带参数跳转
  230 + _this.$router.push({path:'订单查询',params:{orderNumber:resultMessage.orderNumber}});
242 } 231 }
243 } 232 }
244 } 233 }