manage-client 3.3.127 → 3.3.129

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 (12) 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 +13 -0
  6. package/src/components/webmeter/gasStatistics/NewGasStatistics.vue +13 -0
  7. package/src/filiale/lixianV3/RecordInfoQuery.vue +3 -3
  8. package/src/filiale/lixianV3/config/exportConfig.js +1 -0
  9. package/src/filiale/qianneng/ArrearsQuery.vue +6 -1
  10. package/src/filiale/shanxian/OtherChargeQuery.vue +5 -1
  11. package/src/filiale/shanxian/config/exportConfig.js +4 -1
  12. 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.127",
3
+ "version": "3.3.129",
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>
@@ -486,6 +496,9 @@
486
496
  pricetypes() {
487
497
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
488
498
  },
499
+ tableState() {
500
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
501
+ },
489
502
  gasState() {
490
503
  return [{label:'正常', value:'正常'},
491
504
  {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>
@@ -488,6 +498,9 @@
488
498
  pricetypes() {
489
499
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
490
500
  },
501
+ tableState() {
502
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
503
+ },
491
504
  gasState() {
492
505
  return [{label:'正常', value:'正常'},
493
506
  {label:'异常', value:'异常'},
package/src/filiale/lixianV3/RecordInfoQuery.vue CHANGED
@@ -1381,9 +1381,9 @@
1381
1381
  positions() {
1382
1382
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
1383
1383
  },
1384
- meterbooks(){
1385
- return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
1386
- },
1384
+ // meterbooks(){
1385
+ // return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
1386
+ // },
1387
1387
  userstates() {
1388
1388
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
1389
1389
  },
package/src/filiale/lixianV3/config/exportConfig.js CHANGED
@@ -560,6 +560,7 @@ export default {
560
560
  'f_userfiles_address': '安装地址',
561
561
  'f_install_person': '安装人',
562
562
  'f_gas_person': '通气人员',
563
+ 'f_book_name': '表册名称',
563
564
  'f_meter_book_num': '抄表册编号',
564
565
  'f_meter_book_sort': '抄表册顺序',
565
566
  'f_balance_amount': '表剩余金额',
package/src/filiale/qianneng/ArrearsQuery.vue CHANGED
@@ -116,7 +116,7 @@
116
116
  condition="f_meter_book_sort = '{}'" placeholder="册内序号">
117
117
  </div>
118
118
  <div class="col-sm-2 form-group">
119
- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
119
+ <label class="font_normal_body" >表册抄表员</label>
120
120
  <v-select :value.sync="model.f_inputtor"
121
121
  v-model="model.f_inputtor"
122
122
  :options='$parent.$parent.inputtores' placeholder='请选择'
@@ -227,6 +227,11 @@
227
227
  <input type="text" style="width:60%" class="input_search" v-model="model.c"
228
228
  condition="c > '{}'" placeholder='欠费期数大于'>
229
229
  </div>
230
+ <div class="col-sm-2 form-group">
231
+ <label class="font_normal_body">实际抄表员</label>
232
+ <input type="text" style="width:60%" class="input_search" v-model="model.c"
233
+ condition="f_hand_inputtor like '%{}%'" placeholder='实际抄表员'>
234
+ </div>
230
235
 
231
236
  </div>
232
237
  </div>
package/src/filiale/shanxian/OtherChargeQuery.vue CHANGED
@@ -35,6 +35,7 @@
35
35
 
36
36
  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
37
37
  :field="$parent.$parent.getfield" :header="$parent.$parent.other"
38
+ :defaultselect="$parent.$parent.defaultexport"
38
39
  sqlurl="rs/logic/exportfile" sql-name="otherChargeQuery" template-name='其他收费查询导出'
39
40
  :choose-col="true"></export-excel>
40
41
  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -440,7 +441,7 @@
440
441
  all: false,
441
442
  fields: {},
442
443
  config: {
443
- defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
444
+ defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_address', 'f_user_phone', 'id', 'f_typename', 'f_unitprice', 'f_number', 'f_payment','f_operate_date']
444
445
  },
445
446
  //排序
446
447
  orderitem:'f_operate_date desc',
@@ -689,6 +690,9 @@
689
690
  getfield() {
690
691
  return exportConfig.otherchargeConfig
691
692
  },
693
+ defaultexport() {
694
+ return exportConfig.otherexportConfig
695
+ },
692
696
  chargetype() {
693
697
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
694
698
  },
package/src/filiale/shanxian/config/exportConfig.js CHANGED
@@ -107,7 +107,10 @@ export default{
107
107
  chargeexportConfig: {
108
108
  'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_pregas': '气量', 'f_collection': '收款', 'f_stairamount1': '一阶气量', 'f_stair2amount': '二阶气量', 'f_stair3amount': '三阶气量'
109
109
  },
110
- loginQueryexportConfig:{
110
+ otherexportConfig: {
111
+ 'f_userinfo_code': '用户编号', 'f_user_name': '用户名称', 'f_address': '用户地址', 'id': '收费编号', 'f_typename': '品名规格', 'f_unitprice': '单价', 'f_number': '数量', 'f_payment': '付款方式', 'f_operate_date': '收费日期'
112
+ },
113
+ loginQueryexportConfig: {
111
114
  'f_userinfo_id': '登录人编号','f_user_name': '登录人名称', 'logindate': '登录时间', 'type': '类型'
112
115
  },
113
116
  reverseexportConfig: {
package/src/filiale/zhongsheng/UserGasAll.vue DELETED
@@ -1,625 +0,0 @@
1
- <template>
2
- <div class="flex-row" id="unit" v-show="(!echarts)&&(!isActiveTotalForm)">
3
- <div class="basic-main" @keyup.enter="search">
4
- <div class="flex">
5
- <div class="flex" style="flex:1;">
6
- <criteria-paged :model="model" :pager='true' v-ref:paged>
7
- <criteria @condition-changed='$parent.search' partial='criteria' v-ref:cri>
8
- <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
9
- <div class="row" width="100%">
10
- <div class="col-sm-2 form-group">
11
- <label class="font_normal_body">客户编号</label>
12
- <input style="width:60%" class="input_search" condition="f_userinfo_code like '%{}%'" placeholder='客户编号' type="text"
13
- v-el:meternumber v-model="model.f_userinfo_code" v-next-el='f_userinfo_code'
14
- >
15
- </div>
16
- <div class="col-sm-2 form-group">
17
- <label class="font_normal_body">客户名称</label>
18
- <input style="width:60%" class="input_search" condition="f_user_name = '{}'" placeholder='客户名称' type="text"
19
- v-el:username v-model="model.f_username" v-next-el='userid'>
20
- </div>
21
- <div class="col-sm-2 form-group">
22
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
23
- <v-select :value.sync="model.f_residential_area"
24
- class="select_list select"
25
- v-model="model.f_residential_area"
26
- style="width: 60%"
27
- multiple
28
- condition="f_residential_area in {}"
29
- :options='$parent.$parent.residentialArea' placeholder='选择小区'
30
- close-on-select>
31
-
32
- </v-select>
33
- </div>
34
- <div class="col-sm-2 form-group">
35
- <label class="font_normal_body">用气地址</label>
36
- <input style="width:60%" class="input_search" condition="f_address like '%{}%'" placeholder='用气地址' type="text"
37
- v-el:area v-el:xq v-model="model.f_address" v-next-el='address'
38
- >
39
- </div>
40
- <div class="col-sm-4 form-group button-range">
41
- <button @click="search()" class="button_search button_spacing">查询</button>
42
- <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
43
- <export-excel :data="$parent.$parent.getCondition()"
44
- :field="$parent.$parent.getfield"
45
- sqlurl="rs/logic/exportfile" sql-name="webmeter_getUserGasList" template-name='用气分析'
46
- v-ref:exports
47
- :choose-col="true"></export-excel>
48
- <button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()" >显示汇总</button>
49
- <button class="button_export button_spacing" @click="$parent.$parent.showEcharts()">显示图表</button>
50
- <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
51
- </div>
52
- </div>
53
- <div class="row" v-show="$parent.$parent.criteriaShow">
54
-
55
- <!--<div class="col-sm-2 form-group" >
56
- <label class="font_normal_body">用气属性</label>
57
- <v-select
58
- placeholder='用气属性'
59
- value-single="true"
60
- :value.sync="model.f_gasproperties2"
61
- v-model="model.f_gasproperties2"
62
- :options='$parent.$parent.Gasproperties2'
63
- close-on-select condition="uf.f_gasproperties2 {}">
64
- </v-select>
65
- </div>-->
66
- <!-- <res-select-group :show-component="['company']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
67
- <div class="col-sm-2 form-group">
68
- <label class="font_normal_body">表&emsp;&emsp;号</label>
69
- <input style="width:60%" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' type="text"
70
- v-el:meternumber v-model="model.f_meternumber" v-next-el='meternumber'
71
- >
72
- </div>
73
- <!-- <div class="col-sm-2">-->
74
- <!-- <label class="font_normal_body">公&emsp;&emsp;司</label>-->
75
- <!-- <right-tree @re-res="$parent.$parent.getorg"-->
76
- <!-- :initresid='$parent.$parent.orgid'></right-tree>-->
77
- <!-- </div>-->
78
- <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
79
- <!-- <div class="col-sm-2 form-group">-->
80
- <!-- <label class="font_normal_body">组织机构</label>-->
81
- <!-- <res-select :initresid="$parent.$parent.orgid"-->
82
- <!-- style="width:60%"-->
83
- <!-- @res-select="$parent.$parent.getRes"-->
84
- <!-- restype='organization'>-->
85
- <!-- </res-select>-->
86
- <!-- </div>-->
87
-
88
- <div class="col-sm-2 form-group">
89
- <label class="font_normal_body">客户类型</label>
90
- <v-select :options='$parent.$parent.Gasusertype'
91
- :value.sync="model.f_user_type"
92
- close-on-select
93
- style="width:60%"
94
- condition="f_user_type = '{}'"
95
- id="f_user_type"
96
- placeholder='客户类型'
97
- v-model="model.f_user_type"
98
- value-single="true">
99
- </v-select>
100
- </div>
101
- <div class="col-sm-2 form-group">
102
- <label class="font_normal_body">用气性质</label>
103
- <v-select :options='$parent.$parent.Gasproperties'
104
- :value.sync="model.f_gasproperties"
105
- close-on-select
106
- condition="f_gasproperties = '{}'"
107
- id="f_gasproperties"
108
- placeholder='用气性质'
109
- style="width:60%"
110
- v-model="model.f_gasproperties"
111
- value-single="true">
112
- </v-select>
113
- </div>
114
- <div class="col-sm-2 form-group">
115
- <label class="font_normal_body">气表品牌</label>
116
- <v-select :value.sync="model.f_meter_brand"
117
- v-model="model.f_meter_brand"
118
- :options='$parent.$parent.meterbrands' placeholder='请选择'
119
- condition="f_meter_brand = '{}'"
120
- close-on-select></v-select>
121
- </div>
122
- <div class="col-sm-2 form-group">
123
- <label class="font_normal_body">时间区间</label>
124
- <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
125
- :show-reset-button="reset"
126
- :value.sync="model.startDate"
127
- id="startDate"
128
- style="width:60%"
129
- placeholder="开始时间"
130
- v-model="model.startDate">
131
- </datepicker>
132
- </div>
133
- <div class="col-sm-2 form-group">
134
- <label class="font_normal_body" style="word-break:keep-all;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
135
- <datepicker :disabled-days-of-Week="[]" :format="'yyyy-MM-dd HH:mm:ss'"
136
- :show-reset-button="reset"
137
- :value.sync="model.endDate"
138
- style="width:60%"
139
- id="endDate"
140
- style="width:60%"
141
- placeholder="结束日期"
142
- v-model="model.endDate">
143
- </datepicker>
144
- </div>
145
- <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
146
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;用气量&nbsp;</label>
147
- <div class="row">
148
- <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount1"
149
- condition="f_oughtamount >= {} " placeholder="">
150
- <label class="font_normal_body"> ≤ x ≤ </label>
151
- <input type="text" style="width:27%" class="input_search" v-model="model.f_oughtamount2"
152
- condition="f_oughtamount <= {} " placeholder="">
153
- </div>
154
- </div>
155
- <!--<div class="col-sm-2 form-group">
156
- <label class="font_normal_body">用&nbsp;气&nbsp;量&nbsp;</label>
157
- <input type="text" style="width:60%" class="input_search"
158
- v-model="model.f_start_oughtamount" placeholder='起始气量'
159
- >
160
- </div>
161
- <div class="col-sm-2 form-group">
162
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
163
- <input type="text" style="width:60%" class="input_search"
164
- v-model="model.f_end_oughtamount" placeholder='结束气量'
165
- >
166
- </div>-->
167
- <div class="col-sm-2 form-group">
168
- <label class="font_normal_body">壁&ensp;挂&ensp;炉</label>
169
- <v-select id="f_meter_brand"
170
- v-model="model.f_usetype"
171
- placeholder=''
172
- :value.sync="model.f_usetype"
173
- :options='$parent.$parent.usetypes'
174
- condition="f_usetype {}" :search="false"
175
- close-on-select style="width: 60%">
176
- </v-select>
177
- </div>
178
- <div class="col-sm-2 form-group">
179
- <label class="font_normal_body">房屋类型</label>
180
- <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"
181
- :options='$parent.$parent.houseTypes' placeholder='请选择'
182
- close-on-select
183
- condition="f_house_type = '{}'"></v-select>
184
- </div>
185
- <div class="col-sm-2 form-group">
186
- <label class="font_normal_body">安装位置</label>
187
- <v-select :value.sync="model.f_position" v-model="model.f_position"
188
- :options='$parent.$parent.positions' placeholder='请选择'
189
- condition="f_position = '{}'"
190
- close-on-select></v-select>
191
- </div>
192
- <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
193
- <label class="font_normal_body">期末结余</label>
194
- <div class="row">
195
- <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance1"
196
- condition="f_curbalance >= {} " placeholder="">
197
- <label class="font_normal_body"> ≤ x ≤ </label>
198
- <input type="text" style="width:27%" class="input_search" v-model="model.f_curbalance2"
199
- condition="f_curbalance <= {} " placeholder="">
200
- </div>
201
- </div>
202
- </div>
203
- </div>
204
- </criteria>
205
- <data-grid :model="model" id="usergasall" partial='list' class="list_area table_sy" v-ref:grid>
206
- <template partial='head'>
207
- <tr>
208
- <th style="text-align:center">
209
- <nobr>客户编号</nobr>
210
- </th>
211
- <th style="text-align:center">
212
- <nobr>客户类型</nobr>
213
- </th>
214
- <th style="text-align:center">
215
- <nobr>用气性质</nobr>
216
- </th>
217
- <th style="text-align:center">
218
- <nobr>用户电话</nobr>
219
- </th>
220
- <!--<th style="text-align:center"><nobr>用气属性</nobr></th>-->
221
- <th style="text-align:center">
222
- <nobr>客户名称</nobr>
223
- </th>
224
- <th style="text-align:center">
225
- <nobr>小区</nobr>
226
- </th>
227
- <th style="text-align:center">
228
- <nobr>用气单价</nobr>
229
- </th>
230
- <th style="text-align:center">
231
- <nobr>用气量</nobr>
232
- </th>
233
- <th style="text-align:center">
234
- <nobr>用气金额</nobr>
235
- </th>
236
- <th style="text-align:center">
237
- <nobr>累购气量</nobr>
238
- </th>
239
- <th style="text-align:center">
240
- <nobr>累购金额</nobr>
241
- </th>
242
- <th style="text-align:center">
243
- <nobr>账号结余</nobr>
244
- </th>
245
- <th style="text-align:center">
246
- <nobr>气表名称</nobr>
247
- </th>
248
- <th style="text-align:center">
249
- <nobr>用气地址</nobr>
250
- </th>
251
- <th style="text-align:center">
252
- <nobr>表号</nobr>
253
- </th>
254
- <th style="text-align:center">
255
- <nobr>期初余额(元)</nobr>
256
- </th>
257
- <th style="text-align:center">
258
- <nobr>上期底数</nobr>
259
- </th>
260
- <th style="text-align:center">
261
- <nobr>本期底数</nobr>
262
- </th>
263
- <!-- <th style="text-align:center"><nobr>气价(元/m³)</nobr></th>-->
264
- <th style="text-align:center">
265
- <nobr>用气量(m³)</nobr>
266
- </th>
267
- <th style="text-align:center">
268
- <nobr>用气金额(元)</nobr>
269
- </th>
270
- <!-- <th style="text-align:center">-->
271
- <!-- <nobr>充值金额(元)</nobr>-->
272
- <!-- </th>-->
273
- <th style="text-align:center">
274
- <nobr>期末结余(元)</nobr>
275
- </th>
276
- </tr>
277
-
278
-
279
- </template>
280
- <template partial='body'>
281
- <td>{{row.f_userinfo_code}}</td>
282
- <td style="text-align:center">{{row.f_user_type}}</td>
283
- <td style="text-align:center">{{row.f_gasproperties}}</td>
284
- <td style="text-align:center">{{row.f_user_phone}}</td>
285
- <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
286
- <td style="text-align:center">
287
- <nobr>{{row.f_user_name}}</nobr>
288
- </td>
289
- <td style="text-align:center">
290
- <nobr>{{row.f_residential_area}}</nobr>
291
- </td>
292
- <td style="text-align:center">
293
- <nobr>{{row.f_price}}</nobr>
294
- </td>
295
- <td style="text-align:center">
296
- <nobr>{{row.f_gas1}}/{{row.f_gas2}}/{{row.f_gas3}}</nobr>
297
- </td>
298
- <td style="text-align:center">
299
- <nobr>{{row.f_money1}}/{{row.f_money2}}/{{row.f_money3}}</nobr>
300
- </td>
301
- <td style="text-align:center">{{row.f_total_gas}}</td>
302
- <td style="text-align:center">{{row.f_total_fee}}</td>
303
- <td style="text-align:center">{{row.f_balance_amount}}</td>
304
- <td style="text-align:center">{{row.f_meter_brand}}</td>
305
- <td>
306
- <nobr>{{row.f_address}}</nobr>
307
- </td>
308
- <td>{{row.f_meternumber}}</td>
309
- <td style="text-align:center">{{row.f_balance}}</td>
310
- <td style="text-align:center">{{row.f_last_tablebase}}</td>
311
- <td style="text-align:center">{{row.f_tablebase}}</td>
312
- <!--<td style="text-align:center">{{row.f_avg_price}}</td>-->
313
- <td style="text-align:center">{{row.f_oughtamount}}</td>
314
- <td style="text-align:center">{{row.f_oughtfee}}</td>
315
- <!-- <td style="text-align:center">{{row.f_collection}}</td>-->
316
- <td style="text-align:center">{{row.f_curbalance}}</td>
317
- </template>
318
- </data-grid>
319
- </criteria-paged>
320
- <table class="table-hover">
321
- <tr style="position: relative" class="table-bordered">
322
- <td
323
- style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
324
- 汇总信息
325
- </td>
326
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
327
- 总累购气量:&emsp;{{model.sums.f_total_gas}}
328
- </td>
329
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
330
- 总累购金额:&emsp;{{model.sums.f_total_fee}}
331
- </td>
332
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
333
- 总账户结余:&emsp;{{model.sums.f_balance_amount}}
334
- </td>
335
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
336
- 本期用气量合计:&emsp;{{model.sums.f_oughtamount}}
337
- </td>
338
- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
339
- 本期用气金额合计:&emsp;{{model.sums.f_oughtfee}}
340
- </td>
341
- </tr>
342
- </table>
343
- </div>
344
- </div>
345
- </div>
346
- </div>
347
- <div class="flex-row" v-if="echarts">
348
- <user-gas-echarts :condition="condition" :echarts="echarts" :enddate="endDate"
349
- :groupname="groupname[0]" :startdate="startDate"></user-gas-echarts>
350
- </div>
351
- <!--汇总表显示模板-->
352
- <div class="flex-row" v-if="isActiveTotalForm">
353
- <user-gas-eform :condition="condition" :enddate="endDate" :startdate="startDate"></user-gas-eform>
354
- </div>
355
- </template>
356
-
357
- <script>
358
- import {HttpResetClass, PagedList} from 'vue-client'
359
- import UserGasEcharts from '../../components/webmeter/DrillData/UserGasEcharts'
360
- import * as Util from '../../Util'
361
- import getLodop from '../../plugins/LodopFuncs'
362
- import plugins from '../../plugins/GetLoginInfoService'
363
- import plugin from 'system-clients/src/plugins/GetLoginInfoService'
364
- let readyGen = async function (self) {
365
- await self.$MagLoadParams.loadParam()
366
- self.initParams()
367
- self.getaddress()
368
- }
369
-
370
- export default {
371
- title: '用气分析',
372
- props: ['data'],
373
- components: {UserGasEcharts},
374
- data() {
375
- return {
376
- resshow:['company','slicearea'],
377
- model: new PagedList('rs/sql/webmeter_getUserGasList', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
378
- f_gas1: 0,
379
- f_gas2: 0,
380
- f_gas3: 0,
381
- f_money1: 0,
382
- f_money2: 0,
383
- f_money3: 0,
384
- f_oughtamount: 0,
385
- f_oughtfee: 0,
386
- f_total_gas: 0,
387
- f_total_fee: 0,
388
- f_balance_amount: 0
389
- }),
390
- getGroupNameByDate: [
391
- {label: '年份', value: 'year'},
392
- {label: '月份', value: 'month'},
393
- {label: '周', value: 'week'}
394
- ],
395
- meterbrands: [],
396
- residentialArea: [],
397
- criteriaShow: false,
398
- reportStr: null,
399
- show: false,
400
- initres: {
401
- org:[this.$login.f.orgid],
402
- dep:[],
403
- user:[]
404
- },
405
- outlets: [],
406
- operator: [],
407
- filename: '',
408
- searchshow: true,
409
- startDate: '',
410
- endDate: '',
411
- echarts: false,
412
- isActiveTotalForm: false,
413
- condition: '1=1',
414
- getfield: {},
415
- config: {
416
- excelHeaders: {
417
- 'f_userinfo_code':'客户编号',
418
- 'f_user_type':'客户类型',
419
- 'f_gasproperties': '用气性质',
420
- 'f_user_name': '客户名称',
421
- 'f_user_phone':'客户电话',
422
- 'f_residential_area': '小区',
423
- 'f_price':'用气单价',
424
- 'f_address':'用气地址',
425
- 'f_meternumber': '表号',
426
- 'f_meter_brand':'气表品牌',
427
- 'f_balance':'期初余额(元)',
428
- 'f_last_tablebase': '上期底数',
429
- 'f_tablebase':'本期底数',
430
- 'f_oughtamount':'用气量(m³)',
431
- 'f_oughtfee':'用气金额(元)',
432
- 'f_curbalance':'期末结余(元)'
433
-
434
- }
435
- },
436
- groupname: ['day'],
437
- getgroupname: [
438
- {label: '年份', value: 'year'},
439
- {label: '月份', value: 'month'},
440
- {label: '周', value: 'week'},
441
- {label: '日', value: 'day'}
442
- ],
443
- // orgCondtionStr: ' and h.f_orgid in (' + this.$login.f.orgid + ')',
444
- orgCondtionStr: '(' + this.$login.f.orgid + ')',
445
- orgid:[this.$login.f.orgid],
446
- usetypes: [{label: '全部', value: ''},{label: '是', value: `= '壁挂炉'`},{label: '否', value: `!= '壁挂炉'`}],
447
- zonesdata:''
448
- }
449
- },
450
- ready() {
451
- readyGen(this)
452
- console.log('444444444', Util.addDate(new Date(),-6).substring(0,10))
453
- this.$refs.paged.$refs.cri.model.startDate = Util.addDate(new Date(),-4).substring(0,10) + ' 00:00:00'
454
- this.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
455
- this.$refs.paged.$refs.cri.search()
456
- this.getfield = this.config.excelHeaders
457
- },
458
- methods: {
459
- // 查询开关
460
- hidden() {
461
- this.criteriaShow = !this.criteriaShow
462
- },
463
- async getaddress(){
464
- let HttpReset = new HttpResetClass()
465
- var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
466
- data: {
467
- condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
468
- }
469
- }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
470
- console.log('小区',data)
471
- let house = [{label: '全部', value: ''}]
472
- for (let row of data.data){
473
- house.push({label: row.f_residential_area, value: row.f_residential_area})
474
- }
475
- this.residentialArea = house
476
- },
477
- SaveAsFile(str) {
478
- this.$showMessage('您是否需要导出本页数据？', ['confirm', 'cancel']).then((res) => {
479
- if (res === 'confirm') {
480
- let style = '<style>' +
481
- 'td {border-width: 1px;padding: 2px;border-style: solid; border-color:black; border-collapse:collapse;} .tdright{text-align: right;} .tdcenter{text-align: center;}</style>';
482
- let strHtml = style + document.getElementById(str).innerHTML;
483
- console.log(strHtml);
484
- let LODOP = getLodop();
485
- LODOP.PRINT_INIT('');
486
- LODOP.ADD_PRINT_TABLE(5, 5, '99%', '100%', strHtml);
487
- LODOP.SAVE_TO_FILE('用气分析.xls')
488
- }
489
- })
490
- },
491
- clearmsg() {
492
- this.$refs.paged.$refs.cri.model = {}
493
- },
494
- initParams() {
495
- // 初始化气表品牌
496
- let brandArr = []
497
- this.$MagGetSaleParam.getGasbrand().forEach((item) => {
498
- if (item.value.f_meter_type == '物联网表') {
499
- let temp = {}
500
- temp.label = item.label
501
- temp.value = item.value.f_meter_brand
502
- brandArr.push(temp)
503
- }
504
- })
505
- this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
506
-
507
- },
508
- search(args) {
509
- this.startDate = this.$refs.paged.$refs.cri.model.startDate
510
- this.endDate = this.$refs.paged.$refs.cri.model.endDate
511
- if (this.endDate == '' || this.startDate == '') {
512
- return this.$showMessage("时间区间的开始和结束时间不能为空！")
513
- }
514
- // this.condition = this.$refs.paged.$refs.cri.condition + ` ${this.orgCondtionStr}`
515
- if (this.orgCondtionStr)
516
- this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid in ${this.orgCondtionStr}`
517
- else
518
- this.condition = this.$refs.paged.$refs.cri.condition + ` and f_orgid = ${this.$login.f.orgid}`
519
- if(this.zonesdata){
520
- this.condition = this.$refs.paged.$refs.cri.condition + ` and ${this.zonesdata}`
521
- }
522
- args.condition = this.condition
523
- this.model.search(args.condition, args.model)
524
- },
525
- // 显示柱状图
526
- showEcharts() {
527
- this.echarts = true
528
- this.isActiveTotalForm = false
529
- },
530
- notShowTotalForm() {
531
- this.echarts = false
532
- this.isActiveTotalForm = false
533
- },
534
- // 不显示柱状图
535
- notShowEcharts() {
536
- this.echarts = false
537
- this.isActiveTotalForm = false
538
- },
539
- // 显示汇总数据表格
540
- showTotalForm() {
541
- this.echarts = false
542
- this.isActiveTotalForm = true
543
- },
544
- close() {
545
- this.show = false
546
- },
547
- getRes(obj) {
548
- this.orgCondtionStr = plugins.convertToIn(obj)
549
- if(obj.indexOf("f_zones = ")>0){
550
- this.zonesdata = obj.substring(obj.indexOf("f_zones = "))
551
- }else{
552
- this.zonesdata='';
553
- }
554
- },
555
- getorg(obj) {
556
- this.orgCondtionStr = plugin.convertToIn(obj.resids)?plugin.convertToIn(obj.resids):'(' + this.$login.f.orgid + ')'
557
- },
558
- getCondition () {
559
- return {
560
- condition: this.condition,
561
- startDate: this.startDate,
562
- endDate: this.endDate
563
- }
564
- }
565
- // getRes(condition,obj) {
566
- // this.orgCondtionStr = condition
567
- // this.orgname = obj.orgnames[0]
568
- // this.depname = obj.depnames[0]
569
- // }
570
- },
571
- watch: {
572
- 'data'(val) {
573
- if (val.f_files_path) {
574
- this.getFileContent(val.f_files_path)
575
- } else {
576
- this.reportStr = null
577
- }
578
- }
579
- },
580
- computed: {
581
- houseTypes() {
582
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('房屋类型')]
583
- },
584
- positions() {
585
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
586
- },
587
- Gasusertype() {
588
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
589
- },
590
- valveStatus() {
591
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
592
- },
593
- Gasproperties() {
594
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
595
- }
596
- }
597
- }
598
- </script>
599
- <style>
600
- .mystyle {
601
- float: right;
602
- padding-right: 10%;
603
- }
604
-
605
- .mystyle1 {
606
- padding-top: 10px;
607
-
608
- }
609
-
610
- .mystyle2 {
611
- width: 100%;
612
- height: 35px;
613
- /*background: #00A3F0;*/
614
- padding-left: 15px;
615
- float: left;
616
- }
617
-
618
- .datapanel {
619
- color: #333;
620
- background-color: white;
621
- box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
622
- padding: 10px 10px 10px 10px;
623
- border-radius: 15px;
624
- }
625
- </style>