manage-client 3.2.168 → 3.2.169

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,109 +1,109 @@
1
- {
2
- "name": "manage-client",
3
- "version": "3.2.168",
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
- }
1
+ {
2
+ "name": "manage-client",
3
+ "version": "3.2.169",
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
+ }
@@ -148,6 +148,16 @@
148
148
  :show-reset-button="reset">
149
149
  </datepicker>
150
150
  </div>
151
+ <div class="col-sm-2 form-group flex-row" style="white-space: nowrap">
152
+ <label class="font_normal_body">余额区间</label>
153
+ <div class="row">
154
+ <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_sta"
155
+ condition="ss.f_balance_amount >= {} " placeholder="">
156
+ <label class="font_normal_body"> ≤ x ≤ </label>
157
+ <input type="text" style="width:27%" class="input_search" v-model="model.f_balance_amount_end"
158
+ condition="ss.f_balance_amount <= {} " placeholder="">
159
+ </div>
160
+ </div>
151
161
  </div>
152
162
  </div>
153
163
  </criteria>
@@ -288,7 +288,8 @@
288
288
  :options='$parent.$parent.meterbooks' placeholder='请选择'
289
289
  style="width:60%"
290
290
  close-on-select
291
- condition="f_meter_book_num = '{}'"></v-select>
291
+ condition="f_meter_book_num = '{}'">
292
+ </v-select>
292
293
  </div>
293
294
  <div class="col-sm-2 form-group">
294
295
  <label class="font_normal_body">房屋类型</label>
@@ -698,6 +699,9 @@
698
699
  let readySomething = async function (self) {
699
700
  await self.$MagLoadParams.loadParam()
700
701
  // await self.$LoadParams.loadParam(self.f_filialeid)
702
+ await self.bookAll()
703
+ //加载抄表册
704
+ await self.initmeterbook()
701
705
  self.initParams()
702
706
  self.getPricenames();
703
707
  self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
@@ -756,7 +760,10 @@
756
760
  bookSlice:[{label: '全部',value: ''}],
757
761
  pricenames:[],
758
762
  dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
759
- useDate:[{label:"8年以内",value:"8年以内"},{label:"8年以上",value:"8年以上"}]
763
+ useDate:[{label:"8年以内",value:"8年以内"},{label:"8年以上",value:"8年以上"}],
764
+ meterbooks:[{label: '全部',value: ''}], //抄表册
765
+ booksAllData: [],
766
+ allorgid:[],
760
767
  }
761
768
  },
762
769
  ready(){
@@ -768,6 +775,21 @@
768
775
  })
769
776
  },
