address-client 3.2.8 → 3.2.9-gongyi

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.
@@ -10,7 +10,7 @@ var proxy = httpProxy.createProxyServer()
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- var str = 'http://127.0.0.1:8080', str2= 'http://192.168.50.4:8400/'
13
+ var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
14
14
  var proxyTable = {
15
15
 
16
16
  '/rs/logic/getLogin': {
package/package.json CHANGED
@@ -1,99 +1,99 @@
1
- {
2
- "name": "address-client",
3
- "version": "3.2.8",
4
- "description": "地址管理前台组件",
5
- "author": "wanbochao",
6
- "license": "ISC",
7
- "main": "src/index.js",
8
- "keywords": [
9
- "sale"
10
- ],
11
- "scripts": {
12
- "unit": "karma start test/unit/karma.conf.js",
13
- "example": "node build/example-server.js",
14
- "dev": "node build/dev-server.js",
15
- "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
- "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
- "e2e": "node test/e2e/runner.js",
18
- "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
19
- "release": "bash build/release.sh"
20
- },
21
- "repository": {
22
- "type": "git",
23
- "url": "https://gitee.com/aote/address_management.git"
24
- },
25
- "dependencies": {
26
- "less-loader": "^2.2.3",
27
- "vue": "^1.0.17"
28
- },
29
- "devDependencies": {
30
- "babel-core": "^6.0.0",
31
- "babel-loader": "^6.0.0",
32
- "babel-plugin-transform-runtime": "^6.0.0",
33
- "babel-preset-es2015": "^6.0.0",
34
- "babel-preset-stage-2": "^6.0.0",
35
- "chai": "^3.5.0",
36
- "co": "^4.6.0",
37
- "connect-history-api-fallback": "^1.1.0",
38
- "cross-env": "^1.0.7",
39
- "cross-spawn": "^2.1.5",
40
- "css-loader": "^0.23.0",
41
- "echarts": "^4.1.0",
42
- "eslint": "^2.0.0",
43
- "eslint-config-standard": "^5.1.0",
44
- "eslint-friendly-formatter": "^1.2.2",
45
- "eslint-loader": "^1.3.0",
46
- "eslint-plugin-html": "^1.3.0",
47
- "eslint-plugin-promise": "^1.0.8",
48
- "eslint-plugin-standard": "^1.3.2",
49
- "eslint-plugin-vue": "^0.1.1",
50
- "eventsource-polyfill": "^0.9.6",
51
- "express": "^4.13.3",
52
- "extract-text-webpack-plugin": "^1.0.1",
53
- "file-loader": "^0.8.4",
54
- "function-bind": "^1.0.2",
55
- "html-webpack-plugin": "^2.8.1",
56
- "http-proxy-middleware": "^0.11.0",
57
- "inject-loader": "^2.0.1",
58
- "isparta-loader": "^2.0.0",
59
- "jasmine-core": "^2.4.1",
60
- "jquery": "^3.3.1",
61
- "json-loader": "^0.5.4",
62
- "karma": "^1.4.1",
63
- "karma-chrome-launcher": "^2.2.0",
64
- "karma-coverage": "^1.1.1",
65
- "karma-mocha": "^1.3.0",
66
- "karma-sinon-chai": "^1.3.1",
67
- "karma-sourcemap-loader": "^0.3.7",
68
- "karma-spec-reporter": "0.0.31",
69
- "karma-webpack": "^2.0.2",
70
- "less": "^2.7.3",
71
- "mkdirp": "^0.5.1",
72
- "mocha": "^3.2.0",
73
- "ncp": "^2.0.0",
74
- "rimraf": "^2.5.0",
75
- "sale-client": "3.2.11-17",
76
- "selenium-server": "2.52.0",
77
- "sinon": "^2.1.0",
78
- "sinon-chai": "^2.8.0",
79
- "style": "0.0.3",
80
- "style-loader": "^0.20.3",
81
- "system-clients": "3.1.88-5",
82
- "url-loader": "^0.5.7",
83
- "vue-client": "1.24.27",
84
- "vue-hot-reload-api": "^1.2.0",
85
- "vue-html-loader": "^1.0.0",
86
- "vue-loader": "^8.2.1",
87
- "vue-resource": "^1.5.0",
88
- "vue-router": "^0.7.13",
89
- "vue-strap": "^1.0.9",
90
- "vue-style-loader": "^1.0.0",
91
- "vue-validator": "2.1.7",
92
- "webpack": "^1.12.2",
93
- "webpack-dev-middleware": "^1.4.0",
94
- "webpack-hot-middleware": "^2.6.0",
95
- "webpack-merge": "^0.8.3",
96
- "jsencrypt": "3.0.0-rc.1",
97
- "axios": "0.15.3"
98
- }
99
- }
1
+ {
2
+ "name": "address-client",
3
+ "version": "3.2.9-gongyi",
4
+ "description": "地址管理前台组件",
5
+ "author": "wanbochao",
6
+ "license": "ISC",
7
+ "main": "src/index.js",
8
+ "keywords": [
9
+ "sale"
10
+ ],
11
+ "scripts": {
12
+ "unit": "karma start test/unit/karma.conf.js",
13
+ "example": "node build/example-server.js",
14
+ "dev": "node build/dev-server.js",
15
+ "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
16
+ "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
17
+ "e2e": "node test/e2e/runner.js",
18
+ "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js && publish",
19
+ "release": "bash build/release.sh"
20
+ },
21
+ "repository": {
22
+ "type": "git",
23
+ "url": "https://gitee.com/aote/address_management.git"
24
+ },
25
+ "dependencies": {
26
+ "less-loader": "^2.2.3",
27
+ "vue": "^1.0.17"
28
+ },
29
+ "devDependencies": {
30
+ "babel-core": "^6.0.0",
31
+ "babel-loader": "^6.0.0",
32
+ "babel-plugin-transform-runtime": "^6.0.0",
33
+ "babel-preset-es2015": "^6.0.0",
34
+ "babel-preset-stage-2": "^6.0.0",
35
+ "chai": "^3.5.0",
36
+ "co": "^4.6.0",
37
+ "connect-history-api-fallback": "^1.1.0",
38
+ "cross-env": "^1.0.7",
39
+ "cross-spawn": "^2.1.5",
40
+ "css-loader": "^0.23.0",
41
+ "echarts": "^4.1.0",
42
+ "eslint": "^2.0.0",
43
+ "eslint-config-standard": "^5.1.0",
44
+ "eslint-friendly-formatter": "^1.2.2",
45
+ "eslint-loader": "^1.3.0",
46
+ "eslint-plugin-html": "^1.3.0",
47
+ "eslint-plugin-promise": "^1.0.8",
48
+ "eslint-plugin-standard": "^1.3.2",
49
+ "eslint-plugin-vue": "^0.1.1",
50
+ "eventsource-polyfill": "^0.9.6",
51
+ "express": "^4.13.3",
52
+ "extract-text-webpack-plugin": "^1.0.1",
53
+ "file-loader": "^0.8.4",
54
+ "function-bind": "^1.0.2",
55
+ "html-webpack-plugin": "^2.8.1",
56
+ "http-proxy-middleware": "^0.11.0",
57
+ "inject-loader": "^2.0.1",
58
+ "isparta-loader": "^2.0.0",
59
+ "jasmine-core": "^2.4.1",
60
+ "jquery": "^3.3.1",
61
+ "json-loader": "^0.5.4",
62
+ "karma": "^1.4.1",
63
+ "karma-chrome-launcher": "^2.2.0",
64
+ "karma-coverage": "^1.1.1",
65
+ "karma-mocha": "^1.3.0",
66
+ "karma-sinon-chai": "^1.3.1",
67
+ "karma-sourcemap-loader": "^0.3.7",
68
+ "karma-spec-reporter": "0.0.31",
69
+ "karma-webpack": "^2.0.2",
70
+ "less": "^2.7.3",
71
+ "mkdirp": "^0.5.1",
72
+ "mocha": "^3.2.0",
73
+ "ncp": "^2.0.0",
74
+ "rimraf": "^2.5.0",
75
+ "sale-client": "3.2.11-17",
76
+ "selenium-server": "2.52.0",
77
+ "sinon": "^2.1.0",
78
+ "sinon-chai": "^2.8.0",
79
+ "style": "0.0.3",
80
+ "style-loader": "^0.20.3",
81
+ "system-clients": "3.1.88-5",
82
+ "url-loader": "^0.5.7",
83
+ "vue-client": "1.24.27",
84
+ "vue-hot-reload-api": "^1.2.0",
85
+ "vue-html-loader": "^1.0.0",
86
+ "vue-loader": "^8.2.1",
87
+ "vue-resource": "^1.5.0",
88
+ "vue-router": "^0.7.13",
89
+ "vue-strap": "^1.0.9",
90
+ "vue-style-loader": "^1.0.0",
91
+ "vue-validator": "2.1.7",
92
+ "webpack": "^1.12.2",
93
+ "webpack-dev-middleware": "^1.4.0",
94
+ "webpack-hot-middleware": "^2.6.0",
95
+ "webpack-merge": "^0.8.3",
96
+ "jsencrypt": "3.0.0-rc.1",
97
+ "axios": "0.15.3"
98
+ }
99
+ }
@@ -222,11 +222,11 @@
222
222
  </v-select>
223
223
  </div>
224
224
  <div class="col-sm-6 form-group " v-if="showModify"
225
- :class="[$v.f_residential_area_id.required ? 'has-error' : 'has-success']">
225
+ :class="[$v.f_area_id.required ? 'has-error' : 'has-success']">
226
226
  <label class="font_normal_body">小区名称</label>
227
- <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_residential_area_id"
227
+ <input type="text" style="width:41%" v-show="false" v-model="areamodel.f_area_id"
228
228
  v-validate:f_area_id='{required: true }'>
229
- <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
229
+ <v-select :value.sync="areamodel.f_area_id" :value-single="true"
230
230
  :options='areaslist' placeholder='请选择'
231
231
  @change=""
232
232
  close-on-select search="true">
@@ -321,7 +321,7 @@
321
321
  readyGen(this)
322
322
  this.search()
323
323
  this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
324
- this.initareas(`f_filialeid = '${this.f_filialeids}'`)
324
+ this.initAreas(this.f_filialeids)
325
325
  this.$refs.paged.$refs.grid.selectInit()
326
326
  },
327
327
  methods: {
@@ -429,7 +429,7 @@
429
429
  let modifyBatchData = {
430
430
  userInfos: this.userInfos,
431
431
  f_pcd_id: this.areamodel.f_pcd_id,
432
- f_residential_area_id: this.areamodel.f_residential_area_id,
432
+ f_area_id: this.areamodel.f_area_id,
433
433
  f_street_id: this.areamodel.f_street_id,
434
434
  f_operator: this.$login.f.name,
435
435
  f_operatorid: this.$login.f.id,
@@ -46,14 +46,14 @@
46
46
  <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
47
47
  <label class="font_normal_body">省&emsp;&emsp;份</label>
48
48
  <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
49
- condition="f_province like '%{}%'" placeholder="省份"
50
- :size="model.f_province ? model.f_province.length*2 : 6"/>
49
+ condition="f_province like '%{}%'" placeholder="省份"
50
+ :size="model.f_province ? model.f_province.length*2 : 6"/>
51
51
  </div>
52
52
  <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
53
53
  <label class="font_normal_body">城&emsp;&emsp;市</label>
54
54
  <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
55
- condition="f_city like '%{}%'" placeholder="城市"
56
- :size="model.f_city ? model.f_city.length*2 : 6"/>
55
+ condition="f_city like '%{}%'" placeholder="城市"
56
+ :size="model.f_city ? model.f_city.length*2 : 6"/>
57
57
  </div>
58
58
  <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
59
59
  <label class="font_normal_body">区&emsp;&emsp;县</label>
@@ -93,8 +93,8 @@
93
93
  <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
94
94
  <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
95
95
  <td style="text-align:center"><nobr>
96
- <!-- <button type="button" name="button" class="btn btn-link"
97
- @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
96
+ <!-- <button type="button" name="button" class="btn btn-link"
97
+ @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
98
98
  <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
99
99
  style="padding: 5px 12px"
100
100
  @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
@@ -108,103 +108,104 @@
108
108
  </template>
109
109
 
110
110
  <script>
111
- import { PagedList } from 'vue-client'
112
- let readyGen = async function (self) {
113
- self.getfield = self.config.excelHeaders
114
- }
115
- export default {
116
- data () {
117
- return {
118
- criteriaShow: false,
119
- model: new PagedList('rs/sql/address_getstreetlist',20),
120
- addflag: false,
121
- getfield: {},
122
- addtitle:'',
123
- // 公司下拉
124
- curorgid: [this.$login.f.orgid],
125
- f_orgid: '',
126
- config: {
127
- // 导出列要和查询列相同
128
- excelHeaders: {
129
- 'f_province':'省份',
130
- 'f_city':'城市',
131
- 'f_district':'区/县',
132
- 'f_street':'街道名称',
133
- 'f_org_name':'分公司',
134
- 'streenum':'小区数量'
135
- }
111
+ import { PagedList } from 'vue-client'
112
+ let readyGen = async function (self) {
113
+ self.getfield = self.config.excelHeaders
114
+ }
115
+ export default {
116
+ data () {
117
+ return {
118
+ criteriaShow: false,
119
+ model: new PagedList('rs/sql/address_getstreetlist',20),
120
+ addflag: false,
121
+ getfield: {},
122
+ addtitle:'',
123
+ // 公司下拉
124
+ curorgid: [this.$login.f.orgid],
125
+ f_orgid: '',
126
+ config: {
127
+ // 导出列要和查询列相同
128
+ excelHeaders: {
129
+ 'f_province':'省份',
130
+ 'f_city':'城市',
131
+ 'f_district':'区/县',
132
+ 'f_street':'街道名称',
133
+ 'f_address':'详细地址',
134
+ 'f_org_name':'分公司',
135
+ 'streenum':'小区数量'
136
136
  }
137
137
  }
138
+ }
139
+ },
140
+ title: '街道管理',
141
+ props:{
142
+ f_filialeids:{
143
+ type: String
144
+ }
145
+ },
146
+ ready(){
147
+ readyGen(this)
148
+ this.search()
149
+ },
150
+ methods: {
151
+ hidden() {
152
+ this.criteriaShow = !this.criteriaShow
138
153
  },
139
- title: '街道管理',
140
- props:{
141
- f_filialeids:{
142
- type: String
143
- }
144
- },
145
- ready(){
146
- readyGen(this)
147
- this.search()
154
+ search () {
155
+ this.$refs.paged.$refs.cri.search()
148
156
  },
149
- methods: {
150
- hidden() {
151
- this.criteriaShow = !this.criteriaShow
152
- },
153
- search () {
154
- this.$refs.paged.$refs.cri.search()
155
- },
156
- async delete(row){
157
- if(row.id >= 0 ){
158
- var id = row.id
159
- let useraredss = await this.$resetpost('rs/sql/address_singleTable',
160
- {data: {
161
- items: 'f_street_id',
162
- tablename: 't_area',
163
- condition: `f_street_id='${id}'`}
164
- },
165
- {resolveMsg: null, rejectMsg: null})
166
- if(useraredss.data.length>0){
167
- this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
168
- }else{
169
- this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
170
- this.$dispatch('cancel')
171
- })
172
- }
157
+ async delete(row){
158
+ if(row.id >= 0 ){
159
+ var id = row.id
160
+ let useraredss = await this.$resetpost('rs/sql/address_singleTable',
161
+ {data: {
162
+ items: 'f_street_id',
163
+ tablename: 't_area',
164
+ condition: `f_street_id='${id}'`}
165
+ },
166
+ {resolveMsg: null, rejectMsg: null})
167
+ if(useraredss.data.length>0){
168
+ this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
169
+ }else{
170
+ this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
171
+ this.$dispatch('cancel')
172
+ })
173
173
  }
174
- },
175
- add(val){
176
- if (this.f_filialeids) {
177
- this.$refs.paged.$refs.grid.selectStore.selected = null
178
- this.$dispatch('add',val)
179
- } else {
180
- this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
181
- }
182
- },
183
- modify(val){
174
+ }
175
+ },
176
+ add(val){
177
+ if (this.f_filialeids) {
184
178
  this.$refs.paged.$refs.grid.selectStore.selected = null
185
- this.$dispatch('modify',val)
186
- },
187
- selfSearch (args) {
188
- if (!this.f_orgid) {
189
- this.getorg([this.$login.f.orgid])
190
- }
191
- args.condition = `${args.condition} and s.f_filialeid in ${this.f_orgid}`
192
- this.model.search(args.condition, args.model)
193
- },
194
- //清空
195
- clear(){
196
- this.$refs.paged.$refs.cri.model = {}
197
- },
198
- getorg (val) {
199
- this.f_orgid = this.$login.convertToIn(val)
200
- this.f_filialeids = val[0]
179
+ this.$dispatch('add',val)
180
+ } else {
181
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
201
182
  }
202
183
  },
203
- computed: {
204
- getCondition() {
205
- return {
206
- condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`}
184
+ modify(val){
185
+ this.$refs.paged.$refs.grid.selectStore.selected = null
186
+ this.$dispatch('modify',val)
187
+ },
188
+ selfSearch (args) {
189
+ if (!this.f_orgid) {
190
+ this.getorg([this.$login.f.orgid])
207
191
  }
192
+ args.condition = `${args.condition} and s.f_filialeid in ${this.f_orgid}`
193
+ this.model.search(args.condition, args.model)
194
+ },
195
+ //清空
196
+ clear(){
197
+ this.$refs.paged.$refs.cri.model = {}
198
+ },
199
+ getorg (val) {
200
+ this.f_orgid = this.$login.convertToIn(val)
201
+ this.f_filialeids = val[0]
202
+ }
203
+ },
204
+ computed: {
205
+ getCondition() {
206
+ return {
207
+ condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`}
208
208
  }
209
209
  }
210
+ }
210
211
  </script>