manage-client 3.2.165 → 3.2.167

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.
@@ -23,59 +23,62 @@ var system = 'http://192.168.50.4:8400'
23
23
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
24
24
  var proxyTable = {
25
25
  '/rs/logic/exportfile': {
26
- target: fuwu
26
+ target: bendi
27
27
  },
28
28
  '/rs/sql/otherChargeQuery': {
29
29
  target: 'http://localhost:8080/'
30
30
  },
31
+ '/rs/sql/BusinessType': {
32
+ target: 'http://localhost:8080/'
33
+ },
31
34
  '/files': {
32
- target: fuwu
35
+ target: bendi
33
36
  },
34
37
  // 查找资源服务数据
35
38
  '/rs/search': {
36
- target: fuwu
39
+ target: bendi
37
40
  },
38
41
  // 查找资源服务数据
39
42
  '/rs/logic/getLogin': {
40
- target: fuwu
43
+ target: bendi
41
44
  },
42
45
  // 查找资源服务数据
43
46
  '/rs/logic/getInitData': {
44
- target: fuwu
47
+ target: bendi
45
48
  },
46
49
  '/rs/logic/getSaleInitData': {
47
- target: fuwu
50
+ target: bendi
48
51
  },
49
52
  // 用户登录服务地址
50
53
  '/rs/user': {
51
- target: fuwu
54
+ target: bendi
52
55
  },
53
56
  '/rs/path/getParams': {
54
- target: fuwu
57
+ target: bendi
55
58
  },
56
59
  '/rs/data': {
57
- target: fuwu
60
+ target: bendi
58
61
  },
59
62
  '/rs/license': {
60
- target: fuwu
63
+ target: bendi
61
64
  },
62
65
  '/rs/db': {
63
- target: fuwu
66
+ target: bendi
64
67
  },
65
68
  '/excel': {
66
- target: fuwu
69
+ target: bendi
67
70
  },
68
71
  '/rs/config': {
69
- target: fuwu
72
+ target: bendi
70
73
  },
71
74
  '/rs/sql/getLicenseById': {
72
- target: fuwu
75
+ target: bendi
73
76
  },
74
77
  '/rs/report': {
75
78
  target: bendi
76
79
  },
77
80
  '/rs/vue': {
78
- target: fuwu
81
+ target: bendi
79
82
  },
80
83
  '/rs/file': {
81
84
  target: bendi
@@ -84,7 +87,7 @@ var proxyTable = {
84
87
  target: 'http://127.0.0.1:8080'
85
88
  },
86
89
  '/rs': {
87
- target: fuwu
90
+ target: bendi
88
91
  }
89
92
  }
90
93
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.165",
3
+ "version": "3.2.167",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -158,8 +158,6 @@ export default {
158
158
  components: {Tabs, TabButton, ChargeQuery},
159
159
  ready() {
160
160
  this.getaddress()
161
- console.log(this.$refs.list)
162
- console.log('业务查询')
163
161
  },
164
162
  methods: {
165
163
  async getaddress(){
@@ -417,12 +417,9 @@
417
417
  import {PagedList} from 'vue-client'
418
418
  import defaultPrint from '../config/DefaultPrint'
419
419
  import exportConfig from '../config/exportConfig'
420
-
421
420
  let readySomething = async function (self) {
422
-
423
421
  self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
424
422
  self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
425
-
426
423
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
427
424
  // self.$refs.paged.$refs.cri.search()
428
425
  await self.$MagLoadParams.loadParam()
@@ -430,7 +427,6 @@
430
427
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
431
428
  }
432
429
  export default {
433
-
434
430
  props:['data'],
435
431
  title: '换表查询',
436
432
  data() {
@@ -468,7 +464,6 @@
468
464
  tfoot: '',
469
465
  defaultfield: [],
470
466
  // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
471
-
472
467
  //合计数据
473
468
  sumsmodel: {},
474
469
  changemeter_fee:[
@@ -480,13 +475,8 @@
480
475
 
481
476
  },
482
477
  ready() {
483
-
484
- console.log(this.$parent.startDate)
485
- console.log(this.$parent.$parent.startDate)
486
- console.log(this.$parent.$parent.$parent.startDate)
487
478
  this.startDate=this.$parent.startDate
488
479
  this.endDate=this.$parent.endDate
489
- console.log("this",this)
490
480
  readySomething(this)
491
481
  },
492
482
  methods: {
@@ -506,8 +496,6 @@
506
496
  this.show=true
507
497
  },
508
498
  getotherfooter () {
509
- // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
510
- // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
511
499
  this.other = [];
512
500
  this.footer = [];
513
501
  let exportdata = this.getCondition;
@@ -532,7 +520,6 @@
532
520
  brandArr.push(temp)
533
521
  })
534
522
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
535
-
536
523
  },
537
524
  async selfSearch(args) {
538
525
  if (this.data) {
@@ -564,7 +551,6 @@
564
551
  this.criteriaShow = !this.criteriaShow
565
552
  },
566
553
  getRes(obj) {
567
- console.log(obj,"========")
568
554
  this.orgCondtionStr = obj
569
555
  },
570
556
  stamp() {
@@ -572,12 +558,10 @@
572
558
  //默认选择要打印的列
573
559
  this.modelval = defaultPrint.config
574
560
  this.fields = this.getfield
575
- console.log('所有打印字段', this.fields)
576
561
  this.printshow = true
577
562
  this.put()
578
563
  },
579
564
  dealmsg(val) {
580
- console.log('---------------dealmsg')
581
565
  val.model = this.model.model
582
566
  this.$dispatch('deal-msg', val)
583
567
  },
@@ -6,6 +6,7 @@
6
6
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
7
7
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
8
8
  <div class="row">
9
+ <res-select-group :show-component="['company','department']" :selectin="true" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
9
10
  <div class="col-sm-2 form-group">
10
11
  <label for="startDate" class="font_normal_body">开始日期</label>
11
12
  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -26,19 +27,6 @@
26
27
  condition="f_operate_date <= '{}'">
27
28
  </datepicker>
28
29
  </div>
29
- <div class="col-sm-2 form-group">
30
- <label class="font_normal_body">客户名称</label>
31
- <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
32
- condition="f_user_name like '%{}%'" placeholder="客户名称">
33
- </div>
34
- <div class="col-sm-2 form-group">
35
- <label class="font_normal_body">客户类型</label>
36
- <v-select :value.sync="model.f_user_type"
37
- :search="false"
38
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
39
- condition="f_user_type = '{}'"
40
- close-on-select></v-select>
41
- </div>
42
30
  <div class="span" style="float:right;">
43
31
  <button class="button_search button_spacing" @click="search()">查询</button>
44
32
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -59,6 +47,19 @@
59
47
  </div>
60
48
  </div>
61
49
  <div class="row" v-show="$parent.$parent.criteriaShow">
50
+ <div class="col-sm-2 form-group">
51
+ <label class="font_normal_body">客户名称</label>
52
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
53
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
54
+ </div>
55
+ <div class="col-sm-2 form-group">
56
+ <label class="font_normal_body">客户类型</label>
57
+ <v-select :value.sync="model.f_user_type"
58
+ :search="false"
59
+ :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
60
+ condition="f_user_type = '{}'"
61
+ close-on-select></v-select>
62
+ </div>
62
63
  <div class="col-sm-2 form-group">
63
64
  <label class="font_normal_body">客户地址</label>
64
65
  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -390,6 +391,7 @@
390
391
  this.orgCondtionStr = condition
391
392
  this.orgname = obj.orgnames[0]
392
393
  this.depname = obj.depnames[0]
394
+ this.operatorname = this.userresid.filter(x => obj.operatornames.includes(x.value)).map(x=>x.label).toString()
393
395
  },
394
396
  sort (field, rule) {
395
397
  // 将所有排序方式设为不排序,实现相互排斥
@@ -61,7 +61,7 @@
61
61
  <div class="col-sm-2 form-group">
62
62
  <label class="font_normal_body">用户编号</label>
63
63
  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
64
- condition="ua.f_userinfo_code = '{}' " placeholder="用户编号">
64
+ condition="ui.f_userinfo_code = '{}' " placeholder="用户编号">
65
65
  </div>
66
66
  <div class="col-sm-2 form-group">
67
67
  <label class="font_normal_body">用户姓名</label>
@@ -0,0 +1,272 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 98%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
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
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-4" >
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-4" >
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-4">
30
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
31
+ <right-tree @re-res="$parent.$parent.getRes"></right-tree>
32
+ </div>
33
+ <div class="col-sm-4">
34
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
35
+ <res-select restype='department'
36
+ @res-select="$parent.$parent.getdep"
37
+ :parentresid="$parent.$parent.depresid"
38
+ :initresid='$parent.$parent.depid'>
39
+ </res-select>
40
+
41
+ </div>
42
+ <div class="col-sm-4">
43
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
44
+ <res-select restype='user'
45
+ @res-select="$parent.$parent.getuser"
46
+ :parentresid="$parent.$parent.userresid"
47
+ :initresid='$parent.$parent.operatorid'>
48
+ </res-select>
49
+ </div>
50
+
51
+ </div>
52
+ <div class="span" style = "float:right;">
53
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
54
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
55
+ <report-excel id='gasprice'></report-excel>
56
+ </div>
57
+ </div>
58
+ </criteria>
59
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
60
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
61
+ <thead>
62
+ <tr>
63
+ <th colspan='9' style="font-weight: normal; text-align: left;">
64
+ <h3 style="text-align: center">收费类型报表</h3>
65
+ </th>
66
+ </tr>
67
+ <tr>
68
+ <th colspan='9' style="font-weight: normal; text-align: center;">
69
+ 开始时间:{{model.model.startDate}}<br>
70
+ 结束时间:{{ model.model.endDate }}<br>
71
+ 打印时间:{{{$parent.printTime}}}
72
+ </th>
73
+ </tr>
74
+ <tr>
75
+ <th colspan='9' style="font-weight: normal; text-align: center;">
76
+ <div>
77
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
78
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
79
+ <span v-show="$parent.operatorname.trim()!=''">人员:{{$parent.operatorname}}</span>
80
+ </div>
81
+ </th>
82
+ </tr>
83
+ </thead>
84
+ <tr>
85
+ <td colspan='9'>
86
+ {{{ model.data.substring(26,model.data.length-8) }}}
87
+ </td>
88
+ </tr>
89
+ <tfoot>
90
+ <tr style="text-align: left">
91
+ <th colspan='3'>财务审核:</th>
92
+ <th colspan='3'>收款审核:</th>
93
+ <th colspan='3'>收款员:</th>
94
+ </tr>
95
+ </tfoot>
96
+ </table>
97
+ {{{ $parent.reportStr}}}
98
+ </div>
99
+ </criteria-paged>
100
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
101
+ <header slot="modal-header" class="modal-header">
102
+ <h4 class="modal-title">输入文件名称</h4>
103
+ </header>
104
+ <article slot="modal-body" class="modal-body">
105
+ <div class="form-group">
106
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
107
+ </div>
108
+ </article>
109
+ <footer slot="modal-footer" class="modal-footer">
110
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
111
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
112
+ </footer>
113
+ </modal>
114
+ </div>
115
+ </template>
116
+
117
+ <script>
118
+ import { DataModel } from 'vue-client'
119
+ import co from 'co'
120
+ let saveFile = function * (self) {
121
+ // 线验证文件是否重名
122
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
123
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
124
+ {resolveMsg: null, rejectMsg: null})
125
+ if (count.data.length > 0) {
126
+ self.$showAlert('无法保存,文件名重名', 'warning', 3000)
127
+ return
128
+ }
129
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
130
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
131
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
132
+ f_outlets: this.$login.f.depname})
133
+ if (saveBack.data.status === 'succeed') {
134
+ self.show = false
135
+ self.filename = ''
136
+ // 后台保存完成,通知刷新
137
+ self.$dispatch('save-success', self.filename)
138
+ }
139
+ }
140
+ export default {
141
+ title: '营业额统计',
142
+ props: ['data'],
143
+ data () {
144
+ return {
145
+ printTime: this.$login.toStandardTimeString(),
146
+ depresid: [],
147
+ userresid: [],
148
+ f_orgid: this.$login.f.orgid,
149
+ f_depid: this.$login.f.depids,
150
+ f_operatorid: this.$login.f.id,
151
+ operatorid: [],
152
+ depid: [],
153
+ orgname: '',
154
+ depname: '',
155
+ operatorname: '',
156
+ orgCondtionStr: '1=1',
157
+ model: new DataModel('rs/report/summaryes', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
158
+ f_orgid: 'this.model.f_orgid'}),
159
+ reportStr: null,
160
+ show: false,
161
+ }
162
+ },
163
+ ready () {
164
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
165
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
166
+ // this.$refs.paged.$refs.criteria.search()
167
+ console.log(this.$login.f)
168
+ },
169
+ methods: {
170
+ searchData () {
171
+ this.$refs.paged.$refs.criteria.search()
172
+ },
173
+ selfSearch (args) {
174
+ this.printTime = this.$login.toStandardTimeString()
175
+ console.log( "condition:" + args.condition)
176
+ let orgcondition = '1=1'
177
+ if (this.f_orgid[0]) {
178
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
179
+ }
180
+ let deps = ''
181
+ let i = 0
182
+ let depss = ''
183
+ if (this.f_depid[0]) {
184
+ for ( i; i< this.f_depid.length; i++ )
185
+ deps += `'${this.f_depid[i]}',`
186
+ depss = deps.toString().substring(1,deps.length-2)
187
+ orgcondition += " and f_depid in ( '" + depss + "' ) "
188
+ }else {
189
+ depss = ''
190
+ }
191
+ console.log("所选部门:" + depss)
192
+ if (depss === null || depss === '' || depss === undefined) {
193
+ this.$showAlert('请选择部门之后再进行查询!', 'warning', 3000)
194
+ return
195
+ }
196
+
197
+ let opes = ''
198
+ let j = 0
199
+ let opess = ''
200
+ if(this.f_operatorid[0]) {
201
+ for ( j; j< this.f_operatorid.length; j++ )
202
+ opes += `'${this.f_operatorid[j]}',`
203
+ opess = opes.toString().substring(1,opes.length-2)
204
+ orgcondition += "and f_operatorid in ( '" + opess + "' ) "
205
+ }else {
206
+ opess = ''
207
+ }
208
+ console.log("所选人员:" + opess)
209
+
210
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + " and " + args.condition
211
+ this.$refs.paged.search(args)
212
+ },
213
+ getRes (obj) {
214
+ this.orgname = obj.res[0]
215
+ this.depresid = obj.resids
216
+ this.f_orgid = obj.resids
217
+ this.userresid = obj.resids
218
+ },
219
+ getdep (obj, val) {
220
+ this.depname = val
221
+ // this.userresid = obj
222
+ this.f_depid = obj
223
+ },
224
+ getuser ( obj, val) {
225
+ this.operatorname = val
226
+ this.f_operatorid = obj
227
+ },
228
+
229
+ // 根据文件路径获取储存的报表内容
230
+ getFileContent (path) {
231
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
232
+ this.reportStr = res.data.filecontent
233
+ this.model.state = '正确'
234
+ })
235
+ },
236
+ confirm () {
237
+ if (!this.filename || this.filename === '') {
238
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
239
+ }
240
+ let saveGen = saveFile(this)
241
+ co(saveGen)
242
+ },
243
+ close () {
244
+ this.show = false
245
+ },
246
+ // 将报表保存成文件
247
+ confirmReport () {
248
+ this.show = true
249
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
250
+ },
251
+ },
252
+ watch: {
253
+ 'data' (val) {
254
+ if (val.f_files_path) {
255
+ this.getFileContent(val.f_files_path)
256
+ } else {
257
+ this.reportStr = null
258
+ }
259
+ }
260
+ },
261
+ computed: {
262
+ metertypes() {
263
+ return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
264
+ }
265
+ }
266
+ }
267
+ </script>
268
+ <style scoped>
269
+ .noborder{
270
+ border: none;
271
+ }
272
+ </style>
@@ -0,0 +1,253 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
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
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-2 form-group" >
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-2 form-group" >
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <res-select-group :initres="$parent.$parent.initres" :show-component=['company','department','operator'] :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
30
+ <div class="col-sm-2 form-group">
31
+ <label class="font_normal_body">收费状态</label>
32
+ <v-select :value.sync="$parent.$parent.f_state"
33
+ v-model="$parent.$parent.f_state"
34
+ :options='$parent.$parent.charge_state' placeholder='请选择'
35
+ condition="f_state in {}"
36
+ close-on-select></v-select>
37
+ </div>
38
+ <div style = "float:right;">
39
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
40
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
41
+ <report-excel id='gasprice'></report-excel>
42
+ </div>
43
+ </div>
44
+ <!--<div class="span" style = "float:right;">-->
45
+
46
+ <!--</div>-->
47
+ </div>
48
+ </criteria>
49
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
50
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
51
+ <thead>
52
+ <tr>
53
+ <th colspan='{{$parent.spans}}' style="font-weight: bold; text-align: left;">
54
+ <h3 style="text-align: center">月售气量汇总表</h3>
55
+ </th>
56
+ </tr>
57
+ <tr>
58
+ <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
59
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
60
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;
61
+ </th>
62
+ </tr>
63
+ <tr>
64
+ <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
65
+ 打印时间:{{{$parent.printTime}}}
66
+ </th>
67
+ </tr>
68
+ <tr>
69
+ <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
70
+ <div>
71
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
72
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
73
+ </div>
74
+ </th>
75
+ </tr>
76
+ </thead>
77
+ <tr>
78
+ <td style="font-weight: normal;" id="test">
79
+ {{{ model.data.substring(26,model.data.length-8) }}}
80
+ </td>
81
+ </tr>
82
+ <tfoot>
83
+ <tr style="text-align: left">
84
+ <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: left;">
85
+ 收款人:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
86
+ 审核人:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
87
+ 经手人:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
88
+ </th>
89
+ </tr>
90
+ </tfoot>
91
+ </table>
92
+ {{{ $parent.reportStr}}}
93
+ </div>
94
+ </criteria-paged>
95
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
96
+ <header slot="modal-header" class="modal-header">
97
+ <h4 class="modal-title">输入文件名称</h4>
98
+ </header>
99
+ <article slot="modal-body" class="modal-body">
100
+ <div class="form-group">
101
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
102
+ </div>
103
+ </article>
104
+ <footer slot="modal-footer" class="modal-footer">
105
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
106
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
107
+ </footer>
108
+ </modal>
109
+ </div>
110
+ </template>
111
+
112
+ <script>
113
+ import { DataModel } from 'vue-client'
114
+ import co from 'co'
115
+ let saveFile = function * (self) {
116
+ // 线验证文件是否重名
117
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
118
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
119
+ {resolveMsg: null, rejectMsg: null})
120
+ if (count.data.length > 0) {
121
+ self.$showAlert('无法保存,文件名重名', 'warning', 3000)
122
+ return
123
+ }
124
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
125
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
126
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
127
+ f_outlets: this.$login.f.depname})
128
+ if (saveBack.data.status === 'succeed') {
129
+ self.show = false
130
+ self.filename = ''
131
+ // 后台保存完成,通知刷新
132
+ self.$dispatch('save-success', self.filename)
133
+ }
134
+ }
135
+ export default {
136
+ title: '月售气量汇总表',
137
+ props: ['data'],
138
+ data () {
139
+ return {
140
+ printTime: this.$login.toStandardTimeString(),
141
+ depresid: [],
142
+ userresid: [],
143
+ initres: {
144
+ org:[this.$login.f.orgid],
145
+ dep:[],
146
+ user:[]
147
+ },
148
+ f_orgid: this.$login.f.orgid,
149
+ f_depid: this.$login.f.depids,
150
+ f_operatorid: this.$login.f.id,
151
+ operatorid: [],
152
+ depid: [],
153
+ orgname: '',
154
+ depname: '',
155
+ f_state:['有效'],
156
+ operatorname: '',
157
+ orgCondtionStr: '1=1',
158
+ model: new DataModel('rs/report/manage_month_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
159
+ f_orgid: 'this.model.f_orgid'}),
160
+ reportStr: null,
161
+ show: false,
162
+ spans: ''
163
+ }
164
+ },
165
+ ready () {
166
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
167
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
168
+ // this.$refs.paged.$refs.criteria.search()
169
+ },
170
+ methods: {
171
+ searchData () {
172
+ this.$refs.paged.$refs.criteria.search()
173
+ },
174
+ selfSearch (args) {
175
+ this.printTime = this.$login.toStandardTimeString()
176
+ let orgstr = this.orgCondtionStr
177
+ args.condition = `${args.condition} ` + orgstr
178
+ if (this.depname === null || this.depname === '' || this.depname === undefined) {
179
+ this.$showAlert('请选择部门之后再进行查询!', 'warning', 3000)
180
+ return
181
+ }
182
+ this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr + (this.f_state && this.f_state != '' ? " and f_state='" + this.f_state + "' " : '')
183
+ this.$refs.paged.search(args)
184
+ },
185
+ getRes (condition, obj) {
186
+ this.orgCondtionStr = condition
187
+ this.orgname = obj.orgnames[0]
188
+ this.depname = obj.depnames[0]
189
+ },
190
+ // getdep (obj, val) {
191
+ // // this.depname = val[0]
192
+ // this.userresid = obj
193
+ // this.f_depid = obj
194
+ // },
195
+ // getuser ( obj, val) {
196
+ // this.operatorname = val[0]
197
+ // this.f_operatorid = obj
198
+ // },
199
+
200
+ // 根据文件路径获取储存的报表内容
201
+ getFileContent (path) {
202
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
203
+ this.reportStr = res.data.filecontent
204
+ this.model.state = '正确'
205
+ })
206
+ },
207
+ confirm () {
208
+ if (!this.filename || this.filename === '') {
209
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
210
+ }
211
+ let saveGen = saveFile(this)
212
+ co(saveGen)
213
+ },
214
+ close () {
215
+ this.show = false
216
+ },
217
+ // 将报表保存成文件
218
+ confirmReport () {
219
+ this.show = true
220
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
221
+ }
222
+ },
223
+ watch: {
224
+ 'data' (val) {
225
+ if (val.f_files_path) {
226
+ this.getFileContent(val.f_files_path)
227
+ } else {
228
+ this.reportStr = null
229
+ }
230
+ },
231
+ 'model.data' (val) {
232
+ let tab = document.getElementById('test').children[0]
233
+ var tds = tab.getElementsByTagName('td')
234
+ var num = 0
235
+ for (let td of tds) {
236
+ let span = td.getAttribute('colspan')
237
+ num = num + ((span ? span : 1) - 0)
238
+ }
239
+ this.spans = num
240
+ }
241
+ },
242
+ computed: {
243
+ charge_state() {
244
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
245
+ }
246
+ }
247
+ }
248
+ </script>
249
+ <style scoped>
250
+ .noborder{
251
+ border: none;
252
+ }
253
+ </style>
@@ -0,0 +1,288 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
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
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
8
+ <div class="row">
9
+ <div class="col-sm-4 form-group" >
10
+ <label class="font_normal_body" for="startDate">开始日期:</label>
11
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
12
+ v-model="model.startDate"
13
+ :value.sync="model.startDate"
14
+ :disabled-days-of-Week="[]"
15
+ :format="'yyyy-MM-dd HH:mm:ss'"
16
+ :show-reset-button="reset">
17
+ </datepicker>
18
+ </div>
19
+ <div class="col-sm-4 form-group" >
20
+ <label class="font_normal_body" for="endDate">结束日期:</label>
21
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
22
+ v-model="model.endDate"
23
+ :value.sync="model.endDate"
24
+ :disabled-days-of-Week="[]"
25
+ :format="'yyyy-MM-dd HH:mm:ss'"
26
+ :show-reset-button="reset">
27
+ </datepicker>
28
+ </div>
29
+ <div class="col-sm-4 form-group" >
30
+ <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
31
+ <right-tree id="org" @re-res="$parent.$parent.getRes"></right-tree>
32
+ </div>
33
+ <div class="col-sm-4 form-group">
34
+ <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
35
+ <res-select id="dep" restype='department'
36
+ @res-select="$parent.$parent.getdep"
37
+ :parentresid="$parent.$parent.depresid"
38
+ :initresid='$parent.$parent.depid' >
39
+ </res-select>
40
+
41
+ </div>
42
+ <div class="col-sm-4 form-group">
43
+ <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
44
+ <res-select id="oper" restype='user'
45
+ is-mul="false"
46
+ @res-select="$parent.$parent.getuser"
47
+ :parentresid="$parent.$parent.userresid"
48
+ :initresid='$parent.$parent.operatorid'>
49
+ </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>
63
+ </div>
64
+ </div>
65
+ <!--<div class="span" style = "float:right;">-->
66
+
67
+ <!--</div>-->
68
+ </div>
69
+ </criteria>
70
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
71
+ <table class='tableprint' style="margin: 0px auto">
72
+ <thead>
73
+ <tr>
74
+ <th :colspan='$parent.spans' style="font-weight: bold; text-align: left;">
75
+ <h3 style="text-align: center">营业厅分项汇总表</h3>
76
+ </th>
77
+ </tr>
78
+ <tr>
79
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
80
+ 开始时间:{{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}}}
87
+ </th>
88
+ </tr>
89
+ <tr>
90
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
91
+ <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>
95
+ </div>
96
+ </th>
97
+ </tr>
98
+ </thead>
99
+ <tr>
100
+ <td :colspan='$parent.spans' class="noborder">
101
+ {{{ model.data.substring(26,model.data.length-8) }}}
102
+ </td>
103
+ </tr>
104
+ <tfoot>
105
+ <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>
115
+ </tr>
116
+ </tfoot>
117
+ </table>
118
+ {{{ $parent.reportStr}}}
119
+ </div>
120
+ </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
+ </div>
136
+ </template>
137
+
138
+ <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: ''
189
+ }
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()
195
+ },
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.depname === null || this.depname === '' || this.depname === undefined) {
204
+ this.$showAlert('请选择部门之后再进行查询!', 'warning', 3000)
205
+ return
206
+ }
207
+ if (this.f_orgid[0]) {
208
+ this.orgCondtionStr += ' and f_orgid in (' + this.f_orgid + ")"
209
+ }
210
+ if (this.f_depid[0]) {
211
+ this.orgCondtionStr += " and f_depid in (" + this.f_depid.toString() + ")"
212
+ }
213
+ if(this.f_operatorid[0]) {
214
+ this.orgCondtionStr += ' and f_operatorid in (' + this.f_operatorid + ")"
215
+ }
216
+ 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 + "' " : '')
217
+ this.$refs.paged.search(args)
218
+ },
219
+ getRes (obj) {
220
+ this.orgname = obj.res[0]
221
+ this.depresid = obj.resids
222
+ this.userresid = obj.resids
223
+ this.f_orgid = obj.resids
224
+ },
225
+ getdep (obj, val) {
226
+ this.depname = val[0]
227
+ this.userresid = obj
228
+ this.f_depid = obj
229
+ },
230
+ getuser ( obj, val) {
231
+ this.operatorname = val[0]
232
+ this.f_operatorid = obj
233
+ },
234
+ // 根据文件路径获取储存的报表内容
235
+ getFileContent (path) {
236
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
237
+ this.reportStr = res.data.filecontent
238
+ this.model.state = '正确'
239
+ })
240
+ },
241
+ confirm () {
242
+ if (!this.filename || this.filename === '') {
243
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
244
+ }
245
+ let saveGen = saveFile(this)
246
+ co(saveGen)
247
+ },
248
+ close () {
249
+ this.show = false
250
+ },
251
+ // 将报表保存成文件
252
+ confirmReport () {
253
+ this.show = true
254
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
255
+ }
256
+ },
257
+ watch: {
258
+ 'data' (val) {
259
+ if (val.f_files_path) {
260
+ this.getFileContent(val.f_files_path)
261
+ } else {
262
+ this.reportStr = null
263
+ }
264
+ },
265
+ 'model.data' (val) {
266
+ let len=0
267
+ let a=val.split('</tr>')
268
+ for(let i=0;i<a.length;i++){
269
+ if(a[i].split('</td>').length-1>len){
270
+ len=a[i].split('</td>').length-1
271
+ }
272
+ continue
273
+ }
274
+ this.spans = len
275
+ }
276
+ },
277
+ computed: {
278
+ charge_state() {
279
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
280
+ }
281
+ }
282
+ }
283
+ </script>
284
+ <style scoped>
285
+ .noborder{
286
+ border: none;
287
+ }
288
+ </style>
@@ -0,0 +1,9 @@
1
+ let specialComp = {
2
+ // 营业分析汇总报表
3
+ 'manage-sell-type': (resolve) => { require(['./ManageSellType'], resolve) },
4
+ // 日结账报表
5
+ 'bus-summaryes': (resolve) => { require(['./BusSummaryes'], resolve) },
6
+ // 月用气量汇总表
7
+ 'manage-month-gas': (resolve) => { require(['./ManageMonthGas'], resolve) }
8
+ }
9
+ exports.specialComp = specialComp
@@ -0,0 +1,123 @@
1
+ <template lang="html">
2
+ <div id="charts">
3
+ <div id="sm" :style="{width:'100%',height:'98%'}"></div>
4
+ </div>
5
+ </template>
6
+
7
+ <script>
8
+ /* eslint-disable indent,key-spacing,no-labels */
9
+
10
+ import * as Util from '../../Util'
11
+ import co from 'co'
12
+ import echarts from 'echarts'
13
+ import {HttpResetClass } from 'vue-client'
14
+
15
+ let getData = function * (self) {
16
+ let load = new HttpResetClass()
17
+ load.load('POST','rs/sql/BusinessType',
18
+ {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
19
+ {resolveMsg: null, rejectMsg: null})
20
+ .then((res) => {
21
+ self.texttile = '用户类型'
22
+ let arrparams = []
23
+ let numdata = []
24
+ for (var i = 0; i < res.data.length; i++) {
25
+ arrparams[i] = res.data[i].name
26
+ numdata[i] = res.data[i].num
27
+ }
28
+ self.set(arrparams,numdata)
29
+ })
30
+ }
31
+ export default {
32
+ props: {
33
+ startdate: {
34
+ type: String,
35
+ default: Util.toStandardDateString()
36
+ },
37
+ enddate: {
38
+ type: String,
39
+ default: Util.toStandardDateString()
40
+ },
41
+ orgid: {
42
+ type: String
43
+ }
44
+ },
45
+ data () {
46
+ title: '业务类型'
47
+ return {
48
+ texttile: '',
49
+ xc: ''
50
+ }
51
+ },
52
+ methods: {
53
+ set (arrparams,numdata) {
54
+ this.xc = echarts.init(document.getElementById('sm'))
55
+ this.xc.setOption({
56
+ title : {
57
+ text: '其他业务散列图',
58
+ subtext: '数据查询来源',
59
+ x: 'left'
60
+ },
61
+ tooltip:{
62
+ trigger:'axis'
63
+ },
64
+ legend: {
65
+ x: 'left',
66
+ y: 'bottom',
67
+ data: ['数量']
68
+ },
69
+ toolbox: {
70
+ show : true,
71
+ feature : {
72
+ dataView : {show: true, readOnly: false},
73
+ magicType : {show: true, type: ['line', 'bar']},
74
+ restore : {show: true},
75
+ saveAsImage : {show: true}
76
+ }
77
+ },
78
+ calculable : true,
79
+ xAxis : [
80
+ {
81
+ type : 'category',
82
+ data : arrparams
83
+ }
84
+ ],
85
+ yAxis : [
86
+ {
87
+ type : 'value'
88
+ }
89
+ ],
90
+ series : [
91
+ {
92
+ name:'数量',
93
+ type:'bar',
94
+ data:numdata,
95
+ markLine : {
96
+ silent: true
97
+ }
98
+ }
99
+ ]
100
+ })
101
+ },
102
+ searchdata () {
103
+ let getGen = getData(this)
104
+ co(getGen)
105
+ }
106
+ },
107
+ ready () {
108
+ this.searchdata()
109
+ },
110
+ watch: {
111
+ 'startdate' (val) {
112
+ this.searchdata()
113
+ },
114
+ 'enddate' (val) {
115
+ this.searchdata()
116
+ },
117
+ 'orgid' (val) {
118
+ this.searchdata()
119
+ }
120
+ }
121
+
122
+ }
123
+ </script>
@@ -6,16 +6,18 @@ let specialComp = {
6
6
  'res-select-group': (resolve) => { require(['./ResSelectGroupNew'], resolve) },
7
7
  'fill-gas-query': (resolve) => { require(['./FillGasQuery'], resolve) },
8
8
  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
9
- 'report-list':(resolve) => { require(['./reportList'], resolve) },
10
- 'handplan-query': (resolve) => {require(['./HandplanQuery'], resolve)},
9
+ 'report-list': (resolve) => { require(['./reportList'], resolve) },
10
+ 'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
11
11
  // 调价记录查询
12
- 'price-change-query':(resolve) => {require(['./PriceChangeQuery'], resolve)},
12
+ 'price-change-query': (resolve) => { require(['./PriceChangeQuery'], resolve) },
13
13
  // 用户设备查询
14
- 'user-equipment-query':(resolve) => {require(['./UserDeviceQuery'], resolve)},
14
+ 'user-equipment-query': (resolve) => { require(['./UserDeviceQuery'], resolve) },
15
15
  // 表具设备查询
16
- 'equipment-query': (resolve) => {require(['./DeviceQuery'], resolve)},
16
+ 'equipment-query': (resolve) => { require(['./DeviceQuery'], resolve) },
17
17
  // 表具查询
18
- 'meter-query': (resolve) => {require(['./MeterQuery'], resolve)}
18
+ 'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
19
+ // 其他业务散列
20
+ 'bussiness-type': (resolve) => { require(['./BussinessType'], resolve) }
19
21
 
20
22
  }
21
23
  exports.specialComp = specialComp
package/src/main.js CHANGED
@@ -44,7 +44,7 @@ all()
44
44
  ldap()
45
45
  system(false)
46
46
 
47
- saleManage("WEINAN")
47
+ saleManage("tongchuan")
48
48
  webmeterManage()
49
49
  ManageHome()
50
50
  newmanage()