manage-client 3.3.110 → 3.3.111-xinkang

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 (14) hide show
  1. package/build/dev-server.js +24 -33
  2. package/lib/package_2022-12-01-14-30-50.json +109 -0
  3. package/package.json +1 -1
  4. package/src/components/sale/businessquery/GasInspection.vue +17 -39
  5. package/src/filiale/jinbin/exportConfig.js +1110 -0
  6. package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +1372 -0
  7. package/src/filiale/jinbin/sale.js +7 -0
  8. package/src/filiale/tongchuan/ChargeQuery.vue +7 -94
  9. package/src/filiale/tongchuan/sale.js +0 -4
  10. package/src/filiale/xinkang/GasStatistics.vue +268 -228
  11. package/src/filiale/xinkang/ManageBrandHouseCount.vue +23 -23
  12. package/src/filiale/xinkang/exportConfig.js +3 -0
  13. package/src/main.js +1 -1
  14. package/src/filiale/tongchuan/GasInspection.vue +0 -682
package/build/dev-server.js CHANGED
@@ -19,91 +19,82 @@ var qtx= 'http://36.103.222.144:6300/'
19
19
  // var bendi = 'http://203.57.101.233:8400/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var server = 'http://192.168.50.4:8400'
22
+ var bendi = 'http://192.168.50.67:31785'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var local = 'http://127.0.0.1:8084'
24
+ var wode = 'http://192.168.50.67:31785'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
28
28
  var proxyTable = {
29
29
  '/rs/logic/exportfile': {
30
- target: server
30
+ target: bendi
31
31
  },
32
32
  '/rs/sql/chargeQuery_by_gasproperties': {
33
- target: local
33
+ target: 'http://localhost:8084/'
34
34
  },
35
35
  '/rs/logic/chargeQuery_by_gasproperties_line': {
36
- target: local
36
+ target: 'http://localhost:8084/'
37
37
  },
38
38
  '/files': {
39
- target: server
39
+ target: bendi
40
40
  },
41
41
  // 查找资源服务数据
42
42
  '/rs/search': {
43
- target: server
43
+ target: bendi
44
44
  },
45
45
  // 查找资源服务数据
46
46
  '/rs/logic/getLogin': {
47
- target: server
47
+ target: bendi
48
48
  },
49
49
  // 查找资源服务数据
50
50
  '/rs/logic/getInitData': {
51
- target: server
51
+ target: bendi
52
52
  },
53
53
  '/rs/logic/getSaleInitData': {
54
- target: server
54
+ target: bendi
55
55
  },
56
56
  // 用户登录服务地址
57
57
  '/rs/user': {
58
- target: server
58
+ target: bendi
59
59
  },
60
60
  '/rs/path/getParams': {
61
- target: server
61
+ target: bendi
62
62
  },
63
63
  '/rs/data': {
64
- target: server
64
+ target: bendi
65
65
  },
66
66
  '/rs/license': {
67
- target: server
67
+ target: bendi
68
68
  },
69
69
  '/rs/db': {
70
- target: server
70
+ target: bendi
71
71
  },
72
72
  '/excel': {
73
- target: server
73
+ target: bendi
74
74
  },
75
75
  '/rs/config': {
76
- target: server
76
+ target: bendi
77
77
  },
78
78
  '/rs/sql/getLicenseById': {
79
- target: server
79
+ target: bendi
80
80
  },
81
81
  '/rs/report': {
82
- target: server
82
+ target: bendi
83
83
  },
84
84
  '/rs/vue': {
85
- target: server
85
+ target: bendi
86
86
  },
87
87
  '/rs/file': {
88
- target: local
88
+ target: bendi
89
89
  },
90
90
  '/rs/sql/singleTable': {
91
- target: server
92
- },
93
- '/rs/sql/address': {
94
- target: server
95
- },
96
- '/rs/sql/getFiles': {
97
- target: server
91
+ target: bendi
98
92
  },
99
93
  '/rs/sql': {
100
- target: local
101
- },
102
- '/rs/logic': {
103
- target: local
94
+ target: 'http://localhost:8084/'
104
95
  },
105
96
  '/rs': {
106
- target: server
97
+ target: wode
107
98
  }
108
99
  }
109
100
 
