address-client 3.0.23-19-aode → 3.0.23-2-fx

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 (27) hide show
  1. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  2. package/build/dev-server.js +122 -123
  3. package/package.json +2 -2
  4. package/src/components/AddAreaMsg.vue +35 -64
  5. package/src/components/AddStreetOrPcd.vue +17 -17
  6. package/src/components/AddressList.vue +91 -132
  7. package/src/components/AddressManage.vue +6 -9
  8. package/src/components/AddressTree.vue +1 -1
  9. package/src/components/AreaFiles.vue +1 -1
  10. package/src/components/AreaList.vue +210 -238
  11. package/src/components/AreaManage.vue +6 -6
  12. package/src/components/CityManage.vue +1 -1
  13. package/src/components/StreetList.vue +12 -23
  14. package/src/components/UserAddress.vue +685 -736
  15. package/src/main.js +1 -1
  16. package/.gradle/5.5/fileChanges/last-build.bin +0 -0
  17. package/.gradle/5.5/fileHashes/fileHashes.lock +0 -0
  18. package/.gradle/5.5/gc.properties +0 -0
  19. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  20. package/.gradle/vcs-1/gc.properties +0 -0
  21. package/AddressClient.iml +0 -15
  22. package/doc//345/257/274/345/205/245/345/234/260/345/235/200/346/250/241/346/235/277.xlsx +0 -0
  23. package/examples/showAdd/App.vue +0 -40
  24. package/examples/showAdd/TestData.js +0 -448
  25. package/examples/showAdd/comp.js +0 -250
  26. package/examples/showAdd/index.html +0 -17
  27. package/examples/showAdd/main.js +0 -13
