manage-client 4.0.56-1 → 4.0.57

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.
@@ -11,17 +11,17 @@ var compiler = webpack(config)
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
- var shaoguan = 'http://119.146.1.106:8300/'
15
- var qtx= 'http://36.103.222.144:6300/'
14
+ var shaoguan = 'http://192.168.50.67:31567/'
15
+ var qtx= 'http://192.168.50.67:31567/'
16
16
  // var bendi = 'http://220.194.141.253:8600/'
17
17
  // var bendi = 'http://203.57.101.233:9001'
18
18
  // var bendi = 'http://172.168.1.11:9001/'
19
19
  // var bendi = 'http://192.168.50.4: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://192.168.50.4:8400/'
22
+ var bendi = 'http://192.168.50.67:31567/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://192.168.50.4:8400/'
24
+ var wode = 'http://192.168.50.67:31567/'
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'
@@ -30,7 +30,7 @@ var proxyTable = {
30
30
  target: bendi
31
31
  },
32
32
  '/api': {
33
- target: 'http://192.168.50.4:8400'
33
+ target: 'http://192.168.50.67:31567/'
34
34
 
35
35
  },
36
36
  '/rs/sql/chargeQuery_by_gasproperties': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "4.0.56-1",
3
+ "version": "4.0.57",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,175 @@
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
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-2 form-group" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-2 form-group" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <res-select-group :show-component="$parent.$parent.resshow"
28
+ :selectin="true" :initres="$parent.$parent.initres"
29
+ :cascade =true @re-res="$parent.$parent.getRes"
30
+ v-ref:sel>
31
+ </res-select-group>
32
+ </div>
33
+ <div class="span" style = "float:right;">
34
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
35
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
36
+ <report-excel id='gasprice'></report-excel>
37
+ </div>
38
+ </div>
39
+ </criteria>
40
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
41
+ <table class='tableprint' style="margin: 0px auto">
42
+ <thead>
43
+ <tr>
44
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
45
+ <h3 style="text-align: center">用户数量统计报表</h3>
46
+ </th>
47
+ </tr>
48
+ <tr>
49
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
50
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
51
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
52
+ <!--收费员:{{// $parent.operatorname}}-->
53
+ </th>
54
+ </tr>
55
+ <tr >
56
+ <th v-if="false" :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
57
+ <div>
58
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
59
+ <!-- <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>-->
60
+ <!-- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员:{{$parent.operatorname}}</span>-->
61
+ </div>
62
+ </th>
63
+ </tr>
64
+ </thead>
65
+ <tr>
66
+ <td :colspan='$parent.spans' class="noborder">
67
+ {{{ model.data.substring(26,model.data.length-8) }}}
68
+ </td>
69
+ </tr>
70
+ <!-- <tfoot>-->
71
+ <!-- <tr style="text-align: left">-->
72
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>报账人:</th>-->
73
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>数据审核:</th>-->
74
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>接收人:</th>-->
75
+ <!-- </tr>-->
76
+ <!-- </tfoot>-->
77
+ </table>
78
+ {{{ $parent.reportStr}}}
79
+ </div>
80
+ </criteria-paged>
81
+ </div>
82
+ </template>
83
+
84
+ <script>
85
+ import { DataModel } from 'vue-client'
86
+ import co from 'co'
87
+ export default {
88
+ title: '用户数量统计报表',
89
+ props: ['data'],
90
+ data () {
91
+ return {
92
+ printTime: this.$login.toStandardTimeString(),
93
+ depresid: [],
94
+ userresid: [],
95
+ f_orgid: this.$login.f.orgid,
96
+ f_depid: this.$login.f.depids,
97
+ // f_operatorid: this.$login.f.id,
98
+ operatorid: [],
99
+ depid: [],
100
+ orgname: '',
101
+ depname: '',
102
+ criteriaShow: false,
103
+ operatorname: '',
104
+ orgCondtionStr: '1=1',
105
+ f_user_type: '',
106
+ f_state: ['有效'],
107
+ model: new DataModel('api/af-revenue/report/meter_type_number', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
108
+ f_orgid: 'this.model.f_orgid'}),
109
+ reportStr: null,
110
+ resshow: ['company'],
111
+ spans: 0,
112
+ initres: {
113
+ org: [this.$login.f.orgid],
114
+ dep: [],
115
+ user: []
116
+ }
117
+ }
118
+ },
119
+ ready () {
120
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
121
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
122
+ },
123
+ methods: {
124
+ searchData () {
125
+ this.$refs.paged.$refs.criteria.search()
126
+ },
127
+ selfSearch (args) {
128
+ this.printTime = this.$login.toStandardTimeString()
129
+ let orgcondition = '1=1'
130
+ let orgstr = this.orgCondtionStr
131
+ orgcondition = orgcondition + orgstr
132
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
133
+ this.$refs.paged.search(args)
134
+ },
135
+
136
+ hidden () {
137
+ this.criteriaShow = !this.criteriaShow
138
+ },
139
+ getRes (condition, obj) {
140
+ this.orgCondtionStr = condition
141
+ this.orgname = obj.orgnames[0]
142
+ this.depname = obj.depnames[0]
143
+ this.operatorname = obj.operatornames[0]
144
+ },
145
+ getdep (obj, val) {
146
+ this.depname = val[0]
147
+ this.userresid = obj
148
+ this.f_depid = obj
149
+ },
150
+ getuser ( obj, val) {
151
+ this.operatorname = val[0]
152
+ this.f_operatorid = obj
153
+ }
154
+ },
155
+ watch: {
156
+ 'model.data' (val) {
157
+ let len=0
158
+ let a=val.split('</tr>')
159
+ for(let i=0;i<a.length;i++){
160
+ if(a[i].split('</td>').length-1>len){
161
+ len=a[i].split('</td>').length-1
162
+ }
163
+ }
164
+ this.spans = len
165
+ }
166
+ },
167
+ computed: {
168
+ }
169
+ }
170
+ </script>
171
+ <style scoped>
172
+ .noborder{
173
+ border: none;
174
+ }
175
+ </style>
@@ -844,4 +844,8 @@ export default function () {
844
844
  Vue.component('sy-kf-summary', (resolve) => {
845
845
  require(['./components/SellReport/siyang/SYKFSummary'], resolve)
846
846
  })
847
+ // 用户数量统计报表
848
+ Vue.component('manage-metertype-number', (resolve) => {
849
+ require(['./components/SellReport/ManageMetertypeNumber'], resolve)
850
+ })
847
851
  }