manage-client 3.2.138 → 3.2.140

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.
@@ -13,9 +13,9 @@ var compiler = webpack(config)
13
13
  // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
14
14
  var shaoguan='http://119.146.1.106:8300/'
15
15
  var qtx='http://36.103.222.144:6300/'
16
- var bendi = 'http://127.0.0.1:8090'
16
+ var bendi = 'http://192.168.50.4:8400'
17
17
  // var bendi = 'http://172.168.1.11:9001'
18
- var fuwu = 'http://121.36.106.17:8400'
18
+ var fuwu = 'http://192.168.50.4:8400'
19
19
  // var fuwu = 'http://203.57.101.233:9001'
20
20
  var system = 'http://192.168.50.4:8400'
21
21
  //192.168.
@@ -0,0 +1,2 @@
1
+ Manifest-Version: 1.0
2
+
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.138",
3
+ "version": "3.2.140",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,151 @@
1
+ <template lang="html">
2
+ <div id="charts">
3
+ <div id="GasPropertiesManager">
4
+ <button class="button_export button_spacing" @click="change('f_user_type')">一级用气性质</button>
5
+ <button class="button_export button_spacing" @click="change('f_gasproperties')">二级用气性质</button>
6
+ </div>
7
+ <div id="sm" :style="{width:'100%',height:'98%'}"></div>
8
+ </div>
9
+ </template>
10
+
11
+ <script>
12
+ /* eslint-disable indent,key-spacing,no-labels */
13
+
14
+ import * as Util from '../../Util'
15
+ import co from 'co'
16
+ import echarts from 'echarts'
17
+ import {HttpResetClass} from 'vue-client'
18
+
19
+ let getData = function* (self) {
20
+ let load = new HttpResetClass()
21
+ load.load('POST', 'rs/sql/gasPropertiesStatistics',
22
+ {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid, groupkey: self.groupkey}},
23
+ {resolveMsg: null, rejectMsg: null})
24
+ .then((res) => {
25
+ self.texttile = '用户类型'
26
+ let arrparams = []
27
+ let numdata = []
28
+ let pricedata = []
29
+ for (var i = 0; i < res.data.length; i++) {
30
+ arrparams[i] = res.data[i].name
31
+ numdata[i] = res.data[i].num
32
+ pricedata[i] = res.data[i].money
33
+ }
34
+ self.set(arrparams, numdata, pricedata)
35
+ })
36
+ }
37
+ export default {
38
+ props: {
39
+ startdate: {
40
+ type: String,
41
+ default: Util.toStandardDateString()
42
+ },
43
+ enddate: {
44
+ type: String,
45
+ default: Util.toStandardDateString()
46
+ },
47
+ orgid: {
48
+ type: String
49
+ }
50
+ },
51
+ data () {
52
+ return {
53
+ texttile: '',
54
+ xc: '',
55
+ groupkey: 'f_user_type'
56
+ }
57
+ },
58
+ methods: {
59
+ change (type) {
60
+ this.groupkey = type
61
+ this.searchdata()
62
+ },
63
+ set (arrparams, numdata, pricedata) {
64
+ this.xc = echarts.init(document.getElementById('sm'))
65
+ this.xc.setOption({
66
+ title: {
67
+ text: '用气性质散列图',
68
+ subtext: '数据查询来源',
69
+ x: 'left'
70
+ },
71
+ tooltip: {
72
+ trigger: 'axis'
73
+ },
74
+ legend: {
75
+ x: 'left',
76
+ y: 'bottom',
77
+ data: ['条数', '用量']
78
+ },
79
+ toolbox: {
80
+ show: true,
81
+ feature: {
82
+ dataView: {show: true, readOnly: false},
83
+ magicType: {show: true, type: ['line', 'bar']},
84
+ restore: {show: true},
85
+ saveAsImage: {show: true}
86
+ }
87
+ },
88
+ calculable: true,
89
+ xAxis: [
90
+ {
91
+ type: 'category',
92
+ data: arrparams
93
+ }
94
+ ],
95
+ yAxis: [
96
+ {
97
+ type: 'value'
98
+ }
99
+ ],
100
+ series: [
101
+ {
102
+ name: '条数',
103
+ type: 'bar',
104
+ data: numdata,
105
+ markLine: {
106
+ data: [
107
+ {type: 'average', name: '平均值'}
108
+ ]
109
+ }
110
+ },
111
+ {
112
+ name: '用量',
113
+ type: 'bar',
114
+ data: pricedata,
115
+ markLine: {
116
+ data: [
117
+ {type: 'average', name: '平均值'}
118
+ ]
119
+ }
120
+ }
121
+ ]
122
+ })
123
+ },
124
+ searchdata () {
125
+ let getGen = getData(this)
126
+ co(getGen)
127
+ }
128
+ },
129
+ ready () {
130
+ this.searchdata()
131
+ },
132
+ watch: {
133
+ 'startdate' (val) {
134
+ this.searchdata()
135
+ },
136
+ 'enddate' (val) {
137
+ this.searchdata()
138
+ },
139
+ 'orgid' (val) {
140
+ this.searchdata()
141
+ }
142
+ }
143
+
144
+ }
145
+ </script>
146
+ <style lang="less">
147
+ #GasPropertiesManager {
148
+ display: flex;
149
+ justify-content: center;
150
+ }
151
+ </style>
@@ -0,0 +1,237 @@
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 HH:mm:ss'"
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 HH:mm:ss'"
24
+ :show-reset-button="reset">
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>
30
+ </div>
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"
35
+ @res-select="$parent.$parent.getdep"
36
+ :parentresid="$parent.$parent.depresid"
37
+ :initresid='$parent.$parent.depid'>
38
+ </res-select>
39
+
40
+ </div>
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'
44
+ is-mul="false"
45
+ @res-select="$parent.$parent.getuser"
46
+ :parentresid="$parent.$parent.userresid"
47
+ :initresid='$parent.$parent.operatorid'>
48
+ </res-select>
49
+ </div>
50
+ -->
51
+ <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>
52
+ </div>
53
+ <div class="span" style = "float:right;">
54
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
55
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
56
+ <report-excel id='gasprice'></report-excel>
57
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
58
+ 'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
59
+ </div>
60
+ <div class="row" v-show="$parent.$parent.criteriaShow">
61
+ <div class="col-sm-2 form-group">
62
+ <label class="font_normal_body">用户类型</label>
63
+ <v-select :value.sync="$parent.$parent.f_user_type"
64
+ v-model="$parent.$parent.f_user_type"
65
+ :options='$parent.$parent.user_type' placeholder='请选择'
66
+ condition="f_user_type = '{}'"
67
+ close-on-select></v-select>
68
+ </div>
69
+ <!--<div class="col-sm-2 form-group">-->
70
+ <!--<label class="font_normal_body">收费状态</label>-->
71
+ <!--<v-select :value.sync="$parent.$parent.f_state" multiple-->
72
+ <!--v-model="$parent.$parent.f_state"-->
73
+ <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
74
+ <!--condition="f_state in {}"-->
75
+ <!--close-on-select></v-select>-->
76
+ <!--</div>-->
77
+ </div>
78
+ </div>
79
+ </criteria>
80
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
81
+ <table class='tableprint' style="margin: 0px auto">
82
+ <thead>
83
+ <tr>
84
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
85
+ <h3 style="text-align: center">月度用气性质使用占比报表</h3>
86
+ </th>
87
+ </tr>
88
+ <tr>
89
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
90
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
91
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
92
+ <!--打印时间:{{{$parent.printTime}}}-->
93
+ 打印时间:{{$parent.printTime}}
94
+ <!--收费员:{{// $parent.operatorname}}-->
95
+ </th>
96
+ </tr>
97
+ <tr>
98
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
99
+ <div>
100
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
101
+ <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>
102
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员:{{$parent.operatorname}}</span>
103
+ </div>
104
+ </th>
105
+ </tr>
106
+ </thead>
107
+ <tr>
108
+ <td :colspan='$parent.spans' class="noborder">
109
+ {{{ model.data.substring(26,model.data.length-8) }}}
110
+ </td>
111
+ </tr>
112
+ <tfoot>
113
+ <tr style="text-align: left">
114
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核:</th>
115
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核:</th>
116
+ <th :colspan='Math.floor($parent.spans/3)'>收款员:</th>
117
+ </tr>
118
+ </tfoot>
119
+ </table>
120
+ {{{ $parent.reportStr}}}
121
+ </div>
122
+ </criteria-paged>
123
+ </div>
124
+ </template>
125
+
126
+ <script>
127
+ import { DataModel } from 'vue-client'
128
+ import co from 'co'
129
+
130
+ export default {
131
+ title: '月度用气性质使用占比报表',
132
+ props: ['data'],
133
+ data () {
134
+ return {
135
+ printTime: this.$login.toStandardTimeString(),
136
+ depresid: [],
137
+ userresid: [],
138
+ f_orgid: this.$login.f.orgid,
139
+ f_depid: this.$login.f.depids,
140
+ f_operatorid: this.$login.f.id,
141
+ operatorid: [],
142
+ depid: [],
143
+ orgname: '',
144
+ depname: '',
145
+ criteriaShow: false,
146
+ operatorname: '',
147
+ orgCondtionStr: '1=1',
148
+ f_user_type: '',
149
+ f_state:['有效'],
150
+ model: new DataModel('rs/report/applygasfillgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
151
+ f_orgid: 'this.model.f_orgid'}),
152
+ reportStr: null,
153
+ resshow:['company','department','operator'],
154
+ spans: 0,
155
+ initres: {
156
+ org: [this.$login.f.orgid],
157
+ dep: [],
158
+ user: []
159
+ }
160
+ }
161
+ },
162
+ ready () {
163
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
164
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
165
+ console.log(this.$login.f)
166
+ },
167
+ methods: {
168
+ searchData () {
169
+ this.$refs.paged.$refs.criteria.search()
170
+ },
171
+ selfSearch (args) {
172
+ this.printTime = this.$login.toStandardTimeString()
173
+ let orgcondition = '1=1'
174
+ let orgstr = this.orgCondtionStr
175
+ orgcondition = orgcondition + orgstr
176
+ console.log('23231312321:',this.f_user_type)
177
+ if(this.f_user_type && this.f_user_type[0]) {
178
+ orgcondition += ` and f_user_type = '${ this.f_user_type} '`
179
+ }
180
+ /* if (this.f_orgid && this.f_orgid[0]) {
181
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
182
+ }
183
+ if (this.f_depid && this.f_depid[0]) {
184
+ orgcondition += ' and f_depid in (' + this.f_depid + ')'
185
+ }
186
+ if(this.f_operatorid && this.f_operatorid[0]) {
187
+ orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
188
+ }*/
189
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
190
+ this.$refs.paged.search(args)
191
+ },
192
+
193
+ hidden() {
194
+ this.criteriaShow = !this.criteriaShow
195
+ },
196
+ getRes (condition, obj) {
197
+ this.orgCondtionStr = condition
198
+ this.orgname = obj.orgnames[0]
199
+ this.depname = obj.depnames[0]
200
+ },
201
+ getdep (obj, val) {
202
+ this.depname = val[0]
203
+ this.userresid = obj
204
+ this.f_depid = obj
205
+ },
206
+ getuser ( obj, val) {
207
+ this.operatorname = val[0]
208
+ this.f_operatorid = obj
209
+ }
210
+ },
211
+ watch: {
212
+ 'model.data' (val) {
213
+ let len=0
214
+ let a=val.split('</tr>')
215
+ for(let i=0;i<a.length;i++){
216
+ if(a[i].split('</td>').length-1>len){
217
+ len=a[i].split('</td>').length-1
218
+ }
219
+ }
220
+ this.spans = len
221
+ }
222
+ },
223
+ computed: {
224
+ charge_state() {
225
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
226
+ },
227
+ user_type () {
228
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
229
+ }
230
+ }
231
+ }
232
+ </script>
233
+ <style scoped>
234
+ .noborder{
235
+ border: none;
236
+ }
237
+ </style>
@@ -32,10 +32,11 @@
32
32
  @res-select="getRes"
33
33
  :initresid="model.id">
34
34
  </res-select>
35
+ <button class="button_search button_spacing" @click="changePage()">下一页</button>
35
36
  </div>
36
37
  </div>
37
38
  </div>
38
- <div style="height: 97%;">
39
+ <div style="height: 97%;" v-if="showPage === 1">
39
40
  <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
40
41
  <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
41
42
  <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
@@ -49,8 +50,9 @@
49
50
  <div class="flex-row" style="flex: 1;height: 48%">
50
51
 
51
52
  <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
52
- <div style="flex: 1;">
53
- <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
53
+ <div style="flex: 1;">
54
+ <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
55
+ v-ref:pay></paymentpie>
54
56
  </div>
55
57
  <!-- <div style="flex: 1;">-->
56
58
  <!-- <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
@@ -58,7 +60,15 @@
58
60
  </div>
59
61
 
60
62
  <div style="flex: 1;width: 50%">
61
- <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
63
+ <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
64
+ v-ref:pay></bussiness-type>
65
+ </div>
66
+ </div>
67
+ </div>
68
+ <div style="height: 97%;" v-if="showPage === 2">
69
+ <div class="flex-row" style="flex: 1;height: 96%">
70
+ <div style="flex: 1">
71
+ <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
62
72
  </div>
63
73
  </div>
64
74
  </div>
@@ -67,43 +77,53 @@
67
77
  </template>
68
78
 
69
79
  <script>
70
- import * as Util from '../../Util'
80
+ import * as Util from '../../Util'
71
81
 
72
- export default {
73
- props: {
74
- classname: {
75
- type: String,
76
- default: 'basic-main'
77
- },
78
- width: {
79
- type: String,
80
- default: '98.5%'
81
- },
82
- height: {
83
- type: String,
84
- default: '98%'
82
+ export default {
83
+ props: {
84
+ classname: {
85
+ type: String,
86
+ default: 'basic-main'
87
+ },
88
+ width: {
89
+ type: String,
90
+ default: '98.5%'
91
+ },
92
+ height: {
93
+ type: String,
94
+ default: '98%'
95
+ }
96
+ },
97
+ data () {
98
+ return {
99
+ showPage: 1,
100
+ page: [1, 2],
101
+ jurisdiction: this.$login.r,
102
+ model: {
103
+ id: [this.$login.f.orgid],
104
+ orgid: [this.$login.f.orgid],
105
+ startDate: Util.toStandardDateString(),
106
+ endDate: Util.toStandardDateString()
85
107
  }
108
+ }
109
+ },
110
+ methods: {
111
+ searchdata () {
112
+ this.$refs.pay.searchdata()
86
113
  },
87
- data() {
88
- return {
89
- jurisdiction: this.$login.r,
90
- model: {
91
- id: [this.$login.f.orgid],
92
- orgid: [this.$login.f.orgid],
93
- startDate: Util.toStandardDateString(),
94
- endDate: Util.toStandardDateString()
95
- }
114
+ changePage () {
115
+ let curPage = this.page.indexOf(this.showPage)
116
+ if (curPage + 1 === this.page.length) {
117
+ this.showPage = this.page[0]
118
+ } else {
119
+ this.showPage = this.page[curPage + 1]
96
120
  }
97
121
  },
98
- methods: {
99
- searchdata() {
100
- this.$refs.pay.searchdata()
101
- },
102
- getRes(obj) {
103
- this.model.orgid = obj
104
- },
122
+ getRes (obj) {
123
+ this.model.orgid = obj
105
124
  }
106
125
  }
126
+ }
107
127
  </script>
108
128
 
109
129
  <style lang="css">
@@ -6,7 +6,7 @@
6
6
  <div class="flex">
7
7
  <div class="flex" >
8
8
  <div class="flex-row" style="height: 40%;margin-top: 2%;">
9
- <div class="auto col-sm-12" style="width: 40%;height: 100%;padding: 1em" >
9
+ <div class="auto col-sm-12" style="width: 60%;height: 100%;padding: 1em" >
10
10
  <div class=" col-sm-12 auto" style="padding-left: 1em">
11
11
  <span class="font-title">安检</span>
12
12
  </div>
@@ -24,9 +24,9 @@
24
24
  <span class="normal-font" >计划安检量</span>
25
25
  </div>
26
26
  </div>
27
- <div style="width: 60%">
28
- <ring-safecheck-wh></ring-safecheck-wh>
29
- </div>
27
+ <!--<div style="width: 60%">-->
28
+ <!--<ring-safecheck-wh></ring-safecheck-wh>-->
29
+ <!--</div>-->
30
30
  </div>
31
31
  <div style="height: 58%">
32
32
  <safe-check-wh></safe-check-wh>
@@ -1,14 +1,18 @@
1
1
  {
2
2
  "checkData":{
3
- "wrhsum":2458,
3
+ "wrhsum":1021,
4
4
  "jhsum":81300
5
5
  },
6
- "checkByMonth":[{"sucnum":8359,"time":"2021-11","allnum":8359},
7
- {"sucnum":2114,"time":"2021-12","allnum":2114},
8
- {"sucnum":5528,"time":"2022-01","allnum":5528},
9
- {"sucnum":6921,"time":"2022-02","allnum":6921},
10
- {"sucnum":3820,"time":"2022-03","allnum":3820}
11
- ],
6
+ "checkByMonth":[
7
+ {"sucnum":8359,"time":"2021-10","allnum":8500},
8
+ {"sucnum":8359,"time":"2021-11","allnum":8400},
9
+ {"sucnum":2114,"time":"2021-12","allnum":2200},
10
+ {"sucnum":5500,"time":"2022-01","allnum":5528},
11
+ {"sucnum":6921,"time":"2022-02","allnum":7000},
12
+ {"sucnum":3820,"time":"2022-03","allnum":4000},
13
+ {"sucnum":8617,"time":"2022-04","allnum":9000},
14
+ {"sucnum":9388,"time":"2022-05","allnum":9500}
15
+ ],
12
16
  "callData":{
13
17
  "yearamount":12101,
14
18
  "sumsend":2453,
@@ -24,9 +24,10 @@
24
24
  // color: color,
25
25
  backgroundColor: '#ffffff00',
26
26
  legend: {
27
+ // show: false,
27
28
  orient: 'horizontal',
28
29
  x: 'center',
29
- y: 'top',
30
+ y: 'bottom',
30
31
  icon: 'circle',
31
32
  data: title,
32
33
  itemWidth: 10,
@@ -48,23 +49,32 @@
48
49
  // }],
49
50
  labelLine: {
50
51
  normal: {
51
- length: '5%'
52
+ length: 10
52
53
  }
53
54
  },
54
55
  label: {
55
56
  show: true,
56
- formatter: '{b|{b}}\n{per|{d}%}',
57
+ formatter: '{b|{b}}{per|{d}%}',
57
58
  rich: {
59
+ a: {
60
+ color: '#999',
61
+ lineHeight: 16,
62
+ align: 'center'
63
+ },
64
+ hr: {
65
+ borderColor: '#aaa',
66
+ width: '100%',
67
+ borderWidth: 1,
68
+ height: 0
69
+ },
58
70
  b: {
59
71
  fontSize: 10,
60
72
  padding: [5, 0],
61
73
  color: '#fff'
62
74
  },
63
- hr: {
64
- height: 0,
65
- borderWidth: 1,
66
- width: '100%',
67
- borderColor: '#fff'
75
+ c: {
76
+ fontSize: 10,
77
+ color: '#eee'
68
78
  },
69
79
  per: {
70
80
  color: '#FDF44E',
@@ -8,20 +8,20 @@
8
8
  <div class="row">
9
9
  <div class="col-sm-2 form-group">
10
10
 
11
- <label for="startDate" class="font_normal_body" title="归属日期">开始日期</label>
12
- <datepicker id="startDate" placeholder="开始日期" style="width:60%"
13
- v-model="model.startDate"
14
- :value.sync="model.startDate"
11
+ <label for="startDate1" class="font_normal_body" title="归属日期">开始日期</label>
12
+ <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
13
+ v-model="model.startDate1"
14
+ :value.sync="model.startDate1"
15
15
  :format="'yyyy-MM-dd HH:mm:ss'"
16
16
  :show-reset-button="true"
17
17
  >
18
18
  </datepicker>
19
19
  </div>
20
20
  <div class="col-sm-2 form-group">
21
- <label for="endDate" class="font_normal_body" title="归属日期">结束日期</label>
22
- <datepicker id="endDate" placeholder="结束日期" style="width:60%"
23
- v-model="model.endDate"
24
- :value.sync="model.endDate"
21
+ <label for="endDate1" class="font_normal_body" title="归属日期">结束日期</label>
22
+ <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
23
+ v-model="model.endDate1"
24
+ :value.sync="model.endDate1"
25
25
  :format="'yyyy-MM-dd HH:mm:ss'"
26
26
  :show-reset-button="true"
27
27
  >
@@ -563,7 +563,7 @@
563
563
  dep:[],
564
564
  user:[]
565
565
  },
566
- model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
566
+ model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1'}, {
567
567
  f_oughtamount: 0,
568
568
  f_oughtfee: 0,
569
569
  f_debt_money: 0,
@@ -911,8 +911,10 @@
911
911
  },
912
912
  getCondition() {
913
913
  return {
914
- startDate: this.$refs.paged.$refs.cri.model.startDate,
915
- endDate: this.$refs.paged.$refs.cri.model.endDate,
914
+ startDate: this.$refs.paged.$refs.cri.model.inputstartDate,
915
+ endDate: this.$refs.paged.$refs.cri.model.inputendDate,
916
+ startDate1: this.$refs.paged.$refs.cri.model.startDate1,
917
+ endDate1: this.$refs.paged.$refs.cri.model.endDate1,
916
918
  condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
917
919
  condValue: `${this.model.condValue}`
918
920
  }
@@ -59,7 +59,7 @@
59
59
  </div>
60
60
  </div>
61
61
  <div class="row" v-show="$parent.$parent.criteriaShow">
62
- <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>
62
+ <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
63
63
  <div class="col-sm-2 form-group">
64
64
  <label class="font_normal_body">客户名称</label>
65
65
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
@@ -697,7 +697,7 @@
697
697
  <nobr>{{row.f_stairamount1}}</nobr>
698
698
  </td>
699
699
  <td style="text-align: center;">
700
- <nobr>{{row.f_stair1price}}</nobr>
700
+ <nobr>{{row.conutnum>1?'--':row.f_stair1price}}</nobr>
701
701
  </td>
702
702
  <td style="text-align: center;">
703
703
  <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
@@ -706,7 +706,7 @@
706
706
  <nobr>{{row.f_stair2amount}}</nobr>
707
707
  </td>
708
708
  <td style="text-align: center;">
709
- <nobr>{{row.f_stair2price}}</nobr>
709
+ <nobr>{{row.conutnum>1?'--':row.f_stair2price}}</nobr>
710
710
  </td>
711
711
  <td style="text-align: center;">
712
712
  <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
@@ -715,7 +715,7 @@
715
715
  <nobr>{{row.f_stair3amount}}</nobr>
716
716
  </td>
717
717
  <td style="text-align: center;">
718
- <nobr>{{row.f_stair3price}}</nobr>
718
+ <nobr>{{row.conutnum>1?'--':row.f_stair3price}}</nobr>
719
719
  </td>
720
720
  <td style="text-align: center;">
721
721
  <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
@@ -35,7 +35,7 @@
35
35
  style="width: 60%"
36
36
  v-model="model.f_residential_area"
37
37
  :options='$parent.$parent.residentialArea' placeholder='选择小区'
38
- condition="ud.f_residential_area = '{}'"
38
+ condition="f_residential_area = '{}'"
39
39
  close-on-select search="true">
40
40
  </v-select>
41
41
  </div>
@@ -274,6 +274,7 @@
274
274
  self.$MagGetSaleParam.initinputtor();
275
275
  self.getinputtores();
276
276
  self.initmeterbook();
277
+ self.initSlice()
277
278
  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
278
279
  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
279
280
  // self.$refs.paged.$refs.cri.search()
@@ -339,8 +340,7 @@
339
340
  }
340
341
  },
341
342
  ready() {
342
- // this.getaddress()
343
- //
343
+ this.getaddress()
344
344
  readySomething(this).then(() => {
345
345
  this.$emit('ready')
346
346
  }).catch((error) => {
@@ -350,6 +350,9 @@
350
350
  methods: {
351
351
  //初始化片区
352
352
  async initSlice (val) {
353
+ if(val == null ){
354
+ val = this.f_filialeid;
355
+ }
353
356
  if (val) {
354
357
  let getAllArea = await this.$resetpost('/rs/search', {
355
358
  source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
@@ -65,14 +65,14 @@
65
65
  <!--<input type="text" style="width:60%" class="input_search" v-model="model.id"-->
66
66
  <!--condition="id = '{}'" placeholder="收费编号">-->
67
67
  <!--</div>-->
68
- <div class="col-sm-2 form-group">
69
- <label class="font_normal_body">抄&ensp;表&ensp;册</label>
70
- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
71
- :options='$parent.$parent.meterbooks' placeholder='抄表册'
72
- style="width:60%"
73
- close-on-select
74
- condition="f_meter_book_num = '{}'"></v-select>
75
- </div>
68
+ <!-- <div class="col-sm-2 form-group">-->
69
+ <!-- <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
70
+ <!-- <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
71
+ <!-- :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
72
+ <!-- style="width:60%"-->
73
+ <!-- close-on-select-->
74
+ <!-- condition="f_meter_book_num = '{}'"></v-select>-->
75
+ <!-- </div>-->
76
76
  <div class="col-sm-2 form-group">
77
77
  <label class="font_normal_body">客户电话</label>
78
78
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
@@ -149,38 +149,37 @@
149
149
  <v-select :value.sync="model.f_price_name"
150
150
  v-model="model.f_price_name"
151
151
  :options="$parent.$parent.getPricenames"
152
- condition="f_price_name = '{}'"
153
152
  close-on-select></v-select>
154
153
  </div>
155
- <div class="col-sm-2 form-group">
156
- <label class="font_normal_body" title="欠费气量大于">欠费气量</label>
157
- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtamount"
158
- condition="f_oughtamount > '{}'" placeholder="欠费气量大于">
159
- </div>
160
- <div class="col-sm-2 form-group">
161
- <label class="font_normal_body" title="气费金额大于">气费金额</label>
162
- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_new"
163
- condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">
164
- </div>
165
- <div class="col-sm-2 form-group">
166
- <label class="font_normal_body" title="欠费金额大于">欠费金额</label>
167
- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_all"
168
- condition="f_oughtfee_all > '{}'" placeholder="欠费金额大于">
169
- </div>
170
- <div class="col-sm-2 form-group">
171
- <label class="font_normal_body">欠费期数</label>
172
- <input type="text" style="width:60%" class="input_search" v-model="model.c"
173
- condition="c > '{}'" placeholder='欠费期数大于'>
174
- </div>
175
- <div class="col-sm-2 form-group">
176
- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
177
- <v-select :value.sync="model.f_inputtor"
178
- v-model="model.f_inputtor"
179
- :options='$parent.$parent.inputtores' placeholder='请选择'
180
- condition="f_inputtor = '{}'"
181
- close-on-select :search="false">
182
- </v-select>
183
- </div>
154
+ <!-- <div class="col-sm-2 form-group">-->
155
+ <!-- <label class="font_normal_body" title="欠费气量大于">欠费气量</label>-->
156
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtamount"-->
157
+ <!-- condition="f_oughtamount > '{}'" placeholder="欠费气量大于">-->
158
+ <!-- </div>-->
159
+ <!-- <div class="col-sm-2 form-group">-->
160
+ <!-- <label class="font_normal_body" title="气费金额大于">气费金额</label>-->
161
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_new"-->
162
+ <!-- condition="f_oughtfee_new > '{}'" placeholder="气费金额大于">-->
163
+ <!-- </div>-->
164
+ <!-- <div class="col-sm-2 form-group">-->
165
+ <!-- <label class="font_normal_body" title="欠费金额大于">欠费金额</label>-->
166
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_oughtfee_all"-->
167
+ <!-- condition="f_oughtfee_all > '{}'" placeholder="欠费金额大于">-->
168
+ <!-- </div>-->
169
+ <!-- <div class="col-sm-2 form-group">-->
170
+ <!-- <label class="font_normal_body">欠费期数</label>-->
171
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.c"-->
172
+ <!-- condition="c > '{}'" placeholder='欠费期数大于'>-->
173
+ <!-- </div>-->
174
+ <!-- <div class="col-sm-2 form-group">-->
175
+ <!-- <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>-->
176
+ <!-- <v-select :value.sync="model.f_inputtor"-->
177
+ <!-- v-model="model.f_inputtor"-->
178
+ <!-- :options='$parent.$parent.inputtores' placeholder='请选择'-->
179
+ <!-- condition="f_inputtor = '{}'"-->
180
+ <!-- close-on-select :search="false">-->
181
+ <!-- </v-select>-->
182
+ <!-- </div>-->
184
183
  <div class="col-sm-2 form-group" v-if="false">
185
184
  <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
186
185
  <input type="text" style="width:60%" class="input_search" v-model="model.f_inputtor"
@@ -85,6 +85,10 @@ export default function (filiale) {
85
85
  Vue.component('site-manager', (resolve) => {
86
86
  require(['./components/SellReport/SiteManager'], resolve)
87
87
  })
88
+ // 用气性质散列图
89
+ Vue.component('gas-properties-manager', (resolve) => {
90
+ require(['./components/SellReport/GasPropertiesManager'], resolve)
91
+ })
88
92
 
89
93
  /** **************************营收模块(SellReport)******************************/
90
94
  // 报表相关,所属为抄表员汇总表(实际为报表汇总表,功能名称后期改变),调整找那个,尚未归类
@@ -591,6 +595,10 @@ export default function (filiale) {
591
595
  Vue.component('applys-gas-fill-money', (resolve) => {
592
596
  require(['./components/SellReport/applysFillmoney'], resolve)
593
597
  })
598
+ // 月度用气性质使用占比报表
599
+ Vue.component('market-month-gas', (resolve) => {
600
+ require(['./components/SellReport/MarketMonthgas'], resolve)
601
+ })
594
602
  if (filiale) {
595
603
  let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
596
604
  Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale