manage-client 3.2.13 → 3.2.17

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.
@@ -15,8 +15,8 @@ var shaoguan='http://119.146.1.106:8300/'
15
15
  var qtx='http://36.103.222.144:6300/'
16
16
  var bendi = 'http://127.0.0.1:8090'
17
17
  // var bendi = 'http://172.168.1.11:9001'
18
- // var fuwu = 'http://192.168.50.4:8400'
19
- var fuwu = 'http://172.168.1.11:9001'
18
+ var fuwu = 'http://192.168.50.4:8400'
19
+ // var fuwu = 'http://172.168.1.11:9001'
20
20
  var system = 'http://192.168.50.4:8400'
21
21
  //192.168.
22
22
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.13",
3
+ "version": "3.2.17",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,194 @@
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" for="org">公&emsp;&emsp;司:</label>
29
+ <right-tree id="org" @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" for="dep" >部&emsp;&emsp;门:</label>
33
+ <res-select id="dep" restype='department' style="width: 60%"
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" for="oper">人&emsp;&emsp;员:</label>
43
+ <res-select id="oper" restype='user' style="width: 60%"
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
+ </div>
51
+ <div class="span" style = "float:right;">
52
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
+ </div>
56
+ </div>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
60
+ <thead>
61
+ <tr>
62
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">民用气量统计表</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
68
+ 时间区间:{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
69
+ 打印时间:{{$parent.printTime}}
70
+ </th>
71
+ </tr>
72
+ <tr>
73
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
74
+ <div>
75
+ <span v-show="$parent.orgname[0]">公司:{{$parent.orgname}}</span>
76
+ <span v-show="$parent.depname[0]"> 部门:{{$parent.depname}}</span>
77
+ <span v-show="$parent.operatorname[0]">人员:{{$parent.operatorname}}</span>
78
+ </div>
79
+ </th>
80
+ </tr>
81
+ </thead>
82
+ <tr>
83
+ <td :colspan='$parent.tablen' class="noborder">
84
+ {{{ model.data.substring(26,model.data.length-8) }}}
85
+ </td>
86
+ </tr>
87
+ <tfoot>
88
+ <tr style="text-align: left">
89
+ <th :colspan='Math.floor($parent.tablen/3)'>财务审核:</th>
90
+ <th :colspan='Math.round($parent.tablen/3)'>收款审核:</th>
91
+ <th :colspan='Math.round($parent.tablen/3)'>收款员:</th>
92
+ </tr>
93
+ </tfoot>
94
+ </table>
95
+ </div>
96
+ </criteria-paged>
97
+ </div>
98
+ </template>
99
+
100
+ <script>
101
+ import { DataModel } from 'vue-client'
102
+ export default {
103
+ title: '民用气量统计表',
104
+ props: ['data'],
105
+ data () {
106
+ return {
107
+ printTime: this.$login.toStandardTimeString(),
108
+ depresid: [],
109
+ userresid: [],
110
+ f_orgid: this.$login.f.orgid,
111
+ f_depid: this.$login.f.depids,
112
+ f_operatorid: this.$login.f.id,
113
+ operatorid: [],
114
+ depid: [],
115
+ tablen:0,
116
+ orgname: '',
117
+ depname: '',
118
+ operatorname: '',
119
+ orgCondtionStr: '1=1',
120
+ model: new DataModel('rs/report/CivilGasStatistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
121
+ f_orgid: 'this.model.f_orgid'}),
122
+ reportStr: null,
123
+ show: false,
124
+ }
125
+ },
126
+ ready () {
127
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
128
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
129
+ console.log(this.$login.f)
130
+ },
131
+ methods: {
132
+ searchData () {
133
+ this.$refs.paged.$refs.criteria.search()
134
+ },
135
+ selfSearch (args) {
136
+ this.printTime = this.$login.toStandardTimeString()
137
+ let orgcondition = '1=1'
138
+ if (this.f_orgid && this.f_orgid[0]) {
139
+ orgcondition += ` and f_orgid in(${this.f_orgid.toString()})`
140
+ }
141
+ if (this.f_depid && this.f_depid[0]) {
142
+ orgcondition += ` and f_orgid in(${this.f_depid.toString()})`
143
+ }
144
+ if(this.f_operatorid && this.f_operatorid[0]) {
145
+ orgcondition += ` and f_orgid in(${this.f_operatorid.toString()})`
146
+ }
147
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
148
+ this.$refs.paged.search(args)
149
+ },
150
+ getRes (obj) {
151
+ this.orgname = obj.res[0]
152
+ this.depresid = obj.resids
153
+ this.userresid = obj.resids
154
+ this.f_orgid = obj.resids
155
+ },
156
+ getdep (obj, val) {
157
+ this.depname = val[0]
158
+ // this.userresid = obj
159
+ this.f_depid = obj
160
+ },
161
+ getuser ( obj, val) {
162
+ this.operatorname = val[0]
163
+ this.f_operatorid = obj
164
+ }
165
+ },
166
+ watch: {
167
+ 'data' (val) {
168
+ if (val.f_files_path) {
169
+ this.getFileContent(val.f_files_path)
170
+ } else {
171
+ this.reportStr = null
172
+ }
173
+ },
174
+ 'model.data' (val) {
175
+ let len=0
176
+ let a=val.split('</tr>')
177
+ for(let i=0;i<a.length;i++){
178
+ if(a[i].split('</td>').length-1>len){
179
+ len=a[i].split('</td>').length-1
180
+ }
181
+ continue
182
+ }
183
+ this.tablen=len
184
+ }
185
+ },
186
+ computed: {
187
+ }
188
+ }
189
+ </script>
190
+ <style scoped>
191
+ .noborder{
192
+ border: none;
193
+ }
194
+ </style>
@@ -0,0 +1,194 @@
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" for="org">公&emsp;&emsp;司:</label>
29
+ <right-tree id="org" @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" for="dep" >部&emsp;&emsp;门:</label>
33
+ <res-select id="dep" restype='department' style="width: 60%"
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" for="oper">人&emsp;&emsp;员:</label>
43
+ <res-select id="oper" restype='user' style="width: 60%"
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
+ </div>
51
+ <div class="span" style = "float:right;">
52
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
+ </div>
56
+ </div>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
60
+ <thead>
61
+ <tr>
62
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">非民用气量统计表</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
68
+ 时间区间:{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
69
+ 打印时间:{{$parent.printTime}}
70
+ </th>
71
+ </tr>
72
+ <tr>
73
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
74
+ <div>
75
+ <span v-show="$parent.orgname[0]">公司:{{$parent.orgname}}</span>
76
+ <span v-show="$parent.depname[0]"> 部门:{{$parent.depname}}</span>
77
+ <span v-show="$parent.operatorname[0]">人员:{{$parent.operatorname}}</span>
78
+ </div>
79
+ </th>
80
+ </tr>
81
+ </thead>
82
+ <tr>
83
+ <td :colspan='$parent.tablen' class="noborder">
84
+ {{{ model.data.substring(26,model.data.length-8) }}}
85
+ </td>
86
+ </tr>
87
+ <tfoot>
88
+ <tr style="text-align: left">
89
+ <th :colspan='Math.floor($parent.tablen/3)'>财务审核:</th>
90
+ <th :colspan='Math.round($parent.tablen/3)'>收款审核:</th>
91
+ <th :colspan='Math.round($parent.tablen/3)'>收款员:</th>
92
+ </tr>
93
+ </tfoot>
94
+ </table>
95
+ </div>
96
+ </criteria-paged>
97
+ </div>
98
+ </template>
99
+
100
+ <script>
101
+ import { DataModel } from 'vue-client'
102
+ export default {
103
+ title: '非民用气量统计表',
104
+ props: ['data'],
105
+ data () {
106
+ return {
107
+ printTime: this.$login.toStandardTimeString(),
108
+ depresid: [],
109
+ userresid: [],
110
+ f_orgid: this.$login.f.orgid,
111
+ f_depid: this.$login.f.depids,
112
+ f_operatorid: this.$login.f.id,
113
+ operatorid: [],
114
+ depid: [],
115
+ tablen:0,
116
+ orgname: '',
117
+ depname: '',
118
+ operatorname: '',
119
+ orgCondtionStr: '1=1',
120
+ model: new DataModel('rs/report/UnCivilGasStatistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
121
+ f_orgid: 'this.model.f_orgid'}),
122
+ reportStr: null,
123
+ show: false,
124
+ }
125
+ },
126
+ ready () {
127
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
128
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
129
+ console.log(this.$login.f)
130
+ },
131
+ methods: {
132
+ searchData () {
133
+ this.$refs.paged.$refs.criteria.search()
134
+ },
135
+ selfSearch (args) {
136
+ this.printTime = this.$login.toStandardTimeString()
137
+ let orgcondition = '1=1'
138
+ if (this.f_orgid && this.f_orgid[0]) {
139
+ orgcondition += ` and f_orgid in(${this.f_orgid.toString()})`
140
+ }
141
+ if (this.f_depid && this.f_depid[0]) {
142
+ orgcondition += ` and f_orgid in(${this.f_depid.toString()})`
143
+ }
144
+ if(this.f_operatorid && this.f_operatorid[0]) {
145
+ orgcondition += ` and f_orgid in(${this.f_operatorid.toString()})`
146
+ }
147
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
148
+ this.$refs.paged.search(args)
149
+ },
150
+ getRes (obj) {
151
+ this.orgname = obj.res[0]
152
+ this.depresid = obj.resids
153
+ this.userresid = obj.resids
154
+ this.f_orgid = obj.resids
155
+ },
156
+ getdep (obj, val) {
157
+ this.depname = val[0]
158
+ // this.userresid = obj
159
+ this.f_depid = obj
160
+ },
161
+ getuser ( obj, val) {
162
+ this.operatorname = val[0]
163
+ this.f_operatorid = obj
164
+ }
165
+ },
166
+ watch: {
167
+ 'data' (val) {
168
+ if (val.f_files_path) {
169
+ this.getFileContent(val.f_files_path)
170
+ } else {
171
+ this.reportStr = null
172
+ }
173
+ },
174
+ 'model.data' (val) {
175
+ let len=0
176
+ let a=val.split('</tr>')
177
+ for(let i=0;i<a.length;i++){
178
+ if(a[i].split('</td>').length-1>len){
179
+ len=a[i].split('</td>').length-1
180
+ }
181
+ continue
182
+ }
183
+ this.tablen=len
184
+ }
185
+ },
186
+ computed: {
187
+ }
188
+ }
189
+ </script>
190
+ <style scoped>
191
+ .noborder{
192
+ border: none;
193
+ }
194
+ </style>
@@ -195,7 +195,7 @@
195
195
  footer: [],
