朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 a6237e101c85cfd0a87f30d7c959aaebcfc11995 1 个父辈 2c29be66

订单

内嵌 并排对比
正在显示 7 个修改的文件 包含 697 行增加 和 52 行删除
  1 +import axios from 'axios'
  2 +
  3 +let base = 'empt-electricity-meter/order';
  4 +export const getOrder = params => { return axios.get(`${base}/list`, { params: params }); };
  5 +export const addOrder=params=>{return http.post(`${baseUrl}/add`, params);};
  6 +export const ediOrder=params=>{return http.put(`${baseUrl}/edi`, params);};
  7 +export const delOrder = params => { return http.del(`${baseUrl}/del`,params)};
  1 +import axios from 'axios'
  2 +
  3 +let base = 'empt-electricity-meter/electricity_meter';
  4 +
  5 +
  6 +export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
  7 +
  8 +
  9 +export const remove = params => { return axios({
  10 + method: 'DELETE',
  11 + url: `${base}/del`,
  12 + data: params,
  13 + headers: {
  14 + 'Content-Type': 'application/json;charset=UTF-8'
  15 + }
  16 +})};
  17 +
  18 +//批量删除
  19 +export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
  20 +
  21 +export const edit = params => { return axios({
  22 + method: 'PUT',
  23 + url: `${base}/edit`,
  24 + data: params,
  25 + headers: {
  26 + 'Content-Type': 'application/json;charset=UTF-8'
  27 + }
  28 +})};
  29 +
  30 +export const add = params => { return axios({
  31 + method: 'POST',
  32 + url: `${base}/add`,
  33 + params: params,
  34 + headers: {
  35 + 'Content-Type': 'application/json;charset=UTF-8'
  36 + }
  37 +})};
  38 +
  39 +export const getEEModel = params => { return axios({
  40 + method: 'POST',
  41 + url: `${base}/getEEModel`,
  42 + params: params,
  43 + headers: {
  44 + 'Content-Type': 'application/json;charset=UTF-8'
  45 + }
  46 +})};
  47 +
  48 +export const update = params => { return axios({
  49 + method: 'PUT',
  50 + url: `${base}/update`,
  51 + data: params,
  52 + headers: {
  53 + 'Content-Type': 'application/json;charset=UTF-8'
  54 + }
  55 +})};
  1 +import axios from 'axios'
  2 +
  3 +let base = 'empt-electricity-meter/water_meter';
  4 +
  5 +
  6 +export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
  7 +
  8 +
  9 +export const remove = params => { return axios({
  10 + method: 'DELETE',
  11 + url: `${base}/del`,
  12 + data: params,
  13 + headers: {
  14 + 'Content-Type': 'application/json;charset=UTF-8'
  15 + }
  16 +})};
  17 +
  18 +//批量删除
  19 +export const batchRemove = params => { return axios.get(`${base}/batchremove`, { params: params }); };
  20 +
  21 +export const edit = params => { return axios({
  22 + method: 'PUT',
  23 + url: `${base}/edit`,
  24 + data: params,
  25 + headers: {
  26 + 'Content-Type': 'application/json;charset=UTF-8'
  27 + }
  28 +})};
  29 +
  30 +export const add = params => { return axios({
  31 + method: 'POST',
  32 + url: `${base}/add`,
  33 + params: params,
  34 + headers: {
  35 + 'Content-Type': 'application/json;charset=UTF-8'
  36 + }
  37 +})};
  38 +
  39 +export const findRealTime = params => { return axios({
  40 + method: 'POST',
  41 + url: `${base}/findRealTime`,
  42 + params: params,
  43 + headers: {
  44 + 'Content-Type': 'application/json;charset=UTF-8'
  45 + }
  46 +})};
  47 +
  48 +export const update = params => { return axios({
  49 + method: 'PUT',
  50 + url: `${base}/update`,
  51 + data: params,
  52 + headers: {
  53 + 'Content-Type': 'application/json;charset=UTF-8'
  54 + }
  55 +})};
@@ -12,19 +12,16 @@ import Department from './views/nav1/department.vue' @@ -12,19 +12,16 @@ import Department from './views/nav1/department.vue'
12 import Group from './views/nav1/groupcompany.vue' 12 import Group from './views/nav1/groupcompany.vue'
13 import Process from './views/hqpt/Process.vue' 13 import Process from './views/hqpt/Process.vue'
14 import Job from './views/hqpt/Job.vue' 14 import Job from './views/hqpt/Job.vue'
15 -// import Form from './views/nav1/Form.vue'  
16 15
17 import User from './views/nav1/user.vue' 16 import User from './views/nav1/user.vue'
18 -import Page4 from './views/nav2/Page4.vue'  
19 -import Page5 from './views/nav2/Page5.vue'  
20 import Page6 from './views/nav3/Page6.vue' 17 import Page6 from './views/nav3/Page6.vue'
21 import echarts from './views/charts/echarts.vue' 18 import echarts from './views/charts/echarts.vue'
22 import SecrityInspection from './views/staff/security_inspection.vue' 19 import SecrityInspection from './views/staff/security_inspection.vue'
23 import Key from './views/staff/key.vue' 20 import Key from './views/staff/key.vue'
24 import Maintain from './views/staff/maintain.vue' 21 import Maintain from './views/staff/maintain.vue'
25 -import ComeCar from './views/staff/come_car.vue'  
26 -import OnDuty from './views/staff/on_duty.vue'  
27 import Location from './views/empt/Location.vue' 22 import Location from './views/empt/Location.vue'
  23 +import QueryOrder from './views/empt/QueryOrder.vue'
  24 +import PayOrder from './views/empt/PayOrder.vue'
28 25
29 let routes = [ 26 let routes = [
30 { 27 {
@@ -82,6 +79,8 @@ let routes = [ @@ -82,6 +79,8 @@ let routes = [
82 iconCls: 'fa fa-id-card-o', 79 iconCls: 'fa fa-id-card-o',
83 children: [ 80 children: [
84 { path: '/location', component: Location, name: '能源缴费' }, 81 { path: '/location', component: Location, name: '能源缴费' },
  82 + { path: '/PayOrder', component: PayOrder, name: '缴水电费订单' },
  83 + { path: '/QueryOrder', component: QueryOrder, name: '订单查询' },
85 ] 84 ]
86 }, 85 },
87 { 86 {
@@ -41,7 +41,20 @@ @@ -41,7 +41,20 @@
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 - <el-button type="primary" size="small" @click="electrixityMeterConfiguration(scope.row)">电表参数配置</el-button> 44 +
  45 + <el-button v-if="scope.row.type=='3'" type="primary" size="small" @click="pay(scope.row)">缴费</el-button>
  46 + <el-button v-else disabled="" type="primary" size="small" @click="pay(scope.row)">缴费</el-button>
  47 +
  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>
  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>
  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>
  56 +
  57 +
45 </template> 58 </template>
46 </el-table-column> 59 </el-table-column>
47 </el-table> 60 </el-table>
@@ -53,7 +66,7 @@ @@ -53,7 +66,7 @@
53 </el-pagination> 66 </el-pagination>
54 </el-col> 67 </el-col>
55 68
56 - <!--水表新增--> 69 + <!--电表新增-->
57 <el-dialog title="电表参数配置新增" :visible.sync="electrixityAddFormVisible" :close-on-click-modal="false"> 70 <el-dialog title="电表参数配置新增" :visible.sync="electrixityAddFormVisible" :close-on-click-modal="false">
58 <el-form :model="electrixityAddForm" label-width="110px" :rules="addFormRules" ref="electrixityAddForm"> 71 <el-form :model="electrixityAddForm" label-width="110px" :rules="addFormRules" ref="electrixityAddForm">
59 <el-form-item label="水电预付费" prop="prepaid"> 72 <el-form-item label="水电预付费" prop="prepaid">
@@ -61,10 +74,10 @@ @@ -61,10 +74,10 @@
61 v-model="electrixityAddForm.prepaid" 74 v-model="electrixityAddForm.prepaid"
62 active-color="#00A854" 75 active-color="#00A854"
63 active-text="是" 76 active-text="是"
64 - active-value="0" 77 + active-value="1"
65 inactive-color="#F04134" 78 inactive-color="#F04134"
66 inactive-text="否" 79 inactive-text="否"
67 - inactive-value="1"> 80 + inactive-value="0">
68 </el-switch> 81 </el-switch>
69 </el-form-item> 82 </el-form-item>
70 <el-form-item label="电警告跳闸" prop="warningtrip"> 83 <el-form-item label="电警告跳闸" prop="warningtrip">
@@ -72,10 +85,10 @@ @@ -72,10 +85,10 @@
72 v-model="electrixityAddForm.warningtrip" 85 v-model="electrixityAddForm.warningtrip"
73 active-color="#00A854" 86 active-color="#00A854"
74 active-text="是" 87 active-text="是"
75 - active-value="0" 88 + active-value="1"
76 inactive-color="#F04134" 89 inactive-color="#F04134"
77 inactive-text="否" 90 inactive-text="否"
78 - inactive-value="1"> 91 + inactive-value="0">
79 </el-switch> 92 </el-switch>
80 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>告警阀值</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.warningthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span> 93 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>告警阀值</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.warningthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
81 </el-form-item> 94 </el-form-item>
@@ -84,22 +97,22 @@ @@ -84,22 +97,22 @@
84 v-model="electrixityAddForm.overdraft" 97 v-model="electrixityAddForm.overdraft"
85 active-color="#00A854" 98 active-color="#00A854"
86 active-text="是" 99 active-text="是"
87 - active-value="0" 100 + active-value="1"
88 inactive-color="#F04134" 101 inactive-color="#F04134"
89 inactive-text="否" 102 inactive-text="否"
90 - inactive-value="1"> 103 + inactive-value="0">
91 </el-switch> 104 </el-switch>
92 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>可透支额度</span>&nbsp;&nbsp;<el-input v-model="electrixityAddForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span> 105 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>可透支额度</span>&nbsp;&nbsp;<el-input v-model="electrixityAddForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
93 </el-form-item> 106 </el-form-item>
94 <el-form-item label="过负荷跳闸使能" prop="overdraft"> 107 <el-form-item label="过负荷跳闸使能" prop="overdraft">
95 <el-switch 108 <el-switch
96 - v-model="electrixityAddForm.load" 109 + v-model="electrixityAddForm.waterload"
97 active-color="#00A854" 110 active-color="#00A854"
98 active-text="是" 111 active-text="是"
99 - active-value="0" 112 + active-value="1"
100 inactive-color="#F04134" 113 inactive-color="#F04134"
101 inactive-text="否" 114 inactive-text="否"
102 - inactive-value="1"> 115 + inactive-value="0">
103 </el-switch> 116 </el-switch>
104 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.power" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>KW</span> 117 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.power" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>KW</span>
105 <br/> 118 <br/>
@@ -111,12 +124,12 @@ @@ -111,12 +124,12 @@
111 v-model="electrixityAddForm.free" 124 v-model="electrixityAddForm.free"
112 active-color="#00A854" 125 active-color="#00A854"
113 active-text="是" 126 active-text="是"
114 - active-value="0" 127 + active-value="1"
115 inactive-color="#F04134" 128 inactive-color="#F04134"
116 inactive-text="否" 129 inactive-text="否"
117 - inactive-value="1"> 130 + inactive-value="0">
118 </el-switch> 131 </el-switch>
119 - &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span> 132 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityAddForm.freeelectricitylimit" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span>
120 </el-form-item> 133 </el-form-item>
121 </el-form> 134 </el-form>
122 <div slot="footer" class="dialog-footer"> 135 <div slot="footer" class="dialog-footer">
@@ -124,6 +137,121 @@ @@ -124,6 +137,121 @@
124 <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button> 137 <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
125 </div> 138 </div>
126 </el-dialog> 139 </el-dialog>
  140 +
  141 +
  142 +
  143 +
  144 +
  145 +
  146 + <!--电表参数配置修改-->
  147 + <el-dialog title="电表参数配置新增" :visible.sync="electrixityeditFormVisible" :close-on-click-modal="false">
  148 + <el-form :model="electrixityeditForm" label-width="110px" :rules="editFormRules" ref="electrixityeditForm">
  149 + <el-form-item label="电表编号" prop="companyName">
  150 + <el-input v-model="electrixityeditForm.eeId" auto-complete="off" style="width: 40%" disabled></el-input>
  151 + </el-form-item>
  152 + <el-form-item label="水电预付费" prop="prepaid">
  153 + <el-switch
  154 + v-model="electrixityeditForm.prepaid"
  155 + active-color="#00A854"
  156 + active-text="是"
  157 + :active-value="true"
  158 + inactive-color="#F04134"
  159 + inactive-text="否"
  160 + :inactive-value="false"
  161 + @change="func(data)">
  162 + </el-switch>
  163 + </el-form-item>
  164 + <el-form-item label="电警告跳闸" prop="warningtrip">
  165 + <el-switch
  166 + v-model="electrixityeditForm.warningtrip"
  167 + active-color="#00A854"
  168 + active-text="是"
  169 + :active-value="true"
  170 + inactive-color="#F04134"
  171 + inactive-text="否"
  172 + :inactive-value="false">
  173 + </el-switch>
  174 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>告警阀值</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.warningthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
  175 + </el-form-item>
  176 + <el-form-item label="透支使能" prop="overdraft">
  177 + <el-switch
  178 + v-model="electrixityeditForm.overdraft"
  179 + active-color="#00A854"
  180 + active-text="是"
  181 + :active-value="true"
  182 + inactive-color="#F04134"
  183 + inactive-text="否"
  184 + :inactive-value="false">
  185 + </el-switch>
  186 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>可透支额度</span>&nbsp;&nbsp;<el-input v-model="electrixityeditForm.overdraftthreshold" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>元</span>
  187 + </el-form-item>
  188 + <el-form-item label="过负荷跳闸使能" prop="overdraft">
  189 + <el-switch
  190 + v-model="electrixityeditForm.waterload"
  191 + active-color="#00A854"
  192 + active-text="是"
  193 + :active-value="true"
  194 + inactive-color="#F04134"
  195 + inactive-text="否"
  196 + :inactive-value="false">
  197 + </el-switch>
  198 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.power" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>KW</span>
  199 + <br/>
  200 + <br/>
  201 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>功率因数</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.powerfactor" style="width: 100px;" auto-complete="off"></el-input>
  202 + </el-form-item>
  203 + <el-form-item label="免费电度使能" prop="overdraft">
  204 + <el-switch
  205 + v-model="electrixityeditForm.free"
  206 + active-color="#00A854"
  207 + active-text="是"
  208 + :active-value="true"
  209 + inactive-color="#F04134"
  210 + inactive-text="否"
  211 + :inactive-value="false">
  212 + </el-switch>
  213 + &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>免费电度</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input v-model="electrixityeditForm.freeelectricitylimit" style="width: 100px;" auto-complete="off"></el-input>&nbsp;&nbsp;&nbsp;<span>度</span>
  214 + </el-form-item>
  215 + </el-form>
  216 + <div slot="footer" class="dialog-footer">
  217 + <el-button @click.native="electrixityeditFormVisible = false">取消</el-button>
  218 + <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
  219 + </div>
  220 + </el-dialog>
  221 +
  222 + <!--水表实时信息-->
  223 + <el-dialog title="水表实施信息" :visible.sync="waterMeterVisible" :close-on-click-modal="false">
  224 + <el-form :model="waterMaterForm" label-width="100px" ref="waterMaterForm">
  225 + <el-form-item label="水表编号" prop="wmId">
  226 + <el-input v-model="waterMaterForm.wmId" auto-complete="off" ></el-input>
  227 + </el-form-item>
  228 + <el-form-item label="累计充值量" prop="wmSacc">
  229 + <el-input v-model="waterMaterForm.wmSacc" auto-complete="off" ></el-input>
  230 + </el-form-item>
  231 + <el-form-item label="累计流量" prop="wmLacc">
  232 + <el-input v-model="waterMaterForm.wmLacc" auto-complete="off"></el-input>
  233 + </el-form-item>
  234 + <el-form-item label="上传时间" prop="wmRdtime">
  235 + <el-input v-model="waterMaterForm.wmRdtime" auto-complete="off" ></el-input>
  236 + </el-form-item>
  237 + <el-form-item label="阀门状态" prop="wmFmstate">
  238 + <el-input v-model="waterMaterForm.wmFmstate" auto-complete="off"></el-input>
  239 + </el-form-item>
  240 + <el-form-item label="故障状态" prop="wmErrmessage">
  241 + <el-input v-model="waterMaterForm.wmErrmessage" auto-complete="off" ></el-input>
  242 + </el-form-item>
  243 + <el-form-item label="电压" prop="wmVoltage">
  244 + <el-input v-model="waterMaterForm.wmVoltage" auto-complete="off"></el-input>
  245 + </el-form-item>
  246 + <el-form-item label="表示信号强度" prop="wmSignalpower">
  247 + <el-input v-model="waterMaterForm.wmSignalpower" auto-complete="off"></el-input>
  248 + </el-form-item>
  249 + </el-form>
  250 + <div slot="footer" class="dialog-footer">
  251 + <el-button @click.native="waterMeterVisible = false">取消</el-button>
  252 + </div>
  253 + </el-dialog>
  254 +
127 </section> 255 </section>
128 </template> 256 </template>
129 <style> 257 <style>
@@ -141,6 +269,8 @@ @@ -141,6 +269,8 @@
141 </style> 269 </style>
142 <script> 270 <script>
143 import { getList,add} from '@/api/empt/location_api'; 271 import { getList,add} from '@/api/empt/location_api';
  272 + import {add as electicity, getEEModel, edit} from '@/api/empt/electricityParams';
  273 + import {findRealTime } from '@/api/empt/waterMeter';
144 import moment from 'moment' 274 import moment from 'moment'
145 import parseTime from '@/utils' 275 import parseTime from '@/utils'
146 import loginUserInfo from '@/api/base' 276 import loginUserInfo from '@/api/base'
@@ -152,8 +282,6 @@ @@ -152,8 +282,6 @@
152 processName: '', 282 processName: '',
153 parseTime: parseTime 283 parseTime: parseTime
154 }, 284 },
155 - userId: '',  
156 - realName: '',  
157 wmId:'', 285 wmId:'',
158 locationList:[], 286 locationList:[],
159 total: 0, 287 total: 0,
@@ -163,6 +291,10 @@ @@ -163,6 +291,10 @@
163 sels: [],//列表选中列 291 sels: [],//列表选中列
164 //编辑界面是否显示 292 //编辑界面是否显示
165 editFormVisible: false, 293 editFormVisible: false,
  294 + electrixityeditFormVisible: false,
  295 + // 水表实施信息
  296 + waterMeterVisible:false,
  297 +
166 editLoading: false, 298 editLoading: false,
167 editFormRules: { 299 editFormRules: {
168 roleName: [ 300 roleName: [
@@ -177,6 +309,20 @@ @@ -177,6 +309,20 @@
177 roleSign: 1, 309 roleSign: 1,
178 departmentId:'' 310 departmentId:''
179 }, 311 },
  312 + // 编辑电表参数配置
  313 + electrixityeditForm:{
  314 + id:'',
  315 + prepaid: '',
  316 + warningtrip: '',
  317 + warningthreshold: '',
  318 + overdraft:'',
  319 + overdraftthreshold: '',
  320 + waterload: '',
  321 + power: '',
  322 + powerfactor: '',
  323 + freeelectricitylimit: '',
  324 + eeId: ''
  325 + },
180 //用户ID 326 //用户ID
181 //新增界面是否显示 327 //新增界面是否显示
182 electrixityAddFormVisible: false, 328 electrixityAddFormVisible: false,
@@ -190,19 +336,32 @@ @@ -190,19 +336,32 @@
190 { required: true, message: '请输入岗位/角色描述', trigger: 'blur' } 336 { required: true, message: '请输入岗位/角色描述', trigger: 'blur' }
191 ] 337 ]
192 }, 338 },
193 - //水表参数配置、界面数据 339 + //电表参数配置、界面数据
194 electrixityAddForm: { 340 electrixityAddForm: {
195 prepaid: '', 341 prepaid: '',
196 warningtrip: '', 342 warningtrip: '',
197 warningthreshold: '', 343 warningthreshold: '',
198 overdraft:'', 344 overdraft:'',
199 overdraftthreshold: '', 345 overdraftthreshold: '',
200 - load: '', 346 + waterload: '',
201 power: '', 347 power: '',
202 powerfactor: '', 348 powerfactor: '',
203 freeelectricitylimit: '', 349 freeelectricitylimit: '',
204 eeId: '' 350 eeId: ''
205 }, 351 },
  352 +
  353 + // 水表实施信息
  354 + waterMaterForm:{
  355 + wmId:'',
  356 + wmSacc:'',
  357 + wmLacc:'',
  358 + wmRdtime:'',
  359 + wmFmstate:'',
  360 + wmErrmessage:'',
  361 + wmVoltage:'',
  362 + wmSignalpower:''
  363 + },
  364 +
206 permForm: { 365 permForm: {
207 roleId: 1, 366 roleId: 1,
208 description: '', 367 description: '',
@@ -278,6 +437,9 @@ @@ -278,6 +437,9 @@
278 } 437 }
279 }, 438 },
280 methods: { 439 methods: {
  440 + one: function(prepaid){
  441 + return prepaid?true:one='是'?false:one='否'
  442 + },
281 //性别显示转换 443 //性别显示转换
282 formatType: function (row, column) { 444 formatType: function (row, column) {
283 let msg = '未知'; 445 let msg = '未知';
@@ -296,6 +458,9 @@ @@ -296,6 +458,9 @@
296 break; 458 break;
297 } 459 }
298 return msg; 460 return msg;
  461 + },//性别显示转换
  462 + formatperpaid: function (value) {
  463 + return value === true ? "1" : "0";
299 }, 464 },
300 handleCurrentChange(val) { 465 handleCurrentChange(val) {
301 this.pageNum = val; 466 this.pageNum = val;
@@ -353,12 +518,18 @@ @@ -353,12 +518,18 @@
353 * @param index 518 * @param index
354 * @param row 为这行的数据对象 519 * @param row 为这行的数据对象
355 */ 520 */
356 - handleEdit: function (index, row) {  
357 - this.editFormVisible = true;  
358 - this.editForm = Object.assign({}, row);  
359 - this.getdepartmentNames(); 521 + electrixityMeterEdit: function (row) {
  522 + this.electrixityeditFormVisible = true;
  523 + var ids = row.eeid;
  524 + let para = { eeId: ids };
  525 + // 查询电表参数配置表数据
  526 + getEEModel(para).then((res) => {
  527 + this.electrixityeditForm = res.data;
  528 + });
360 }, 529 },
361 - //水表参数配置新增界面，每次点开初始化数据 530 +
  531 +
  532 + //电表参数配置新增界面，每次点开初始化数据
362 electrixityMeterConfiguration: function (row) { 533 electrixityMeterConfiguration: function (row) {
363 this.electrixityAddFormVisible = true; 534 this.electrixityAddFormVisible = true;
364 this.electrixityAddForm = { 535 this.electrixityAddForm = {
@@ -367,14 +538,31 @@ @@ -367,14 +538,31 @@
367 warningthreshold: '', 538 warningthreshold: '',
368 overdraft:'', 539 overdraft:'',
369 overdraftthreshold: '', 540 overdraftthreshold: '',
370 - load: '', 541 + waterload: '',
371 water: '', 542 water: '',
372 free: '', 543 free: '',
373 freeWater: '', 544 freeWater: '',
374 - eeId: row.eeId 545 + eeId: row.eeid
375 } 546 }
376 }, 547 },
377 548
  549 +
  550 + // 水表实施信息
  551 + waterMeter: function (row) {
  552 + let loadingInstance1 = Loading.service({ fullscreen: true });
  553 + this.waterMeterVisible=true;
  554 + var wmId = row.wmid;
  555 + let para = { wmId: wmId };
  556 + findRealTime(para).then((res) => {
  557 + this.waterMaterForm = res.data;
  558 +
  559 + });
  560 + loadingInstance1.close();
  561 +
  562 + },
  563 +
  564 +
  565 +
378 //新增 566 //新增
379 addSubmit: function () { 567 addSubmit: function () {
380 this.$refs.electrixityAddForm.validate((valid) => { 568 this.$refs.electrixityAddForm.validate((valid) => {
@@ -383,16 +571,20 @@ @@ -383,16 +571,20 @@
383 this.addLoading = true; 571 this.addLoading = true;
384 //NProgress.start(); 572 //NProgress.start();
385 let para = Object.assign({}, this.electrixityAddForm); 573 let para = Object.assign({}, this.electrixityAddForm);
386 - add(para).then((res) => { 574 + electicity(para).then((res) => {
387 this.addLoading = false; 575 this.addLoading = false;
388 if (res.status ===200) { 576 if (res.status ===200) {
389 this.$message({ 577 this.$message({
390 message: '提交成功', 578 message: '提交成功',
391 type: 'success' 579 type: 'success'
392 }); 580 });
393 - this.$refs['permForm'].resetFields(); 581 + this.$refs['electrixityAddForm'].resetFields();
394 this.electrixityAddFormVisible = false; 582 this.electrixityAddFormVisible = false;
395 - this.getList(); 583 + }else if (res.status===201){
  584 + this.$message({
  585 + message:'不能重复提交',
  586 + type:"error"
  587 + })
396 } 588 }
397 }).catch(error => alert(error)); 589 }).catch(error => alert(error));
398 }); 590 });
@@ -400,30 +592,21 @@ @@ -400,30 +592,21 @@
400 }); 592 });
401 }, 593 },
402 594
403 - //编辑 595 + // 编辑电表参数配置
404 editSubmit: function () { 596 editSubmit: function () {
405 - this.$refs.editForm.validate((valid) => { 597 + this.$refs.electrixityeditForm.validate((valid) => {
406 if (valid) { 598 if (valid) {
407 this.$confirm('确认提交吗？', '提示', {}).then(() => { 599 this.$confirm('确认提交吗？', '提示', {}).then(() => {
408 this.editLoading = true; 600 this.editLoading = true;
409 //NProgress.start(); 601 //NProgress.start();
410 - let para = Object.assign({}, this.editForm);  
411 - //不需要提交的 去掉，后端不好接收  
412 - para.authorities = null;  
413 - para.permissions = null;  
414 - para.roles = null;  
415 -// para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');  
416 - /*  
417 - 查询之后格式this.filters.column.create_start_date中日期发生变化;  
418 - Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) 变成了 "2017-08-08T16:00:00.000Z";  
419 - 所以使用 moment 日期格式化插件将时间转换成 [ Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) ] 格  
420 - 式;  
421 - */  
422 - /*moment 安装 npm install moment --save*/  
423 - para.creattime = moment(para.creattime).format('YYYY-MM-DD HH:mm:ss'); 602 + let para= Object.assign({}, this.electrixityeditForm);
  603 + para.prepaid = this.formatperpaid(para.prepaid);
  604 + para.warningtrip = this.formatperpaid(para.warningtrip);
  605 + para.overdraft = this.formatperpaid(para.overdraft);
  606 + para.waterload = this.formatperpaid(para.waterload);
  607 + para.free = this.formatperpaid(para.free);
424 this.editLoading = false; 608 this.editLoading = false;
425 edit(para).then((res) => { 609 edit(para).then((res) => {
426 -  
427 //NProgress.done(); 610 //NProgress.done();
428 this.$message({ 611 this.$message({
429 message: '提交成功', 612 message: '提交成功',
@@ -474,10 +657,15 @@ @@ -474,10 +657,15 @@
474 handleSelectionChange(val) { 657 handleSelectionChange(val) {
475 this.multipleSelection = val 658 this.multipleSelection = val
476 }, 659 },
  660 +
  661 + //缴水电费订单跳转
  662 + pay(row){
  663 + this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'create'}});
  664 + },
  665 +
477 }, 666 },
478 mounted() { 667 mounted() {
479 - this.userId = loginUserInfo.userId;  
480 - this.realName = loginUserInfo.realname; 668 +
481 this.getList(); 669 this.getList();
482 } 670 }
483 } 671 }
  1 +<template>
  2 + <el-container>
  3 + <el-main >
  4 + <el-row type="flex" class="row-bg" justify="center">
  5 + <el-col :span="20">
  6 + <el-form :model="OrderForm" :rules="rules" ref="OrderForm" label-width="180px" :label-position="labelPosition">
  7 + <el-col :span="24">
  8 + <el-form-item label="充值类型" prop="payType">
  9 + <el-col :span="24">
  10 + <el-select v-if="Edistatus=='create'" v-model="OrderForm.payType" @change="selectTrigger(OrderForm.payType)" placeholder="请选择充值类型" style="width:100%">
  11 + <el-option v-for="item in payTypes" :key="item.value" :label="item.label"
  12 + :value="item.value" ></el-option>
  13 + </el-select>
  14 + <el-select v-else v-model="OrderForm.payType" style="width:100%">
  15 + <el-option disabled="" v-for="item in payTypes" :key="item.value" :label="item.label"
  16 + :value="item.value" ></el-option>
  17 + </el-select>
  18 + </el-col>
  19 + </el-form-item>
  20 + </el-col>
  21 + <el-col :span="24">
  22 + <el-form-item label="仪表地址">
  23 + <el-input disabled="" v-model="OrderForm.payTypeAddress"></el-input>
  24 + </el-form-item>
  25 + </el-col>
  26 + <el-col :span="24">
  27 + <el-form-item label="用户名称">
  28 + <el-input disabled="" v-model="OrderForm.payUserName"></el-input>
  29 + </el-form-item>
  30 + </el-col>
  31 + <el-col :span="24">
  32 + <el-form-item label="房间号码">
  33 + <el-input disabled="" v-model="OrderForm.payLocationName"></el-input>
  34 + </el-form-item>
  35 + </el-col>
  36 + <el-col :span="24">
  37 + <el-form-item label="充值日期">
  38 + <el-date-picker type="date" placeholder="" v-model="OrderForm.payTime" disabled="" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
  39 + </el-form-item>
  40 + </el-col>
  41 + <el-col :span="24">
  42 + <el-form-item v-if="Edistatus=='create'" label="充值金额" prop="payFees">
  43 + <el-input type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="OrderForm.payFees"></el-input>
  44 + </el-form-item>
  45 + <el-form-item v-else label="充值金额" prop="payFees">
  46 + <el-input disabled="" type="number" oninput ="value=value.replace(/[^0-9.]/g,'')" v-model.number="OrderForm.payFees"></el-input>
  47 + </el-form-item>
  48 + </el-col>
  49 + <el-col :span="24">
  50 + <el-form-item label="支付方式">
  51 + <el-radio-group v-model="OrderForm.payFessType">
  52 + <el-radio v-for="item in payFessTypes" :key="item.value" :label="item.value" border>{{item.label}}</el-radio>
  53 + </el-radio-group>
  54 + </el-form-item>
  55 + </el-col>
  56 + <el-col :span="24">
  57 + <el-form-item >
  58 + <el-button type="primary" style="width:100%" @click="Edistatus==='create'?createData('OrderForm'):updateData('OrderForm')">确认支付</el-button>
  59 + </el-form-item>
  60 + </el-col>
  61 + </el-form>
  62 + </el-col>
  63 + </el-row>
  64 + </el-main>
  65 + </el-container>
  66 +</template>
  67 +<style scoped>
  68 +
  69 +</style>
  70 +<script>
  71 + import loginUserInfo from '@/api/base'
  72 + export default {
  73 + data() {
  74 + return{
  75 + OrderForm:{
  76 + payUserId:'',
  77 + payUserName:'',
  78 + payTime:new Date(),
  79 + payLocationId:'',
  80 + payLocationName:'3#01-101',
  81 + payTypeAddress:'',
  82 + payFees:'',
  83 + payType:'',
  84 + payFessType:'1',
  85 + orderNumber:'',
  86 + payStatus:'',
  87 + },
  88 + rules:{
  89 + payType: [
  90 + { required: true, message: '请选择充值类型', trigger: 'change' }
  91 + ],
  92 + payFees:[
  93 + { required: true, message: '充值金额不能为空'},
  94 + { type: 'number', message: '金额必须为数字值'}
  95 + ]
  96 + },
  97 + payTypes: [
  98 + {
  99 + value: '0',
  100 + label: '水费'
  101 + }, {
  102 + value: '1',
  103 + label: '电费'
  104 + }],
  105 + payFessTypes:[
  106 + {
  107 + value: '0',
  108 + label: '微 信'
  109 + }, {
  110 + value: '1',
  111 + label: '支付宝'
  112 + }],
  113 + labelPosition:'left',
  114 + Edistatus:'',
  115 + shuibiao:'',
  116 + dianbiao:''
  117 + }
  118 + },
  119 + methods:{
  120 +
  121 + getdefaultData(){
  122 +
  123 + if(this.$route.params.Edistatus=='create'){
  124 + this.OrderForm.payUserId=loginUserInfo.userId;
  125 + this.OrderForm.payUserName=loginUserInfo.username;
  126 + this.OrderForm.payLocationId=this.$route.params.row.id;
  127 + this.OrderForm.payLocationName=this.$route.params.row.adrname;
  128 + this.Edistatus=this.$route.params.Edistatus;
  129 + this.shuibiao='1111111';
  130 + this.dianbiao='222222';
  131 +
  132 + }else{
  133 + this.Edistatus='update';
  134 + this.OrderForm.payType='0'
  135 + this.OrderForm.payTypeAddress='333333';
  136 + }
  137 + },
  138 + selectTrigger(val){
  139 + if(val=='0'){
  140 + this.OrderForm.payTypeAddress=this.shuibiao
  141 + }else{
  142 + this.OrderForm.payTypeAddress=this.dianbiao;
  143 + }
  144 + },
  145 + createData(formName){
  146 + this.$refs[formName].validate((valid) => {
  147 + if (valid) {
  148 + alert("新增充值"+this.OrderForm.payType+"支付方式为："+this.OrderForm.payFessType+"充值金额："+this.OrderForm.payFees);
  149 + } else {
  150 + console.log('error submit!!');
  151 + return false;
  152 + }
  153 + });
  154 + },
  155 + updateData(formName){
  156 + this.$refs[formName].validate((valid) => {
  157 + if (valid) {
  158 + alert("完成充值"+this.OrderForm.payType+"支付方式为："+this.OrderForm.payFessType+"充值金额："+this.OrderForm.payFees);
  159 + } else {
  160 + console.log('error submit!!');
  161 + return false;
  162 + }
  163 + });
  164 + }
  165 + },
  166 + mounted(){
  167 + this.getdefaultData();
  168 + }
  169 + }
  170 +</script>
  1 +<template>
  2 + <section>
  3 + <el-col :span="24" class="toolbar" style="padding-bottom: 0px">
  4 + <el-form :inline="true" :model="formInline">
  5 + <el-form-item>
  6 + <el-input v-model="formInline.user" placeholder="用户编号"></el-input>
  7 + </el-form-item>
  8 + <el-form-item>
  9 + <div class="block">
  10 + <el-date-picker
  11 + v-model="formInline.date1"
  12 + type="daterange"
  13 + align="right"
  14 + unlink-panels
  15 + value-format="yyyy-MM-dd"
  16 + range-separator="至"
  17 + start-placeholder="开始日期"
  18 + end-placeholder="结束日期"
  19 + :picker-options="pickerOptions">
  20 + </el-date-picker>
  21 + </div>
  22 + </el-form-item>
  23 + <el-form-item>
  24 + <el-button type="primary" v-on:click="QueryOrder()">查询</el-button>
  25 + </el-form-item>
  26 + </el-form>
  27 + </el-col>
  28 + <el-table
  29 + :data="tableData"
  30 + stripe
  31 + style="width: 100%">
  32 + <el-table-column
  33 + prop="ordernumber"
  34 + label="订单号"
  35 + width="150">
  36 + </el-table-column>
  37 + <el-table-column
  38 + prop="payuserid"
  39 + label="用户编号"
  40 + width="100">
  41 + </el-table-column>
  42 + <el-table-column
  43 + prop="payusername"
  44 + label="用户名称"
  45 + width="90">
  46 + </el-table-column>
  47 + <el-table-column
  48 + prop="paylocationname"
  49 + label="房间号码"
  50 + width="100">
  51 + </el-table-column>
  52 + <el-table-column
  53 + prop="paytime"
  54 + label="充值日期"
  55 + width="100">
  56 + </el-table-column>
  57 + <el-table-column
  58 + prop="payType"
  59 + label="充值类型">
  60 + </el-table-column>
  61 + <el-table-column
  62 + prop="payFees"
  63 + label="充值金额"
  64 + width="100">
  65 + </el-table-column>
  66 + <el-table-column
  67 + prop="payfees"
  68 + label="支付方式"
  69 + width="100">
  70 + </el-table-column>
  71 + <el-table-column
  72 + prop="payStatus"
  73 + label="支付状态"
  74 + width="100">
  75 + </el-table-column>
  76 + <el-table-column
  77 + fixed="right"
  78 + label="操作"
  79 + width="180">
  80 + <template slot-scope="scope">
  81 + <el-button @click="Pay(scope.row)" type="primary" size="mini">去完成</el-button>
  82 + <el-button type="text" size="small">移除订单</el-button>
  83 + </template>
  84 + </el-table-column>
  85 + </el-table>
  86 +
  87 + <!--工具条-->
  88 + <el-col :span="24" class="toolbar">
  89 + <!--<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>-->
  90 + <el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
  91 + </el-pagination>
  92 + </el-col>
  93 +
  94 + </section>
  95 +</template>
  96 +<script>
  97 + import { getOrder,addOrder,ediOrder,delOrder} from '../../api/empt/PayOrder';
  98 + export default {
  99 + data() {
  100 + return {
  101 + total: 0,
  102 + pageNum: 1,
  103 + pageSize: 5,
  104 +
  105 + pickerOptions: {
  106 + shortcuts: [{
  107 + text: '最近一周',
  108 + onClick(picker) {
  109 + const end = new Date();
  110 + const start = new Date();
  111 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
  112 + picker.$emit('pick', [start, end]);
  113 + }
  114 + }, {
  115 + text: '最近一个月',
  116 + onClick(picker) {
  117 + const end = new Date();
  118 + const start = new Date();
  119 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
  120 + picker.$emit('pick', [start, end]);
  121 + }
  122 + }, {
  123 + text: '最近三个月',
  124 + onClick(picker) {
  125 + const end = new Date();
  126 + const start = new Date();
  127 + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
  128 + picker.$emit('pick', [start, end]);
  129 + }
  130 + }]},
  131 + formInline: {
  132 + user: '',
  133 + date1:'',
  134 +
  135 + },
  136 + tableData: [],
  137 + }
  138 + },
  139 + mounted() {
  140 + this.QueryOrder();
  141 + },
  142 + methods: {
  143 + handleCurrentChange(val) {
  144 + this.pageNum = val;
  145 + },
  146 + QueryOrder(){
  147 + let params = {
  148 + pageNum: this.pageNum,
  149 + pageSize: this.pageSize,
  150 + };
  151 + getOrder(params).then(res=>{
  152 + let resData = res.data;
  153 + this.total = resData.total;
  154 + this.tableData = resData.list;
  155 + }).catch((error) => {
  156 + if(null!= error.response && error.response!==undefined){
  157 + let status= error.response.status;
  158 + let msg = error.response.statusText;
  159 + alert(status+msg);
  160 + }else {
  161 + alert(error);
  162 + }
  163 + })
  164 + },
  165 + Pay(row){
  166 + this.$router.push({name:'缴水电费订单',params:{row,Edistatus:'update'}})
  167 + },
  168 + },
  169 +
  170 + }
  171 +</script>