朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 bbd427a19db04b18f693c5e6bc65ea43a0d5d114 1 个父辈 c4005abc

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 50 行增加 和 30 行删除
... ... @@ -48,4 +48,15 @@ export const defeatedOrder = params =>{
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
\ No newline at end of file
};
export const remoteTopUpWater = params =>{
return axios({
method: 'POST',
url: `${base}/remoteTopUpWater`,
data: params,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
};
\ No newline at end of file
... ...
... ... @@ -166,8 +166,6 @@
<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">
... ... @@ -252,7 +250,6 @@
<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">
... ... @@ -285,7 +282,6 @@
<el-button @click.native="waterMeterVisible = false">取消</el-button>
</div>
</el-dialog>
<!--电表实时信息-->
<el-dialog title="电表实施信息" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
<el-form v-loading="electrixityLoading" :model="electricityForm" label-width="100px" ref="waterMaterForm">
... ... @@ -315,7 +311,6 @@
<el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
</div>
</el-dialog>
<!--location新增界面-->
<el-dialog title="新增" :visible.sync="addFormLocationVisible" :close-on-click-modal="false">
<el-form :model="addLocationForm" label-width="80px" :rules="addLocationFormRules" ref="addLocationForm">
... ... @@ -328,7 +323,6 @@
<el-button type="primary" @click.native="addLocationParent" :loading="addLoading">提交</el-button>
</div>
</el-dialog>
<!--location编辑界面-->
<el-dialog title="编辑" :visible.sync="editFormLocationVisible" :close-on-click-modal="false">
<el-form :model="editLocationForm" label-width="80px" :rules="editLocationFormRules" ref="editLocationForm">
... ... @@ -338,31 +332,15 @@
<el-form-item label="名称" prop="adrName">
<el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
</el-form-item>
<!-- <el-col v-if="waterNumber === 'waterNum'">-->
<!-- <el-form-item label="水表编号" prop="wmid">-->
<!-- <el-select style="height: 38px; width: 100%"-->
<!-- v-model="editLocationForm.wmid"-->
<!-- filterable-->
<!-- remote-->
<!-- default-first-option-->
<!-- allow-create-->
<!-- placeholder="请输入关键词"-->
<!-- :remote-method="waterMeterAlls"-->
<!-- :loading="listLoading" clearable>-->
<!-- <el-option-->
<!-- v-for="item in waterMeterList"-->
<!-- :key="item.wmId" :label="item.wmId" :value="item.wmId" clearable>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="waterNumber==='waterNum'" label="水表编号" prop="wmid">
<el-input v-model="editLocationForm.wmid" auto-complete="off" placeholder="请输入水表编号"></el-input>
</el-form-item>
<!-- </el-col>-->
<el-form-item v-if="electricityNumber==='eeNum'" label="电表编号" prop="eeid">
<el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电表编号"></el-input>
</el-form-item>
<!-- <el-form-item label="电话号码" prop="eeid">-->
<!-- <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电话号码"></el-input>-->
<!-- </el-form-item>-->
</el-form>
... ... @@ -371,7 +349,6 @@
<el-button type="primary" @click.native="editLocationAdrName" :loading="addLoading">提交</el-button>
</div>
</el-dialog>
</section>
</template>
<style>
... ... @@ -746,6 +723,7 @@
},
// 公寓新增
addLocationParent: function () {
this.addLoading = false;
this.$refs.addLocationForm.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
... ...
... ... @@ -3,7 +3,7 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.orderNumber" placeholder="订单号"></el-input>
<el-input v-model="filters.orderNumber" placeholder="房间号"></el-input>
</el-form-item>
<el-form-item>
<div class="block">
... ... @@ -99,6 +99,7 @@
</template>
</el-table-column>
<el-table-column
width="350"
fixed="right"
label="操作">
<template slot-scope="scope" align="center" class-name="small-padding fixed-width">
... ... @@ -115,7 +116,9 @@
<el-button type="primary" v-else-if="username == 'admin'" disabled @click="defeatedOrders(scope.$index,scope.row)"
size="small">处理订单充值
</el-button>
<el-button type="primary" v-if="username == 'admin'" @click="processingWaterPrepaidPhone(scope.$index,scope.row)"
size="small">处理水费充值
</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -145,7 +148,7 @@
</section>
</template>
<script>
import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount} from '../../api/empt/PayOrder';
import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount,remoteTopUpWater} from '../../api/empt/PayOrder';
import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
import moment from 'moment'
// 引入插件
... ... @@ -323,6 +326,34 @@
}).catch();
},
// 处理水费充值
processingWaterPrepaidPhone: function(index, row){
this.$confirm('确定充值?', '提示', {
type: 'warning'
}).then(() => {
this.listLoading = true;
remoteTopUpWater(row).then((res) => {
this.listLoading = false;
if (res.data.code == '200'){
this.$message({
message: res.data.msg,
type: 'success'
});
}else {
this.$message({
message: res.data.msg,
type: 'error'
});
}
this.QueryOrder();
}).catch((error) => {
this.listLoading = false;
alert(error);
});
}).catch();
},
dateForma: function (row, column) {
var date = row[column.property];
... ...