manage-client 3.3.271 → 3.3.272-xh2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package.json +111 -111
  2. package/src/components/SellReport/PublicGasPrice2Report.vue +261 -0
  3. package/src/components/SellReport/xihu/XHKFReport.vue +175 -0
  4. package/src/components/SellReport/xihu/XHManageSummary.vue +2 -2
  5. package/src/components/SellReport/xihu/XHNewManageSummary.vue +182 -182
  6. package/src/components/SellReport/xihu/XHOtherChargeSummary.vue +175 -0
  7. package/src/reportManage.js +12 -0
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.3.271",
4
- "description": "经营管控模块前台组件",
5
- "main": "src/index.js",
6
- "directories": {
7
- "test": "test"
8
- },
9
- "dependencies": {
10
- "crypto-js": "^4.1.1",
11
- "swiper": "^5.4.5"
12
- },
13
- "devDependencies": {
14
- "axios": "0.15.3",
15
- "babel-core": "^6.0.0",
16
- "babel-loader": "^6.0.0",
17
- "babel-plugin-transform-runtime": "^6.0.0",
18
- "babel-preset-es2015": "^6.0.0",
19
- "babel-preset-stage-2": "^6.0.0",
20
- "chai": "^3.5.0",
21
- "co": "^4.6.0",
22
- "connect-history-api-fallback": "^1.1.0",
23
- "cross-env": "^1.0.7",
24
- "cross-spawn": "^2.1.5",
25
- "css-loader": "^0.23.0",
26
- "echarts": "^4.1.0",
27
- "eslint": "^2.0.0",
28
- "eslint-config-standard": "^5.1.0",
29
- "eslint-friendly-formatter": "^1.2.2",
30
- "eslint-loader": "^1.3.0",
31
- "eslint-plugin-html": "^1.3.0",
32
- "eslint-plugin-promise": "^1.0.8",
33
- "eslint-plugin-standard": "^1.3.2",
34
- "eslint-plugin-vue": "^0.1.1",
35
- "eventsource-polyfill": "^0.9.6",
36
- "express": "^4.13.3",
37
- "extract-text-webpack-plugin": "^1.0.1",
38
- "filemanager-webpack-plugin": "^2.0.5",
39
- "file-loader": "^0.8.4",
40
- "function-bind": "^1.0.2",
41
- "html-webpack-plugin": "^2.8.1",
42
- "http-proxy-middleware": "^0.11.0",
43
- "inject-loader": "^2.0.1",
44
- "isparta-loader": "^2.0.0",
45
- "jasmine-core": "^2.4.1",
46
- "jquery": "^3.3.1",
47
- "jsencrypt": "3.0.0-rc.1",
48
- "json-loader": "^0.5.4",
49
- "karma": "^1.4.1",
50
- "karma-chrome-launcher": "^2.2.0",
51
- "karma-coverage": "^1.1.1",
52
- "karma-mocha": "^1.3.0",
53
- "karma-sinon-chai": "^1.3.1",
54
- "karma-sourcemap-loader": "^0.3.7",
55
- "karma-spec-reporter": "0.0.31",
56
- "karma-webpack": "^2.0.2",
57
- "less": "^2.7.3",
58
- "mkdirp": "^0.5.1",
59
- "mocha": "^3.2.0",
60
- "moment": "2.24.0",
61
- "ncp": "^2.0.0",
62
- "rimraf": "^2.5.0",
63
- "sale-client": "3.4.14",
64
- "selenium-server": "2.52.0",
65
- "sinon": "^2.1.0",
66
- "sinon-chai": "^2.8.0",
67
- "style": "0.0.3",
68
- "style-loader": "^0.20.3",
69
- "swiper": "^5.4.5",
70
- "system-clients": "3.3.2",
71
- "ldap-clients": "3.0.96",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.162",
75
- "vue-hot-reload-api": "^1.2.0",
76
- "vue-html-loader": "^1.0.0",
77
- "vue-loader": "8.2.1",
78
- "vue-resource": "^1.5.0",
79
- "vue-router": "^0.7.13",
80
- "vue-strap": "^1.0.9",
81
- "vue-style-loader": "^1.0.0",
82
- "vue-validator": "2.1.7",
83
- "webpack": "1.12.2",
84
- "webpack-dev-middleware": "^1.4.0",
85
- "webpack-hot-middleware": "^2.6.0",
86
- "webpack-merge": "^0.8.3",
87
- "webpack-parallel-uglify-plugin": "^1.0.0"
88
- },
89
- "scripts": {
90
- "unit": "karma start test/unit/karma.conf.js --single-run",
91
- "example": "node build/example-server.js",
92
- "dev": "node build/dev-server.js",
93
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
- "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
- "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
- "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
- "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
- "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
- "e2e": "node test/e2e/runner.js",
100
- "release": "bash build/release.sh"
101
- },
102
- "repository": {
103
- "type": "git",
104
- "url": "https://gitee.com/aote/management_modules.git"
105
- },
106
- "keywords": [
107
- "manage"
108
- ],
109
- "author": "liuxudong",
110
- "license": "ISC"
111
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.3.272-xh2",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "crypto-js": "^4.1.1",
11
+ "swiper": "^5.4.5"
12
+ },
13
+ "devDependencies": {
14
+ "axios": "0.15.3",
15
+ "babel-core": "^6.0.0",
16
+ "babel-loader": "^6.0.0",
17
+ "babel-plugin-transform-runtime": "^6.0.0",
18
+ "babel-preset-es2015": "^6.0.0",
19
+ "babel-preset-stage-2": "^6.0.0",
20
+ "chai": "^3.5.0",
21
+ "co": "^4.6.0",
22
+ "connect-history-api-fallback": "^1.1.0",
23
+ "cross-env": "^1.0.7",
24
+ "cross-spawn": "^2.1.5",
25
+ "css-loader": "^0.23.0",
26
+ "echarts": "^4.1.0",
27
+ "eslint": "^2.0.0",
28
+ "eslint-config-standard": "^5.1.0",
29
+ "eslint-friendly-formatter": "^1.2.2",
30
+ "eslint-loader": "^1.3.0",
31
+ "eslint-plugin-html": "^1.3.0",
32
+ "eslint-plugin-promise": "^1.0.8",
33
+ "eslint-plugin-standard": "^1.3.2",
34
+ "eslint-plugin-vue": "^0.1.1",
35
+ "eventsource-polyfill": "^0.9.6",
36
+ "express": "^4.13.3",
37
+ "extract-text-webpack-plugin": "^1.0.1",
38
+ "filemanager-webpack-plugin": "^2.0.5",
39
+ "file-loader": "^0.8.4",
40
+ "function-bind": "^1.0.2",
41
+ "html-webpack-plugin": "^2.8.1",
42
+ "http-proxy-middleware": "^0.11.0",
43
+ "inject-loader": "^2.0.1",
44
+ "isparta-loader": "^2.0.0",
45
+ "jasmine-core": "^2.4.1",
46
+ "jquery": "^3.3.1",
47
+ "jsencrypt": "3.0.0-rc.1",
48
+ "json-loader": "^0.5.4",
49
+ "karma": "^1.4.1",
50
+ "karma-chrome-launcher": "^2.2.0",
51
+ "karma-coverage": "^1.1.1",
52
+ "karma-mocha": "^1.3.0",
53
+ "karma-sinon-chai": "^1.3.1",
54
+ "karma-sourcemap-loader": "^0.3.7",
55
+ "karma-spec-reporter": "0.0.31",
56
+ "karma-webpack": "^2.0.2",
57
+ "less": "^2.7.3",
58
+ "mkdirp": "^0.5.1",
59
+ "mocha": "^3.2.0",
60
+ "moment": "2.24.0",
61
+ "ncp": "^2.0.0",
62
+ "rimraf": "^2.5.0",
63
+ "sale-client": "3.4.14",
64
+ "selenium-server": "2.52.0",
65
+ "sinon": "^2.1.0",
66
+ "sinon-chai": "^2.8.0",
67
+ "style": "0.0.3",
68
+ "style-loader": "^0.20.3",
69
+ "swiper": "^5.4.5",
70
+ "system-clients": "3.3.2",
71
+ "ldap-clients": "3.0.96",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.162",
75
+ "vue-hot-reload-api": "^1.2.0",
76
+ "vue-html-loader": "^1.0.0",
77
+ "vue-loader": "8.2.1",
78
+ "vue-resource": "^1.5.0",
79
+ "vue-router": "^0.7.13",
80
+ "vue-strap": "^1.0.9",
81
+ "vue-style-loader": "^1.0.0",
82
+ "vue-validator": "2.1.7",
83
+ "webpack": "1.12.2",
84
+ "webpack-dev-middleware": "^1.4.0",
85
+ "webpack-hot-middleware": "^2.6.0",
86
+ "webpack-merge": "^0.8.3",
87
+ "webpack-parallel-uglify-plugin": "^1.0.0"
88
+ },
89
+ "scripts": {
90
+ "unit": "karma start test/unit/karma.conf.js --single-run",
91
+ "example": "node build/example-server.js",
92
+ "dev": "node build/dev-server.js",
93
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
94
+ "oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
95
+ "build": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_ENTRY=reportManage webpack --progress --hide-modules --config build/webpack.prod.conf.js && cross-env VUE_APP_BUILDEND=true VUE_APP_ENTRY=webmeterManage webpack --progress --hide-modules --config build/webpack.prod.conf.js",
96
+ "buildSaleManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=saleManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
97
+ "buildReportManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=reportManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
98
+ "buildWebmeterManage": "rimraf lib && mkdirp lib && cross-env VUE_APP_ENTRY=webmeterManage VUE_APP_SINGLE=true webpack --progress --hide-modules --config build/webpack.prod.conf.js",
99
+ "e2e": "node test/e2e/runner.js",
100
+ "release": "bash build/release.sh"
101
+ },
102
+ "repository": {
103
+ "type": "git",
104
+ "url": "https://gitee.com/aote/management_modules.git"
105
+ },
106
+ "keywords": [
107
+ "manage"
108
+ ],
109
+ "author": "liuxudong",
110
+ "license": "ISC"
111
+ }
package/src/components/SellReport/PublicGasPrice2Report.vue ADDED
@@ -0,0 +1,261 @@
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"></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
+ @res-select="$parent.$parent.getdep"
35
+ :parentresid ="$parent.$parent.depresid"
36
+ :initresid='$parent.$parent.depid'>
37
+ </res-select>
38
+
39
+ </div>
40
+ <div class="col-sm-2 form-group">
41
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
42
+ <res-select restype='user'
43
+ @res-select="$parent.$parent.getuser"
44
+ :parentresid="$parent.$parent.userresid"
45
+ :initresid='$parent.$parent.operatorid'>
46
+ </res-select>
47
+ </div>
48
+ <div class="col-sm-2 form-group">
49
+ <label class="font_normal_body" title="分组项一">分组项一</label>
50
+ <v-select :value.sync="model.f_public_group1"
51
+ v-model="model.f_public_group1"
52
+ v-ref:groupone
53
+ :options='$parent.$parent.group1' placeholder='请选择'
54
+ close-on-select></v-select>
55
+ </div>
56
+ <div class="col-sm-2 form-group">
57
+ <label class="font_normal_body" title="分组项二">分组项二</label>
58
+ <v-select :value.sync="model.f_public_group2"
59
+ v-ref:grouptwo
60
+ v-model="model.f_public_group2"
61
+ :options='$parent.$parent.group2' placeholder='请选择'
62
+ close-on-select></v-select>
63
+ </div>
64
+ <div style = "float:right;">
65
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
66
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
67
+ <report-excel id='gasprice'></report-excel>
68
+ </div>
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" v-if="!$parent.data.f_files_path">
74
+ <thead>
75
+ <tr>
76
+ <th colspan='5' style="font-weight: bold; text-align: left;">
77
+ <h3 style="text-align: center">气费分项统计报表</h3>
78
+ </th>
79
+ </tr>
80
+ <tr>
81
+ <th colspan='5' style="font-weight: normal; text-align: center;">
82
+ 开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
83
+ 结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
84
+ </th>
85
+ </tr>
86
+ <tr>
87
+ <th colspan='5' style="font-weight: normal; text-align: center;">
88
+ 打印时间：{{{$parent.printTime}}}
89
+ </th>
90
+ </tr>
91
+ <tr>
92
+ <th colspan='5' style="font-weight: normal; text-align: center;">
93
+ <div>
94
+ <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
95
+ <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
96
+ </div>
97
+ </th>
98
+ </tr>
99
+ </thead>
100
+ <tr>
101
+ <td colspan='5' style="font-weight: normal;" id="test">
102
+ {{{ model.data.substring(26,model.data.length-8) }}}
103
+ </td>
104
+ </tr>
105
+ <!-- <tfoot>-->
106
+ <!-- <tr style="text-align: left">-->
107
+ <!-- <th colspan='3' style="font-weight: normal; text-align: center;">-->
108
+ <!-- 收款人：-->
109
+ <!-- </th><th colspan='3' style="font-weight: normal; text-align: center;">-->
110
+ <!-- 审核人：-->
111
+ <!-- </th><th colspan='2' style="font-weight: normal; text-align: center;">-->
112
+ <!-- 经手人：-->
113
+ <!-- </th>-->
114
+ <!-- </tr>-->
115
+ <!-- </tfoot>-->
116
+ </table>
117
+ {{{ $parent.reportStr}}}
118
+ </div>
119
+ </criteria-paged>
120
+ </div>
121
+ </template>
122
+
123
+ <script>
124
+ import { DataModel } from 'vue-client'
125
+ import co from 'co'
126
+ export default {
127
+ title: '气费分项统计报表',
128
+ props: ['data'],
129
+ data () {
130
+ return {
131
+ printTime: this.$login.toStandardTimeString(),
132
+ depresid: [],
133
+ userresid: [],
134
+ initres: {
135
+ org:[this.$login.f.orgid],
136
+ dep:[],
137
+ user:[]
138
+ },
139
+ f_public_group1: '',
140
+ f_public_group2: '',
141
+ f_orgid: this.$login.f.orgid,
142
+ f_depid: this.$login.f.depids,
143
+ f_operatorid: this.$login.f.id,
144
+ operatorid: [],
145
+ depid: [],
146
+ orgname: '',
147
+ group1Name: '',
148
+ group2Name: '',
149
+ depname: '',
150
+ operatorname: '',
151
+ orgCondtionStr: '1=1',
152
+ model: new DataModel('api/af-revenue/report/PublicGasPriceReport2',
153
+ {startDate: 'this.model.startDate',
154
+ endDate: 'this.model.endDate',
155
+ f_orgid: 'this.model.f_orgid',
156
+ f_public_group1: 'this.model.f_public_group1[0]',
157
+ f_public_group2: 'this.model.f_public_group2[0]',
158
+ group1Name: 'this.model.group1Name',
159
+ group2Name: 'this.model.group2Name'
160
+ }
161
+ ),
162
+ reportStr: null,
163
+ show: false,
164
+ spans: ''
165
+ }
166
+ },
167
+ ready () {
168
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
169
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
170
+ // this.$refs.paged.$refs.criteria.search()
171
+ },
172
+ methods: {
173
+ searchData () {
174
+ this.$refs.paged.$refs.criteria.search()
175
+ },
176
+ selfSearch (args) {
177
+ this.printTime = this.$login.toStandardTimeString()
178
+ this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
179
+ this.$refs.paged.$refs.criteria.model.group2Name = this.$refs.paged.$refs.criteria.$refs.grouptwo.selectedItems
180
+ let orgcondition = '1 = 1'
181
+ if (this.f_orgid[0]) {
182
+ orgcondition += ` and f_orgid in ('${this.f_orgid}')`
183
+ }
184
+ if (this.f_depid[0]) {
185
+ orgcondition += ` and f_depid in ('${this.f_depid}')`
186
+ }
187
+ if(this.f_operatorid[0]) {
188
+ orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
189
+ }
190
+ let name1 = args.model.f_public_group1
191
+ let name2 = args.model.f_public_group2
192
+ if (name1 == null || name1 == '' || name2 == null || name2 == ''){
193
+ alert("请选择分组项！！！")
194
+ return
195
+ }
196
+ if (name2.toString() == name1.toString()){
197
+ alert("分组项一与分组项二不能重复！！！")
198
+ return
199
+ }
200
+ console.log(args.model.f_public_group1)
201
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
202
+ this.$refs.paged.search(args)
203
+ },
204
+ getRes (obj) {
205
+ this.orgname = obj.res[0]
206
+ this.depresid = obj.resids
207
+ this.f_orgid = obj.resids
208
+ },
209
+ getdep (obj, val) {
210
+ this.depname = val[0]
211
+ this.userresid = obj
212
+ this.f_depid = obj
213
+ },
214
+ getuser ( obj, val) {
215
+ this.operatorname = val[0]
216
+ this.f_operatorid = obj
217
+ }
218
+ },
219
+ watch: {
220
+ 'data' (val) {
221
+ if (val.f_files_path) {
222
+ this.getFileContent(val.f_files_path)
223
+ } else {
224
+ this.reportStr = null
225
+ }
226
+ },
227
+ 'model.data' (val) {
228
+ let tab = document.getElementById('test').children[0]
229
+ var tds = tab.getElementsByTagName('td')
230
+ var num = 0
231
+ for (let td of tds) {
232
+ let span = td.getAttribute('colspan')
233
+ num = num + ((span ? span : 1) - 0)
234
+ }
235
+ this.spans = num
236
+ }
237
+ },
238
+ computed: {
239
+ group1() {
240
+ return [{label:'用户类型', value:'f_user_type'},
241
+ {label:'用气性质', value:'f_gasproperties'},
242
+ {label:'用户标签', value:'f_user_tags'},
243
+ {label:'用气类型', value:'f_user_gas_type'},
244
+ {label:'气价名称 ', value:'f_price_name'}]
245
+ },
246
+ group2() {
247
+ return [{label:'用户类型', value:'f_user_type'},
248
+ {label:'用气性质', value:'f_gasproperties'},
249
+ {label:'气价名称', value:'f_price_name'},
250
+ {label:'用户标签', value:'f_user_tags'},
251
+ {label:'用气类型', value:'f_user_gas_type'},
252
+ {label:'单价', value:'f_stair_price'}]
253
+ }
254
+ }
255
+ }
256
+ </script>
257
+ <style scoped>
258
+ .noborder{
259
+ border: none;
260
+ }
261
+ </style>
package/src/components/SellReport/xihu/XHKFReport.vue ADDED
@@ -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/xh_kf_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
108
+ f_orgid: 'this.model.f_orgid'}),
109
+ reportStr: null,
110
+ resshow: ['company', 'department', 'operator'],
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>
package/src/components/SellReport/xihu/XHManageSummary.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  v-model="model.startDate"
11
11
  :value.sync="model.startDate"