package/lib/package_2022-12-01-14-30-50.json ADDED
@@ -0,0 +1,109 @@
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.2.174",
4
+ "description": "经营管控模块前台组件",
5
+ "main": "src/index.js",
6
+ "directories": {
7
+ "test": "test"
8
+ },
9
+ "dependencies": {
10
+ "swiper": "^5.4.5"
11
+ },
12
+ "devDependencies": {
13
+ "axios": "0.15.3",
14
+ "babel-core": "^6.0.0",
15
+ "babel-loader": "^6.0.0",
16
+ "babel-plugin-transform-runtime": "^6.0.0",
17
+ "babel-preset-es2015": "^6.0.0",
18
+ "babel-preset-stage-2": "^6.0.0",
19
+ "chai": "^3.5.0",
20
+ "co": "^4.6.0",
21
+ "connect-history-api-fallback": "^1.1.0",
22
+ "cross-env": "^1.0.7",
23
+ "cross-spawn": "^2.1.5",
24
+ "css-loader": "^0.23.0",
25
+ "echarts": "^4.1.0",
26
+ "eslint": "^2.0.0",
27
+ "eslint-config-standard": "^5.1.0",
28
+ "eslint-friendly-formatter": "^1.2.2",
29
+ "eslint-loader": "^1.3.0",
30
+ "eslint-plugin-html": "^1.3.0",
31
+ "eslint-plugin-promise": "^1.0.8",
32
+ "eslint-plugin-standard": "^1.3.2",
33
+ "eslint-plugin-vue": "^0.1.1",
34
+ "eventsource-polyfill": "^0.9.6",
35
+ "express": "^4.13.3",
36
+ "extract-text-webpack-plugin": "^1.0.1",
37
+ "filemanager-webpack-plugin": "^2.0.5",
38
+ "file-loader": "^0.8.4",
39
+ "function-bind": "^1.0.2",
40
+ "html-webpack-plugin": "^2.8.1",
41
+ "http-proxy-middleware": "^0.11.0",
42
+ "inject-loader": "^2.0.1",
43
+ "isparta-loader": "^2.0.0",
44
+ "jasmine-core": "^2.4.1",
45
+ "jquery": "^3.3.1",
46
+ "jsencrypt": "3.0.0-rc.1",
47
+ "json-loader": "^0.5.4",
48
+ "karma": "^1.4.1",
49
+ "karma-chrome-launcher": "^2.2.0",
50
+ "karma-coverage": "^1.1.1",
51
+ "karma-mocha": "^1.3.0",
52
+ "karma-sinon-chai": "^1.3.1",
53
+ "karma-sourcemap-loader": "^0.3.7",
54
+ "karma-spec-reporter": "0.0.31",
55
+ "karma-webpack": "^2.0.2",
56
+ "ldap-clients": "3.0.28",
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.1.89-20",
71
+ "url-loader": "^0.5.7",
72
+ "vue-amap": "0.5.10",
73
+ "vue-client": "1.24.51",
74
+ "vue-hot-reload-api": "^1.2.0",
75
+ "vue-html-loader": "^1.0.0",
76
+ "vue-loader": "8.2.1",
77
+ "vue-resource": "^1.5.0",
78
+ "vue-router": "^0.7.13",
79
+ "vue-strap": "^1.0.9",
80
+ "vue-style-loader": "^1.0.0",
81
+ "vue-validator": "2.1.7",
82
+ "webpack": "1.12.2",
83
+ "webpack-dev-middleware": "^1.4.0",
84
+ "webpack-hot-middleware": "^2.6.0",
85
+ "webpack-merge": "^0.8.3",
86
+ "webpack-parallel-uglify-plugin": "^1.0.0"
87
+ },
88
+ "scripts": {
89
+ "unit": "karma start test/unit/karma.conf.js --single-run",
90
+ "example": "node build/example-server.js",
91
+ "dev": "node build/dev-server.js",
92
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
93
+ "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
+ "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
+ "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",
96
+ "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",
97
+ "e2e": "node test/e2e/runner.js",
98
+ "release": "bash build/release.sh"
99
+ },
100
+ "repository": {
101
+ "type": "git",
102
+ "url": "https://gitee.com/aote/management_modules.git"
103
+ },
104
+ "keywords": [
105
+ "manage"
106
+ ],
107
+ "author": "liuxudong",
108
+ "license": "ISC"
109
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.110",
3
+ "version": "3.3.111-xinkang",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/sale/businessquery/GasInspection.vue CHANGED
@@ -19,7 +19,7 @@
19
19
  style="width:60%"
20
20
  :value.sync="model.startDate"
21
21
  :disabled-days-of-Week="[]"
22
- :format="'yyyy-MM-dd HH:mm:ss'"
22
+ :format="'yyyy-MM-dd'"
23
23
  :show-reset-button="reset">
24
24
  </datepicker>
25
25
  </div>
@@ -30,7 +30,7 @@
30
30
  style="width:60%"
31
31
  :value.sync="model.endDate"
32
32
  :disabled-days-of-Week="[]"
33
- :format="'yyyy-MM-dd HH:mm:ss'"
33
+ :format="'yyyy-MM-dd'"
34
34
  :show-reset-button="reset">
35
35
  </datepicker>
36
36
  </div>
@@ -64,22 +64,6 @@
64
64
  </div>
65
65
  </div>
66
66
  <div class="row" v-show="$parent.$parent.criteriaShow">
