朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 c4005abc646aed9a8f0002dd97ee39613ef440c6 1 个父辈 b86723cd

订单界面 水电剩余额度统计 公寓界面添加 远程水表阀开

内嵌 并排对比
正在显示 4 个修改的文件 包含 90 行增加 和 22 行删除
@@ -6,6 +6,11 @@ export const getOrder = params => { @@ -6,6 +6,11 @@ export const getOrder = params => {
6 return axios.get(`${base}/list`, {params: params}); 6 return axios.get(`${base}/list`, {params: params});
7 }; 7 };
8 8
  9 +export const waterEleCount = params => {
  10 + return axios.get(`${base}/waterEleCount`, {params: params});
  11 +};
  12 +
  13 +
9 export const addOrder = params => { 14 export const addOrder = params => {
10 return http.post(`${base}/add`, params); 15 return http.post(`${base}/add`, params);
11 }; 16 };
@@ -7,6 +7,10 @@ export const getList = params => { @@ -7,6 +7,10 @@ export const getList = params => {
7 return axios.get(`${base}/list`, {params: params}); 7 return axios.get(`${base}/list`, {params: params});
8 }; 8 };
9 9
  10 +export const serverMtfmset = params => {
  11 + return axios.get(`${base}/allAddMtfmset`, {params: params});
  12 +};
  13 +
