正在显示
6 个修改的文件
包含
77 行增加
和
285 行删除
src/api/empt/PayWater.js
已删除
100755 → 0
1 | -import axios from 'axios' | ||
2 | - | ||
3 | -let base = 'empt-location/queryWater'; | ||
4 | - | ||
5 | -export const getWater = params => { return axios.get(`${base}/list`, { params: params }); }; | ||
6 | - | ||
7 | -export const addOrder=params=>{return http.post(`${base}/add`, params);}; | ||
8 | - | ||
9 | -export const ediOrder=params=>{return http.put(`${base}/edi`, params);}; | ||
10 | - | ||
11 | -export const remove = params => { return axios({ | ||
12 | - method: 'DELETE', | ||
13 | - url: `${base}/del`, | ||
14 | - data: params, | ||
15 | - headers: { | ||
16 | - 'Content-Type': 'application/json;charset=UTF-8' | ||
17 | - } | ||
18 | -})}; |
@@ -3,7 +3,7 @@ import axios from 'axios' | @@ -3,7 +3,7 @@ import axios from 'axios' | ||
3 | let base = 'empt-location/water_meter'; | 3 | let base = 'empt-location/water_meter'; |
4 | 4 | ||
5 | 5 | ||
6 | -export const getList = params => { return axios.get(`${base}/list`, { params: params }); }; | 6 | +export const getList = params => { return axios.get(`${base}/selectAll`, { params: params }); }; |
7 | 7 | ||
8 | 8 | ||
9 | export const remove = params => { return axios({ | 9 | export const remove = params => { return axios({ |
@@ -21,7 +21,6 @@ import Location from './views/empt/Location.vue' | @@ -21,7 +21,6 @@ import Location from './views/empt/Location.vue' | ||
21 | import QueryOrder from './views/empt/QueryOrder.vue' | 21 | import QueryOrder from './views/empt/QueryOrder.vue' |
22 | import PayOrder from './views/empt/PayOrder.vue' | 22 | import PayOrder from './views/empt/PayOrder.vue' |
23 | import userPayOrder from './views/empt/userPayOrder.vue' | 23 | import userPayOrder from './views/empt/userPayOrder.vue' |
24 | -import QueryWater from './views/empt/QueryWater.vue' | ||
25 | 24 | ||
26 | let routes = [ | 25 | let routes = [ |
27 | { | 26 | { |
@@ -82,7 +81,6 @@ let routes = [ | @@ -82,7 +81,6 @@ let routes = [ | ||
82 | { path: '/PayOrder', component: PayOrder, name: '缴水电费订单' }, | 81 | { path: '/PayOrder', component: PayOrder, name: '缴水电费订单' }, |
83 | { path: '/userPayOrder', component: userPayOrder, name: '用户水电缴费' }, | 82 | { path: '/userPayOrder', component: userPayOrder, name: '用户水电缴费' }, |
84 | { path: '/QueryOrder', component: QueryOrder, name: '订单查询' }, | 83 | { path: '/QueryOrder', component: QueryOrder, name: '订单查询' }, |
85 | - { path: '/QueryWater', component: QueryWater, name: '水表实施信息' }, | ||
86 | ] | 84 | ] |
87 | }, | 85 | }, |
88 | { | 86 | { |
@@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
38 | </el-table-column> | 38 | </el-table-column> |
39 | <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width"> | 39 | <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width"> |
40 | <template slot-scope="scope"> | 40 | <template slot-scope="scope"> |
41 | - <el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button> | 41 | + <!--<el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>--> |
42 | <el-button type="primary" size="small" @click="handleUpdate(scope.row)">新增</el-button> | 42 | <el-button type="primary" size="small" @click="handleUpdate(scope.row)">新增</el-button> |
43 | <el-button size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">{{ $t('table.delete') }}</el-button> | 43 | <el-button size="mini" type="danger" @click="handleModifyStatus(scope.row,'deleted')">{{ $t('table.delete') }}</el-button> |
44 | 44 | ||
@@ -48,11 +48,11 @@ | @@ -48,11 +48,11 @@ | ||
48 | <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> | 48 | <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> |
49 | <el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> | 49 | <el-button v-else disabled="" type="primary" size="small" @click="waterMeter(scope.row)">水表实时信息</el-button> |
50 | 50 | ||
51 | - <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button> | ||
52 | - <el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button> | 51 | + <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> |
52 | + <!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> | ||
53 | 53 | ||
54 | - <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button> | ||
55 | - <el-button v-else disabled="" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button> | 54 | + <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button>--> |
55 | + <!--<el-button v-else disabled="" type="primary" size="small" @click="electrixityMeterEdit(scope.row)">编辑电表参数配置</el-button>--> | ||
56 | 56 | ||
57 | 57 | ||
58 | </template> | 58 | </template> |
src/views/empt/QueryWater.vue
已删除
100644 → 0
1 | -<template> | ||
2 | - <section> | ||
3 | - <el-col :span="24" class="toolbar" style="padding-bottom: 0px"> | ||
4 | - <el-form :inline="true" :model="filters"> | ||
5 | - <el-form-item> | ||
6 | - <el-input v-model="filters.orderNumber" placeholder="订单号"></el-input> | ||
7 | - </el-form-item> | ||
8 | - <el-form-item> | ||
9 | - <div class="block"> | ||
10 | - <el-date-picker | ||
11 | - v-model="filters.payTime" | ||
12 | - type="datetimerange" | ||
13 | - unlink-panels | ||
14 | - value-format="yyyy-MM-dd HH:mm:ss" | ||
15 | - range-separator="至" | ||
16 | - start-placeholder="开始日期" | ||
17 | - end-placeholder="结束日期" | ||
18 | - :picker-options="pickerOptions"> | ||
19 | - </el-date-picker> | ||
20 | - </div> | ||
21 | - </el-form-item> | ||
22 | - <el-form-item> | ||
23 | - <el-button type="primary" v-on:click="QueryOrder()">查询</el-button> | ||
24 | - </el-form-item> | ||
25 | - </el-form> | ||
26 | - </el-col> | ||
27 | - <el-table | ||
28 | - :data="tableData" | ||
29 | - stripe | ||
30 | - style="width: 100%"> | ||
31 | - <el-table-column prop="ordernumber" label="订单号" width="180"> | ||
32 | - </el-table-column> | ||
33 | - <el-table-column | ||
34 | - prop="payuserid" | ||
35 | - label="用户编号" | ||
36 | - width="100"> | ||
37 | - </el-table-column> | ||
38 | - <el-table-column | ||
39 | - prop="payusername" | ||
40 | - label="用户名称" | ||
41 | - width="90"> | ||
42 | - </el-table-column> | ||
43 | - <el-table-column | ||
44 | - prop="paylocationname" | ||
45 | - label="房间号码" | ||
46 | - width="100"> | ||
47 | - </el-table-column> | ||
48 | - <el-table-column | ||
49 | - prop="paytime" | ||
50 | - label="充值日期" | ||
51 | - width="160"> | ||
52 | - </el-table-column> | ||
53 | - <el-table-column | ||
54 | - prop="payfees" | ||
55 | - label="充值金额" | ||
56 | - width="100"> | ||
57 | - </el-table-column> | ||
58 | - <el-table-column prop="paytype" label="充值类型" width="100"> | ||
59 | - <template slot-scope="scope"> | ||
60 | - <div v-if="scope.row.paytype === false" style="color:#20a0ff">水</div> | ||
61 | - <div v-else="scope.row.paytype === true" style="color: #42d885">电</div> | ||
62 | - </template> | ||
63 | - </el-table-column> | ||
64 | - | ||
65 | - <el-table-column prop="payfesstype" label="支付方式" width="100"> | ||
66 | - <template slot-scope="scope"> | ||
67 | - <div v-if="scope.row.payfesstype === false" style="color:#42d885">微信</div> | ||
68 | - <div v-else="scope.row.payfesstype === true" style="color: #20a0ff">支付宝</div> | ||
69 | - </template> | ||
70 | - </el-table-column> | ||
71 | - <el-table-column prop="paystatus" label="支付状态" width="100"> | ||
72 | - <template slot-scope="scope"> | ||
73 | - <div v-if="scope.row.payfesstype === false" style="color:#ff4d51">未完成</div> | ||
74 | - <div v-else="scope.row.payfesstype === true" style="color: #42d885">已完成</div> | ||
75 | - </template> | ||
76 | - </el-table-column> | ||
77 | - <el-table-column | ||
78 | - fixed="right" | ||
79 | - label="操作" | ||
80 | - > | ||
81 | - <template slot-scope="scope" align="center" class-name="small-padding fixed-width" > | ||
82 | - <el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button> | ||
83 | - <el-button type="primary" @click="payDelete(scope.$index,scope.row)" size="small">移除订单</el-button> | ||
84 | - </template> | ||
85 | - </el-table-column> | ||
86 | - </el-table> | ||
87 | - | ||
88 | - <!--工具条--> | ||
89 | - <el-col :span="24" class="toolbar"> | ||
90 | - <!--<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>--> | ||
91 | - <el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;"> | ||
92 | - </el-pagination> | ||
93 | - </el-col> | ||
94 | - | ||
95 | - </section> | ||
96 | -</template> | ||
97 | -<script> | ||
98 | - import { getWater,addOrder,ediOrder,remove} from '../../api/empt/PayWater'; | ||
99 | - import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue"; | ||
100 | - export default { | ||
101 | - components: {ElButton}, | ||
102 | - data() { | ||
103 | - return { | ||
104 | - filters: { | ||
105 | - orderNumber: '', | ||
106 | - payTime:'' | ||
107 | - }, | ||
108 | - total: 0, | ||
109 | - pageNum: 1, | ||
110 | - pageSize: 5, | ||
111 | - | ||
112 | - pickerOptions: { | ||
113 | - shortcuts: [{ | ||
114 | - text: '最近一周', | ||
115 | - onClick(picker) { | ||
116 | - const end = new Date(); | ||
117 | - const start = new Date(); | ||
118 | - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); | ||
119 | - picker.$emit('pick', [start, end]); | ||
120 | - } | ||
121 | - }, { | ||
122 | - text: '最近一个月', | ||
123 | - onClick(picker) { | ||
124 | - const end = new Date(); | ||
125 | - const start = new Date(); | ||
126 | - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); | ||
127 | - picker.$emit('pick', [start, end]); | ||
128 | - } | ||
129 | - }, { | ||
130 | - text: '最近三个月', | ||
131 | - onClick(picker) { | ||
132 | - const end = new Date(); | ||
133 | - const start = new Date(); | ||
134 | - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); | ||
135 | - picker.$emit('pick', [start, end]); | ||
136 | - } | ||
137 | - }]}, | ||
138 | - formInline: { | ||
139 | - user: '', | ||
140 | - date1:'', | ||
141 | - | ||
142 | - }, | ||
143 | - tableData: [], | ||
144 | - } | ||
145 | - }, | ||
146 | - mounted() { | ||
147 | - this.QueryOrder(); | ||
148 | - }, | ||
149 | - methods: { | ||
150 | - | ||
151 | - handleCurrentChange(val) { | ||
152 | - this.pageNum = val; | ||
153 | - }, | ||
154 | - QueryOrder(){ | ||
155 | - | ||
156 | - // 清空后为null 问题 | ||
157 | - var payTimes = ''; | ||
158 | - if (this.filters.payTime!==null){ | ||
159 | - payTimes = this.filters.payTime[0]+','+this.filters.payTime[1] | ||
160 | - } | ||
161 | - let params = { | ||
162 | - pageNum: this.pageNum, | ||
163 | - pageSize: this.pageSize, | ||
164 | - orderNumber: this.filters.orderNumber, | ||
165 | - payTime: payTimes, | ||
166 | - | ||
167 | - }; | ||
168 | - getOrder(params).then(res=>{ | ||
169 | - let resData = res.data; | ||
170 | - this.total = resData.total; | ||
171 | - this.tableData = resData.list; | ||
172 | - }).catch((error) => { | ||
173 | - if(null!= error.response && error.response!==undefined){ | ||
174 | - let status= error.response.status; | ||
175 | - let msg = error.response.statusText; | ||
176 | - alert(status+msg); | ||
177 | - }else { | ||
178 | - alert(error); | ||
179 | - } | ||
180 | - }) | ||
181 | - }, | ||
182 | - | ||
183 | - //删除 | ||
184 | - payDelete: function (index, row) { | ||
185 | - this.$confirm('确认移出该订单吗?', '提示', { | ||
186 | - type: 'warning' | ||
187 | - }).then(() => { | ||
188 | - this.listLoading = true; | ||
189 | - let para = { id: row.id }; | ||
190 | - remove(para).then((res) => { | ||
191 | - this.listLoading = false; | ||
192 | - //NProgress.done(); | ||
193 | - this.$message({ | ||
194 | - message: '移出成功', | ||
195 | - type: 'success' | ||
196 | - }); | ||
197 | - this.QueryOrder(); | ||
198 | - }).catch((error) => { | ||
199 | - this.listLoading = false; | ||
200 | - alert(error); | ||
201 | - }); | ||
202 | - }).catch(); | ||
203 | - }, | ||
204 | - | ||
205 | - Pay(row){ | ||
206 | - this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}}) | ||
207 | - }, | ||
208 | - }, | ||
209 | - | ||
210 | - } | ||
211 | -</script> |
@@ -15,73 +15,64 @@ | @@ -15,73 +15,64 @@ | ||
15 | </el-form-item> | 15 | </el-form-item> |
16 | </el-form> | 16 | </el-form> |
17 | 17 | ||
18 | - <el-form :model="userPayForm" :rules="rules" ref="userPayForm" label-width="180px" :label-position="labelPosition"> | 18 | + <el-form :model="electricityForm" :rules="rules" ref="userPayForm" label-width="180px" :label-position="labelPosition"> |
19 | <el-col :span="24"> | 19 | <el-col :span="24"> |
20 | <el-form-item label="透支电费"> | 20 | <el-form-item label="透支电费"> |
21 | - <el-input disabled="" style="width: 100px" v-model="userPayForm.overdraftthreshold"></el-input> 元 | ||
22 | - </el-form-item> | ||
23 | - | 21 | + <el-input disabled="" style="width: 200px; -webkit-text-fill-color: #070A08" v-model="electricityForm.overdraftthreshold"></el-input> |
22 | + <span style="margin-right: 200px"> 元</span> | ||
24 | 23 | ||
25 | - </el-col> | ||
26 | - <el-col :span="24"> | ||
27 | - <el-form-item label="状态"> | ||
28 | - <el-input disabled="" style="width: 100px" v-model="userPayForm.payUserName"></el-input> | 24 | + <span style="margin-right: 140px"> 状态</span> |
25 | + <el-input disabled="" style="width: 200px; -webkit-text-fill-color: #070A08" v-model="electricityForm.payUserName"></el-input> | ||
29 | </el-form-item> | 26 | </el-form-item> |
30 | </el-col> | 27 | </el-col> |
31 | <el-col :span="24"> | 28 | <el-col :span="24"> |
32 | <el-form-item label="剩余电费"> | 29 | <el-form-item label="剩余电费"> |
33 | - <el-input disabled="" style="width: 100px" v-model="userPayForm.payLocationName"></el-input> | 30 | + <el-input disabled="" style="width: 200px; margin-right: 200px; -webkit-text-fill-color: #070A08" v-model="electricityForm.payLocationName"></el-input> |
31 | + <span style="margin-right: 134px"> 充值日期</span> | ||
32 | + <el-date-picker type="date" placeholder="" v-model="electricityForm.payTime" disabled="" style="width: 200px; -webkit-text-fill-color: #070A08" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> | ||
34 | </el-form-item> | 33 | </el-form-item> |
35 | </el-col> | 34 | </el-col> |
36 | 35 | ||
37 | <el-col :span="24"> | 36 | <el-col :span="24"> |
38 | - <el-form-item label="充值日期"> | ||
39 | - <el-date-picker type="date" placeholder="" v-model="userPayForm.payTime" disabled="" style="width: 200px;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> | ||
40 | - </el-form-item> | ||
41 | - </el-col> | ||
42 | - <el-col :span="24"> | ||
43 | <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees"> | 37 | <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees"> |
44 | - <el-input type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="userPayForm.payFees"></el-input> | 38 | + <el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="electricityForm.payFees"></el-input> |
45 | </el-form-item> | 39 | </el-form-item> |
46 | <el-form-item v-else label="充值金额" prop="payFees"> | 40 | <el-form-item v-else label="充值金额" prop="payFees"> |
47 | - <el-input type="number" oninput ="value=value.replace(/[^0-9]/g,'')" v-model.number="userPayForm.payFees"></el-input> | 41 | + <el-input type="number" style="width: 802px" oninput ="value=value.replace(/[^0-9]/g,'')" v-model.number="electricityForm.payFees"></el-input> |
48 | </el-form-item> | 42 | </el-form-item> |
49 | </el-col> | 43 | </el-col> |
50 | </el-form> | 44 | </el-form> |
51 | 45 | ||
52 | - <el-form :model="waterForm" :rules="rules" ref="userPayForm" label-width="180px" :label-position="labelPosition"> | 46 | + <el-form :model="waterForm" :rules="rules" ref="waterForm" label-width="180px" :label-position="labelPosition"> |
47 | + <input type="hidden" v-model="waterForm.wmId" /> | ||
53 | <el-col :span="24"> | 48 | <el-col :span="24"> |
54 | <el-form-item label="透支水费"> | 49 | <el-form-item label="透支水费"> |
55 | - <el-input disabled="" style="width: 100px" v-model="waterForm.overdraftthreshold"></el-input> 元 | ||
56 | - </el-form-item> | 50 | + <el-input disabled="" style="width: 200px; -webkit-text-fill-color: #070A08" v-model="waterForm.overdraftthreshold"></el-input> |
51 | + <span style="margin-right: 200px"> 元</span> | ||
57 | 52 | ||
58 | - | ||
59 | - </el-col> | ||
60 | - <el-col :span="24"> | ||
61 | - <el-form-item label="状态"> | ||
62 | - <el-input disabled="" style="width: 100px" v-model="waterForm.payUserName"></el-input> | 53 | + <span style="margin-right: 140px"> 状态</span> |
54 | + <el-input disabled style="width: 200px; -webkit-text-fill-color: #070A08" v-model="waterForm.wmFmstate"></el-input> | ||
63 | </el-form-item> | 55 | </el-form-item> |
64 | </el-col> | 56 | </el-col> |
65 | <el-col :span="24"> | 57 | <el-col :span="24"> |
66 | <el-form-item label="剩余水费"> | 58 | <el-form-item label="剩余水费"> |
67 | - <el-input disabled="" style="width: 100px" v-model="waterForm.payLocationName"></el-input> | 59 | + <el-input disabled="" style="width: 200px; -webkit-text-fill-color: #070A08; margin-right: 200px;" v-model="waterForm.subtraction"></el-input> |
60 | + <span style="margin-right: 134px"> 充值日期</span> | ||
61 | + <el-date-picker type="date" placeholder="" v-model="waterForm.payTime" disabled="" style="width: 200px; -webkit-text-fill-color: #070A08" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> | ||
68 | </el-form-item> | 62 | </el-form-item> |
69 | </el-col> | 63 | </el-col> |
70 | 64 | ||
71 | <el-col :span="24"> | 65 | <el-col :span="24"> |
72 | - <el-form-item label="充值日期"> | ||
73 | - <el-date-picker type="date" placeholder="" v-model="waterForm.payTime" disabled="" style="width: 200px;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> | ||
74 | - </el-form-item> | ||
75 | - </el-col> | ||
76 | - <el-col :span="24"> | ||
77 | <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees"> | 66 | <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees"> |
78 | - <el-input type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input> | 67 | + <el-input type="number" style="width:200px" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="waterForm.payFees"></el-input> |
79 | </el-form-item> | 68 | </el-form-item> |
80 | <el-form-item v-else label="充值金额" prop="payFees"> | 69 | <el-form-item v-else label="充值金额" prop="payFees"> |
81 | - <el-input type="number" oninput ="value=value.replace(/[^0-9]/g,'')" v-model.number="waterForm.payFees"></el-input> | 70 | + <el-input type="number" style="width: 802px" oninput ="value=value.replace(/[^0-9]/g,'')" v-model.number="waterForm.payFees"></el-input> |
82 | </el-form-item> | 71 | </el-form-item> |
83 | </el-col> | 72 | </el-col> |
84 | </el-form> | 73 | </el-form> |
74 | + | ||
75 | + <el-button style="margin-left:885px" type="primary" v-on:click="topUpWater()">充值水费</el-button> | ||
85 | </el-col> | 76 | </el-col> |
86 | 77 | ||
87 | 78 | ||
@@ -94,22 +85,28 @@ | @@ -94,22 +85,28 @@ | ||
94 | </style> | 85 | </style> |
95 | <script> | 86 | <script> |
96 | import loginUserInfo from '@/api/base' | 87 | import loginUserInfo from '@/api/base' |
97 | - import {getList} from '../../api/empt/userPayOrder'; | 88 | + import {getList, add} from '../../api/empt/userPayOrder'; |
89 | + import ElCol from "element-ui/packages/col/src/col"; | ||
98 | 90 | ||
99 | export default { | 91 | export default { |
92 | + components: {ElCol}, | ||
100 | data() { | 93 | data() { |
101 | return{ | 94 | return{ |
102 | filters:{ | 95 | filters:{ |
103 | - roomNumber:'' | 96 | + roomNumber:'三号楼一层卫生间' |
104 | }, | 97 | }, |
105 | 98 | ||
106 | - userPayForm:{ | 99 | + electricityForm:{ |
107 | overdraftthreshold:'', | 100 | overdraftthreshold:'', |
108 | payTime:'', | 101 | payTime:'', |
109 | }, | 102 | }, |
110 | waterForm:{ | 103 | waterForm:{ |
111 | overdraftthreshold:'', | 104 | overdraftthreshold:'', |
105 | + wmFmstate:'', | ||
112 | payTime:'', | 106 | payTime:'', |
107 | + subtraction:'', | ||
108 | + wmId:'', | ||
109 | + payFees:'' | ||
113 | }, | 110 | }, |
114 | rules:{ | 111 | rules:{ |
115 | payType: [ | 112 | payType: [ |
@@ -121,7 +118,6 @@ | @@ -121,7 +118,6 @@ | ||
121 | ], | 118 | ], |
122 | 119 | ||
123 | }, | 120 | }, |
124 | - | ||
125 | labelPosition:'left', | 121 | labelPosition:'left', |
126 | Edistatus:'', | 122 | Edistatus:'', |
127 | shuibiao:'', | 123 | shuibiao:'', |
@@ -130,7 +126,7 @@ | @@ -130,7 +126,7 @@ | ||
130 | }, | 126 | }, |
131 | methods:{ | 127 | methods:{ |
132 | 128 | ||
133 | - getdefaultData(){ | 129 | + getdefaultData() { |
134 | 130 | ||
135 | let para = { | 131 | let para = { |
136 | roomNumber: this.filters.roomNumber | 132 | roomNumber: this.filters.roomNumber |
@@ -139,18 +135,18 @@ | @@ -139,18 +135,18 @@ | ||
139 | 135 | ||
140 | getList(para).then((res) => { | 136 | getList(para).then((res) => { |
141 | let resData = res.data; | 137 | let resData = res.data; |
142 | - if (resData.length>0){ | ||
143 | - for(var i=0; i<resData.length; i++){ | ||
144 | - if(resData[i].wmId === null){ | 138 | + if (resData.length > 0) { |
139 | + for (var i = 0; i < resData.length; i++) { | ||
140 | + if (resData[i].wmId === null) { | ||
145 | 141 | ||
146 | - this.userPayForm = resData[i]; | ||
147 | - this.userPayForm.payTime = new Date(); | ||
148 | - }else { | 142 | + this.electricityForm = resData[i]; |
143 | + this.electricityForm.payTime = new Date(); | ||
144 | + } else { | ||
149 | this.waterForm = resData[i]; | 145 | this.waterForm = resData[i]; |
150 | this.waterForm.payTime = new Date(); | 146 | this.waterForm.payTime = new Date(); |
151 | } | 147 | } |
152 | } | 148 | } |
153 | - }else { | 149 | + } else { |
154 | this.$alert('请输入正确的房间号', '提示', { | 150 | this.$alert('请输入正确的房间号', '提示', { |
155 | confirmButtonText: '确定', | 151 | confirmButtonText: '确定', |
156 | callback: action => { | 152 | callback: action => { |
@@ -163,14 +159,13 @@ | @@ -163,14 +159,13 @@ | ||
163 | //NProgress.done(); | 159 | //NProgress.done(); |
164 | }).catch((error) => { | 160 | }).catch((error) => { |
165 | this.listLoading = false; | 161 | this.listLoading = false; |
166 | - if(null!= error.response && error.response!==undefined){ | ||
167 | - let status= error.response.status; | 162 | + if (null != error.response && error.response !== undefined) { |
163 | + let status = error.response.status; | ||
168 | let msg = error.response.statusText; | 164 | let msg = error.response.statusText; |
169 | alert("请输入所查询的房号1"); | 165 | alert("请输入所查询的房号1"); |
170 | - }else { | 166 | + } else { |
171 | this.$alert('请输入房间号', '提示', { | 167 | this.$alert('请输入房间号', '提示', { |
172 | confirmButtonText: '确定', | 168 | confirmButtonText: '确定', |
173 | - | ||
174 | }); | 169 | }); |
175 | } | 170 | } |
176 | 171 | ||
@@ -179,7 +174,35 @@ | @@ -179,7 +174,35 @@ | ||
179 | 174 | ||
180 | }, | 175 | }, |
181 | 176 | ||
177 | + //充值水费 | ||
178 | + topUpWater: function () { | ||
179 | + | ||
180 | + this.$refs.waterForm.validate((valid) => { | ||
181 | + if (valid) { | ||
182 | + this.$confirm('确认充值吗?', '提示', {}).then(() => { | ||
183 | + let para = Object.assign({}, this.waterForm); | ||
184 | + add(para).then((res) => { | ||
185 | + console.log(res.data.code) | ||
186 | + console.log(res) | ||
187 | + this.addLoading = false; | ||
188 | + if (res.data.code == 200) { | ||
189 | + this.$message({ | ||
190 | + message: '充值成功', | ||
191 | + type: 'success' | ||
192 | + }); | ||
193 | + }else { | ||
194 | + this.$message({ | ||
195 | + message: '网络异常', | ||
196 | + type: 'error' | ||
197 | + }); | ||
198 | + } | ||
199 | + }).catch(error => alert(error)); | ||
200 | + }); | ||
201 | + } | ||
202 | + }); | ||
203 | + }, | ||
182 | }, | 204 | }, |
205 | + | ||
183 | mounted(){ | 206 | mounted(){ |
184 | 207 | ||
185 | } | 208 | } |
-
请 注册 或 登录 后发表评论