67
- <div class="col-sm-2 form-group">
68
- <label class="font_normal_body">客户状态&emsp; </label>
69
- <v-select :value.sync="model.f_user_state"
70
- v-model="model.f_user_state"
71
- :options='$parent.$parent.userstates' placeholder='请选择'
72
- condition="f_user_state = '{}'"
73
- close-on-select></v-select>
74
- </div>
75
- <div class="col-sm-2 form-group">
76
- <label class="font_normal_body">气表状态&emsp;</label>
77
- <v-select :value.sync="model.f_table_state"
78
- v-model="model.f_table_state"
79
- :options='$parent.$parent.tablestate' placeholder='请选择'
80
- condition="f_table_state = '{}'"
81
- close-on-select></v-select>
82
- </div>
83
67
  <div class="col-sm-2 form-group">
84
68
  <label class="font_normal_body">表&emsp;&emsp;号&emsp;</label>
85
69
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -141,7 +125,7 @@
141
125
  condition="f_book_slice_area = '{}'"></v-select>
142
126
  </div>
143
127
  <div class="col-sm-2 ">
144
- <label for="f_meter_classify"class="font_normal_body">表类型&emsp;&emsp;</label>
128
+ <label for="f_meter_classify"class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表类型</label>
145
129
  <v-select id="f_meter_classify"
146
130
  v-model="model.meter_classify"
147
131
  placeholder='表类型'
@@ -303,8 +287,8 @@
303
287
  self.initParams()
304
288
  self.initSlice(self.$login.f.orgid)
305
289
  let year = new Date().getFullYear()
306
- self.$refs.paged.$refs.cri.model.startDate = year+'-01-01 00:00:00'
307
- self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
290
+ self.$refs.paged.$refs.cri.model.startDate = year+'-01-01'
291
+ self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
308
292
  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
309
293
  }
310
294
  export default {
@@ -495,15 +479,15 @@
495
479
  a += ` and f_book_slice_area = '${this.$refs.paged.$refs.cri.model.model.f_book_slice_area}'`
496
480
  }
497
481
  if(this.$refs.paged.$refs.cri.model.startDate){
498
- this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate}' `
482
+ this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `
499
483
  }else{
500
- this.model.params.startDate = this.$login.toStandardDateString() + ' 00:00:00'
484
+ this.model.params.startDate ='DATEADD(yy,DATEDIFF(yy,0,getdate()),0)'
501
485
  }
502
486
 
503
487
  if(this.$refs.paged.$refs.cri.model.endDate){
504
- this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate}' `
488
+ this.model.params.endDate = `'${this.$refs.paged.$refs.cri.model.endDate} 23:59:59' `
505
489
  }else{
506
- this.model.params.endDate = this.$login.toStandardDateString() + ' 23:59:59'
490
+ this.model.params.endDate ='DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
507
491
  }
508
492
  this.mycondition = a
509
493
  args.condition = args.condition+ ` ${this.filialeCodeStr}`
@@ -530,12 +514,6 @@
530
514
 
531
515
  },
532
516
  computed: {
533
- userstates (){
534
- return this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : []
535
- },
536
- tablestate() {
537
- return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
538
- },
539
517
  getfield() {
540
518
  return exportConfig.gasInspectionConfig
541
519
  },
@@ -560,18 +538,18 @@
560
538
  result.condition = result.condition + this.mycondition
561
539
  let temp2 = this.$refs.paged.$refs.cri
562
540
  if (temp2.model.startDate && temp2.model.endDate) {
563
- result.startDate = ` '${temp2.model.startDate}'`
564
- result.endDate = ` '${temp2.model.endDate}'`
541
+ result.startDate = ` '${temp2.model.startDate} 00:00:00'`
542
+ result.endDate = ` '${temp2.model.endDate} 23:59:59'`
565
543
  } if (!temp2.model.startDate && !temp2.model.endDate) {
566
- result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
567
- result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
544
+ result.startDate = 'new Date().getFullYear()'
545
+ result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
568
546
  }
569
547
  if (temp2.model.startDate&&!temp2.model.endDate) {
570
- result.startDate = ` '${temp2.model.startDate}'`
571
- result.endDate = this.$login.toStandardDateString() + ' 23:59:59'
548
+ result.startDate = ` '${temp2.model.startDate} 00:00:00'`
549
+ result.endDate = 'DATEADD(SS,-1,DATEADD(DD,1,CONVERT(DATETIME,CONVERT(VARCHAR(10),GETDATE(),120))))'
572
550
  } if (temp2.model.endDate&&!temp2.model.startDate) {
573
- result.startDate = this.$login.toStandardDateString() + ' 00:00:00'
574
- result.endDate = ` '${temp2.model.endDate}'`
551
+ result.startDate = 'new Date().getFullYear()'
552
+ result.endDate = ` '${temp2.model.endDate} 23:59:59'`
575
553
  }
576
554
  if (temp2.model.contain_newfile==='否'){
577
555
  result.condition = result.condition+" and f_open_date not between " + result.startDate + " and " + result.endDate