朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 bbd427a19db04b18f693c5e6bc65ea43a0d5d114 1 个父辈 c4005abc

添加 水费充值 水表不上水的问题

内嵌 并排对比
正在显示 3 个修改的文件 包含 50 行增加 和 30 行删除
@@ -48,4 +48,15 @@ export const defeatedOrder = params =>{ @@ -48,4 +48,15 @@ export const defeatedOrder = params =>{
48 'Content-Type': 'application/json;charset=UTF-8' 48 'Content-Type': 'application/json;charset=UTF-8'
49 } 49 }
50 }) 50 })
51 -}  
  51 +};
  52 +
  53 +export const remoteTopUpWater = params =>{
  54 + return axios({
  55 + method: 'POST',
  56 + url: `${base}/remoteTopUpWater`,
  57 + data: params,
  58 + headers: {
  59 + 'Content-Type': 'application/json;charset=UTF-8'
  60 + }
  61 + })
  62 +};
@@ -166,8 +166,6 @@ @@ -166,8 +166,6 @@
166 <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button> 166 <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
167 </div> 167 </div>
168 </el-dialog> 168 </el-dialog>
169 -  
170 -  
171 <!--电表参数配置修改--> 169 <!--电表参数配置修改-->
172 <el-dialog title="电表参数配置新增" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false"> 170 <el-dialog title="电表参数配置新增" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
173 <el-form :model="electrixityeditForm" label-width="110px" :rules="editFormRules" ref="electrixityeditForm"> 171 <el-form :model="electrixityeditForm" label-width="110px" :rules="editFormRules" ref="electrixityeditForm">
@@ -252,7 +250,6 @@ @@ -252,7 +250,6 @@
252 <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button> 250 <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
253 </div> 251 </div>
254 </el-dialog> 252 </el-dialog>
255 -  
256 <!--水表实时信息--> 253 <!--水表实时信息-->
257 <el-dialog title="水表实施信息" :visible.sync="waterMeterVisible" :close-on-click-modal="false"> 254 <el-dialog title="水表实施信息" :visible.sync="waterMeterVisible" :close-on-click-modal="false">
258 <el-form :model="waterMaterForm" label-width="100px" ref="waterMaterForm"> 255 <el-form :model="waterMaterForm" label-width="100px" ref="waterMaterForm">
@@ -285,7 +282,6 @@ @@ -285,7 +282,6 @@
285 <el-button @click.native="waterMeterVisible = false">取消</el-button> 282 <el-button @click.native="waterMeterVisible = false">取消</el-button>
286 </div> 283 </div>
287 </el-dialog> 284 </el-dialog>
288 -  
289 <!--电表实时信息--> 285 <!--电表实时信息-->
290 <el-dialog title="电表实施信息" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false"> 286 <el-dialog title="电表实施信息" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
291 <el-form v-loading="electrixityLoading" :model="electricityForm" label-width="100px" ref="waterMaterForm"> 287 <el-form v-loading="electrixityLoading" :model="electricityForm" label-width="100px" ref="waterMaterForm">
@@ -315,7 +311,6 @@ @@ -315,7 +311,6 @@
315 <el-button @click.native="electrixityeditFormVisible = false">取消</el-button> 311 <el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
316 </div> 312 </div>
317 </el-dialog> 313 </el-dialog>
318 -  
319 <!--location新增界面--> 314 <!--location新增界面-->
320 <el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false"> 315 <el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
321 <el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm"> 316 <el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
@@ -328,7 +323,6 @@ @@ -328,7 +323,6 @@
328 <el-button type="primary" @click.native="addLocationParent" :loading="addLoading">提交</el-button> 323 <el-button type="primary" @click.native="addLocationParent" :loading="addLoading">提交</el-button>
329 </div> 324 </div>
330 </el-dialog> 325 </el-dialog>
331 -  
332 <!--location编辑界面--> 326 <!--location编辑界面-->
333 <el-dialog title="编辑" :visible.sync="editFormLocationVisible" :close-on-click-modal="false"> 327 <el-dialog title="编辑" :visible.sync="editFormLocationVisible" :close-on-click-modal="false">
334 <el-form :model="editLocationForm" label-width="80px" :rules="editLocationFormRules" ref="editLocationForm"> 328 <el-form :model="editLocationForm" label-width="80px" :rules="editLocationFormRules" ref="editLocationForm">
@@ -338,31 +332,15 @@ @@ -338,31 +332,15 @@
338 <el-form-item label="名称" prop="adrName"> 332 <el-form-item label="名称" prop="adrName">
339 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input> 333 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
340 </el-form-item> 334 </el-form-item>
341 -  
342 -<!-- <el-col v-if="waterNumber === 'waterNum'">-->  
343 -<!-- <el-form-item label="水表编号" prop="wmid">-->  
344 -<!-- <el-select style="height: 38px; width: 100%"-->  
345 -<!-- v-model="editLocationForm.wmid"-->  
346 -<!-- filterable-->  
347 -<!-- remote-->  
348 -<!-- default-first-option-->  
349 -<!-- allow-create-->  
350 -<!-- placeholder="请输入关键词"-->  
351 -<!-- :remote-method="waterMeterAlls"-->  
352 -<!-- :loading="listLoading" clearable>-->  
353 -<!-- <el-option-->  
354 -<!-- v-for="item in waterMeterList"-->  
355 -<!-- :key="item.wmId" :label="item.wmId" :value="item.wmId" clearable>-->  
356 -<!-- </el-option>-->  
357 -<!-- </el-select>-->  
358 -<!-- </el-form-item>-->  
359 <el-form-item v-if="waterNumber==='waterNum'" label="水表编号" prop="wmid"> 335 <el-form-item v-if="waterNumber==='waterNum'" label="水表编号" prop="wmid">
360 <el-input v-model="editLocationForm.wmid" auto-complete="off" placeholder="请输入水表编号"></el-input> 336 <el-input v-model="editLocationForm.wmid" auto-complete="off" placeholder="请输入水表编号"></el-input>
361 </el-form-item> 337 </el-form-item>
362 -<!-- </el-col>-->  
363 <el-form-item v-if="electricityNumber==='eeNum'" label="电表编号" prop="eeid"> 338 <el-form-item v-if="electricityNumber==='eeNum'" label="电表编号" prop="eeid">
364 <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电表编号"></el-input> 339 <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电表编号"></el-input>
365 </el-form-item> 340 </el-form-item>
  341 +<!-- <el-form-item label="电话号码" prop="eeid">-->
  342 +<!-- <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电话号码"></el-input>-->
  343 +<!-- </el-form-item>-->