770
777
  methods: {
778
+ async bookAll () {
779
+ let param={
780
+ items:'*',
781
+ tablename:'t_meter_book',
782
+ condition:` 1=1 and f_book_state='有效'`,
783
+ orderitem:'id'
784
+ }
785
+ await this.$resetpost('rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
786
+ .then(item => {
787
+ this.booksAllData = item.data
788
+ this.booksAll = item.data.map(x => {
789
+ return {id: x.id,f_book_code: x.f_book_code}
790
+ })
791
+ })
792
+ },
771
793
  ReadIDCard(){
772
794
  this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
773
795
  console.log('======',msg)
@@ -986,45 +1008,31 @@
986
1008
  },
987
1009
  //表册片区和抄表册关联
988
1010
  async inputtorchange(){
989
- this.$set('$refs.paged.$refs.cri.model.f_meter_book',[]);
990
- /*let val1=this.$refs.paged.$refs.cri.model.f_meter_book*/
991
- let val2=this.$refs.paged.$refs.cri.model.f_book_slice_area
992
- if((val2.length>0)){
993
- let condition = ` 1=1 and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `
994
- /*if (val1[0]){
995
- condition = condition+ ` and f_meter_book = '${val1[0]}' `
996
- }*/
997
- if(val2[0]) {
998
- condition = condition + ` and f_book_slice_area = '${val2}' `
999
- }
1000
- let param={
1001
- items:'*',
1002
- tablename:'t_meter_book',
1003
- condition:condition,
1004
- orderitem:'id'
1005
- }
1006
- let getMeterBooks = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错!!!'})
1007
- if (getMeterBooks.data) {
1008
- if(getMeterBooks.data.length >0){
1009
- let rs = [];
1010
- getMeterBooks.data.forEach((item)=>{
1011
- let temp = {
1012
- label:item.f_book_name,
1013
- value:item.id
1014
- };
1015
- rs.push(temp);
1016
-
1017
- })
1018
- this.meterbooks = [{label: '全部',value: ''}, ...rs];
1019
- }else{
1020
- this.meterbooks = [{label: '全部',value: ''}];
1011
+ let val = this.$refs.paged.$refs.cri.model.f_inputtor;
1012
+ if(val != null && val != ""){
1013
+ let bookData = this.booksAllData.filter(item => val.includes(item.f_inputtor) && this.allorgid.includes(item.f_orgid))
1014
+ let rs = bookData.map(x => {
1015
+ return {
1016
+ label: `[${x.f_book_code}]-${x.f_book_name}`,
1017
+ value: x.id
1021
1018
  }
1022
- }
1019
+ })
1020
+ this.meterbooks = [{label: '全部',value: ''}, ...rs];
1021
+ this.$set('$refs.paged.$refs.cri.model.f_meter_book',[bookData[0] ? bookData[0].id : '']);
1023
1022
  }else{
1024
- this.meterbooks = [{label: '全部',value: ''}];
1023
+ this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
1025
1024
  this.initmeterbook();
1026
1025
  }
1027
1026
  },
1027
+ async initmeterbook(){
1028
+ let bs = this.booksAllData.filter(item => this.allorgid.includes(item.f_orgid)).map(x => {
1029
+ return {
1030
+ label: `${x.f_book_name}`,
1031
+ value: x.id
1032
+ }
1033
+ })
1034
+ this.meterbooks = [{label: '全部', value: ''}, ...bs]
1035
+ },
1028
1036
  },
1029
1037
  watch:{
1030
1038
  'model.rows.length' () {
@@ -1063,6 +1071,10 @@
1063
1071
  }
1064
1072
  this.updateParams()
1065
1073
  }
1074
+ this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
1075
+ this.$refs.paged.$refs.cri.model.f_meter_book = []
1076
+ this.meterbooks = [{label: '全部',value: ''}]
1077
+ this.initmeterbook()
1066
1078
  },
1067
1079
  },
1068
1080
  computed:{
@@ -1088,9 +1100,9 @@
1088
1100
  positions() {
1089
1101
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('安装位置')]
1090
1102
  },
1091
- meterbooks(){
1092
- return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
1093
- },
1103
+ // meterbooks(){
1104
+ // return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
1105
+ // },
1094
1106
  // gasproperties() {
1095
1107
  // return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
1096
1108
  // },
@@ -549,7 +549,8 @@
549
549
  residentialArea: [],
550
550
  sumsmodel: {},
551
551
  f_filialeid: this.$login.f.orgid,
552
- meterbooks:[{label: '全部',value: ''}], //抄表册
552
+ //抄表册
553
+ meterbooks:[{label: '全部',value: ''}],
553
554
  inputtores:[{label: '全部',value: ''}],
554
555
  dainputtores:[{label: '全部',value: ''}],
555
556
  allorgid:[],
@@ -621,7 +622,6 @@
621
622
  })
622
623
  this.meterbooks = [{label: '全部',value: ''}, ...rs];
623
624
  this.$set('$refs.paged.$refs.cri.model.f_meter_book',[bookData[0] ? bookData[0].id : '']);
624
-
625
625
  }else{
626
626
  this.$set('$refs.paged.$refs.cri.model.f_meter_book','');
627
627
  this.initmeterbook();
@@ -20,7 +20,7 @@
20
20
  <div class="col-sm-2">
21
21
  <label class="font_normal_body">表&nbsp;&nbsp;号&nbsp;</label>
22
22
  <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_meternumber" placeholder='表号'
23
- condition="m.f_meternumber = ''" v-next-el='meternumber' v-el:meternumber
23
+ condition="m.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
24
24
  >
25
25
  </div>
26
26
  <!-- <div class="col-sm-2">-->