朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 77389fe52d3195419760ae3c3389fb5c7c7c40d2 1 个父辈 a6237e10

订单查询 移出订单

内嵌 并排对比
正在显示 5 个修改的文件 包含 75 行增加 和 31 行删除
... ... @@ -30,6 +30,7 @@ module.exports = {
proxyTable: {
'/api':{
target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.43.78:12343',//设置你调用的接口域名和端口号 别忘了加http
changeOrigin: true,
pathRewrite: {
'^/api': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
... ...
import axios from 'axios'
let base = 'empt-electricity-meter/order';
export const getOrder = params => { return axios.get(`${base}/list`, { params: params }); };
export const addOrder=params=>{return http.post(`${baseUrl}/add`, params);};
export const ediOrder=params=>{return http.put(`${baseUrl}/edi`, params);};
export const delOrder = params => { return http.del(`${baseUrl}/del`,params)};
\ No newline at end of file
export const addOrder=params=>{return http.post(`${base}/add`, params);};
export const ediOrder=params=>{return http.put(`${base}/edi`, params);};
export const remove = params => { return axios({
method: 'DELETE',
url: `${base}/del`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
\ No newline at end of file
... ...
... ... @@ -549,7 +549,7 @@
// 水表实施信息
waterMeter: function (row) {
let loadingInstance1 = Loading.service({ fullscreen: true });
// let loadingInstance1 = Loading.service({ fullscreen: true });
this.waterMeterVisible=true;
var wmId = row.wmid;
let para = { wmId: wmId };
... ... @@ -557,7 +557,7 @@
this.waterMaterForm = res.data;
});
loadingInstance1.close();
// loadingInstance1.close();
},
... ...
... ... @@ -43,7 +43,7 @@
<el-input type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="OrderForm.payFees"></el-input>
</el-form-item>
<el-form-item v-else label="充值金额" prop="payFees">
<el-input disabled="" type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="OrderForm.payFees"></el-input>
<el-input disabled="" type="number" oninput ="value=value.replace(/[^0-9]/g,'')" v-model.number="OrderForm.payFees"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
... ...
<template>
<section>
<el-col :span="24" class="toolbar" style="padding-bottom: 0px">
<el-form :inline="true" :model="formInline">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="formInline.user" placeholder="用户编号"></el-input>
<el-input v-model="filters.orderNumber" placeholder="订单号"></el-input>
</el-form-item>
<el-form-item>
<div class="block">
<el-date-picker
v-model="formInline.date1"
v-model="filters.payTime"
type="daterange"
align="right"
unlink-panels
... ... @@ -29,10 +29,7 @@
:data="tableData"
stripe
style="width: 100%">
<el-table-column
prop="ordernumber"
label="订单号"
width="150">
<el-table-column prop="ordernumber" label="订单号" width="180">
</el-table-column>
<el-table-column
prop="payuserid"
... ... @@ -52,34 +49,39 @@
<el-table-column
prop="paytime"
label="充值日期"
width="100">
</el-table-column>
<el-table-column
prop="payType"
label="充值类型">
width="160">
</el-table-column>
<el-table-column
prop="payFees"
prop="payfees"
label="充值金额"
width="100">
</el-table-column>
<el-table-column
prop="payfees"
label="支付方式"
width="100">
<el-table-column prop="paytype" label="充值类型" width="100">
<template slot-scope="scope">
<div v-if="scope.row.paytype === false" style="color:#20a0ff">水</div>
<div v-else="scope.row.paytype === true" style="color: #42d885">电</div>
</template>
</el-table-column>
<el-table-column
prop="payStatus"
label="支付状态"
width="100">
<el-table-column prop="payfesstype" label="支付方式" width="100">
<template slot-scope="scope">
<div v-if="scope.row.payfesstype === false" style="color:#42d885">微信</div>
<div v-else="scope.row.payfesstype === true" style="color: #20a0ff">支付宝</div>
</template>
</el-table-column>
<el-table-column prop="paystatus" label="支付状态" width="100">
<template slot-scope="scope">
<div v-if="scope.row.payfesstype === false" style="color:#ff4d51">未完成</div>
<div v-else="scope.row.payfesstype === true" style="color: #42d885">已完成</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="180">
<template slot-scope="scope">
>
<template slot-scope="scope" align="center" class-name="small-padding fixed-width" >
<el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
<el-button type="text" size="small">移除订单</el-button>
<el-button type="primary" @click="payDelete(scope.$index,scope.row)" size="small">移除订单</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -94,10 +96,15 @@
</section>
</template>
<script>
import { getOrder,addOrder,ediOrder,delOrder} from '../../api/empt/PayOrder';
import { getOrder,addOrder,ediOrder,remove} from '../../api/empt/PayOrder';
import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
export default {
components: {ElButton},
data() {
return {
filters: {
orderNumber: ''
},
total: 0,
pageNum: 1,
pageSize: 5,
... ... @@ -140,6 +147,7 @@
this.QueryOrder();
},
methods: {
handleCurrentChange(val) {
this.pageNum = val;
},
... ... @@ -147,6 +155,7 @@
let params = {
pageNum: this.pageNum,
pageSize: this.pageSize,
orderNumber: this.filters.orderNumber,
};
getOrder(params).then(res=>{
let resData = res.data;
... ... @@ -162,6 +171,29 @@
}
})
},
//删除
payDelete: function (index, row) {
this.$confirm('确认移出该订单吗?', '提示', {
type: 'warning'
}).then(() => {
this.listLoading = true;
let para = { id: row.id };
remove(para).then((res) => {
this.listLoading = false;
//NProgress.done();
this.$message({
message: '移出成功',
type: 'success'
});
this.QueryOrder();
}).catch((error) => {
this.listLoading = false;
alert(error);
});
}).catch();
},
Pay(row){
this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
},
... ...