366 344
367 345
368 </el-form> 346 </el-form>
@@ -371,7 +349,6 @@ @@ -371,7 +349,6 @@
371 <el-button type="primary" @click.native="editLocationAdrName" :loading="addLoading">提交</el-button> 349 <el-button type="primary" @click.native="editLocationAdrName" :loading="addLoading">提交</el-button>
372 </div> 350 </div>
373 </el-dialog> 351 </el-dialog>
374 -  
375 </section> 352 </section>
376 </template> 353 </template>
377 <style> 354 <style>
@@ -746,6 +723,7 @@ @@ -746,6 +723,7 @@
746 }, 723 },
747 // 公寓新增 724 // 公寓新增
748 addLocationParent: function () { 725 addLocationParent: function () {
  726 + this.addLoading = false;
749 this.$refs.addLocationForm.validate((valid) => { 727 this.$refs.addLocationForm.validate((valid) => {
750 if (valid) { 728 if (valid) {
751 this.$confirm('确认提交吗？', '提示', {}).then(() => { 729 this.$confirm('确认提交吗？', '提示', {}).then(() => {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <el-col :span="24" class="toolbar" style="padding-bottom: 0px"> 3 <el-col :span="24" class="toolbar" style="padding-bottom: 0px">
4 <el-form :inline="true" :model="filters"> 4 <el-form :inline="true" :model="filters">
5 <el-form-item> 5 <el-form-item>
6 - <el-input v-model="filters.orderNumber" placeholder="订单号"></el-input> 6 + <el-input v-model="filters.orderNumber" placeholder="房间号"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item> 8 <el-form-item>
9 <div class="block"> 9 <div class="block">
@@ -99,6 +99,7 @@ @@ -99,6 +99,7 @@
99 </template> 99 </template>
100 </el-table-column> 100 </el-table-column>
101 <el-table-column 101 <el-table-column
  102 + width="350"
102 fixed="right" 103 fixed="right"
103 label="操作"> 104 label="操作">
104 <template slot-scope="scope" align="center" class-name="small-padding fixed-width"> 105 <template slot-scope="scope" align="center" class-name="small-padding fixed-width">
@@ -115,7 +116,9 @@ @@ -115,7 +116,9 @@
115 <el-button type="primary" v-else-if="username == 'admin'" disabled @click="defeatedOrders(scope.$index,scope.row)" 116 <el-button type="primary" v-else-if="username == 'admin'" disabled @click="defeatedOrders(scope.$index,scope.row)"
116 size="small">处理订单充值 117 size="small">处理订单充值
117 </el-button> 118 </el-button>
118 - 119 + <el-button type="primary" v-if="username == 'admin'" @click="processingWaterPrepaidPhone(scope.$index,scope.row)"
  120 + size="small">处理水费充值
  121 + </el-button>
119 </template> 122 </template>
120 </el-table-column> 123 </el-table-column>
121 </el-table> 124 </el-table>
@@ -145,7 +148,7 @@ @@ -145,7 +148,7 @@
145 </section> 148 </section>
146 </template> 149 </template>
147 <script> 150 <script>
148 - import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount} from '../../api/empt/PayOrder'; 151 + import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount,remoteTopUpWater} from '../../api/empt/PayOrder';
149 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue"; 152 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
150 import moment from 'moment' 153 import moment from 'moment'
151 // 引入插件 154 // 引入插件
@@ -323,6 +326,34 @@ @@ -323,6 +326,34 @@
323 }).catch(); 326 }).catch();
324 }, 327 },
325 328
  329 + // 处理水费充值
  330 + processingWaterPrepaidPhone: function(index, row){
  331 + this.$confirm('确定充值?', '提示', {
  332 + type: 'warning'
  333 + }).then(() => {
  334 + this.listLoading = true;
  335 + remoteTopUpWater(row).then((res) => {
  336 + this.listLoading = false;
  337 + if (res.data.code == '200'){
  338 + this.$message({
  339 + message: res.data.msg,
  340 + type: 'success'
  341 + });
  342 + }else {
  343 + this.$message({
  344 + message: res.data.msg,
  345 + type: 'error'
  346 + });
  347 + }
  348 +
  349 + this.QueryOrder();
  350 + }).catch((error) => {
  351 + this.listLoading = false;
  352 + alert(error);
  353 + });
  354 + }).catch();
  355 + },
  356 +
326 dateForma: function (row, column) { 357 dateForma: function (row, column) {
327 358
328 var date = row[column.property]; 359 var date = row[column.property];