package/.gradle/buildOutputCleanup/cache.properties CHANGED
@@ -1,2 +1,2 @@
1
- #Fri Jul 10 10:01:08 CST 2020
2
- gradle.version=3.5
1
+ #Mon Nov 12 14:18:19 CST 2018
2
+ gradle.version=3.5.1
package/build/dev-server.js CHANGED
@@ -1,123 +1,122 @@
1
- var express = require('express')
2
- var webpack = require('webpack')
3
- var config = require('./webpack.dev.conf')
4
- var proxyMiddleware = require('http-proxy-middleware')
5
- var httpProxy = require('http-proxy')
6
-
7
- var app = express()
8
- var compiler = webpack(config)
9
- var proxy = httpProxy.createProxyServer()
10
-
11
- // Define HTTP proxies to your custom API backend
12
- // https://github.com/chimurai/http-proxy-middleware
13
- //var str = 'http://127.0.0.1:8091/ldap', str2= 'http://127.0.0.1:8300'
14
- var str='http://127.0.0.1:8089',str2='http://192.168.10.14:8300'
15
- var proxyTable = {
16
-
17
- '/rs/logic/getLogin': {
18
- target: str2
19
- },
20
- '/rs/user': {
21
- target: str2
22
- },
23
- '/rs/db': {
24
- target: str2
25
- },
26
- '/rs/search': {
27
- target: str2
28
- },
29
- '/rs/data': {
30
- target: str2
31
- },
32
- '/rs/logic/getInitData': {
33
- target: str2
34
- },
35
- '/rs/logic/getSaleInitData': {
36
- target: str2
37
- },
38
- '/rs': {
39
- target: str2
40
- //target: str2
41
- }
42
- }
43
-
44
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
45
- publicPath: config.output.publicPath,
46
- stats: {
47
- colors: true,
48
- chunks: false
49
- }
50
- })
51
-
52
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
53
- // force page reload when html-webpack-plugin template changes
54
- compiler.plugin('compilation', function (compilation) {
55
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
56
- hotMiddleware.publish({ action: 'reload' })
57
- cb()
58
- })
59
- })
60
-
61
- // proxy api requests
62
- Object.keys(proxyTable).forEach(function (context) {
63
- var options = proxyTable[context]
64
- if (typeof options === 'string') {
65
- options = { target: options }
66
- }
67
- app.use(proxyMiddleware(context, options))
68
- })
69
-
70
- // handle fallback for HTML5 history API
71
- app.use(require('connect-history-api-fallback')())
72
-
73
- // serve webpack bundle output
74
- app.use(devMiddleware)
75
-
76
- // enable hot-reload and state-preserving
77
- // compilation error display
78
- app.use(hotMiddleware)
79
-
80
- // serve pure static assets
81
- app.use('/static', express.static('./static'))
82
-
83
- // app.all('/rs/*', function (req, res) {
84
- // proxy.web(req, res, {
85
- // target: 'http://127.0.0.1:8081/reports'
86
- // })
87
- // })
88
-
89
- // app.all('/rs/*', function (req, res) {
90
- // proxy.web(req, res, {
91
- // target: 'http://127.0.0.1:8081/ldap'
92
- // })
93
- // })
94
- // app.all('/excel/*', function (req, res) {
95
- // proxy.web(req, res, {
96
- // target: 'http://127.0.0.1:8081/charge'
97
- // })
98
- // })
99
-
100
- // app.all('/rs/*', function (req, res) {
101
- // proxy.web(req, res, {
102
- // target: 'http://127.0.0.1:82/charge'
103
- // })
104
- // })
105
-
106
- // app.all('/*', function (req, res) {
107
- // proxy.web(req, res, {
108
- // target: 'http://127.0.0.1:82'
109
- // })
110
- // })
111
- // app.all('/rs/user', function (req, res) {
112
- // proxy.web(req, res, {
113
- // target: 'http://127.0.0.1:82'
114
- // })
115
- // })
116
-
117
- module.exports = app.listen(8081, function (err) {
118
- if (err) {
119
- console.log(err)
120
- return
121
- }
122
- console.log('Listening at http://localhost:8085')
123
- })
1
+ var express = require('express')
2
+ var webpack = require('webpack')
3
+ var config = require('./webpack.dev.conf')
4
+ var proxyMiddleware = require('http-proxy-middleware')
5
+ var httpProxy = require('http-proxy')
6
+
7
+ var app = express()
8
+ var compiler = webpack(config)
9
+ var proxy = httpProxy.createProxyServer()
10
+
11
+ // Define HTTP proxies to your custom API backend
12
+ // https://github.com/chimurai/http-proxy-middleware
13
+ var str = 'http://127.0.0.1:8091/ldap', str2= 'http://127.0.0.1:8300'
14
+ var proxyTable = {
15
+
16
+ '/rs/logic/getLogin': {
17
+ target: str2
18
+ },
19
+ '/rs/user': {
20
+ target: str2
21
+ },
22
+ '/rs/db': {
23
+ target: str2
24
+ },
25
+ '/rs/search': {
26
+ target: str2
27
+ },
28
+ '/rs/data': {
29
+ target: str2
30
+ },
31
+ '/rs/logic/getInitData': {
32
+ target: str2
33
+ },
34
+ '/rs/logic/getSaleInitData': {
35
+ target: 'http://127.0.0.1:8090/product'
36
+ },
37
+ '/rs': {
38
+ // target: 'http://192.168.50.199:8300'
39
+ target: 'http://127.0.0.1:8092/address'
40
+ }
41
+ }
42
+
43
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
44
+ publicPath: config.output.publicPath,
45
+ stats: {
46
+ colors: true,
47
+ chunks: false
48
+ }
49
+ })
50
+
51
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
52
+ // force page reload when html-webpack-plugin template changes
53
+ compiler.plugin('compilation', function (compilation) {
54
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
55
+ hotMiddleware.publish({ action: 'reload' })
56
+ cb()
57
+ })
58
+ })
59
+
60
+ // proxy api requests
61
+ Object.keys(proxyTable).forEach(function (context) {
62
+ var options = proxyTable[context]
63
+ if (typeof options === 'string') {
64
+ options = { target: options }
65
+ }
66
+ app.use(proxyMiddleware(context, options))
67
+ })
68
+
69
+ // handle fallback for HTML5 history API
70
+ app.use(require('connect-history-api-fallback')())
71
+
72
+ // serve webpack bundle output
73
+ app.use(devMiddleware)
74
+
75
+ // enable hot-reload and state-preserving
76
+ // compilation error display
77
+ app.use(hotMiddleware)
78
+
79
+ // serve pure static assets
80
+ app.use('/static', express.static('./static'))
81
+
82
+ // app.all('/rs/*', function (req, res) {
83
+ // proxy.web(req, res, {
84
+ // target: 'http://127.0.0.1:8081/reports'
85
+ // })
86
+ // })
87
+
88
+ // app.all('/rs/*', function (req, res) {
89
+ // proxy.web(req, res, {
90
+ // target: 'http://127.0.0.1:8081/ldap'
91
+ // })
92
+ // })
93
+ // app.all('/excel/*', function (req, res) {
94
+ // proxy.web(req, res, {
95
+ // target: 'http://127.0.0.1:8081/charge'
96
+ // })
97
+ // })
98
+
99
+ // app.all('/rs/*', function (req, res) {
100
+ // proxy.web(req, res, {
101
+ // target: 'http://127.0.0.1:82/charge'
102
+ // })
103
+ // })
104
+
105
+ // app.all('/*', function (req, res) {
106
+ // proxy.web(req, res, {
107
+ // target: 'http://127.0.0.1:82'
108
+ // })
109
+ // })
110
+ // app.all('/rs/user', function (req, res) {
111
+ // proxy.web(req, res, {
112
+ // target: 'http://127.0.0.1:82'
113
+ // })
114
+ // })
115
+
116
+ module.exports = app.listen(8085, function (err) {
117
+ if (err) {
118
+ console.log(err)
119
+ return
120
+ }
121
+ console.log('Listening at http://localhost:8085')
122
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.0.23-19-aode",
3
+ "version": "3.0.23-2-fx",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -78,7 +78,7 @@
78
78
  "sinon-chai": "^2.8.0",
79
79
  "style": "0.0.3",
80
80
  "style-loader": "^0.20.3",
81
- "system-clients": "3.0.52",
81
+ "system-clients": "3.0.6",
82
82
  "url-loader": "^0.5.7",
83
83
  "vue-client": "1.21.47",
84
84
  "vue-hot-reload-api": "^1.2.0",
package/src/components/AddAreaMsg.vue CHANGED
@@ -10,15 +10,9 @@
10
10
  <span v-if="operation=='modify'&&f_special">修改【{{areamodel.f_residential_area}}】单位</span>
11
11
  </div>
12
12
  <!--基本小区(单位)信息-->
13
- <div class="col-sm-6 form-group">
14
- <label class="font_normal_body">小区编号</label>
15
- <input type="text" class="input_search" style="width:60%" v-model="areamodel.f_area_id"
16
- @blur="areaidChange" placeholder="小区编号">
17
- </div>
18
-
19
- <div class="col-sm-6 form-group"
13
+ <div class="col-sm-6 "
20
14
  :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
21
- <label class="font_normal_body">省&ensp;市&ensp;区</label>
15
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省市区</label>
22
16
  <input type="text" class="input_search" class="input_search" style="width:60%" v-show="false" v-model="areamodel.f_pcd_id"
23
17
  v-validate:f_pcd_id='{required: true }'>
24
18
  <v-select
@@ -27,7 +21,7 @@
27
21
  close-on-select search="true" @change="pcdChange">
28
22
  </v-select>
29
23
  </div>
30
- <div class="col-sm-6 form-group"
24
+ <div class="col-sm-6 "
31
25
  :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
32
26
  <label class="font_normal_body">街道名称</label>
33
27
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_street_id"
@@ -38,8 +32,8 @@
38
32
  close-on-select search="true" @change="streetChange">
39
33
  </v-select>
40
34
  </div>
41
- <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']">
42
- <label class="font_normal_body">片&emsp;&emsp;区</label>
35
+ <div class="col-sm-6 " :class="[$v.slice.required ? 'has-error' : 'has-success']">
36
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;片区&nbsp;&nbsp;&nbsp;</label>
43
37
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
44
38
  v-validate:slice='{required: true }'>
45
39
  <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
@@ -49,7 +43,7 @@
49
43
  </div>
50
44
  <!--小区(特殊)信息-->
51
45
  <div v-if="!f_special"
52
- class="col-sm-6 form-group"
46
+ class="col-sm-6 "
53
47
  :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
54
48
  <label class="font_normal_body">小区名称</label>
55
49
  <input type="text" style="width:60%" class="input_search" v-model="areamodel.f_residential_area"
@@ -57,14 +51,14 @@
57
51
  v-validate:f_residential_area='{required: true }'>
58
52
  </div>
59
53
  <div v-if="!f_special"
60
- class="col-sm-12 form-group">
54
+ class="col-sm-12 ">
61
55
  <label class="font_normal_body">小区地址</label>
62
56
  <input type="text" style="width:80%" class="input_search" v-model="areamodel.f_area_address"
63
57
  class="form-control" placeholder="小区地址">
64
58
  </div>
65
59
  <!--单位(特殊)信息-->
66
60
  <div v-if="f_special"
67
- class="col-sm-6 form-group"
61
+ class="col-sm-6 "
68
62
  :class="[$v.f_residential_area.required ? 'has-error' : 'has-success']">
69
63
  <label class="font_normal_body">单位名称</label>
70
64
  <input type="text" style="width:60%" class="input_search" v-model="areamodel.f_residential_area"
@@ -72,40 +66,40 @@
72
66
  v-validate:f_residential_area='{required: true }'>
73
67
  </div>
74
68
  <div v-if="f_special"
75
- class="col-sm-12 form-group">
69
+ class="col-sm-12 ">
76
70
  <label class="font_normal_body">单位地址</label>
77
71
  <input type="text" style="width:60%" class="input_search" v-model="areamodel.f_area_address"
78
72
  class="form-control" placeholder="单位地址">
79
73
  </div>
80
74
  <div v-if="f_special"
81
- class="col-sm-6 form-group"
75
+ class="col-sm-6 "
82
76
  :class="[$v.f_linkname.required ? 'has-error' : 'has-success']">
83
- <label class="font_normal_body">联&ensp;系&ensp;人</label>
77
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;联系人</label>
84
78
  <input type="text" style="width:60%" class="input_search" v-model="areamodel.f_linkname"
85
79
  class="form-control" placeholder="联系人"
86
80
  v-validate:f_linkname='{required: true }'>
87
81
  </div>
88
82
  <div v-if="f_special"
89
- class="col-sm-6 form-group"
83
+ class="col-sm-6 "
90
84
  :class="[$v.f_linkphone.required ? 'has-error' : 'has-success']">
91
85
  <label class="font_normal_body">联系电话</label>
92
86
  <input type="text" style="width:60%" class="input_search" v-model="areamodel.f_linkphone"
93
87
  class="form-control" placeholder="联系电话"
94
88
  v-validate:f_linkphone='{required: true }'>
95
89
  </div>
96
- <div class="col-sm-12 form-group">
97
- <label class="font_normal_body " style="">备&emsp;&emsp;注</label>
98
- <textarea class="input_textarea" rows="3" style="margin-top:20px;width:80%;height: auto;" v-model="areamodel.f_comments"></textarea>
90
+ <div class="col-sm-12">
91
+ <label class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
92
+ <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="areamodel.f_comments"></textarea>
99
93
  </div>
100
- <div class="col-sm-12 form-group">
94
+ <div class="col-sm-12">
101
95
  <br/>
102
96
  </div>
103
97
  <!--表具信息-->
104
98
  <div v-if="!f_special" class="col-sm-12 bg-info text-center" style="padding: 8px;font-size: 18px;font-weight: bold">
105
99
  <span >默认表具信息</span>
106
100
  </div>
107
- <div v-if="!f_special" class="row">
108
- <div class="col-sm-6 form-group">
101
+ <div v-if="!f_special">
102
+ <div class="col-sm-6 ">
109
103
  <label class="font_normal_body">用户类型</label>
110
104
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type"
111
105
  >
@@ -115,7 +109,7 @@
115
109
  close-on-select >
116
110
  </v-select>
117
111
  </div>
118
- <div class="col-sm-6 form-group"
112
+ <div class="col-sm-6 "
119
113
  >
120
114
  <label class="font_normal_body">用气性质</label>
121
115
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties"
@@ -126,7 +120,7 @@
126
120
  close-on-select >
127
121
  </v-select>
128
122
  </div>
129
- <div class="col-sm-6 form-group"
123
+ <div class="col-sm-6 "
130
124
  >
131
125
  <label class="font_normal_body">气价类型</label>
132
126
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type"
@@ -137,7 +131,7 @@
137
131
  close-on-select >
138
132
  </v-select>
139
133
  </div>
140
- <div class="col-sm-6 form-group"
134
+ <div class="col-sm-6 "
141
135
  >
142
136
  <label class="font_normal_body">气价名称</label>
143
137
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name"
@@ -148,7 +142,7 @@
148
142
  close-on-select >
149
143
  </v-select>
150
144
  </div>
151
- <div class="col-sm-6 form-group"
145
+ <div class="col-sm-6 "
152
146
  >
153
147
  <label class="font_normal_body">气表品牌</label>
154
148
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand"
@@ -159,7 +153,7 @@
159
153
  close-on-select >
160
154
  </v-select>
161
155
  </div>
162
- <div class="col-sm-6 form-group"
156
+ <div class="col-sm-6 "
163
157
  >
164
158
  <label class="font_normal_body">气表型号</label>
165
159
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style"
@@ -170,7 +164,7 @@
170
164
  close-on-select >
171
165
  </v-select>
172
166
  </div>
173
- <div class="col-sm-6 form-group">
167
+ <div class="col-sm-6 ">
174
168
  <label class="font_normal_body">安装位置</label>
175
169
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_position">
176
170
  <v-select
@@ -179,8 +173,8 @@
179
173
  close-on-select >
180
174
  </v-select>
181
175
  </div>
182
- <div class="col-sm-6 form-group">
183
- <label class="font_normal_body">抄&ensp;表&ensp;员</label>
176
+ <div class="col-sm-6 ">
177
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;抄表员</label>
184
178
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_inputtor">
185
179
  <v-select
186
180
  :value.sync="areamodel.f_inputtor" :value-single="true"
@@ -188,8 +182,8 @@
188
182
  close-on-select >
189
183
  </v-select>
190
184
  </div>
191
- <div class="col-sm-6 form-group">
192
- <label class="font_normal_body">调&ensp;压&ensp;箱</label>
185
+ <div class="col-sm-6 ">
186
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;调压箱</label>
193
187
  <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_adjustable_id">
194
188
  <v-select
195
189
  :value.sync="areamodel.f_adjustable_id" :value-single="true"
@@ -198,7 +192,7 @@
198
192
  </v-select>
199
193
  </div>
200
194
  </div>
201
- <div v-if="f_special" class="col-sm-6 form-group">
195
+ <div v-if="f_special" class="col-sm-6">
202
196
  <br/>
203
197
  </div>
204
198
  </div>
@@ -229,7 +223,6 @@
229
223
  streetslist:[],
230
224
  //小区
231
225
  areamodel: {
232
- f_area_id: '',
233
226
  f_pcd_id:'',
234
227
  f_linkname:'',
235
228
  f_linkphone:'',
@@ -361,25 +354,6 @@
361
354
  this.streetslist=redata
362
355
  },
363
356
 
364
- async areaidChange () {
365
- // 验证小区编号是否已存在
366
-
367
- let param = {
368
- id: this.areamodel.id,
369
- f_area_id: this.areamodel.f_area_id,
370
- f_filialeid: this.f_filialeids
371
- }
372
-
373
- let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
374
- console.log('验证小区是否存在', res)
375
- if (res.data) {
376
- this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
377
- this.areamodel.f_area_id = ''
378
- }
379
-
380
- },
381
-
382
-
383
357
  //根据名字找数据
384
358
  findbyid(list,name){
385
359
  var result
@@ -419,13 +393,11 @@
419
393
  //街道变化
420
394
  streetChange(val){
421
395
  if(val&&this.operation=='add'){
422
- // if(this.areamodel.f_pcd_id.length==0){
396
+ if(this.areamodel.f_pcd_id.length==0){
423
397
  if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
424
- console.log("aa",this.findbyid(this.streetslist,this.areamodel.f_street_id))
425
- console.log("bbb",this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id)
426
398
  this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
427
399
  }
428
- // }
400
+ }
429
401
  }
430
402
  this.$resetValidation()
431
403
  },
@@ -460,7 +432,6 @@
460
432
  },
461
433
  cleardara(){
462
434
  this.areamodel= {
463
- f_area_id: '',
464
435
  f_pcd_id:'',
465
436
  f_street_id:'',
466
437
  f_slice_area:'',
@@ -489,22 +460,22 @@
489
460
  this.initdata()
490
461
  },
491
462
  'areamodel.f_pcd_id'(){
492
- // if (!this.areamodel.f_area_address) {
463
+ if (!this.areamodel.f_area_address) {
493
464
  if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id){
494
465
  if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
495
466
  this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
496
467
  }
497
468
  }
498
- // }
469
+ }
499
470
  },
