diff --git a/src/api/empt/PayOrder.js b/src/api/empt/PayOrder.js
index ea9d3dd..c5779ca 100755
--- a/src/api/empt/PayOrder.js
+++ b/src/api/empt/PayOrder.js
@@ -6,6 +6,11 @@ export const getOrder = params => {
return axios.get(`${base}/list`, {params: params});
};
+export const waterEleCount = params => {
+ return axios.get(`${base}/waterEleCount`, {params: params});
+};
+
+
export const addOrder = params => {
return http.post(`${base}/add`, params);
};
diff --git a/src/api/empt/location_api.js b/src/api/empt/location_api.js
index f67de14..a812b9c 100644
--- a/src/api/empt/location_api.js
+++ b/src/api/empt/location_api.js
@@ -7,6 +7,10 @@ export const getList = params => {
return axios.get(`${base}/list`, {params: params});
};
+export const serverMtfmset = params => {
+ return axios.get(`${base}/allAddMtfmset`, {params: params});
+};
+
export const remove = params => {
return axios({
diff --git a/src/views/empt/Location.vue b/src/views/empt/Location.vue
index e91e854..ef08bc1 100644
--- a/src/views/empt/Location.vue
+++ b/src/views/empt/Location.vue
@@ -63,6 +63,12 @@
<el-button v-else disabled="" type="primary" size="small" @click="electicityInfo(scope.row)">
电表实时信息
</el-button>
+ <el-button v-if="scope.row.type=='3'" type="primary" size="small"
+ @click="allAddMtfmset(scope.row)">水表阀开
+ </el-button>
+ <el-button v-else disabled="" type="primary" size="small" @click="allAddMtfmset(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>-->
@@ -333,24 +339,27 @@
<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-col>
+<!-- <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>
@@ -379,7 +388,7 @@
}
</style>
<script>
- import {getList, add, remove, edit as editLocation} from '@/api/empt/location_api';
+ import {getList, add, remove, edit as editLocation, serverMtfmset} from '@/api/empt/location_api';
import {add as electicity, getEEModel, edit, electricityInfo} from '@/api/empt/electricityParams';
import {findRealTime, waterMeterAll} from '@/api/empt/waterMeter';
import moment from 'moment'
@@ -780,7 +789,7 @@
this.waterNumber = undefined;
this.editFormLocationVisible = true;
this.editLocationForm = row;
- if (row.type == 3) {
+ if (row.type === 3) {
this.waterNumber = 'waterNum';
this.electricityNumber = 'eeNum';
}
@@ -982,6 +991,19 @@
this.$router.push({name: '缴水电费订单', params: {row, Edistatus: 'create'}});
},
+ allAddMtfmset: function(row){
+ let para = {
+ "MtId": row.wmid,
+ "MtFm":"0"
+ }
+ serverMtfmset(para).then((res) => {
+ this.$message({
+ message: '操作成功',
+ type: 'success'
+ });
+ }).catch(error => alert(error));
+ }
+
},
mounted() {
diff --git a/src/views/empt/QueryOrder.vue b/src/views/empt/QueryOrder.vue
index 70b57c0..ce1df82 100644
--- a/src/views/empt/QueryOrder.vue
+++ b/src/views/empt/QueryOrder.vue
@@ -43,6 +43,9 @@
<el-form-item>
<el-button type="primary" v-on:click="exportClick()">导出excel</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button type="primary" v-on:click="waterEleMoneyCount()">水电剩余额度统计</el-button>
+ </el-form-item>
</el-form>
</el-col>
<el-table
@@ -55,7 +58,13 @@
<el-table-column prop="payuserid" label="用户编号" width="100">
</el-table-column>
-
+ <el-table-column prop="reamke4" label="缴费来源" width="100">
+ <template slot-scope="scope">
+ <div v-if="scope.row.reamke4 === '0'" style="color:#20a0ff">水电系统</div>
+ <div v-else-if="scope.row.reamke4 === '1'" style="color: #20a0ff">钉钉小程序</div>
+ <div v-else="scope.row.reamke4 === ''" style="color: #42d885">水电系统</div>
+ </template>
+ </el-table-column>
<el-table-column prop="payusername" label="缴费用户" width="100">
</el-table-column>
@@ -118,10 +127,25 @@
</el-pagination>
</el-col>
+ <el-dialog
+ title="提示"
+ :visible.sync="dialogVisible"
+ width="30%"
+ :close-on-click-modal="false">
+ <template>
+ <el-table :data="waterEleMoney" style="width: 100%">
+ <el-table-column prop="wmMoney" label="水费剩余余额">
+ </el-table-column>
+ <el-table-column prop="emMoney" label="电费剩余余额">
+ </el-table-column>
+ </el-table>
+ </template>
+ </el-dialog>
+
</section>
</template>
<script>
- import {getOrder, addOrder, ediOrder, remove, defeatedOrder} from '../../api/empt/PayOrder';
+ import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount} from '../../api/empt/PayOrder';
import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
import moment from 'moment'
// 引入插件
@@ -144,6 +168,8 @@
pageNum: 1,
pageSize: 30,
listLoading: false,
+ dialogVisible: false,
+ waterEleMoney: [],
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -407,6 +433,17 @@
},
+ waterEleMoneyCount(){
+ this.dialogVisible = true
+ let params = {}
+ waterEleCount(params).then(res => {
+ this.waterEleMoney = res.data.data;
+ this.listLoading = false;
+ }).catch((error) => {
+ alert(error);
+ })
+ },
+
},
}