manage-client 3.3.167 → 3.3.169-rongchang

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.
package/package.json CHANGED
@@ -1,111 +1,111 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.3.167",
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
- "ldap-clients": "3.0.7",
58
- "less": "^2.7.3",
59
- "mkdirp": "^0.5.1",
60
- "mocha": "^3.2.0",
61
- "moment": "2.24.0",
62
- "ncp": "^2.0.0",
63
- "rimraf": "^2.5.0",
64
- "sale-client": "3.4.14",
65
- "selenium-server": "2.52.0",
66
- "sinon": "^2.1.0",
67
- "sinon-chai": "^2.8.0",
68
- "style": "0.0.3",
69
- "style-loader": "^0.20.3",
70
- "swiper": "^5.4.5",
71
- "system-clients": "3.2.61",
72
- "url-loader": "^0.5.7",
73
- "vue-amap": "0.5.10",
74
- "vue-client": "1.24.136",
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.169-rongchang",
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
+ "ldap-clients": "3.0.7",
58
+ "less": "^2.7.3",
59
+ "mkdirp": "^0.5.1",
60
+ "mocha": "^3.2.0",
61
+ "moment": "2.24.0",
62
+ "ncp": "^2.0.0",
63
+ "rimraf": "^2.5.0",
64
+ "sale-client": "3.4.14",
65
+ "selenium-server": "2.52.0",
66
+ "sinon": "^2.1.0",
67
+ "sinon-chai": "^2.8.0",
68
+ "style": "0.0.3",
69
+ "style-loader": "^0.20.3",
70
+ "swiper": "^5.4.5",
71
+ "system-clients": "3.2.61",
72
+ "url-loader": "^0.5.7",
73
+ "vue-amap": "0.5.10",
74
+ "vue-client": "1.24.136",
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
+ }
@@ -0,0 +1,172 @@
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" :selectin="true" :initres="$parent.$parent.initres" :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
28
+ </div>
29
+ <div class="span" style = "float:right;">
30
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
31
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
32
+ <report-excel id='gasprice'></report-excel>
33
+ </div>
34
+ </div>
35
+ </criteria>
36
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
37
+ <table class='tableprint' style="margin: 0px auto">
38
+ <thead>
39
+ <tr>
40
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
41
+ <h3 style="text-align: center">气量销售报表</h3>
42
+ </th>
43
+ </tr>
44
+ <tr>
45
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
46
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
47
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;<br/>
48
+ <!--打印时间:{{{$parent.printTime}}}-->
49
+ 打印时间:{{$parent.printTime}}
50
+ <!--收费员:{{// $parent.operatorname}}-->
51
+ </th>
52
+ </tr>
53
+ <tr>
54
+ <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
55
+ <div>
56
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司:{{$parent.orgname}}</span>
57
+ <span v-show="$parent.depname"> 部门:{{$parent.depname}}</span>
58
+ <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员:{{$parent.operatorname}}</span>
59
+ </div>
60
+ </th>
61
+ </tr>
62
+ </thead>
63
+ <tr>
64
+ <td :colspan='$parent.spans' class="noborder">
65
+ {{{ model.data.substring(26,model.data.length-8) }}}
66
+ </td>
67
+ </tr>
68
+ <tfoot>
69
+ <tr style="text-align: left">
70
+ <th :colspan='Math.floor($parent.spans/3)'>财务审核:</th>
71
+ <th :colspan='Math.floor($parent.spans/3)'>收款审核:</th>
72
+ <th :colspan='Math.floor($parent.spans/3)'>收款员:</th>
73
+ </tr>
74
+ </tfoot>
75
+ </table>
76
+ {{{ $parent.reportStr}}}
77
+ </div>
78
+ </criteria-paged>
79
+ </div>
80
+ </template>
81
+
82
+ <script>
83
+ import { DataModel } from 'vue-client'
84
+ import co from 'co'
85
+
86
+ export default {
87
+ title: '气量销售报表',
88
+ props: ['data'],
89
+ data () {
90
+ return {
91
+ printTime: this.$login.toStandardTimeString(),
92
+ depresid: [],
93
+ userresid: [],
94
+ f_orgid: this.$login.f.orgid,
95
+ f_depid: this.$login.f.depids,
96
+ // f_operatorid: this.$login.f.id,
97
+ operatorid: [],
98
+ depid: [],
99
+ orgname: '',
100
+ depname: '',
101
+ criteriaShow: false,
102
+ operatorname: '',
103
+ orgCondtionStr: '1=1',
104
+ model: new DataModel('api/af-revenue/report/rc_sell_report', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
105
+ f_orgid: 'this.model.f_orgid'}),
106
+ reportStr: null,
107
+ resshow:['company','department','operator'],
108
+ spans: 0,
109
+ initres: {
110
+ org: [this.$login.f.orgid],
111
+ dep: [],
112
+ user: []
113
+ }
114
+ }
115
+ },
116
+ ready () {
117
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
118
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
119
+ console.log(this.$login.f)
120
+ },
121
+ methods: {
122
+ searchData () {
123
+ this.$refs.paged.$refs.criteria.search()
124
+ },
125
+ selfSearch (args) {
126
+ this.printTime = this.$login.toStandardTimeString()
127
+ let orgcondition = '1=1'
128
+ let orgstr = this.orgCondtionStr
129
+ orgcondition = orgcondition + orgstr
130
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
131
+ this.$refs.paged.search(args)
132
+ },
133
+ hidden() {
134
+ this.criteriaShow = !this.criteriaShow
135
+ },
136
+ getRes (condition, obj) {
137
+ this.orgCondtionStr = condition
138
+ this.orgname = obj.orgnames[0]
139
+ this.depname = obj.depnames[0]
140
+ this.operatorname = obj.operatornames[0]
141
+ },
142
+ getdep (obj, val) {
143
+ this.depname = val[0]
144
+ this.userresid = obj
145
+ this.f_depid = obj
146
+ },
147
+ getuser ( obj, val) {
148
+ this.operatorname = val[0]
149
+ this.f_operatorid = obj
150
+ }
151
+ },
152
+ watch: {
153
+ 'model.data' (val) {
154
+ let len=0
155
+ let a=val.split('</tr>')
156
+ for(let i=0;i<a.length;i++){
157
+ if(a[i].split('</td>').length-1>len){
158
+ len=a[i].split('</td>').length-1
159
+ }
160
+ }
161
+ this.spans = len
162
+ }
163
+ },
164
+ computed: {
165
+ }
166
+ }
167
+ </script>
168
+ <style scoped>
169
+ .noborder{
170
+ border: none;
171
+ }
172
+ </style>
@@ -82,6 +82,7 @@
82
82
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
83
83
  <v-select :value.sync="model.f_inputtor"
84
84
  v-model="model.f_inputtor"
85
+ condition="f_inputtor in {}"
85
86
  :options='$parent.$parent.inputtor' placeholder='请选择'
86
87
  multiple = "true"
87
88
  close-on-select></v-select>
@@ -347,15 +348,15 @@
347
348
  this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
348
349
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
349
350
  //抄表员查询条件
350
- this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
351
- if(this.inputtouPerson.length !== 0){
352
- let str = JSON.stringify(this.inputtouPerson)
353
- str = str.replace(/"/g,`'`)
354
- str = str.replace(/\[/g,``)
355
- str = str.replace(/\]/g,``)
356
- //查询多个抄表员时条件
357
- this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
358
- }
351
+ // this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
352
+ // if(this.inputtouPerson.length !== 0){
353
+ // let str = JSON.stringify(this.inputtouPerson)
354
+ // str = str.replace(/"/g,`'`)
355
+ // str = str.replace(/\[/g,``)
356
+ // str = str.replace(/\]/g,``)
357
+ // //查询多个抄表员时条件
358
+ // this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
359
+ // }
359
360
 
360
361
  args.condition = `${args.condition} ` + this.orgCondtionStr
361
362
  this.model.search(args.condition, args.model)
@@ -210,7 +210,7 @@
210
210
  </template>
211
211
  <template partial='body' partial='list'>
212
212
  <tr >
213
- <td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
213
+ <td style="text-align: left;"><nobr> <span @click="$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
214
214
  <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
215
215
  <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
216
216
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
@@ -218,7 +218,7 @@
218
218
  </template>
219
219
  <template partial='body' partial='list'>
220
220
  <tr >
221
- <td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
221
+ <td style="text-align: left;"><nobr> <span @click="$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
222
222
  <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
223
223
  <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
224
224
  <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
@@ -106,6 +106,7 @@
106
106
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
107
107
  <v-select :value.sync="model.f_inputtor"
108
108
  v-model="model.f_inputtor"
109
+ condition="f_inputtor in {}"
109
110
  :options='$parent.$parent.inputtor' placeholder='请选择'
110
111
  multiple = "true"
111
112
  close-on-select></v-select>
@@ -472,15 +473,17 @@
472
473
  this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
473
474
  this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
474
475
  //抄表员查询条件
475
- this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
476
- if(this.inputtouPerson.length !== 0){
477
- let str = JSON.stringify(this.inputtouPerson)
478
- str = str.replace(/"/g,`'`)
479
- str = str.replace(/\[/g,``)
480
- str = str.replace(/\]/g,``)
481
- //查询多个抄表员时条件
482
- this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
483
- }
476
+ // console.log('抄表员==================>', this.$refs.paged.$refs.cri.model.f_inputtor)
477
+ // console.log('抄表员==================>', this.inputtouPerson)
478
+ // this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
479
+ // if(this.inputtouPerson.length !== 0){
480
+ // let str = JSON.stringify(this.inputtouPerson)
481
+ // str = str.replace(/"/g,`'`)
482
+ // str = str.replace(/\[/g,``)
483
+ // str = str.replace(/\]/g,``)
484
+ // //查询多个抄表员时条件
485
+ // this.orgCondtionStr += ` and f_inputtor in ( ${str} )`
486
+ // }
484
487
  args.condition = `${args.condition} ` + this.orgCondtionStr
485
488
  this.model.search(args.condition, args.model)
486
489
  this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -346,10 +346,9 @@
346
346
  let year = new Date().getFullYear()
347
347
  self.$refs.paged.$refs.cri.model.startDate = year+'-01-01 00:00:00'
348
348
  self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
349
- self.$refs.paged.$refs.cri.model.notappear='不包含'
350
- self.$refs.paged.$refs.cri.model.SLday1=10
349
+ self.$refs.paged.$refs.cri.model.notappear='包含'
351
350
  self.$refs.paged.$refs.cri.model.f_user_state='正常'
352
- self.$refs.paged.$refs.cri.search()
351
+ // self.$refs.paged.$refs.cri.search()
353
352
  }
354
353
  export default {
355
354
  title: '失联分析',
@@ -757,4 +757,8 @@ export default function () {
757
757
  Vue.component('tz-bus-summary', (resolve) => {
758
758
  require(['./components/SellReport/taizhou/ManageBusSummary'], resolve)
759
759
  })
760
+ // 报表展示组件(荣昌-气量销售报表)
761
+ Vue.component('rc-sell-data', (resolve) => {
762
+ require(['./components/SellReport/rongchang/RcSellData'], resolve)
763
+ })
760
764
  }
package/.npmignore DELETED
@@ -1,10 +0,0 @@
1
- src/bootstrap
2
- .idea/
3
- .DS_Store
4
- node_modules/
5
- dist/static/*.map
6
- npm-debug.log
7
- selenium-debug.log
8
- test/unit/coverage
9
- test/e2e/reports
10
- yarn.lock
package/build/.npmignore DELETED
@@ -1 +0,0 @@
1
-