10 14
11 export const remove = params => { 15 export const remove = params => {
12 return axios({ 16 return axios({
@@ -63,6 +63,12 @@ @@ -63,6 +63,12 @@
63 <el-button v-else disabled="" type="primary" size="small" @click="electicityInfo(scope.row)"> 63 <el-button v-else disabled="" type="primary" size="small" @click="electicityInfo(scope.row)">
64 电表实时信息 64 电表实时信息
65 </el-button> 65 </el-button>
  66 + <el-button v-if="scope.row.type=='3'" type="primary" size="small"
  67 + @click="allAddMtfmset(scope.row)">水表阀开
  68 + </el-button>
  69 + <el-button v-else disabled="" type="primary" size="small" @click="allAddMtfmset(scope.row)">
  70 + 水表阀开
  71 + </el-button>
66 72
67 <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> 73 <!--<el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
68 <!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>--> 74 <!--<el-button v-else type="primary" disabled="" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button>-->
@@ -333,24 +339,27 @@ @@ -333,24 +339,27 @@
333 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input> 339 <el-input v-model="editLocationForm.adrname" auto-complete="off" placeholder="请输入名称"></el-input>
334 </el-form-item> 340 </el-form-item>
335 341
336 - <el-col v-if="waterNumber === 'waterNum'">  
337 - <el-form-item label="水表编号" prop="wmid">  
338 - <el-select style="height: 38px; width: 100%"  
339 - v-model="editLocationForm.wmid"  
340 - filterable  
341 - remote  
342 - default-first-option  
343 - allow-create  
344 - placeholder="请输入关键词"  
345 - :remote-method="waterMeterAlls"  
346 - :loading="listLoading" clearable>  
347 - <el-option  
348 - v-for="item in waterMeterList"  
349 - :key="item.wmId" :label="item.wmId" :value="item.wmId" clearable>  
350 - </el-option>  
351 - </el-select>  
352 - </el-form-item>  
353 - </el-col> 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">
  360 + <el-input v-model="editLocationForm.wmid" auto-complete="off" placeholder="请输入水表编号"></el-input>
  361 + </el-form-item>
  362 +<!-- </el-col>-->
354 <el-form-item v-if="electricityNumber==='eeNum'" label="电表编号" prop="eeid"> 363 <el-form-item v-if="electricityNumber==='eeNum'" label="电表编号" prop="eeid">
355 <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电表编号"></el-input> 364 <el-input v-model="editLocationForm.eeid" auto-complete="off" placeholder="请输入电表编号"></el-input>
356 </el-form-item> 365 </el-form-item>
@@ -379,7 +388,7 @@ @@ -379,7 +388,7 @@
379 } 388 }
380 </style> 389 </style>
381 <script> 390 <script>
382 - import {getList, add, remove, edit as editLocation} from '@/api/empt/location_api'; 391 + import {getList, add, remove, edit as editLocation, serverMtfmset} from '@/api/empt/location_api';
383 import {add as electicity, getEEModel, edit, electricityInfo} from '@/api/empt/electricityParams'; 392 import {add as electicity, getEEModel, edit, electricityInfo} from '@/api/empt/electricityParams';
384 import {findRealTime, waterMeterAll} from '@/api/empt/waterMeter'; 393 import {findRealTime, waterMeterAll} from '@/api/empt/waterMeter';
385 import moment from 'moment' 394 import moment from 'moment'
@@ -780,7 +789,7 @@ @@ -780,7 +789,7 @@
780 this.waterNumber = undefined; 789 this.waterNumber = undefined;
781 this.editFormLocationVisible = true; 790 this.editFormLocationVisible = true;
782 this.editLocationForm = row; 791 this.editLocationForm = row;
783 - if (row.type == 3) { 792 + if (row.type === 3) {
784 this.waterNumber = 'waterNum'; 793 this.waterNumber = 'waterNum';
785 this.electricityNumber = 'eeNum'; 794 this.electricityNumber = 'eeNum';
786 } 795 }
@@ -982,6 +991,19 @@ @@ -982,6 +991,19 @@
982 this.$router.push({name: '缴水电费订单', params: {row, Edistatus: 'create'}}); 991 this.$router.push({name: '缴水电费订单', params: {row, Edistatus: 'create'}});
983 }, 992 },
984 993
  994 + allAddMtfmset: function(row){
  995 + let para = {
  996 + "MtId": row.wmid,
  997 + "MtFm":"0"
  998 + }
  999 + serverMtfmset(para).then((res) => {
  1000 + this.$message({
  1001 + message: '操作成功',
  1002 + type: 'success'
  1003 + });
  1004 + }).catch(error => alert(error));
  1005 + }
  1006 +
985 }, 1007 },
986 mounted() { 1008 mounted() {
987 1009
@@ -43,6 +43,9 @@ @@ -43,6 +43,9 @@
43 <el-form-item> 43 <el-form-item>
44 <el-button type="primary" v-on:click="exportClick()">导出excel</el-button> 44 <el-button type="primary" v-on:click="exportClick()">导出excel</el-button>
45 </el-form-item> 45 </el-form-item>
  46 + <el-form-item>
  47 + <el-button type="primary" v-on:click="waterEleMoneyCount()">水电剩余额度统计</el-button>
  48 + </el-form-item>
46 </el-form> 49 </el-form>
47 </el-col> 50 </el-col>
48 <el-table 51 <el-table
@@ -55,7 +58,13 @@ @@ -55,7 +58,13 @@
55 58
56 <el-table-column prop="payuserid" label="用户编号" width="100"> 59 <el-table-column prop="payuserid" label="用户编号" width="100">
57 </el-table-column> 60 </el-table-column>
58 - 61 + <el-table-column prop="reamke4" label="缴费来源" width="100">
  62 + <template slot-scope="scope">
  63 + <div v-if="scope.row.reamke4 === '0'" style="color:#20a0ff">水电系统</div>
  64 + <div v-else-if="scope.row.reamke4 === '1'" style="color: #20a0ff">钉钉小程序</div>
  65 + <div v-else="scope.row.reamke4 === ''" style="color: #42d885">水电系统</div>
  66 + </template>
  67 + </el-table-column>
59 <el-table-column prop="payusername" label="缴费用户" width="100"> 68 <el-table-column prop="payusername" label="缴费用户" width="100">
60 </el-table-column> 69 </el-table-column>
61 70
@@ -118,10 +127,25 @@ @@ -118,10 +127,25 @@
118 </el-pagination> 127 </el-pagination>
119 </el-col> 128 </el-col>
120 129
  130 + <el-dialog
  131 + title="提示"
  132 + :visible.sync="dialogVisible"
  133 + width="30%"
  134 + :close-on-click-modal="false">
  135 + <template>
  136 + <el-table :data="waterEleMoney" style="width: 100%">
  137 + <el-table-column prop="wmMoney" label="水费剩余余额">
  138 + </el-table-column>
  139 + <el-table-column prop="emMoney" label="电费剩余余额">
  140 + </el-table-column>
  141 + </el-table>
  142 + </template>
  143 + </el-dialog>
  144 +
121 </section> 145 </section>
122 </template> 146 </template>
123 <script> 147 <script>
124 - import {getOrder, addOrder, ediOrder, remove, defeatedOrder} from '../../api/empt/PayOrder'; 148 + import {getOrder, addOrder, ediOrder, remove, defeatedOrder, waterEleCount} from '../../api/empt/PayOrder';
125 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue"; 149 import ElButton from "../../../node_modules/element-ui/packages/button/src/button.vue";
126 import moment from 'moment' 150 import moment from 'moment'
127 // 引入插件 151 // 引入插件
@@ -144,6 +168,8 @@ @@ -144,6 +168,8 @@
144 pageNum: 1, 168 pageNum: 1,
145 pageSize: 30, 169 pageSize: 30,
146 listLoading: false, 170 listLoading: false,
  171 + dialogVisible: false,
  172 + waterEleMoney: [],
147 pickerOptions: { 173 pickerOptions: {
148 shortcuts: [{ 174 shortcuts: [{
149 text: '最近一周', 175 text: '最近一周',
@@ -407,6 +433,17 @@ @@ -407,6 +433,17 @@
407 433
408 }, 434 },
409 435
  436 + waterEleMoneyCount(){
  437 + this.dialogVisible = true
  438 + let params = {}
  439 + waterEleCount(params).then(res => {
  440 + this.waterEleMoney = res.data.data;
  441 + this.listLoading = false;
  442 + }).catch((error) => {
  443 + alert(error);
  444 + })
  445 + },
  446 +
410 }, 447 },
411 448
412 } 449 }