朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 a6237e101c85cfd0a87f30d7c959aaebcfc11995 1 个父辈 2c29be66

订单

内嵌 并排对比
正在显示 7 个修改的文件 包含 697 行增加 和 52 行删除
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
... ...
import axios from 'axios'
let base = 'empt-electricity-meter/electricity_meter';
export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
export const remove = params => { return axios({
method: 'DELETE',
url: `${base}/del`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
//批量删除
export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
export const edit = params => { return axios({
method: 'PUT',
url: `${base}/edit`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const add = params => { return axios({
method: 'POST',
url: `${base}/add`,
params: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const getEEModel = params => { return axios({
method: 'POST',
url: `${base}/getEEModel`,
params: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const update = params => { return axios({
method: 'PUT',
url: `${base}/update`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
\ No newline at end of file
... ...
import axios from 'axios'
let base = 'empt-electricity-meter/water_meter';
export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
export const remove = params => { return axios({
method: 'DELETE',
url: `${base}/del`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
//批量删除
export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
export const edit = params => { return axios({
method: 'PUT',
url: `${base}/edit`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const add = params => { return axios({
method: 'POST',
url: `${base}/add`,
params: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const findRealTime = params => { return axios({
method: 'POST',
url: `${base}/findRealTime`,
params: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
export const update = params => { return axios({
method: 'PUT',
url: `${base}/update`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})};
\ No newline at end of file
... ...
... ... @@ -12,19 +12,16 @@ import Department from './views/nav1/department.vue'
import Group from './views/nav1/groupcompany.vue'
import Process from './views/hqpt/Process.vue'
import Job from './views/hqpt/Job.vue'
// import Form from './views/nav1/Form.vue'
import User from './views/nav1/user.vue'
import Page4 from './views/nav2/Page4.vue'
import Page5 from './views/nav2/Page5.vue'
import Page6 from './views/nav3/Page6.vue'
import echarts from './views/charts/echarts.vue'
import SecrityInspection from './views/staff/security_inspection.vue'
import Key from './views/staff/key.vue'
import Maintain from './views/staff/maintain.vue'
import ComeCar from './views/staff/come_car.vue'
import OnDuty from './views/staff/on_duty.vue'
import Location from './views/empt/Location.vue'
import QueryOrder from './views/empt/QueryOrder.vue'
import PayOrder from './views/empt/PayOrder.vue'
let routes = [
{
... ... @@ -82,6 +79,8 @@ let routes = [
iconCls: 'fa fa-id-card-o',
children: [
{ path: '/location', component: Location, name: '能源缴费' },
{ path: '/PayOrder', component: PayOrder, name: '缴水电费订单' },
{ path: '/QueryOrder', component: QueryOrder, name: '订单查询' },
]
},
{
... ...
... ... @@ -41,7 +41,20 @@
<el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>
<el-button type="primary" size="small" @click="handleUpdate(scope.row)">新增</el-button>
<el-button size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">{{ $t('table.delete') }}</el-button>
<el-button type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="pay(scope.row)">缴费</el-button>
<el-button v-else disabled="" type="primary" size="small" @click="pay(scope.row)">缴费</el-button>
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
<el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button>
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>
<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>
<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button>
<el-button v-else disabled="" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -53,7 +66,7 @@
</el-pagination>
</el-col>
<!--水表新增-->
<!--电表新增-->
<el-dialog title="电表参数配置新增" :visible.sync="electrixityAddFormVisible" :close-on-click-modal="false">
<el-form :model="electrixityAddForm" label-width="110px" :rules="addFormRules" ref="electrixityAddForm">
<el-form-item label="水电预付费" prop="prepaid">
... ... @@ -61,10 +74,10 @@
v-model="electrixityAddForm.prepaid"
active-color="#00A854"
active-text="是"
active-value="0"
active-value="1"
inactive-color="#F04134"
inactive-text="否"
inactive-value="1">
inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="电警告跳闸" prop="warningtrip">
... ... @@ -72,10 +85,10 @@
v-model="electrixityAddForm.warningtrip"
active-color="#00A854"
active-text="是"
active-value="0"
active-value="1"
inactive-color="#F04134"
inactive-text="否"
inactive-value="1">
inactive-value="0">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>告警阀值</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.warningthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
</el-form-item>
... ... @@ -84,22 +97,22 @@
v-model="electrixityAddForm.overdraft"
active-color="#00A854"
active-text="是"
active-value="0"
active-value="1"
inactive-color="#F04134"
inactive-text="否"
inactive-value="1">
inactive-value="0">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>可透支额度</span>&nbsp;&nbsp;<el-input v-model="electrixityAddForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
</el-form-item>
<el-form-item label="过负荷跳闸使能" prop="overdraft">
<el-switch
v-model="electrixityAddForm.load"
v-model="electrixityAddForm.waterload"
active-color="#00A854"
active-text="是"
active-value="0"
active-value="1"
inactive-color="#F04134"
inactive-text="否"
inactive-value="1">
inactive-value="0">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.power" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>KW</span>
<br/>
... ... @@ -111,12 +124,12 @@
v-model="electrixityAddForm.free"
active-color="#00A854"
active-text="是"
active-value="0"
active-value="1"
inactive-color="#F04134"
inactive-text="否"
inactive-value="1">
inactive-value="0">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.freeelectricitylimit" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
... ... @@ -124,6 +137,121 @@
<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
</div>
</el-dialog>
<!--电表参数配置修改-->
<el-dialog title="电表参数配置新增" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
<el-form :model="electrixityeditForm" label-width="110px" :rules="editFormRules" ref="electrixityeditForm">
<el-form-item label="电表编号" prop="companyName">
<el-input v-model="electrixityeditForm.eeId" auto-complete="off" style="width: 40%" disabled></el-input>
</el-form-item>
<el-form-item label="水电预付费" prop="prepaid">
<el-switch
v-model="electrixityeditForm.prepaid"
active-color="#00A854"
active-text="是"
:active-value="true"
inactive-color="#F04134"
inactive-text="否"
:inactive-value="false"
@change="func(data)">
</el-switch>
</el-form-item>
<el-form-item label="电警告跳闸" prop="warningtrip">
<el-switch
v-model="electrixityeditForm.warningtrip"
active-color="#00A854"
active-text="是"
:active-value="true"
inactive-color="#F04134"
inactive-text="否"
:inactive-value="false">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>告警阀值</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.warningthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
</el-form-item>
<el-form-item label="透支使能" prop="overdraft">
<el-switch
v-model="electrixityeditForm.overdraft"
active-color="#00A854"
active-text="是"
:active-value="true"
inactive-color="#F04134"
inactive-text="否"
:inactive-value="false">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>可透支额度</span>&nbsp;&nbsp;<el-input v-model="electrixityeditForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
</el-form-item>
<el-form-item label="过负荷跳闸使能" prop="overdraft">
<el-switch
v-model="electrixityeditForm.waterload"
active-color="#00A854"
active-text="是"
:active-value="true"
inactive-color="#F04134"
inactive-text="否"
:inactive-value="false">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.power" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>KW</span>
<br/>
<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率因数</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.powerfactor" style="width: 100px;" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="免费电度使能" prop="overdraft">
<el-switch
v-model="electrixityeditForm.free"
active-color="#00A854"
active-text="是"
:active-value="true"
inactive-color="#F04134"
inactive-text="否"
:inactive-value="false">
</el-switch>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.freeelectricitylimit" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
</div>
</el-dialog>
<!--水表实时信息-->
<el-dialog title="水表实施信息" :visible.sync="waterMeterVisible" :close-on-click-modal="false">
<el-form :model="waterMaterForm" label-width="100px" ref="waterMaterForm">
<el-form-item label="水表编号" prop="wmId">
<el-input v-model="waterMaterForm.wmId" auto-complete="off" ></el-input>
</el-form-item>
<el-form-item label="累计充值量" prop="wmSacc">
<el-input v-model="waterMaterForm.wmSacc" auto-complete="off" ></el-input>
</el-form-item>
<el-form-item label="累计流量" prop="wmLacc">
<el-input v-model="waterMaterForm.wmLacc" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="上传时间" prop="wmRdtime">
<el-input v-model="waterMaterForm.wmRdtime" auto-complete="off" ></el-input>
</el-form-item>
<el-form-item label="阀门状态" prop="wmFmstate">
<el-input v-model="waterMaterForm.wmFmstate" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="故障状态" prop="wmErrmessage">
<el-input v-model="waterMaterForm.wmErrmessage" auto-complete="off" ></el-input>
</el-form-item>
<el-form-item label="电压" prop="wmVoltage">
<el-input v-model="waterMaterForm.wmVoltage" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="表示信号强度" prop="wmSignalpower">
<el-input v-model="waterMaterForm.wmSignalpower" auto-complete="off"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="waterMeterVisible = false">取消</el-button>
</div>
</el-dialog>
</section>
</template>
<style>
... ... @@ -141,6 +269,8 @@
</style>
<script>
import { getList,add} from '@/api/empt/location_api';
import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams';
import {findRealTime } from '@/api/empt/waterMeter';
import moment from 'moment'
import parseTime from '@/utils'
import loginUserInfo from '@/api/base'
... ... @@ -152,8 +282,6 @@
processName: '',
parseTime: parseTime
},
userId: '',
realName: '',
wmId:'',
locationList:[],
total: 0,
... ... @@ -163,6 +291,10 @@
sels: [],//列表选中列
//编辑界面是否显示
editFormVisible: false,
electrixityeditFormVisible: false,
// 水表实施信息
waterMeterVisible:false,
editLoading: false,
editFormRules: {
roleName: [
... ... @@ -177,6 +309,20 @@
roleSign: 1,
departmentId:''
},
// 编辑电表参数配置
electrixityeditForm:{
id:'',
prepaid: '',
warningtrip: '',
warningthreshold: '',
overdraft:'',
overdraftthreshold: '',
waterload: '',
power: '',
powerfactor: '',
freeelectricitylimit: '',
eeId: ''
},
//用户ID
//新增界面是否显示
electrixityAddFormVisible: false,
... ... @@ -190,19 +336,32 @@
{ required: true, message: '请输入岗位/角色描述', trigger: 'blur' }
]
},
//水表参数配置、界面数据
//电表参数配置、界面数据
electrixityAddForm: {
prepaid: '',
warningtrip: '',
warningthreshold: '',
overdraft:'',
overdraftthreshold: '',
load: '',
waterload: '',
power: '',
powerfactor: '',
freeelectricitylimit: '',
eeId: ''
},
// 水表实施信息
waterMaterForm:{
wmId:'',
wmSacc:'',
wmLacc:'',
wmRdtime:'',
wmFmstate:'',
wmErrmessage:'',
wmVoltage:'',
wmSignalpower:''
},
permForm: {
roleId: 1,
description: '',
... ... @@ -278,6 +437,9 @@
}
},
methods: {
one: function(prepaid){
return prepaid?true:one='是'?false:one='否'
},
//性别显示转换
formatType: function (row, column) {
let msg = '未知';
... ... @@ -296,6 +458,9 @@
break;
}
return msg;
},//性别显示转换
formatperpaid: function (value) {
return value === true ? "1" : "0";
},
handleCurrentChange(val) {
this.pageNum = val;
... ... @@ -353,12 +518,18 @@
* @param index
* @param row 为这行的数据对象
*/
handleEdit: function (index, row) {
this.editFormVisible = true;
this.editForm = Object.assign({}, row);
this.getdepartmentNames();
electrixityMeterEdit: function (row) {
this.electrixityeditFormVisible = true;
var ids = row.eeid;
let para = { eeId: ids };
// 查询电表参数配置表数据
getEEModel(para).then((res) => {
this.electrixityeditForm = res.data;
});
},
//水表参数配置新增界面，每次点开初始化数据
//电表参数配置新增界面，每次点开初始化数据
electrixityMeterConfiguration: function (row) {
this.electrixityAddFormVisible = true;
this.electrixityAddForm = {
... ... @@ -367,14 +538,31 @@
warningthreshold: '',
overdraft:'',
overdraftthreshold: '',
load: '',
waterload: '',
water: '',
free: '',
freeWater: '',
eeId: row.eeId
eeId: row.eeid
}
},
// 水表实施信息
waterMeter: function (row) {
let loadingInstance1 = Loading.service({ fullscreen: true });
this.waterMeterVisible=true;
var wmId = row.wmid;
let para = { wmId: wmId };
findRealTime(para).then((res) => {
this.waterMaterForm = res.data;
});
loadingInstance1.close();
},
//新增
addSubmit: function () {
this.$refs.electrixityAddForm.validate((valid) => {
... ... @@ -383,16 +571,20 @@
this.addLoading = true;
//NProgress.start();
let para = Object.assign({}, this.electrixityAddForm);
add(para).then((res) => {
electicity(para).then((res) => {
this.addLoading = false;
if (res.status ===200) {
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs['permForm'].resetFields();
this.$refs['electrixityAddForm'].resetFields();
this.electrixityAddFormVisible = false;
this.getList();
}else if (res.status===201){
this.$message({
message:'不能重复提交',
type:"error"
})
}
}).catch(error => alert(error));
});
... ... @@ -400,30 +592,21 @@
});
},
//编辑
// 编辑电表参数配置
editSubmit: function () {
this.$refs.editForm.validate((valid) => {
this.$refs.electrixityeditForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.editLoading = true;
//NProgress.start();
let para = Object.assign({}, this.editForm);
//不需要提交的 去掉，后端不好接收
para.authorities = null;
para.permissions = null;
para.roles = null;
// para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
/*
查询之后格式this.filters.column.create_start_date中日期发生变化;
Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) 变成了 "2017-08-08T16:00:00.000Z";
所以使用 moment 日期格式化插件将时间转换成 [ Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) ] 格
式;
*/
/*moment 安装 npm install moment --save*/
para.creattime = moment(para.creattime).format('YYYY-MM-DD HH:mm:ss');
let para= Object.assign({}, this.electrixityeditForm);
para.prepaid = this.formatperpaid(para.prepaid);
para.warningtrip = this.formatperpaid(para.warningtrip);
para.overdraft = this.formatperpaid(para.overdraft);
para.waterload = this.formatperpaid(para.waterload);
para.free = this.formatperpaid(para.free);
this.editLoading = false;
edit(para).then((res) => {
//NProgress.done();
this.$message({
message: '提交成功',
... ... @@ -474,10 +657,15 @@
handleSelectionChange(val) {
this.multipleSelection = val
},
//缴水电费订单跳转
pay(row){
this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'create'}});
},
},
mounted() {
this.userId = loginUserInfo.userId;
this.realName = loginUserInfo.realname;
this.getList();
}
}
... ...
<template>
<el-container>
<el-main >
<el-row type="flex" class="row-bg" justify="center">
<el-col :span="20">
<el-form :model="OrderForm" :rules="rules" ref="OrderForm" label-width="180px" :label-position="labelPosition">
<el-col :span="24">
<el-form-item label="充值类型" prop="payType">
<el-col :span="24">
<el-select v-if="Edistatus=='create'" v-model="OrderForm.payType" @change="selectTrigger(OrderForm.payType)" placeholder="请选择充值类型" style="width:100%">
<el-option v-for="item in payTypes" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
<el-select v-else v-model="OrderForm.payType" style="width:100%">
<el-option disabled="" v-for="item in payTypes" :key="item.value" :label="item.label"
:value="item.value" ></el-option>
</el-select>
</el-col>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="仪表地址">
<el-input disabled="" v-model="OrderForm.payTypeAddress"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="用户名称">
<el-input disabled="" v-model="OrderForm.payUserName"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="房间号码">
<el-input disabled="" v-model="OrderForm.payLocationName"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="充值日期">
<el-date-picker type="date" placeholder="" v-model="OrderForm.payTime" disabled="" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees">
<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-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="支付方式">
<el-radio-group v-model="OrderForm.payFessType">
<el-radio v-for="item in payFessTypes" :key="item.value" :label="item.value" border>{{item.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item >
<el-button type="primary" style="width:100%" @click="Edistatus==='create'?createData('OrderForm'):updateData('OrderForm')">确认支付</el-button>
</el-form-item>
</el-col>
</el-form>
</el-col>
</el-row>
</el-main>
</el-container>
</template>
<style scoped>
</style>
<script>
import loginUserInfo from '@/api/base'
export default {
data() {
return{
OrderForm:{
payUserId:'',
payUserName:'',
payTime:new Date(),
payLocationId:'',
payLocationName:'3#01-101',
payTypeAddress:'',
payFees:'',
payType:'',
payFessType:'1',
orderNumber:'',
payStatus:'',
},
rules:{
payType: [
{ required: true, message: '请选择充值类型', trigger: 'change' }
],
payFees:[
{ required: true, message: '充值金额不能为空'},
{ type: 'number', message: '金额必须为数字值'}
]
},
payTypes: [
{
value: '0',
label: '水费'
}, {
value: '1',
label: '电费'
}],
payFessTypes:[
{
value: '0',
label: '微 信'
}, {
value: '1',
label: '支付宝'
}],
labelPosition:'left',
Edistatus:'',
shuibiao:'',
dianbiao:''
}
},
methods:{
getdefaultData(){
if(this.$route.params.Edistatus=='create'){
this.OrderForm.payUserId=loginUserInfo.userId;
this.OrderForm.payUserName=loginUserInfo.username;
this.OrderForm.payLocationId=this.$route.params.row.id;
this.OrderForm.payLocationName=this.$route.params.row.adrname;
this.Edistatus=this.$route.params.Edistatus;
this.shuibiao='1111111';
this.dianbiao='222222';
}else{
this.Edistatus='update';
this.OrderForm.payType='0'
this.OrderForm.payTypeAddress='333333';
}
},
selectTrigger(val){
if(val=='0'){
this.OrderForm.payTypeAddress=this.shuibiao
}else{
this.OrderForm.payTypeAddress=this.dianbiao;
}
},
createData(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert("新增充值"+this.OrderForm.payType+"支付方式为："+this.OrderForm.payFessType+"充值金额："+this.OrderForm.payFees);
} else {
console.log('error submit!!');
return false;
}
});
},
updateData(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert("完成充值"+this.OrderForm.payType+"支付方式为："+this.OrderForm.payFessType+"充值金额："+this.OrderForm.payFees);
} else {
console.log('error submit!!');
return false;
}
});
}
},
mounted(){
this.getdefaultData();
}
}
</script>
\ No newline at end of file
... ...
<template>
<section>
<el-col :span="24" class="toolbar" style="padding-bottom: 0px">
<el-form :inline="true" :model="formInline">
<el-form-item>
<el-input v-model="formInline.user" placeholder="用户编号"></el-input>
</el-form-item>
<el-form-item>
<div class="block">
<el-date-picker
v-model="formInline.date1"
type="daterange"
align="right"
unlink-panels
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions">
</el-date-picker>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="QueryOrder()">查询</el-button>
</el-form-item>
</el-form>
</el-col>
<el-table
:data="tableData"
stripe
style="width: 100%">
<el-table-column
prop="ordernumber"
label="订单号"
width="150">
</el-table-column>
<el-table-column
prop="payuserid"
label="用户编号"
width="100">
</el-table-column>
<el-table-column
prop="payusername"
label="用户名称"
width="90">
</el-table-column>
<el-table-column
prop="paylocationname"
label="房间号码"
width="100">
</el-table-column>
<el-table-column
prop="paytime"
label="充值日期"
width="100">
</el-table-column>
<el-table-column
prop="payType"
label="充值类型">
</el-table-column>
<el-table-column
prop="payFees"
label="充值金额"
width="100">
</el-table-column>
<el-table-column
prop="payfees"
label="支付方式"
width="100">
</el-table-column>
<el-table-column
prop="payStatus"
label="支付状态"
width="100">
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="180">
<template slot-scope="scope">
<el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
<el-button type="text" size="small">移除订单</el-button>
</template>
</el-table-column>
</el-table>
<!--工具条-->
<el-col :span="24" class="toolbar">
<!--<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>-->
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
</section>
</template>
<script>
import { getOrder,addOrder,ediOrder,delOrder} from '../../api/empt/PayOrder';
export default {
data() {
return {
total: 0,
pageNum: 1,
pageSize: 5,
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]},
formInline: {
user: '',
date1:'',
},
tableData: [],
}
},
mounted() {
this.QueryOrder();
},
methods: {
handleCurrentChange(val) {
this.pageNum = val;
},
QueryOrder(){
let params = {
pageNum: this.pageNum,
pageSize: this.pageSize,
};
getOrder(params).then(res=>{
let resData = res.data;
this.total = resData.total;
this.tableData = resData.list;
}).catch((error) => {
if(null!= error.response && error.response!==undefined){
let status= error.response.status;
let msg = error.response.statusText;
alert(status+msg);
}else {
alert(error);
}
})
},
Pay(row){
this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
},
},
}
</script>
\ No newline at end of file
... ...