12
12
  :disabled-days-of-Week="[]"
13
- :format="'yyyy-MM-dd HH:mm:ss'"
13
+ :format="'yyyy-MM-dd'"
14
14
  :show-reset-button="reset">
15
15
  </datepicker>
16
16
  </div>
@@ -20,7 +20,7 @@
20
20
  v-model="model.endDate"
21
21
  :value.sync="model.endDate"
22
22
  :disabled-days-of-Week="[]"
23
- :format="'yyyy-MM-dd HH:mm:ss'"
23
+ :format="'yyyy-MM-dd'"
24
24
  :show-reset-button="reset">
25
25
  </datepicker>
26
26
  </div>
package/src/components/SellReport/xihu/XHNewManageSummary.vue CHANGED
@@ -1,182 +1,182 @@
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
- <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.printTime}}}-->
53
- <!--收费员：{{// $parent.operatorname}}-->
54
- </th>
55
- </tr>
56
- <tr v-if="false">
57
- <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
58
- <div>
59
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
60
- <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
61
- <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
62
- </div>
63
- </th>
64
- </tr>
65
- </thead>
66
- <tr>
67
- <td :colspan='$parent.spans' class="noborder">
68
- {{{ model.data.substring(26,model.data.length-8) }}}
69
- </td>
70
- </tr>
71
- <tfoot>
72
- <!-- <tr style="text-align: left">-->
73
- <!-- <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>-->
74
- <!-- <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>-->
75
- <!-- <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>-->
76
- <!-- </tr>-->
77
- </tfoot>
78
- </table>
79
- {{{ $parent.reportStr}}}
80
- </div>
81
- </criteria-paged>
82
- </div>
83
- </template>
84
-
85
- <script>
86
- import { DataModel } from 'vue-client'
87
- import co from 'co'
88
- export default {
89
- title: '新收费结账报表',
90
- props: ['data'],
91
- data () {
92
- return {
93
- printTime: this.$login.toStandardTimeString(),
94
- depresid: [],
95
- userresid: [],
96
- f_orgid: this.$login.f.orgid,
97
- f_depid: this.$login.f.depids,
98
- // f_operatorid: this.$login.f.id,
99
- operatorid: [],
100
- depid: [],
101
- orgname: '',
102
- depname: '',
103
- criteriaShow: false,
104
- operatorname: '',
105
- orgCondtionStr: '1=1',
106
- f_user_type: '',
107
- f_state: ['有效'],
108
- model: new DataModel('api/af-revenue/report/xh_new_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
109
- f_orgid: 'this.model.f_orgid'}),
110
- reportStr: null,
111
- resshow: ['company', 'department', 'operator'],
112
- spans: 0,
113
- initres: {
114
- org: [this.$login.f.orgid],
115
- dep: [],
116
- user: []
117
- }
118
- }
119
- },
120
- ready () {
121
- this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
122
- this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
123
- },
124
- methods: {
125
- searchData () {
126
- this.$refs.paged.$refs.criteria.search()
127
- },
128
- selfSearch (args) {
129
- this.printTime = this.$login.toStandardTimeString()
130
- let orgcondition = '1=1'
131
- let orgstr = this.orgCondtionStr
132
- orgcondition = orgcondition + orgstr
133
- this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
134
- this.$refs.paged.search(args)
135
- },
136
-
137
- hidden () {
138
- this.criteriaShow = !this.criteriaShow
139
- },
140
- getRes (condition, obj) {
141
- this.orgCondtionStr = condition
142
- this.orgname = obj.orgnames[0]
143
- this.depname = obj.depnames[0]
144
- this.operatorname = obj.operatornames[0]
145
- },
146
- getdep (obj, val) {
147
- this.depname = val[0]
148
- this.userresid = obj
149
- this.f_depid = obj
150
- },
151
- getuser ( obj, val) {
152
- this.operatorname = val[0]
153
- this.f_operatorid = obj
154
- }
155
- },
156
- watch: {
157
- 'model.data' (val) {
158
- let len=0
159
- let a=val.split('</tr>')
160
- for(let i=0;i<a.length;i++){
161
- if(a[i].split('</td>').length-1>len){
162
- len=a[i].split('</td>').length-1
163
- }
164
- }
165
- this.spans = len
166
- }
167
- },
168
- computed: {
169
- charge_state () {
170
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
171
- },
172
- user_type () {
173
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
174
- }
175
- }
176
- }
177
- </script>
178
- <style scoped>
179
- .noborder{
180
- border: none;
181
- }
182
- </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
+ <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.printTime}}}-->
53
+ <!--收费员：{{// $parent.operatorname}}-->
54
+ </th>
55
+ </tr>
56
+ <tr v-if="false">
57
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
58
+ <div>
59
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
60
+ <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
61
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
62
+ </div>
63
+ </th>
64
+ </tr>
65
+ </thead>
66
+ <tr>
67
+ <td :colspan='$parent.spans' class="noborder">
68
+ {{{ model.data.substring(26,model.data.length-8) }}}
69
+ </td>
70
+ </tr>
71
+ <tfoot>
72
+ <!-- <tr style="text-align: left">-->
73
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>-->
74
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>-->
75
+ <!-- <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>-->
76
+ <!-- </tr>-->
77
+ </tfoot>
78
+ </table>
79
+ {{{ $parent.reportStr}}}
80
+ </div>
81
+ </criteria-paged>
82
+ </div>
83
+ </template>
84
+
85
+ <script>
86
+ import { DataModel } from 'vue-client'
87
+ import co from 'co'
88
+ export default {
89
+ title: '新收费结账报表',
90
+ props: ['data'],
91
+ data () {
92
+ return {
93
+ printTime: this.$login.toStandardTimeString(),
94
+ depresid: [],
95
+ userresid: [],
96
+ f_orgid: this.$login.f.orgid,
97
+ f_depid: this.$login.f.depids,
98
+ // f_operatorid: this.$login.f.id,
99
+ operatorid: [],
100
+ depid: [],
101
+ orgname: '',
102
+ depname: '',
103
+ criteriaShow: false,
104
+ operatorname: '',
105
+ orgCondtionStr: '1=1',
106
+ f_user_type: '',
107
+ f_state: ['有效'],
108
+ model: new DataModel('api/af-revenue/report/xh_new_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
109
+ f_orgid: 'this.model.f_orgid'}),
110
+ reportStr: null,
111
+ resshow: ['company', 'department', 'operator'],
112
+ spans: 0,
113
+ initres: {
114
+ org: [this.$login.f.orgid],
115
+ dep: [],
116
+ user: []
117
+ }
118
+ }
119
+ },
120
+ ready () {
121
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
122
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
123
+ },
124
+ methods: {
125
+ searchData () {
126
+ this.$refs.paged.$refs.criteria.search()
127
+ },
128
+ selfSearch (args) {
129
+ this.printTime = this.$login.toStandardTimeString()
130
+ let orgcondition = '1=1'
131
+ let orgstr = this.orgCondtionStr
132
+ orgcondition = orgcondition + orgstr
133
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
134
+ this.$refs.paged.search(args)
135
+ },
136
+
137
+ hidden () {
138
+ this.criteriaShow = !this.criteriaShow
139
+ },
140
+ getRes (condition, obj) {
141
+ this.orgCondtionStr = condition
142
+ this.orgname = obj.orgnames[0]
143
+ this.depname = obj.depnames[0]
144
+ this.operatorname = obj.operatornames[0]
145
+ },
146
+ getdep (obj, val) {
147
+ this.depname = val[0]
148
+ this.userresid = obj
149
+ this.f_depid = obj
150
+ },
151
+ getuser ( obj, val) {
152
+ this.operatorname = val[0]
153
+ this.f_operatorid = obj
154
+ }
155
+ },
156
+ watch: {
157
+ 'model.data' (val) {
158
+ let len=0
159
+ let a=val.split('</tr>')
160
+ for(let i=0;i<a.length;i++){
161
+ if(a[i].split('</td>').length-1>len){
162
+ len=a[i].split('</td>').length-1
163
+ }
164
+ }
165
+ this.spans = len
166
+ }
167
+ },
168
+ computed: {
169
+ charge_state () {
170
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
171
+ },
172
+ user_type () {
173
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
174
+ }
175
+ }
176
+ }
177
+ </script>
178
+ <style scoped>
179
+ .noborder{
180
+ border: none;
181
+ }
182
+ </style>
package/src/components/SellReport/xihu/XHOtherChargeSummary.vue ADDED
@@ -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/xh_other_charge', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
108
+ f_orgid: 'this.model.f_orgid'}),
109
+ reportStr: null,
110
+ resshow: ['company', 'department', 'operator'],
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>
package/src/reportManage.js CHANGED
@@ -758,6 +758,10 @@ export default function () {
758
758
  Vue.component('public-gas-price-report', (resolve) => {
759
759
  require(['./components/SellReport/PublicGasPriceReport'], resolve)
760
760
  })
761
+ // 气价分布通用报表2
762
+ Vue.component('public-gas-price2-report', (resolve) => {
763
+ require(['./components/SellReport/PublicGasPrice2Report'], resolve)
764
+ })
761
765
  // 运城 居民用户各项数据统计表（月报）
762
766
  Vue.component('yc-month-summary', (resolve) => {
763
767
  require(['./components/SellReport/YCMonthSummary'], resolve)
@@ -782,6 +786,14 @@ export default function () {
782
786
  Vue.component('xh-new-manage-summary', (resolve) => {
783
787
  require(['./components/SellReport/xihu/XHNewManageSummary'], resolve)
784
788
  })
789
+ // 西户客户部操作报表
790
+ Vue.component('xh-kf-report', (resolve) => {
791
+ require(['./components/SellReport/xihu/XHKFReport'], resolve)
792
+ })
793
+ // 西户其他收费
794
+ Vue.component('xh-other-charge-summary', (resolve) => {
795
+ require(['./components/SellReport/xihu/XHOtherChargeSummary'], resolve)
796
+ })
785
797
  // 发票汇总报表
786
798
  Vue.component('eticket-summary', (resolve) => {
787
799
  require(['./components/SellReport/EticketSummary'], resolve)