manage-client 4.1.93 → 4.1.94-wn
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/.eslintrc.js +3 -1
- package/build/dev-server.js +86 -86
- package/package.json +2 -2
- package/src/components/SellReport/UserGasFillCard.vue +17 -3
- package/src/filiale/bayan/OtherChargeQuery.vue +2 -2
- package/src/filiale/bazhong/ReportDataQuery.vue +319 -319
- package/src/filiale/bazhong/config/DefaultPrint.js +6 -6
- package/src/filiale/bazhong/config/DefaultSelect.js +18 -18
- package/src/filiale/bazhong/config/exportConfig.js +2775 -2775
- package/src/filiale/bazhong/config/tableConfig.js +53 -53
- package/src/filiale/bazhong/webmeterManage.js +7 -7
- package/src/filiale/shimen/UserQuery.vue +1008 -1008
- package/src/filiale/shimen/config/DefaultPrint.js +14 -14
- package/src/filiale/shimen/config/DefaultSelect.js +18 -18
- package/src/filiale/shimen/config/tableConfig.js +53 -53
- package/src/filiale/tongchuan/GasInspection.vue +756 -756
- package/src/filiale/yangchun/ArchivesManage.vue +89 -89
- package/src/main.js +15 -13
- package/.gradle/7.4/checksums/checksums.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.4/fileChanges/last-build.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.4/gc.properties +0 -0
- package/.gradle/8.5/checksums/checksums.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.5/gc.properties +0 -0
package/.eslintrc.js
CHANGED
|
@@ -15,6 +15,8 @@ module.exports = {
|
|
|
15
15
|
// allow debugger during development
|
|
16
16
|
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
|
|
17
17
|
// 必须使用全等
|
|
18
|
-
'eqeqeq': 0
|
|
18
|
+
'eqeqeq': 0,
|
|
19
|
+
"import/no-unresolved": ["error", { "caseSensitive": true }],
|
|
20
|
+
"camelcase": "off"
|
|
19
21
|
}
|
|
20
22
|
}
|
package/build/dev-server.js
CHANGED
|
@@ -6,97 +6,97 @@ const proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
const app = express()
|
|
7
7
|
const compiler = webpack(config)
|
|
8
8
|
|
|
9
|
-
const server = 'http://
|
|
9
|
+
const server = 'http://172.168.1.11:8400/'
|
|
10
10
|
const local = 'http://127.0.0.1:9026/'
|
|
11
11
|
const proxyTable = {
|
|
12
|
-
'/rs/logic/exportfile': {
|
|
13
|
-
|
|
14
|
-
},
|
|
15
|
-
'/dataManage': {
|
|
16
|
-
|
|
17
|
-
},
|
|
18
|
-
'/api/af-revenue/sql/': {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
},
|
|
24
|
-
'/api/af-revenue/report/': {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
},
|
|
30
|
-
'/api/af-revenue/logic': {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
},
|
|
12
|
+
// '/rs/logic/exportfile': {
|
|
13
|
+
// target: server
|
|
14
|
+
// },
|
|
15
|
+
// '/dataManage': {
|
|
16
|
+
// target: server
|
|
17
|
+
// },
|
|
18
|
+
// '/api/af-revenue/sql/': {
|
|
19
|
+
// pathRewrite: {
|
|
20
|
+
// '^/api/af-revenue': '/'
|
|
21
|
+
// },
|
|
22
|
+
// target: local
|
|
23
|
+
// },
|
|
24
|
+
// '/api/af-revenue/report/': {
|
|
25
|
+
// pathRewrite: {
|
|
26
|
+
// '^/api/af-revenue': '/'
|
|
27
|
+
// },
|
|
28
|
+
// target: local
|
|
29
|
+
// },
|
|
30
|
+
// '/api/af-revenue/logic': {
|
|
31
|
+
// pathRewrite: {
|
|
32
|
+
// '^/api/af-revenue': '/'
|
|
33
|
+
// },
|
|
34
|
+
// target: local
|
|
35
|
+
// },
|
|
36
36
|
'/api': {
|
|
37
37
|
target: server
|
|
38
38
|
},
|
|
39
|
-
'/rs/sql/chargeQuery_by_gasproperties': {
|
|
40
|
-
|
|
41
|
-
},
|
|
42
|
-
'/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
43
|
-
|
|
44
|
-
},
|
|
45
|
-
'/files': {
|
|
46
|
-
|
|
47
|
-
},
|
|
48
|
-
// 查找资源服务数据
|
|
49
|
-
'/rs/search': {
|
|
50
|
-
|
|
51
|
-
},
|
|
52
|
-
// 查找资源服务数据
|
|
53
|
-
'/rs/logic/getLogin': {
|
|
54
|
-
|
|
55
|
-
},
|
|
56
|
-
// 查找资源服务数据
|
|
57
|
-
'/rs/logic/getInitData': {
|
|
58
|
-
|
|
59
|
-
},
|
|
60
|
-
'/rs/logic/getSaleInitData': {
|
|
61
|
-
|
|
62
|
-
},
|
|
63
|
-
// 用户登录服务地址
|
|
64
|
-
'/rs/user': {
|
|
65
|
-
|
|
66
|
-
},
|
|
67
|
-
'/rs/path/getParams': {
|
|
68
|
-
|
|
69
|
-
},
|
|
70
|
-
'/rs/data': {
|
|
71
|
-
|
|
72
|
-
},
|
|
73
|
-
'/rs/license': {
|
|
74
|
-
|
|
75
|
-
},
|
|
76
|
-
'/rs/db': {
|
|
77
|
-
|
|
78
|
-
},
|
|
79
|
-
'/excel': {
|
|
80
|
-
|
|
81
|
-
},
|
|
82
|
-
'/rs/config': {
|
|
83
|
-
|
|
84
|
-
},
|
|
85
|
-
'/rs/sql/getLicenseById': {
|
|
86
|
-
|
|
87
|
-
},
|
|
88
|
-
'/rs/report': {
|
|
89
|
-
|
|
90
|
-
},
|
|
91
|
-
'/rs/vue': {
|
|
92
|
-
|
|
93
|
-
},
|
|
94
|
-
'/rs/file': {
|
|
95
|
-
|
|
96
|
-
},
|
|
97
|
-
'/rs/sql/singleTable': {
|
|
98
|
-
|
|
99
|
-
},
|
|
39
|
+
// '/rs/sql/chargeQuery_by_gasproperties': {
|
|
40
|
+
// target: server
|
|
41
|
+
// },
|
|
42
|
+
// '/rs/logic/chargeQuery_by_gasproperties_line': {
|
|
43
|
+
// target: server
|
|
44
|
+
// },
|
|
45
|
+
// '/files': {
|
|
46
|
+
// target: server
|
|
47
|
+
// },
|
|
48
|
+
// // 查找资源服务数据
|
|
49
|
+
// '/rs/search': {
|
|
50
|
+
// target: server
|
|
51
|
+
// },
|
|
52
|
+
// // 查找资源服务数据
|
|
53
|
+
// '/rs/logic/getLogin': {
|
|
54
|
+
// target: server
|
|
55
|
+
// },
|
|
56
|
+
// // 查找资源服务数据
|
|
57
|
+
// '/rs/logic/getInitData': {
|
|
58
|
+
// target: server
|
|
59
|
+
// },
|
|
60
|
+
// '/rs/logic/getSaleInitData': {
|
|
61
|
+
// target: server
|
|
62
|
+
// },
|
|
63
|
+
// // 用户登录服务地址
|
|
64
|
+
// '/rs/user': {
|
|
65
|
+
// target: server
|
|
66
|
+
// },
|
|
67
|
+
// '/rs/path/getParams': {
|
|
68
|
+
// target: server
|
|
69
|
+
// },
|
|
70
|
+
// '/rs/data': {
|
|
71
|
+
// target: server
|
|
72
|
+
// },
|
|
73
|
+
// '/rs/license': {
|
|
74
|
+
// target: server
|
|
75
|
+
// },
|
|
76
|
+
// '/rs/db': {
|
|
77
|
+
// target: server
|
|
78
|
+
// },
|
|
79
|
+
// '/excel': {
|
|
80
|
+
// target: server
|
|
81
|
+
// },
|
|
82
|
+
// '/rs/config': {
|
|
83
|
+
// target: server
|
|
84
|
+
// },
|
|
85
|
+
// '/rs/sql/getLicenseById': {
|
|
86
|
+
// target: server
|
|
87
|
+
// },
|
|
88
|
+
// '/rs/report': {
|
|
89
|
+
// target: server
|
|
90
|
+
// },
|
|
91
|
+
// '/rs/vue': {
|
|
92
|
+
// target: server
|
|
93
|
+
// },
|
|
94
|
+
// '/rs/file': {
|
|
95
|
+
// target: server
|
|
96
|
+
// },
|
|
97
|
+
// '/rs/sql/singleTable': {
|
|
98
|
+
// target: server
|
|
99
|
+
// },
|
|
100
100
|
'/rs': {
|
|
101
101
|
target: server
|
|
102
102
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.94-wn",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"style": "0.0.3",
|
|
68
68
|
"style-loader": "^0.20.3",
|
|
69
69
|
"swiper": "^5.4.5",
|
|
70
|
-
"system-clients": "
|
|
70
|
+
"system-clients": "3.2.87",
|
|
71
71
|
"ldap-clients": "3.0.96",
|
|
72
72
|
"url-loader": "^0.5.7",
|
|
73
73
|
"vue-amap": "0.5.10",
|
|
@@ -308,13 +308,27 @@
|
|
|
308
308
|
search(){
|
|
309
309
|
this.$refs.paged.$refs.cri.search()
|
|
310
310
|
},
|
|
311
|
+
appendCondition (data) {
|
|
312
|
+
console.log('data=====>',data)
|
|
313
|
+
let stringValue = ''
|
|
314
|
+
for (var i = 0; i < data.length; i++) {
|
|
315
|
+
if (data[i]) {
|
|
316
|
+
if (i === data.length - 1) {
|
|
317
|
+
stringValue = stringValue + "'" + data[i] + "'"
|
|
318
|
+
} else {
|
|
319
|
+
stringValue = stringValue + "'" + data[i] + "',"
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
return stringValue
|
|
324
|
+
},
|
|
311
325
|
selfSearch(args) {
|
|
312
|
-
let orgcondition = ' s.f_orgid in (' + this.f_orgid + ')'
|
|
326
|
+
let orgcondition = ' s.f_orgid in (' + this.appendCondition(this.f_orgid) + ')'
|
|
313
327
|
if (this.f_depid[0]) {
|
|
314
|
-
orgcondition += " and s.f_depid in("+this.f_depid
|
|
328
|
+
orgcondition += " and s.f_depid in(" + this.appendCondition(this.f_depid) + ')'
|
|
315
329
|
}
|
|
316
330
|
if(this.f_operatorid[0]) {
|
|
317
|
-
orgcondition += ' and s.f_operatorid in (' + this.f_operatorid + ')'
|
|
331
|
+
orgcondition += ' and s.f_operatorid in (' + this.appendCondition(this.f_operatorid) + ')'
|
|
318
332
|
}
|
|
319
333
|
this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
|
|
320
334
|
this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
|
|
@@ -201,10 +201,10 @@
|
|
|
201
201
|
>
|
|
202
202
|
</div>
|
|
203
203
|
<div class="col-sm-2 form-group">
|
|
204
|
-
<label class="font_normal_body"
|
|
204
|
+
<label class="font_normal_body">小于等于</label>
|
|
205
205
|
<input style="width:60%" type="number" class="input_search"
|
|
206
206
|
v-model="model.f_money_end" placeholder='小于等于'
|
|
207
|
-
condition="f_money
|
|
207
|
+
condition="f_money <= {}"
|
|
208
208
|
@keyup.enter="search"
|
|
209
209
|
v-el:xq v-next-el='f_day' v-el:area
|
|
210
210
|
>
|