196
196
  model: new PagedList('rs/sql/BusinesQuery', 20, {}, {f_money: 0}),
197
197
  criteriaShow: false,
198
- bodyData: ["f_userinfo_code", "f_user_name", "f_meternumber","f_money", "f_operat_type","f_state", "f_operate_date", "f_orgname", "f_depname", "f_operator"],
198
+ bodyData: ["f_userinfo_code", "f_user_name", "f_money", "f_operat_type","f_state", "f_operate_date", "f_orgname", "f_depname", "f_operator"],
199
199
  orgCondtionStr: '',
200
200
  show:false,
201
201
  rowdata:{},
@@ -213,7 +213,7 @@
213
213
  org:[this.$login.f.orgid],
214
214
  },
215
215
  config: {
216
- defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber_old', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
216
+ defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_type', 'f_changemeter_fee', 'f_meternumber', 'f_change_operator', 'f_state', 'f_operate_date']
217
217
  },
218
218
  //合计数据
219
219
  sumsmodel: {},
@@ -17,7 +17,7 @@ export default{
17
17
  },
18
18
  // 业务查询
19
19
  businesConfig: {
20
- 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_money': '收款金额', 'f_operat_type': '操作类型',
20
+ 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_money': '收款金额', 'f_operat_type': '操作类型',
21
21
  'f_state': '操作状态', 'f_operate_date': '操作日期', 'f_orgname': '组织名称', 'f_depname': '部门名称', 'f_operator': '操作人'
22
22
  },
