manage-client 3.2.177 → 3.2.179
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/build/dev-server.js +3 -3
- package/build/webpack.oldprod.conf.js +60 -0
- package/package.json +2 -1
- package/src/components/daping/CallCenter.vue +5 -5
- package/src/components/daping/json/dataManage(bak).json +30 -0
- package/src/components/daping/json/dataManage.json +1 -28
- package/src/components/sale/businessquery/ArrearsQuery.vue +7 -4
- package/src/filiale/WEINAN/NewAccountQuery.vue +1 -1
- package/src/filiale/meihekou/HandplanQuery.vue +2 -2
- package/src/filiale/meihekou/YingShouMingXi.vue +21 -3
package/build/dev-server.js
CHANGED
|
@@ -13,8 +13,8 @@ var compiler = webpack(config)
|
|
|
13
13
|
// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
|
|
14
14
|
var shaoguan = 'http://119.146.1.106:8300/'
|
|
15
15
|
var qtx= 'http://36.103.222.144:6300/'
|
|
16
|
-
var bendi = 'http://192.168.50.4:8400'
|
|
17
|
-
|
|
16
|
+
// var bendi = 'http://192.168.50.4:8400'
|
|
17
|
+
var bendi = 'http://203.57.101.233:9001'
|
|
18
18
|
var fuwu = 'http://172.168.1.11:9001/'
|
|
19
19
|
// var fuwu = 'http://203.57.101.233:9001'
|
|
20
20
|
var system = 'http://192.168.50.4:8400'
|
|
@@ -173,7 +173,7 @@ app.use('/static', express.static('./static'))
|
|
|
173
173
|
// })
|
|
174
174
|
// })
|
|
175
175
|
|
|
176
|
-
module.exports = app.listen(
|
|
176
|
+
module.exports = app.listen(8015, function (err) {
|
|
177
177
|
if (err) {
|
|
178
178
|
console.log(err)
|
|
179
179
|
return
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
var webpack = require('webpack')
|
|
2
|
+
var merge = require('webpack-merge')
|
|
3
|
+
var baseConfig = require('./webpack.base.conf')
|
|
4
|
+
var cssLoaders = require('./css-loaders')
|
|
5
|
+
var ExtractTextPlugin = require('extract-text-webpack-plugin')
|
|
6
|
+
var HtmlWebpackPlugin = require('html-webpack-plugin')
|
|
7
|
+
|
|
8
|
+
// whether to generate source map for production files.
|
|
9
|
+
// disabling this can speed up the build.
|
|
10
|
+
var SOURCE_MAP = true
|
|
11
|
+
|
|
12
|
+
module.exports = merge(baseConfig, {
|
|
13
|
+
stats: {
|
|
14
|
+
children: false
|
|
15
|
+
},
|
|
16
|
+
devtool: SOURCE_MAP ? '#source-map' : false,
|
|
17
|
+
output: {
|
|
18
|
+
// naming output files with hashes for better caching.
|
|
19
|
+
// dist/index.html will be auto-generated with correct URLs.
|
|
20
|
+
filename: '[name][chunkhash].js',
|
|
21
|
+
chunkFilename: '[id].[chunkhash].js'
|
|
22
|
+
},
|
|
23
|
+
vue: {
|
|
24
|
+
loaders: cssLoaders({
|
|
25
|
+
sourceMap: SOURCE_MAP,
|
|
26
|
+
extract: true
|
|
27
|
+
})
|
|
28
|
+
},
|
|
29
|
+
plugins: [
|
|
30
|
+
// http://vuejs.github.io/vue-loader/workflow/production.html
|
|
31
|
+
new webpack.DefinePlugin({
|
|
32
|
+
'process.env': {
|
|
33
|
+
NODE_ENV: '"production"'
|
|
34
|
+
}
|
|
35
|
+
}),
|
|
36
|
+
new webpack.optimize.UglifyJsPlugin({
|
|
37
|
+
compress: {
|
|
38
|
+
warnings: false
|
|
39
|
+
}
|
|
40
|
+
}),
|
|
41
|
+
new webpack.optimize.OccurenceOrderPlugin(),
|
|
42
|
+
// extract css into its own file
|
|
43
|
+
new ExtractTextPlugin('[name].css'),
|
|
44
|
+
// generate dist index.html with correct asset hash for caching.
|
|
45
|
+
// you can customize output by editing /index.html
|
|
46
|
+
// see https://github.com/ampedandwired/html-webpack-plugin
|
|
47
|
+
new HtmlWebpackPlugin({
|
|
48
|
+
filename: '../index.html',
|
|
49
|
+
template: 'index.html',
|
|
50
|
+
inject: true,
|
|
51
|
+
minify: {
|
|
52
|
+
removeComments: true,
|
|
53
|
+
collapseWhitespace: true,
|
|
54
|
+
removeAttributeQuotes: true
|
|
55
|
+
// more options:
|
|
56
|
+
// https://github.com/kangax/html-minifier#options-quick-reference
|
|
57
|
+
}
|
|
58
|
+
})
|
|
59
|
+
]
|
|
60
|
+
})
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.179",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -90,6 +90,7 @@
|
|
|
90
90
|
"example": "node build/example-server.js",
|
|
91
91
|
"dev": "node build/dev-server.js",
|
|
92
92
|
"lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
|
|
93
|
+
"oldbuild": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.oldprod.conf.js",
|
|
93
94
|
"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",
|
|
94
95
|
"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",
|
|
95
96
|
"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",
|
|
@@ -130,11 +130,11 @@
|
|
|
130
130
|
}
|
|
131
131
|
if (!dataManage.callSumByUnit) {
|
|
132
132
|
load3.load('POST', 'rs/sql/getCallSumByUnit', {data: {}}, {rejectMsg: null, resolveMsg: null}).then((ret) => {
|
|
133
|
-
ret.data
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
133
|
+
this.items = []// ret.data
|
|
134
|
+
this.items = ret.data
|
|
135
|
+
this.items.push(ret.data.filter((item) => item.name === "滨河")[0])
|
|
136
|
+
this.items.push(ret.data.filter((item) => item.name === "乌达")[0])
|
|
137
|
+
this.items.push(ret.data.filter((item) => item.name === "海勃湾")[0])
|
|
138
138
|
})
|
|
139
139
|
} else {
|
|
140
140
|
this.items = dataManage.callSumByUnit
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
{
|
|
2
|
+
"checkData":{
|
|
3
|
+
"wrhsum":1021,
|
|
4
|
+
"jhsum":81300
|
|
5
|
+
},
|
|
6
|
+
"checkByMonth":[
|
|
7
|
+
{"sucnum":8359,"time":"2021-10","allnum":8500},
|
|
8
|
+
{"sucnum":8359,"time":"2021-11","allnum":8400},
|
|
9
|
+
{"sucnum":2114,"time":"2021-12","allnum":2200},
|
|
10
|
+
{"sucnum":5500,"time":"2022-01","allnum":5528},
|
|
11
|
+
{"sucnum":6921,"time":"2022-02","allnum":7000},
|
|
12
|
+
{"sucnum":3820,"time":"2022-03","allnum":4000},
|
|
13
|
+
{"sucnum":8617,"time":"2022-04","allnum":9000},
|
|
14
|
+
{"sucnum":9388,"time":"2022-05","allnum":9500}
|
|
15
|
+
],
|
|
16
|
+
"callData":{
|
|
17
|
+
"yearamount":12101,
|
|
18
|
+
"sumsend":2453,
|
|
19
|
+
"dayamount":12101,
|
|
20
|
+
"sumwmm":2397
|
|
21
|
+
},
|
|
22
|
+
"callSum":[
|
|
23
|
+
{"lastyear":100,"addvalue":10,"year":118,"name":"昨日呼入量"},
|
|
24
|
+
{"lastyear":56,"addvalue":3,"year":70,"name":"昨日派单量"}
|
|
25
|
+
],
|
|
26
|
+
"callSumByUnit":[
|
|
27
|
+
{"value":100,"addvalue":99,"name":"昨日呼入量"},
|
|
28
|
+
{"value":56,"addvalue":98,"name":"昨日派单量"}
|
|
29
|
+
]
|
|
30
|
+
}
|
|
@@ -1,30 +1,3 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
"wrhsum":1021,
|
|
4
|
-
"jhsum":81300
|
|
5
|
-
},
|
|
6
|
-
"checkByMonth":[
|
|
7
|
-
{"sucnum":8359,"time":"2021-10","allnum":8500},
|
|
8
|
-
{"sucnum":8359,"time":"2021-11","allnum":8400},
|
|
9
|
-
{"sucnum":2114,"time":"2021-12","allnum":2200},
|
|
10
|
-
{"sucnum":5500,"time":"2022-01","allnum":5528},
|
|
11
|
-
{"sucnum":6921,"time":"2022-02","allnum":7000},
|
|
12
|
-
{"sucnum":3820,"time":"2022-03","allnum":4000},
|
|
13
|
-
{"sucnum":8617,"time":"2022-04","allnum":9000},
|
|
14
|
-
{"sucnum":9388,"time":"2022-05","allnum":9500}
|
|
15
|
-
],
|
|
16
|
-
"callData":{
|
|
17
|
-
"yearamount":12101,
|
|
18
|
-
"sumsend":2453,
|
|
19
|
-
"dayamount":12101,
|
|
20
|
-
"sumwmm":2397
|
|
21
|
-
},
|
|
22
|
-
"callSum":[
|
|
23
|
-
{"lastyear":100,"addvalue":10,"year":118,"name":"昨日呼入量"},
|
|
24
|
-
{"lastyear":56,"addvalue":3,"year":70,"name":"昨日派单量"}
|
|
25
|
-
],
|
|
26
|
-
"callSumByUnit":[
|
|
27
|
-
{"value":100,"addvalue":99,"name":"昨日呼入量"},
|
|
28
|
-
{"value":56,"addvalue":98,"name":"昨日派单量"}
|
|
29
|
-
]
|
|
2
|
+
|
|
30
3
|
}
|
|
@@ -535,8 +535,11 @@
|
|
|
535
535
|
self.getinputtores();
|
|
536
536
|
//加载抄表册
|
|
537
537
|
self.initmeterbook();
|
|
538
|
-
self.$refs.paged.$refs.cri.model.startDate = self.$login.
|
|
538
|
+
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0] + ' 00:00:00'
|
|
539
539
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
540
|
+
|
|
541
|
+
self.$refs.paged.$refs.cri.model.inputstartDate = self.$login.toStartAndEndDateString()[0] + ' 00:00:00'
|
|
542
|
+
self.$refs.paged.$refs.cri.model.inputendDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
540
543
|
// self.$refs.paged.$refs.cri.search()
|
|
541
544
|
self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
|
|
542
545
|
await self.$MagLoadParams.loadParam()
|
|
@@ -563,7 +566,7 @@
|
|
|
563
566
|
dep:[],
|
|
564
567
|
user:[]
|
|
565
568
|
},
|
|
566
|
-
model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.
|
|
569
|
+
model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.startDate', endDate1: 'this.model.endDate'}, {
|
|
567
570
|
f_oughtamount: 0,
|
|
568
571
|
f_oughtfee: 0,
|
|
569
572
|
f_debt_money: 0,
|
|
@@ -913,8 +916,8 @@
|
|
|
913
916
|
return {
|
|
914
917
|
startDate: this.$refs.paged.$refs.cri.model.inputstartDate,
|
|
915
918
|
endDate: this.$refs.paged.$refs.cri.model.inputendDate,
|
|
916
|
-
startDate1: this.$refs.paged.$refs.cri.model.
|
|
917
|
-
endDate1: this.$refs.paged.$refs.cri.model.
|
|
919
|
+
startDate1: this.$refs.paged.$refs.cri.model.startDate,
|
|
920
|
+
endDate1: this.$refs.paged.$refs.cri.model.endDate,
|
|
918
921
|
condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
|
|
919
922
|
condValue: `${this.model.condValue}`
|
|
920
923
|
}
|
|
@@ -561,7 +561,7 @@
|
|
|
561
561
|
<nobr>{{row.f_inputtor}}</nobr>
|
|
562
562
|
</td>
|
|
563
563
|
<td style="text-align: center;">
|
|
564
|
-
<nobr>{{row.f_input_person}}</nobr>
|
|
564
|
+
<nobr>{{row.f_meter_classify == '物联网表' && row.f_input_person == null ? "抄表系统":row.f_input_person}}</nobr>
|
|
565
565
|
</td>
|
|
566
566
|
<td style="text-align: center;">
|
|
567
567
|
<nobr>{{row.f_whether_pay}}</nobr>
|
|
@@ -574,7 +574,7 @@
|
|
|
574
574
|
<nobr>{{row.f_hand_state}}</nobr>
|
|
575
575
|
</td>
|
|
576
576
|
<td style="text-align: center;">
|
|
577
|
-
<nobr>{{row.f_operator}}</nobr>
|
|
577
|
+
<nobr>{{row.f_meter_classify == '物联网表' && row.f_operator == null?"抄表系统":row.f_operator}}</nobr>
|
|
578
578
|
</td>
|
|
579
579
|
<td style="text-align: center;">
|
|
580
580
|
<nobr>{{row.f_depname}}</nobr>
|
|
@@ -102,6 +102,16 @@
|
|
|
102
102
|
condition="f_inputtor in {}"
|
|
103
103
|
close-on-select></v-select>
|
|
104
104
|
</div>
|
|
105
|
+
<div class="col-sm-2 form-group">
|
|
106
|
+
<label class="font_normal_body">收费类型</label>
|
|
107
|
+
<v-select v-model="model.f_type"
|
|
108
|
+
multiple
|
|
109
|
+
placeholder='请选择'
|
|
110
|
+
condition="f_type in {}"
|
|
111
|
+
:value.sync="model.f_type"
|
|
112
|
+
:options='$parent.$parent.chargetype'
|
|
113
|
+
close-on-select clear-button></v-select>
|
|
114
|
+
</div>
|
|
105
115
|
</div>
|
|
106
116
|
</div>
|
|
107
117
|
</criteria>
|
|
@@ -114,6 +124,7 @@
|
|
|
114
124
|
<th><nobr>客户类型</nobr></th>
|
|
115
125
|
<th><nobr>用气性质</nobr></th>
|
|
116
126
|
<th><nobr>气表类型</nobr></th>
|
|
127
|
+
<th><nobr>收费类型</nobr></th>
|
|
117
128
|
<th><nobr>操作员</nobr></th>
|
|
118
129
|
<th><nobr>抄表员</nobr></th>
|
|
119
130
|
<th><nobr>录入时间</nobr></th>
|
|
@@ -151,9 +162,13 @@
|
|
|
151
162
|
<td style="text-align: center;">
|
|
152
163
|
<nobr>{{row.f_gasproperties}}</nobr>
|
|
153
164
|
</td>
|
|
165
|
+
|
|
154
166
|
<td style="text-align: center;">
|
|
155
167
|
<nobr>{{row.f_meter_classify}}</nobr>
|
|
156
168
|
</td>
|
|
169
|
+
<td style="text-align: center;">
|
|
170
|
+
<nobr>{{row.f_type}}</nobr>
|
|
171
|
+
</td>
|
|
157
172
|
<td style="text-align: center;">
|
|
158
173
|
<nobr>{{row.f_operator}}</nobr>
|
|
159
174
|
</td>
|
|
@@ -497,9 +512,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
497
512
|
getfield() {
|
|
498
513
|
return exportConfig.ysConfig
|
|
499
514
|
},
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
515
|
+
usertypes() {
|
|
516
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
|
|
517
|
+
},
|
|
518
|
+
chargetype() {
|
|
519
|
+
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
|
|
520
|
+
},
|
|
503
521
|
metertypes() {
|
|
504
522
|
return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
|
|
505
523
|
},
|