500
471
  'areamodel.f_street_id'(){
501
- // if (!this.areamodel.f_area_address) {
472
+ if (!this.areamodel.f_area_address) {
502
473
  if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
503
474
  if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
504
475
  this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
505
476
  }
506
477
  }
507
- // }
478
+ }
508
479
  },
509
480
  'f_filialeids'(){
510
481
  if (this.areamodel.f_filialeid) {
package/src/components/AddStreetOrPcd.vue CHANGED
@@ -8,37 +8,37 @@
8
8
  <div style="text-align:right;margin-top:6px;" class="col-sm-12">
9
9
  <!-- 省市区-->
10
10
  <div v-if="areatype=='省市区'" class="row">
11
- <div class="col-sm-6 form-group "
11
+ <div class="col-sm-6 "
12
12
  :class="[$v.f_province.required ? 'has-error' : 'has-success']">
13
- <label class="font_normal_body">省&emsp;&emsp;份</label>
13
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省份&nbsp;&nbsp;&nbsp;</label>
14
14
  <input type="text" v-model="pcdmodel.f_province"
15
15
  class="input_search" style="width:60%" placeholder="省份"
16
16
  v-validate:f_province='{required: true }'>
17
17
  </div>
18
- <div class="col-sm-6 form-group "
18
+ <div class="col-sm-6 "
19
19
  :class="[$v.f_city.required ? 'has-error' : 'has-success']">
20
- <label class="font_normal_body">城&emsp;&emsp;市</label>
20
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;城市&nbsp;&nbsp;&nbsp;</label>
21
21
  <input type="text" v-model="pcdmodel.f_city"
22
22
  class="input_search" style="width:60%" placeholder="城市"
23
23
  v-validate:f_city='{required: true }'>
24
24
  </div>
25
- <div class="col-sm-6 form-group "
25
+ <div class="col-sm-6 "
26
26
  :class="[$v.f_district.required ? 'has-error' : 'has-success']">
27
- <label class="font_normal_body">区&ensp;&ensp;/&ensp;县</label>
27
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;区/县&nbsp;&nbsp;</label>
28
28
  <input type="text" v-model="pcdmodel.f_district"
29
29
  class="input_search" style="width:60%" placeholder="区/县"
30
30
  v-validate:f_district='{required: true }'>
31
31
  </div>
32
- <div class="col-sm-12 form-group">
33
- <label class="font_normal_body " style="">备&emsp;&emsp;注</label>
34
- <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;" v-model="pcdmodel.f_comments"></textarea>
32
+ <div class="col-sm-12">
33
+ <label class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
34
+ <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="pcdmodel.f_comments"></textarea>
35
35
  </div>
36
36
  </div>
37
37
  <!-- 街道-->
38
- <div v-if="areatype=='街道'" class="row">
39
- <div class="col-sm-6 form-group "
38
+ <div v-if="areatype=='街道'">
39
+ <div class="col-sm-6 "
40
40
  :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
41
- <label class="font_normal_body">省&ensp;市&ensp;区</label>
41
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;省市区</label>
42
42
  <input type="text" v-show="false" v-model="streetmodel.f_pcd_id"
43
43
  v-validate:f_pcd_id='{required: true }'>
44
44
  <v-select
@@ -47,21 +47,21 @@
47
47
  close-on-select search="true" @change="pcdChange">
48
48
  </v-select>
49
49
  </div>
50
- <div class="col-sm-6 form-group "
50
+ <div class="col-sm-6 "
51
51
  :class="[$v.f_street.required ? 'has-error' : 'has-success']">
52
52
  <label class="font_normal_body">街道名称</label>
53
53
  <input type="text" v-model="streetmodel.f_street"
54
54
  class="input_search" style="width:60%" placeholder="街道名称"
55
55
  v-validate:f_street='{required: true }'>
56
56
  </div>
57
- <div class="col-sm-12 form-group">
58
- <label class="font_normal_body " style="">备&emsp;&emsp;注</label>
59
- <textarea class="input_textarea" rows="3" style="margin-top:25px;width:80%;height: auto;" v-model="streetmodel.f_comments"></textarea>
57
+ <div class="col-sm-12">
58
+ <label class="font_normal_body " style="margin-top:-20px">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
59
+ <textarea class="input_textarea" rows="3" style="width:80%;margin-top:5px" v-model="streetmodel.f_comments"></textarea>
60
60
  </div>
61
61
  </div>
62
62
 
63
63
  <div class="row">
64
- <div style="margin-top:40px;text-align:right;">
64
+ <div style="text-align:right;">
65
65
  <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
66
66
  <button class="button_clear button_spacing" @click="cancel()">取消</button>
67
67
  </div>