23
23
  // 资源操作
@@ -164,9 +164,6 @@
164
164
  <th>
165
165
  <nobr>气量</nobr>
166
166
  </th>
167
- <th>
168
- <nobr>单价</nobr>
169
- </th>
170
167
  <th>
171
168
  <nobr>抄表结果状态</nobr>
172
169
  </th>
@@ -186,6 +183,33 @@
186
183
  <th>
187
184
  <nobr>抄表状态</nobr>
188
185
  </th>
186
+ <th>
187
+ <nobr>一阶气量</nobr>
188
+ </th>
189
+ <th>
190
+ <nobr>一阶单价</nobr>
191
+ </th>
192
+ <th>
193
+ <nobr>一阶气费</nobr>
194
+ </th>
195
+ <th>
196
+ <nobr>二阶气量</nobr>
197
+ </th>
198
+ <th>
199
+ <nobr>二阶单价</nobr>
200
+ </th>
201
+ <th>
202
+ <nobr>二阶气费</nobr>
203
+ </th>
204
+ <th>
205
+ <nobr>三阶气量</nobr>
206
+ </th>
207
+ <th>
208
+ <nobr>三阶单价</nobr>
209
+ </th>
210
+ <th>
211
+ <nobr>三阶气费</nobr>
212
+ </th>
189
213
  <th>
190
214
  <nobr>人员</nobr>
191
215
  </th>
@@ -223,9 +247,6 @@
223
247
  <td style="text-align: center;">
224
248
  <nobr>{{row.f_real_amount}}</nobr>
225
249
  </td>
