manage-client 3.3.128 → 3.3.130

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/build/dev-server.js +3 -3
  2. package/package.json +1 -1
  3. package/src/components/SellReport/ManageSellType.vue +181 -200
  4. package/src/components/sale/config/exportConfig.js +1 -1
  5. package/src/components/webmeter/gasStatistics/GasStatistics.vue +19 -2
  6. package/src/components/webmeter/gasStatistics/NewGasStatistics.vue +19 -2
  7. package/src/components/webmeter/operationValueRecord.vue +30 -5
  8. package/src/filiale/haile/exportConfig.js +1 -1
  9. package/src/filiale/haile/sale/businessquery/ChargeQuery.vue +12 -0
  10. package/src/filiale/kelai/exportConfig.js +1 -1
  11. package/src/filiale/kelai/feimin_style.vue +8 -2
  12. package/src/filiale/ningjin/GasStatistics.vue +6 -2
  13. package/src/filiale/qianneng/ArrearsQuery.vue +2 -7
  14. package/src/filiale/shanxian/OtherChargeQuery.vue +5 -1
  15. package/src/filiale/shanxian/config/exportConfig.js +4 -1
  16. package/src/filiale/zhongsheng/UserGasAll.vue +0 -625
package/build/dev-server.js CHANGED
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
19
19
  // var bendi = 'http://203.57.101.233:8400/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://121.36.106.17:8400'
22
+ var bendi = 'http://192.168.50.67:31785'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://121.36.106.17:8400'
24
+ var wode = 'http://192.168.50.67:31785'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -91,7 +91,7 @@ var proxyTable = {
91
91
  target: bendi
92
92
  },
93
93
  '/rs/sql': {
94
- target: bendi
94
+ target: 'http://localhost:8084/'
95
95
  },
96
96
  '/rs': {
97
97
  target: wode
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.128",
3
+ "version": "3.3.130",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/SellReport/ManageSellType.vue CHANGED
@@ -2,11 +2,9 @@
2
2
  <div class="basic-main" style="height: 100%">
3
3
  <criteria-paged :model="model" :pager='false' v-ref:paged>
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
- <p class="bg-info text-center" style="padding: 8px;">营业厅分项汇总表</p>
6
- <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
7
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
6
  <div class="row">
9
- <div class="col-sm-4 form-group" >
7
+ <div class="col-sm-2 form-group" >
10
8
  <label class="font_normal_body" for="startDate">开始日期:</label>
11
9
  <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
10
  v-model="model.startDate"
@@ -16,7 +14,7 @@
16
14
  :show-reset-button="reset">
17
15
  </datepicker>
18
16
  </div>
19
- <div class="col-sm-4 form-group" >
17
+ <div class="col-sm-2 form-group" >
20
18
  <label class="font_normal_body" for="endDate">结束日期:</label>
21
19
  <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
20
  v-model="model.endDate"
@@ -25,73 +23,92 @@
25
23
  :format="'yyyy-MM-dd HH:mm:ss'"
26
24
  :show-reset-button="reset">
27
25
  </datepicker>
26
+ </div><!--
27
+ <div class="col-sm-2 form-group">
28
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
29
+ <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
28
30
  </div>
29
- <div class="col-sm-4 form-group" >
30
- <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
31
- <manage-right-tree id="org" @re-res="$parent.$parent.getRes"></manage-right-tree>
32
- </div>
33
- <div class="col-sm-4 form-group">
34
- <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
35
- <manage-res-select id="dep" restype='department'
31
+ <div class="col-sm-2 form-group">
32
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
33
+ <res-select restype='department'
34
+ is-mul="false"
36
35
  @res-select="$parent.$parent.getdep"
37
36
  :parentresid="$parent.$parent.depresid"
38
- :initresid='$parent.$parent.depid' >
39
- </manage-res-select>
37
+ :initresid='$parent.$parent.depid'>
38
+ </res-select>
40
39
 
41
40
  </div>
42
- <div class="col-sm-4 form-group">
43
- <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
44
- <manage-res-select id="oper" restype='user'
41
+ <div class="col-sm-2 form-group">
42
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
43
+ <res-select restype='user'
45
44
  is-mul="false"
46
45
  @res-select="$parent.$parent.getuser"
47
46
  :parentresid="$parent.$parent.userresid"
48
47
  :initresid='$parent.$parent.operatorid'>
49
- </manage-res-select>
50
- </div>
51
- <div class="col-sm-4 form-group">
52
- <label class="font_normal_body">收费状态:</label>
53
- <v-select :value.sync="$parent.$parent.f_state" multiple
54
- v-model="$parent.$parent.f_state"
55
- :options='$parent.$parent.charge_state' placeholder='请选择'
56
- condition="f_state in {}"
57
- close-on-select></v-select>
58
- </div>
59
- <div style = "float:right;">
60
- <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
61
- <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
62
- <report-excel id='gasprice'></report-excel>
48
+ </res-select>
63
49
  </div>
50
+ -->
51
+ <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
52
+ </div>
53
+ <div class="col-sm-2 form-group">
54
+ <label class="font_normal_body">用户类型</label>
55
+ <v-select :value.sync="$parent.$parent.f_user_type"
56
+ v-model="$parent.$parent.f_user_type"
57
+ :options='$parent.$parent.user_type' placeholder='请选择'
58
+ condition="f_user_type in '{}'"
59
+ close-on-select></v-select>
64
60
  </div>
65
- <!--<div class="span" style = "float:right;">-->
61
+ <div class="col-sm-2 form-group">
62
+ <label class="font_normal_body" title="参数:付款方式查询">收费状态</label>
63
+ <v-select :value.sync="model.f_state" multiple
64
+ v-model="model.f_state"
65
+ :options='$parent.$parent.charge_state' placeholder='请选择'
66
+ condition="f_state in {}"
67
+ close-on-select></v-select>
68
+ </div>
69
+ <div class="span" style = "float:right;">
70
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
71
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
72
+ <report-excel id='gasprice'></report-excel>
73
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
74
+ 'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
75
+ </div>
76
+ <div class="row" v-show="$parent.$parent.criteriaShow">
66
77
 
67
- <!--</div>-->
78
+ <!--<div class="col-sm-2 form-group">-->
79
+ <!--<label class="font_normal_body">收费状态</label>-->
80
+ <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
81
+ <!--v-model="$parent.$parent.f_state"-->
82
+ <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
83
+ <!--condition="f_state in {}"-->
84
+ <!--close-on-select></v-select>-->
85
+ <!--</div>-->
86
+ </div>
68
87
  </div>
69
88
  </criteria>
70
89
  <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
71
90
  <table class='tableprint' style="margin: 0px auto">
72
91
  <thead>
73
92
  <tr>
74
- <th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
93
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
75
94
  <h3 style="text-align: center">营业厅分项汇总表</h3>
76
95
  </th>
77
96
  </tr>
78
97
  <tr>
79
98
  <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
80
99
  开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
81
- 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
82
- </th>
83
- </tr>
84
- <tr>
85
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
86
- 打印时间：{{{$parent.printTime}}}
100
+ 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
101
+ <!--打印时间：{{{$parent.printTime}}}-->
102
+ 打印时间：{{$parent.printTime}}
103
+ <!--收费员：{{// $parent.operatorname}}-->
87
104
  </th>
88
105
  </tr>
89
106
  <tr>
90
107
  <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
91
108
  <div>
92
- <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
93
- <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
94
- <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
109
+ <span yle="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
110
+ <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
111
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
95
112
  </div>
96
113
  </th>
97
114
  </tr>
@@ -103,182 +120,146 @@
103
120
  </tr>
104
121
  <tfoot>
105
122
  <tr style="text-align: left">
106
- <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
107
- 收款人:
108
- </th>
109
- <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
110
- 审核人:
111
- </th>
112
- <th :colspan='$parent.spans/3' style="font-weight: normal; text-align: left;">
113
- 经手人:
114
- </th>
123
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
124
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
125
+ <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
115
126
  </tr>
116
127
  </tfoot>
117
128
  </table>
118
129
  {{{ $parent.reportStr}}}
119
130
  </div>
120
131
  </criteria-paged>
121
- <modal :show.sync="show" v-ref:modal small backdrop="false">
122
- <header slot="modal-header" class="modal-header">
123
- <h4 class="modal-title">输入文件名称</h4>
124
- </header>
125
- <article slot="modal-body" class="modal-body">
126
- <div class="form-group">
127
- <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
128
- </div>
129
- </article>
130
- <footer slot="modal-footer" class="modal-footer">
131
- <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
132
- <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
133
- </footer>
134
- </modal>
135
132
  </div>
136
133
  </template>
137
134
 
138
135
  <script>
139
- import { DataModel } from 'vue-client'
140
- import co from 'co'
141
- let saveFile = function * (self) {
142
- // 线验证文件是否重名
143
- let count = yield self.$resetpost('rs/sql/manageSingleTable',
144
- {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
145
- {resolveMsg: null, rejectMsg: null})
146
- if (count.data.length > 0) {
147
- self.$showAlert('无法保存，文件名重名', 'warning', 3000)
148
- return
149
- }
150
- let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
151
- f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
152
- f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
153
- f_outlets: this.$login.f.depname})
154
- if (saveBack.data.status === 'succeed') {
155
- self.show = false
156
- self.filename = ''
157
- // 后台保存完成，通知刷新
158
- self.$dispatch('save-success', self.filename)
159
- }
160
- }
161
- export default {
162
- title: '营业厅分项汇总表',
163
- props: ['data'],
164
- data () {
165
- return {
166
- printTime: this.$login.toStandardTimeString(),
167
- depresid: [],
168
- userresid: [],
169
- initres: {
170
- org:[this.$login.f.orgid],
171
- dep:[],
172
- user:[]
173
- },
174
- f_orgid: this.$login.f.orgid,
175
- f_depid: this.$login.f.depids,
176
- f_operatorid: this.$login.f.id,
177
- operatorid: [],
178
- depid: [],
179
- f_state:['有效'],
180
- orgname: '',
181
- depname: '',
182
- operatorname: '',
183
- orgCondtionStr: '1=1',
184
- model: new DataModel('rs/report/fenxiangsell', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
185
- f_orgid: 'this.model.f_orgid'}),
186
- reportStr: null,
187
- show: false,
188
- spans: ''
136
+ import { DataModel } from 'vue-client'
137
+ import co from 'co'
138
+
139
+ let readySomething = async function (self) {
140
+ await self.$MagLoadParams.loadParam()
141
+ self.initParams()
142
+ }
143
+ export default {
144
+ title: '营业厅分项汇总表',
145
+ props: ['data'],
146
+ data () {
147
+ return {
148
+ printTime: this.$login.toStandardTimeString(),
149
+ depresid: [],
150
+ userresid: [],
151
+ f_orgid: this.$login.f.orgid,
152
+ f_depid: this.$login.f.depids,
153
+ // f_operatorid: this.$login.f.id,
154
+ operatorid: [],
155
+ depid: [],
156
+ orgname: '',
157
+ depname: '',
158
+ criteriaShow: false,
159
+ operatorname: '',
160
+ orgCondtionStr: '1=1',
161
+ f_user_type: '',
162
+ f_state:['有效'],
163
+ model: new DataModel('rs/report/fenxiangsell', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
164
+ f_orgid: 'this.model.f_orgid'}),
165
+ reportStr: null,
166
+ resshow:['company','department','operator'],
167
+ spans: 0,
168
+ user_type:[],
169
+ meterbrands: [],
170
+ initres: {
171
+ org: [this.$login.f.orgid],
172
+ dep: [],
173
+ user: []
189
174
  }
175
+ }
176
+ },
177
+ ready () {
178
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
179
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
180
+ console.log(this.$login.f)
181
+ readySomething(this).then(() => {
182
+ this.$emit('ready')
183
+ }).catch((error) => {
184
+ this.$emit('error', error)
185
+ })
186
+ },
187
+ methods: {
188
+ searchData () {
189
+ this.$refs.paged.$refs.criteria.search()
190
190
  },
191
- ready () {
192
- this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
193
- this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
194
- // this.$refs.paged.$refs.criteria.search()
191
+ initParams() {
192
+ // 初始化气表品牌
193
+ let brandArr = []
194
+ this.$MagGetSaleParam.getGasbrand().forEach((item) => {
195
+ let temp = {}
196
+ temp.label = item.label
197
+ temp.value = item.value.f_meter_brand
198
+ brandArr.push(temp)
199
+ })
200
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
201
+
195
202
  },
196
- methods: {
197
- searchData () {
198
- this.$refs.paged.$refs.criteria.search()
199
- },
200
- selfSearch (args) {
201
- this.printTime = this.$login.toStandardTimeString()
202
- this.orgCondtionStr='1=1'
203
- if (this.f_orgid[0]) {
204
- this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ')'
205
- }
206
- if (this.f_depid[0]) {
207
- this.orgCondtionStr += ' and f_depid in (' + this.f_depid.toString() + ')'
208
- }
209
- if(this.f_operatorid[0]) {
210
- this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ')'
211
- }
212
- this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr.replace('1=1','') + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
213
- this.$refs.paged.search(args)
214
- },
215
- getRes (obj) {
216
- this.orgname = obj.res[0]
217
- this.depresid = obj.resids
218
- this.userresid = obj.resids
219
- this.f_orgid = obj.resids
220
- },
221
- getdep (obj, val) {
222
- this.depname = val[0]
223
- this.userresid = obj
224
- this.f_depid = obj
225
- },
226
- getuser ( obj, val) {
227
- this.operatorname = val[0]
228
- this.f_operatorid = obj
229
- },
230
- // 根据文件路径获取储存的报表内容
231
- getFileContent (path) {
232
- this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
233
- this.reportStr = res.data.filecontent
234
- this.model.state = '正确'
235
- })
236
- },
237
- confirm () {
238
- if (!this.filename || this.filename === '') {
239
- this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
240
- }
241
- let saveGen = saveFile(this)
242
- co(saveGen)
243
- },
244
- close () {
245
- this.show = false
246
- },
247
- // 将报表保存成文件
248
- confirmReport () {
249
- this.show = true
250
- this.filename = this.data.f_report_name + this.$login.toStandardDateString()
251
- }
203
+ selfSearch (args) {
204
+ this.printTime = this.$login.toStandardTimeString()
205
+ let orgcondition = '1=1'
206
+ console.log("args:",args)
207
+ let orgstr = this.orgCondtionStr
208
+ orgcondition = orgcondition + orgstr
209
+ /* if (this.f_orgid && this.f_orgid[0]) {
210
+ orgcondition += ` and f_orgid in ('${this.f_orgid}')`
211
+ }
212
+ if (this.f_depid && this.f_depid[0]) {
213
+ orgcondition += ` and f_depid in ('${this.f_depid}')`
214
+ }
215
+ if(this.f_operatorid && this.f_operatorid[0]) {
216
+ orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
217
+ }*/
218
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition.replace('1=1','') + ' and ' + args.condition
219
+ this.$refs.paged.search(args)
252
220
  },
253
- watch: {
254
- 'data' (val) {
255
- if (val.f_files_path) {
256
- this.getFileContent(val.f_files_path)
257
- } else {
258
- this.reportStr = null
259
- }
260
- },
261
- 'model.data' (val) {
262
- let len=0
263
- let a=val.split('</tr>')
264
- for(let i=0;i<a.length;i++){
265
- if(a[i].split('</td>').length-1>len){
266
- len=a[i].split('</td>').length-1
267
- }
268
- continue
269
- }
270
- this.spans = len
271
- }
221
+
222
+ hidden() {
223
+ this.criteriaShow = !this.criteriaShow
224
+ },
225
+ getRes (condition, obj) {
226
+ this.orgCondtionStr = condition
227
+ this.orgname = obj.orgnames[0]
228
+ this.depname = obj.depnames[0]
229
+ },
230
+ getdep (obj, val) {
231
+ this.depname = val[0]
232
+ this.userresid = obj
233
+ this.f_depid = obj
272
234
  },
273
- computed: {
274
- charge_state() {
275
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
235
+ getuser ( obj, val) {
236
+ this.operatorname = val[0]
237
+ this.f_operatorid = obj
238
+ }
239
+ },
240
+ watch: {
241
+ 'model.data' (val) {
242
+ let len=0
243
+ let a=val.split('</tr>')
244
+ for(let i=0;i<a.length;i++){
245
+ if(a[i].split('</td>').length-1>len){
246
+ len=a[i].split('</td>').length-1
247
+ }
276
248
  }
249
+ this.spans = len
277
250
  }
251
+ },
252
+ computed: {
253
+
254
+ charge_state () {
255
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
256
+ }
257
+
278
258
  }
259
+ }
279
260
  </script>
280
261
  <style scoped>
281
- .noborder{
282
- border: none;
283
- }
262
+ .noborder{
263
+ border: none;
264
+ }
284
265
  </style>
package/src/components/sale/config/exportConfig.js CHANGED
@@ -684,7 +684,7 @@ export default{
684
684
  'f_collection': '实收金额', 'f_instruct_state': '指令状态', 'f_receive_state': '表返回状态', 'f_instruct_date': '生成指令时间'
685
685
  },
686
686
  GasStatistics: {
687
- 'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_gascode': '燃气证号', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌',
687
+ 'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_residential_area': '小区', 'f_address': '地址', 'f_user_phone': '电话', 'f_table_state': '气表状态', 'f_gascode': '燃气证号', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌',
688
688
  'f_meter_classify': '表具类型', 'f_meter_title': '表描述', 'f_price_name': '气价名称', 'f_user_nature': '用气类型','f_gasproperties': '用气性质', 'f_balance': '期初余额', 'f_last_tablebase': '起方', 'f_tablebase': '止方',
689
689
  'f_oughtamount': '期间用气量', 'f_oughtfee': '期间用气金额', 'f_collection': '期末充值金额', 'f_curbalance': '期末余额', 'f_gas_state': '用气状态', 'f_changetable_state': '是否换表', 'f_first_input_date': '首次抄表时间', 'f_input_date': '最后通讯日期'
690
690
  },
package/src/components/webmeter/gasStatistics/GasStatistics.vue CHANGED
@@ -108,6 +108,14 @@
108
108
  condition="ss.f_gas_state = '{}'"
109
109
  close-on-select></v-select>
110
110
  </div>
111
+ <div class="col-sm-2 form-group">
112
+ <label class="font_normal_body">气表状态</label>
113
+ <v-select :value.sync="model.f_table_state"
114
+ v-model="model.f_table_state"
115
+ :options="$parent.$parent.tableState"
116
+ condition="f_table_state = '{}'"
117
+ close-on-select></v-select>
118
+ </div>
111
119
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
112
120
  <label class="font_normal_body">用气量区间</label>
113
121
  <div class="row">
@@ -177,6 +185,7 @@
177
185
  <th><nobr>地址</nobr></th>
178
186
  <th><nobr>电话</nobr></th>
179
187
 
188
+ <th><nobr>气表状态</nobr></th>
180
189
  <th><nobr>燃气证号</nobr></th>
181
190
  <th><nobr>气表品牌</nobr></th>
182
191
  <th><nobr>表号</nobr></th>
@@ -207,6 +216,7 @@
207
216
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
208
217
  <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
209
218
 
219
+ <td style="text-align:center"><nobr>{{row.f_table_state}}</nobr></td>
210
220
  <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
211
221
  <th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
212
222
  <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
@@ -272,6 +282,9 @@
272
282
  </div>
273
283
  </div>
274
284
  </div>
285
+ <div class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
286
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
287
+ </div>
275
288
  </template>
276
289
 
277
290
  <script>
@@ -308,6 +321,7 @@
308
321
  sumsmodel: {},
309
322
  orgid:[this.$login.f.orgid],
310
323
  criteriaShow:false,
324
+ showdetail:false,
311
325
  //默认打印列
312
326
  defaultfield: [],
313
327
  orgCondtionStr: '',
@@ -380,7 +394,7 @@
380
394
  this.criteriaShow = !this.criteriaShow
381
395
  },
382
396
  cancel() {
383
- this.show = false
397
+ this.showdetail = false
384
398
  },
385
399
  clearmsg () {
386
400
  Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
@@ -394,7 +408,7 @@
394
408
  },
395
409
  showmsg(obj){
396
410
  this.rowdata=obj
397
- this.show=true
411
+ this.showdetail=true
398
412
  },
399
413
 
400
414
  search (args) {
@@ -486,6 +500,9 @@
486
500
  pricetypes() {
487
501
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
488
502
  },
503
+ tableState() {
504
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
505
+ },
489
506
  gasState() {
490
507
  return [{label:'正常', value:'正常'},
491
508
  {label:'异常', value:'异常'},
package/src/components/webmeter/gasStatistics/NewGasStatistics.vue CHANGED
@@ -109,6 +109,14 @@
109
109
  condition="ss.f_gas_state = '{}'"
110
110
  close-on-select></v-select>
111
111
  </div>
112
+ <div class="col-sm-2 form-group">
113
+ <label class="font_normal_body">气表状态</label>
114
+ <v-select :value.sync="model.f_table_state"
115
+ v-model="model.f_table_state"
116
+ :options="$parent.$parent.tableState"
117
+ condition="f_table_state = '{}'"
118
+ close-on-select></v-select>
119
+ </div>
112
120
  <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
113
121
  <label class="font_normal_body">用气量区间</label>
114
122
  <div class="row">
@@ -185,6 +193,7 @@
185
193
  <th><nobr>地址</nobr></th>
186
194
  <th><nobr>电话</nobr></th>
187
195
 
196
+ <th><nobr>气表状态</nobr></th>
188
197
  <th><nobr>燃气证号</nobr></th>
189
198
  <th><nobr>气表品牌</nobr></th>
190
199
  <th><nobr>表号</nobr></th>
@@ -215,6 +224,7 @@
215
224
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
216
225
  <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
217
226
 
227
+ <td style="text-align:center"><nobr>{{row.f_table_state}}</nobr></td>
218
228
  <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
219
229
  <th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
220
230
  <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
@@ -281,6 +291,9 @@
281
291
  </div>
282
292
  </div>
283
293
  </div>
294
+ <div class="flex-row" style="width:99%;height:98%;margin-bottom:0px" v-if="showdetail">
295
+ <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
296
+ </div>
284
297
  </template>
285
298
 
286
299
  <script>
@@ -317,6 +330,7 @@
317
330
  sumsmodel: {},
318
331
  orgid:[this.$login.f.orgid],
319
332
  criteriaShow:false,
333
+ showdetail:false,
320
334
  //默认打印列
321
335
  defaultfield: [],
322
336
  orgCondtionStr: '',
@@ -390,7 +404,7 @@
390
404
  this.criteriaShow = !this.criteriaShow
391
405
  },
392
406
  cancel() {
393
- this.show = false
407
+ this.showdetail = false
394
408
  },
395
409
  clearmsg () {
396
410
  Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
@@ -404,7 +418,7 @@
404
418
  },
405
419
  showmsg(obj){
406
420
  this.rowdata=obj
407
- this.show=true
421
+ this.showdetail=true
408
422
  },
409
423
 
410
424
  search (args) {
@@ -488,6 +502,9 @@
488
502
  pricetypes() {
489
503
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
490
504
  },
505
+ tableState() {
506
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
507
+ },
491
508
  gasState() {
492
509
  return [{label:'正常', value:'正常'},
493
510
  {label:'异常', value:'异常'},