226
- <td style="text-align: center;">
227
- <nobr>{{row.f_price}}</nobr>
228
- </td>
229
250
  <td style="text-align: center;">
230
251
  <nobr>{{row.f_result_state}}</nobr>
231
252
  </td>
@@ -245,6 +266,33 @@
245
266
  <td style="text-align: center;">
246
267
  <nobr>{{row.f_meter_state}}</nobr>
247
268
  </td>
269
+ <td style="text-align: center;">
270
+ <nobr>{{row.f_stairamount1}}</nobr>
271
+ </td>
272
+ <td style="text-align: center;">
273
+ <nobr>{{row.f_stair1price}}</nobr>
274
+ </td>
275
+ <td style="text-align: center;">
276
+ <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
277
+ </td>
278
+ <td style="text-align: center;">
279
+ <nobr>{{row.f_stair2amount}}</nobr>
280
+ </td>
281
+ <td style="text-align: center;">
282
+ <nobr>{{row.f_stair2price}}</nobr>
283
+ </td>
284
+ <td style="text-align: center;">
285
+ <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
286
+ </td>
287
+ <td style="text-align: center;">
288
+ <nobr>{{row.f_stair3amount}}</nobr>
289
+ </td>
290
+ <td style="text-align: center;">
291
+ <nobr>{{row.f_stair3price}}</nobr>
292
+ </td>
293
+ <td style="text-align: center;">
294
+ <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
295
+ </td>
248
296
  <td style="text-align: center;">
249
297
  <nobr>{{row.f_operator}}</nobr>
250
298
  </td>
@@ -273,6 +321,24 @@
273
321
  <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
274
322
  余量合计:&emsp;{{sumsmodel.f_yuliang}}
275
323
  </td>
324
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
325
+ 一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
326
+ </td>
327
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
328
+ 一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
329
+ </td>
330
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
331
+ 二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}
332
+ </td>
333
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
334
+ 二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
335
+ </td>
336
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
337
+ 三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}
338
+ </td>
339
+ <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
340
+ 三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
341
+ </td>
276
342
  </tr>
277
343
  </table>
278
344
  </div>
@@ -319,7 +385,12 @@
319
385
  other:[],
320
386
  footer:[],
321
387
  data: {},
322
- model: new PagedList('rs/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_card_total_gas:0,f_yuliang:0}),
388
+ model: new PagedList('rs/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_card_total_gas:0,f_yuliang:0,f_stairamount1:0,
389
+ f_stair1fee:0,
390
+ f_stair2amount:0,
391
+ f_stair2fee:0,
392
+ f_stair3amount:0,
393
+ f_stair3fee:0}),
323
394
  initres: {
324
395
  org:[this.$login.f.orgid],
325
396
  dep:[],
@@ -334,7 +334,7 @@
334
334
  </div>
335
335
  <div class="col-sm-2 form-group">
336
336
  <label class="font_normal_body">档案抄表员</label>
337
- <v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
337
+ <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
338
338
  style="width:60%"
339
339
  :multiple="true"
340
340
  :options='$parent.$parent.inputtores' placeholder='档案抄表员'
@@ -343,7 +343,7 @@
343
343
  </div>
344
344
  <div class="col-sm-2 form-group">
345
345
  <label class="font_normal_body">表册抄表员</label>
346
- <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
346
+ <v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
347
347
  style="width:60%"
348
348
  :multiple="true"
349
349
  :options='$parent.$parent.inputtores' placeholder='表册抄表员'
@@ -546,8 +546,8 @@
546
546
  <td style="text-align: center;"><nobr>{{row.f_total_gas}}</nobr></td>
547
547
  <td style="text-align: center;"><nobr>{{row.f_total_fee}}</nobr></td>
548
548
 
549
- <td style="text-align: center;"><nobr>{{row.f_inputtor}}</nobr></td>
550
549
  <td style="text-align: center;"><nobr>{{row.f_book_inputtor}}</nobr></td>
550
+ <td style="text-align: center;"><nobr>{{row.f_inputtor}}</nobr></td>
551
551
  <td style="text-align: center;"><nobr>{{row.f_userfiles_address}}</nobr></td>
552
552
  <td style="text-align: center;"><nobr>{{row.f_install_person}}</nobr></td>
553
553
  <td style="text-align: center;"><nobr>{{row.f_gas_person}}</nobr></td>
@@ -143,8 +143,8 @@ export default{
143
143
  'f_used_name': '曾用名','f_rent_phone': '备用电话','f_rent_name': '租户姓名','f_zuhu_phone': '租户电话',
144
144
  'f_contract_id': '合同ID','f_is_mgq': '是否煤改气','f_send_usegas_card': '是否发放天然气使用证',
145
145
  'f_usetype':'使用类型','f_meter_style': '气表型号','f_table_state': '表状态','f_initial_base': '初始气表底数',
146
- 'f_total_usegas_amount': '累计用气金额','f_total_gas': '表累购气量','f_total_fee': '表累购金额','f_inputtor': '表册抄表员',
147
- 'f_book_inputtor': '档案抄表员',
146
+ 'f_total_usegas_amount': '累计用气金额','f_total_gas': '表累购气量','f_total_fee': '表累购金额','f_inputtor': '档案抄表员',
147
+ 'f_book_inputtor': '表册抄表员',
148
148
  'f_userfiles_address': '安装地址','f_install_person': '安装人','f_gas_person': '通气人',
149
149
  'f_meter_book_num': '抄表册编号','f_meter_book_sort': '抄表册顺序',
150
150
  'f_balance_amount': '表剩余金额','f_times': '写卡次数',
@@ -1,302 +1,240 @@
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-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
- <div class="col-sm-2 form-group" >
30
- <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
31
- <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%" v-ref:org></right-tree>
32
- </div>
33
- <div class="col-sm-2 form-group">
34
- <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
35
- <v-select id="dep" style="width: 60%"
36
- :multiple="false"
37
- @change="$parent.$parent.getDep"
38
- :value.sync="model.f_depid"
39
- v-model="model.f_depid"
40
- :options='$parent.$parent.depresid' placeholder='请选择'
41
- condition="f_depid in {}">
42
- </v-select>
43
-
44
- </div>
45
- <div class="col-sm-2 form-group">
46
- <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
47
- <v-select id="oper" style="width: 60%"
48
- :multiple="false"
49
- @change="$parent.$parent.getOpe"
50
- :value.sync="model.f_operatorid"
51
- v-model="model.f_operatorid"
52
- :options='$parent.$parent.userresid' placeholder='请选择'
53
- condition="f_operatorid in {}">
54
- </v-select>
55
- </div>
56
- <div class="col-sm-2 form-group">
57
- <label class="font_normal_body">收费状态</label>
58
- <v-select :value.sync="$parent.$parent.f_state" multiple
59
- v-model="$parent.$parent.f_state"
60
- :options='$parent.$parent.charge_state' placeholder='请选择'
61
- condition="f_state in {}"
62
- close-on-select></v-select>
63
- </div>
64
- </div>
65
- <div class="span" style = "float:right;">
66
- <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
67
- <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
68
- <report-excel id='gasprice'></report-excel>
69
- </div>
70
- </div>
71
- </criteria>
72
- <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
73
- <table class='tableprint' style="margin: 0px auto">
74
- <thead>
75
- <tr>
76
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
77
- <h3 style="text-align: center">收费结账报表</h3>
78
- </th>
79
- </tr>
80
- <tr>
81
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
82
- 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
83
- 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
84
- <!--打印时间:{{{$parent.printTime}}}-->
85
- 打印时间:{{$parent.printTime}}
86
- <!--收费员:{{// $parent.operatorname}}-->
87
- </th>
88
- </tr>
89
- <tr>
90
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
91
- <div>
92
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname[0]">公司:{{$parent.orgname}}</span>
93
- <span v-show="$parent.depname[0]"> 部门:{{$parent.depname}}</span>
94
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname[0]">人员:{{$parent.operatorname}}</span>
95
- </div>
96
- </th>
97
- </tr>
98
- </thead>
99
- <tr>
100
- <td :colspan='$parent.spans'>
101
- {{{ model.data.substring(26,model.data.length-8) }}}
102
- </td>
103
- </tr>
104
- <tfoot>
105
- <tr style="text-align: left">
106
- <th :colspan='Math.floor($parent.spans/3)'>财务审核:</th>
107
- <th :colspan='Math.floor($parent.spans/3)'>收款审核:</th>
108
- <th :colspan='Math.floor($parent.spans/3)'>收款员:</th>
109
- </tr>
110
- </tfoot>
111
- </table>
112
- {{{ $parent.reportStr}}}
113
- </div>
114
- </criteria-paged>
115
- <div>注:</div>
116
- <modal :show.sync="show" v-ref:modal small backdrop="false">
117
- <header slot="modal-header" class="modal-header">
118
- <h4 class="modal-title">输入文件名称</h4>
119
- </header>
120
- <article slot="modal-body" class="modal-body">
121
- <div class="form-group">
122
- <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
123
- </div>
124
- </article>
125
- <footer slot="modal-footer" class="modal-footer">
126
- <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
127
- <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
128
- </footer>
129
- </modal>
130
- </div>
131
- </template>
132
-
133
- <script>
134
- import {DataModel, HttpResetClass} from 'vue-client'
135
- import co from 'co'
136
- let saveFile = function * (self) {
137
- // 线验证文件是否重名
138
- let count = yield self.$resetpost('rs/sql/manageSingleTable',
139
- {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
140
- {resolveMsg: null, rejectMsg: null})
141
- if (count.data.length > 0) {
142
- self.$showAlert('无法保存,文件名重名', 'warning', 3000)
143
- return
144
- }
145
- let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
146
- f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
147
- f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
148
- f_outlets: this.$login.f.depname})
149
- if (saveBack.data.status === 'succeed') {
150
- self.show = false
151
- self.filename = ''
152
- // 后台保存完成,通知刷新
153
- self.$dispatch('save-success', self.filename)
154
- }
155
- }
156
- let getorg = async function (self) {
157
- new HttpResetClass().load("POST",'rs/sql/singleTableParam',
158
- {
159
- data: {
160
- items: 'name label,id value',
161
- tablename: 't_department',
162
- condition: `1=1`
163
- }
164
- },
165
- {resolveMsg: null, rejectMsg: null})
166
- .then((res) => {
167
- self.depresid = res.data
168
- })
169
- new HttpResetClass().load("POST",'rs/sql/singleTableParam',
170
- {
171
- data: {
172
- items: 'name label,id value',
173
- tablename: 't_user',
174
- condition: `state = '在职' and f_department_name is not null`
175
- }
176
- },
177
- {resolveMsg: null, rejectMsg: null})
178
- .then((res) => {
179
- self.userresid = res.data
180
- })
181
- }
182
- export default {
183
- title: '收费结账报表',
184
- props: ['data'],
185
- data () {
186
- return {
187
- printTime: this.$login.toStandardTimeString(),
188
- depresid: [],
189
- userresid: [],
190
- f_orgid: this.$login.f.orgid,
191
- f_depid: this.$login.f.depids,
192
- f_operatorid: this.$login.f.id,
193
- operatorid: [],
194
- depid: [],
195
- orgname: '',
196
- depname: '',
197
- operatorname: '',
198
- orgCondtionStr: '1=1',
199
- // f_state:['有效'],
200
- model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
201
- f_orgid: 'this.model.f_orgid'}),
202
- reportStr: null,
203
- show: false,
204
- spans: 0,
205
- initres: {
206
- org: [this.$login.f.orgid],
207
- dep: [],
208
- user: []
209
- }
210
- }
211
- },
212
- ready () {
213
- getorg(this)
214
- this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
215
- this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
216
- console.log(this.$login.f)
217
- },
218
- methods: {
219
- searchData () {
220
- this.$refs.paged.$refs.criteria.search()
221
- },
222
- getDep(val){
223
- this.depname = this.depresid.filter(x => x.value ==val).map(x=>x.label).toString()
224
- console.log('dep',this.depname )
225
- },
226
- getOpe(val){
227
- this.operatorname = this.userresid.filter(x => x.value ==val).map(x=>x.label).toString()
228
- console.log('dep',this.operatorname )
229
- },
230
- selfSearch (args) {
231
- this.printTime = this.$login.toStandardTimeString()
232
- let s = '1=1'
233
- if (this.f_orgid[0]) {
234
- s += ' and f_orgid in(' + this.f_orgid +')'
235
- }
236
- if (this.f_state[0]) {
237
- s += ' and f_state in(\'' + this.f_state.toString().replace(new RegExp(',','g')) +'\')'
238
- }
239
- s += ' and ' + args.condition
240
- console.log('xxxxxxxxxxx',this.orgCondtionStr)
241
- // let orgstr = this.f_state[0] ? "f_state in('" + this.f_state.toString().replace(new RegExp(',','g'), "','") +"') "+ s: s
242
- this.$refs.paged.$refs.criteria.model.f_orgid = s
243
- this.$refs.paged.search(args)
244
- },
245
- // 根据文件路径获取储存的报表内容
246
- getFileContent (path) {
247
- this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
248
- this.reportStr = res.data.filecontent
249
- this.model.state = '正确'
250
- })
251
- },
252
- confirm () {
253
- if (!this.filename || this.filename === '') {
254
- this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
255
- }
256
- let saveGen = saveFile(this)
257
- co(saveGen)
258
- },
259
- close () {
260
- this.show = false
261
- },
262
- // 将报表保存成文件
263
- confirmReport () {
264
- this.show = true
265
- this.filename = this.data.f_report_name + this.$login.toStandardDateString()
266
- },
267
- getRes (obj) {
268
- this.orgname = obj.res[0]
269
- this.f_orgid = obj.resids
270
- }
271
- },
272
- watch: {
273
- 'data' (val) {
274
- if (val.f_files_path) {
275
- this.getFileContent(val.f_files_path)
276
- } else {
277
- this.reportStr = null
278
- }
279
- },
280
- 'model.data' (val) {
281
- let len=0
282
- let a=val.split('</tr>')
283
- for(let i=0;i<a.length;i++){
284
- if(a[i].split('</td>').length-1>len){
285
- len=a[i].split('</td>').length-1
286
- }
287
- }
288
- this.spans = len
289
- }
290
- },
291
- computed: {
292
- charge_state() {
293
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
294
- }
295
- }
296
- }
297
- </script>
298
- <style scoped>
299
- .noborder{
300
- border: none;
301
- }
302
- </style>
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-3 form-group">
32
+ <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
33
+ <v-select id="dep" style="width: 60%"
34
+ :multiple="true"
35
+ @change="$parent.$parent.getDep"
36
+ :value.sync="model.f_depid"
37
+ v-model="model.f_depid"
38
+ :options='$parent.$parent.depresid' placeholder='请选择'
39
+ condition="f_depid in {}">
40
+ </v-select>
41
+
42
+ </div>
43
+ <div class="col-sm-3 form-group">
44
+ <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
45
+ <v-select id="oper" style="width: 60%"
46
+ :multiple="false"
47
+ @change="$parent.$parent.getOpe"
48
+ :value.sync="model.f_operatorid"
49
+ v-model="model.f_operatorid"
50
+ :options='$parent.$parent.userresid' placeholder='请选择'
51
+ condition="f_operatorid in {}">
52
+ </v-select>
53
+ </div>
54
+ </div>
55
+ <div class="span" style = "float:right;">
56
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
57
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
58
+ <report-excel id='gasprice'></report-excel>
59
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
60
+ 'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
61
+ </div>
62
+ <div class="row" v-show="$parent.$parent.criteriaShow">
63
+ <div class="col-sm-2 form-group">
64
+ <label class="font_normal_body">收费状态</label>
65
+ <v-select :value.sync="$parent.$parent.f_state" multiple
66
+ v-model="$parent.$parent.f_state"
67
+ :options='$parent.$parent.charge_state' placeholder='请选择'
68
+ condition="f_state in {}"
69
+ close-on-select></v-select>
70
+ </div>
71
+ </div>
72
+ </div>
73
+ </criteria>
74
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
75
+ <table class='tableprint' style="margin: 0px auto">
76
+ <thead>
77
+ <tr>
78
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
79
+ <h3 style="text-align: center">收费结账报表</h3>
80
+ </th>
81
+ </tr>
82
+ <tr>
83
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
84
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
85
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
86
+ <!--打印时间:{{{$parent.printTime}}}-->
87
+ 打印时间:{{$parent.printTime}}
88
+ <!--收费员:{{// $parent.operatorname}}-->
89
+ </th>
90
+ </tr>
91
+ <tr>
92
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
93
+ <div>
94
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
95
+ <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>
96
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员:{{$parent.operatorname}}</span>
97
+ </div>
98
+ </th>
99
+ </tr>
100
+ </thead>
101
+ <tr>
102
+ <td :colspan='$parent.spans' class="noborder">
103
+ {{{ model.data.substring(26,model.data.length-8) }}}
104
+ </td>
105
+ </tr>
106
+ <tfoot>
107
+ <tr style="text-align: left">
108
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核:</th>
109
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核:</th>
110
+ <th :colspan='Math.floor($parent.spans/3)'>收款员:</th>
111
+ </tr>
112
+ </tfoot>
113
+ </table>
114
+ </div>
115
+ </criteria-paged>
116
+ </div>
117
+ </template>
118
+
119
+ <script>
120
+ import {DataModel, HttpResetClass} from 'vue-client'
121
+ import co from 'co'
122
+ let getorg = async function (self) {
123
+ new HttpResetClass().load("POST",'rs/sql/singleTableParam',
124
+ {
125
+ data: {
126
+ items: 'name label,id value',
127
+ tablename: 't_department',
128
+ condition: `1=1`
129
+ }
130
+ },
131
+ {resolveMsg: null, rejectMsg: null})
132
+ .then((res) => {
133
+ self.depresid = res.data
134
+ })
135
+ new HttpResetClass().load("POST",'rs/sql/singleTableParam',
136
+ {
137
+ data: {
138
+ items: 'name label,id value',
139
+ tablename: 't_user',
140
+ condition: `state = '在职' and f_department_name is not null`
141
+ }
142
+ },
143
+ {resolveMsg: null, rejectMsg: null})
144
+ .then((res) => {
145
+ self.userresid = res.data
146
+ })
147
+ }
148
+ export default {
149
+ title: '收费结账报表',
150
+ props: ['data'],
151
+ data () {
152
+ return {
153
+ printTime: this.$login.toStandardTimeString(),
154
+ depresid: [],
155
+ userresid: [],
156
+ f_orgid: this.$login.f.orgid,
157
+ f_depid: this.$login.f.depids,
158
+ f_operatorid: this.$login.f.id,
159
+ operatorid: [],
160
+ depid: [],
161
+ orgname: '',
162
+ depname: '',
163
+ criteriaShow: false,
164
+ operatorname: '',
165
+ orgCondtionStr: '1=1',
166
+ f_state:'',
167
+ model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
168
+ f_orgid: 'this.model.f_orgid'}),
169
+ reportStr: null,
170
+ spans: 0,
171
+ initres: {
172
+ org: [this.$login.f.orgid],
173
+ dep: [],
174
+ user: []
175
+ }
176
+ }
177
+ },
178
+ ready () {
179
+ getorg(this)
180
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
181
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
182
+ console.log(this.$login.f)
183
+ },
184
+ methods: {
185
+ searchData () {
186
+ this.$refs.paged.$refs.criteria.search()
187
+ },
188
+ selfSearch (args) {
189
+ this.printTime = this.$login.toStandardTimeString()
190
+ let orgcondition = ''
191
+ if (this.f_orgid[0]) {
192
+ orgcondition += ' and f_orgid in(' + this.f_orgid + ')'
193
+ }
194
+ if(this.f_state && this.f_state[0]) {
195
+ orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
196
+ }
197
+ this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
198
+ this.$refs.paged.search(args)
199
+ },
200
+
201
+ hidden() {
202
+ this.criteriaShow = !this.criteriaShow
203
+ },
204
+ getRes (obj) {
205
+ this.orgname = obj.res[0]
206
+ this.f_orgid = obj.resids
207
+ },
208
+ getDep(val){
209
+ this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
210
+ console.log('dep',this.depname )
211
+ },
212
+ getOpe(val){
213
+ this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
214
+ console.log('operatorname',this.operatorname )
215
+ },
216
+ },
217
+ watch: {
218
+ 'model.data' (val) {
219
+ let len=0
220
+ let a=val.split('</tr>')
221
+ for(let i=0;i<a.length;i++){
222
+ if(a[i].split('</td>').length-1>len){
223
+ len=a[i].split('</td>').length-1
224
+ }
225
+ }
226
+ this.spans = len
227
+ }
228
+ },
229
+ computed: {
230
+ charge_state() {
231
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
232
+ }
233
+ }
234
+ }
235
+ </script>
236
+ <style scoped>
237
+ .noborder{
238
+ border: none;
239
+ }
240
+ </style>
@@ -1,6 +1,5 @@
1
- let specialComp = {
2
- // 收费查询
3
- 'manage-bus-summary': (resolve) => { require(['./ManageBusSummary'], resolve) },
4
- 'report-list': (resolve) => { require(['./reportList'], resolve) }
5
- }
6
- exports.specialComp = specialComp
1
+ let specialComp = {
2
+ // 收费查询
3
+ 'manage-bus-summary': (resolve) => { require(['./ManageBusSummary'], resolve) }
4
+ }
5
+ exports.specialComp = specialComp
package/src/main.js CHANGED
@@ -43,12 +43,12 @@ all()
43
43
  // sale()
44
44
  ldap()
45
45
  system(false)
46
- saleManage('WEINAN')
46
+ saleManage()
47
47
 
48
- webmeterManage('WEINAN')
48
+ webmeterManage()
49
49
  ManageHome()
50
50
  newmanage()
51
- reportManage('WEINAN')
51
+ reportManage('tongchuan')
52
52
  require('system-clients/src/styles/less/bootstrap.less')
53
53
  require('./components/qinhua/Style/qinhuaStyle.less')
54
54
  // require('./bootstrap/less/manageStyle/manageChile.less')
@@ -472,6 +472,14 @@ export default function (filiale) {
472
472
  Vue.component('sell-BySelf-Help', (resolve) => {
473
473
  require(['./components/SellReport/SellBySelfHelp'], resolve)
474
474
  })
475
+ //民用气量统计表
476
+ Vue.component('civil-gas-count', (resolve) => {
477
+ require(['./components/SellReport/CivilGasReport'], resolve)
478
+ })
479
+ //非民用气量统计表
480
+ Vue.component('uncivil-gas-count', (resolve) => {
481
+ require(['./components/SellReport/UnCivilGasReport'], resolve)
482
+ })
475
483
  if (filiale) {
476
484
  let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
477
485
  Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale