address-client 3.2.62 → 3.2.63

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.
@@ -1,162 +1,162 @@
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:8078', str2= 'http://192.168.50.4:8400/'
14
- var str3= 'http://192.168.50.4:8400/'
15
- var proxyTable = {
16
- '/rs/sql':{
17
- target: str3,
18
- secure:true,
19
- changeOrigin:true
20
- // target: 'http://127.0.0.1:8080'
21
- },
22
- '/webapps':{
23
- target: str3,
24
- secure:true,
25
- changeOrigin:true
26
- // target: 'http://127.0.0.1:8080'
27
- },
28
- '/rs/logic/getLogin': {
29
- target: str3,
30
- secure:true,
31
- changeOrigin:true
32
- },
33
- '/rs/logic/getInitData': {
34
- target: str3,
35
- secure:true,
36
- changeOrigin:true,
37
- },
38
- '/rs/logic/getSaleInitData': {
39
- target: str3,
40
- secure:true,
41
- changeOrigin:true
42
- },
43
- '/rs/logic':{
44
- target: str3,
45
- secure:true,
46
- changeOrigin:true
47
- // target: 'http://127.0.0.1:8080'
48
- },
49
- '/rs/vue': {
50
- target: str3,
51
- secure:true,
52
- changeOrigin:true
53
- },
54
- '/rs/user': {
55
- target: str3,
56
- secure:true,
57
- changeOrigin:true
58
- },
59
- '/rs/db': {
60
- target: str3,
61
- secure:true,
62
- changeOrigin:true
63
- },
64
- '/rs/search': {
65
- target: str3,
66
- secure:true,
67
- changeOrigin:true
68
- // target: 'http://127.0.0.1:8080'
69
- },
70
- '/rs/data': {
71
- target: str3,
72
- secure:true,
73
- changeOrigin:true
74
- },
75
- '/rs': {
76
- // target: 'http://192.168.50.199:8300'
77
- target: str3,
78
- secure:true,
79
- changeOrigin:true
80
- }
81
- }
82
-
83
- var devMiddleware = require('webpack-dev-middleware')(compiler, {
84
- publicPath: config.output.publicPath,
85
- stats: {
86
- colors: true,
87
- chunks: false
88
- }
89
- })
90
-
91
- var hotMiddleware = require('webpack-hot-middleware')(compiler)
92
- // force page reload when html-webpack-plugin template changes
93
- compiler.plugin('compilation', function (compilation) {
94
- compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
95
- hotMiddleware.publish({ action: 'reload' })
96
- cb()
97
- })
98
- })
99
-
100
- // proxy api requests
101
- Object.keys(proxyTable).forEach(function (context) {
102
- var options = proxyTable[context]
103
- if (typeof options === 'string') {
104
- options = { target: options }
105
- }
106
- app.use(proxyMiddleware(context, options))
107
- })
108
-
109
- // handle fallback for HTML5 history API
110
- app.use(require('connect-history-api-fallback')())
111
-
112
- // serve webpack bundle output
113
- app.use(devMiddleware)
114
-
115
- // enable hot-reload and state-preserving
116
- // compilation error display
117
- app.use(hotMiddleware)
118
-
119
- // serve pure static assets
120
- app.use('/static', express.static('./static'))
121
-
122
- // app.all('/rs/*', function (req, res) {
123
- // proxy.web(req, res, {
124
- // target: 'http://127.0.0.1:8081/reports'
125
- // })
126
- // })
127
-
128
- // app.all('/rs/*', function (req, res) {
129
- // proxy.web(req, res, {
130
- // target: 'http://127.0.0.1:8081/ldap'
131
- // })
132
- // })
133
- // app.all('/excel/*', function (req, res) {
134
- // proxy.web(req, res, {
135
- // target: 'http://127.0.0.1:8081/charge'
136
- // })
137
- // })
138
-
139
- // app.all('/rs/*', function (req, res) {
140
- // proxy.web(req, res, {
141
- // target: 'http://127.0.0.1:82/charge'
142
- // })
143
- // })
144
-
145
- // app.all('/*', function (req, res) {
146
- // proxy.web(req, res, {
147
- // target: 'http://127.0.0.1:82'
148
- // })
149
- // })
150
- // app.all('/rs/user', function (req, res) {
151
- // proxy.web(req, res, {
152
- // target: 'http://127.0.0.1:82'
153
- // })
154
- // })
155
-
156
- module.exports = app.listen(8085, function (err) {
157
- if (err) {
158
- console.log(err)
159
- return
160
- }
161
- console.log('Listening at http://localhost:8085')
162
- })
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:8078', str2= 'http://192.168.50.4:8400/'
14
+ var str3= 'http://192.168.50.4:8400/'
15
+ var proxyTable = {
16
+ '/rs/sql':{
17
+ target: str3,
18
+ secure:true,
19
+ changeOrigin:true
20
+ // target: 'http://127.0.0.1:8080'
21
+ },
22
+ '/webapps':{
23
+ target: str3,
24
+ secure:true,
25
+ changeOrigin:true
26
+ // target: 'http://127.0.0.1:8080'
27
+ },
28
+ '/rs/logic/getLogin': {
29
+ target: str3,
30
+ secure:true,
31
+ changeOrigin:true
32
+ },
33
+ '/rs/logic/getInitData': {
34
+ target: str3,
35
+ secure:true,
36
+ changeOrigin:true,
37
+ },
38
+ '/rs/logic/getSaleInitData': {
39
+ target: str3,
40
+ secure:true,
41
+ changeOrigin:true
42
+ },
43
+ '/rs/logic':{
44
+ target: str3,
45
+ secure:true,
46
+ changeOrigin:true
47
+ // target: 'http://127.0.0.1:8080'
48
+ },
49
+ '/rs/vue': {
50
+ target: str3,
51
+ secure:true,
52
+ changeOrigin:true
53
+ },
54
+ '/rs/user': {
55
+ target: str3,
56
+ secure:true,
57
+ changeOrigin:true
58
+ },
59
+ '/rs/db': {
60
+ target: str3,
61
+ secure:true,
62
+ changeOrigin:true
63
+ },
64
+ '/rs/search': {
65
+ target: str3,
66
+ secure:true,
67
+ changeOrigin:true
68
+ // target: 'http://127.0.0.1:8080'
69
+ },
70
+ '/rs/data': {
71
+ target: str3,
72
+ secure:true,
73
+ changeOrigin:true
74
+ },
75
+ '/rs': {
76
+ // target: 'http://192.168.50.199:8300'
77
+ target: str3,
78
+ secure:true,
79
+ changeOrigin:true
80
+ }
81
+ }
82
+
83
+ var devMiddleware = require('webpack-dev-middleware')(compiler, {
84
+ publicPath: config.output.publicPath,
85
+ stats: {
86
+ colors: true,
87
+ chunks: false
88
+ }
89
+ })
90
+
91
+ var hotMiddleware = require('webpack-hot-middleware')(compiler)
92
+ // force page reload when html-webpack-plugin template changes
93
+ compiler.plugin('compilation', function (compilation) {
94
+ compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
95
+ hotMiddleware.publish({ action: 'reload' })
96
+ cb()
97
+ })
98
+ })
99
+
100
+ // proxy api requests
101
+ Object.keys(proxyTable).forEach(function (context) {
102
+ var options = proxyTable[context]
103
+ if (typeof options === 'string') {
104
+ options = { target: options }
105
+ }
106
+ app.use(proxyMiddleware(context, options))
107
+ })
108
+
109
+ // handle fallback for HTML5 history API
110
+ app.use(require('connect-history-api-fallback')())
111
+
112
+ // serve webpack bundle output
113
+ app.use(devMiddleware)
114
+
115
+ // enable hot-reload and state-preserving
116
+ // compilation error display
117
+ app.use(hotMiddleware)
118
+
119
+ // serve pure static assets
120
+ app.use('/static', express.static('./static'))
121
+
122
+ // app.all('/rs/*', function (req, res) {
123
+ // proxy.web(req, res, {
124
+ // target: 'http://127.0.0.1:8081/reports'
125
+ // })
126
+ // })
127
+
128
+ // app.all('/rs/*', function (req, res) {
129
+ // proxy.web(req, res, {
130
+ // target: 'http://127.0.0.1:8081/ldap'
131
+ // })
132
+ // })
133
+ // app.all('/excel/*', function (req, res) {
134
+ // proxy.web(req, res, {
135
+ // target: 'http://127.0.0.1:8081/charge'
136
+ // })
137
+ // })
138
+
139
+ // app.all('/rs/*', function (req, res) {
140
+ // proxy.web(req, res, {
141
+ // target: 'http://127.0.0.1:82/charge'
142
+ // })
143
+ // })
144
+
145
+ // app.all('/*', function (req, res) {
146
+ // proxy.web(req, res, {
147
+ // target: 'http://127.0.0.1:82'
148
+ // })
149
+ // })
150
+ // app.all('/rs/user', function (req, res) {
151
+ // proxy.web(req, res, {
152
+ // target: 'http://127.0.0.1:82'
153
+ // })
154
+ // })
155
+
156
+ module.exports = app.listen(8085, function (err) {
157
+ if (err) {
158
+ console.log(err)
159
+ return
160
+ }
161
+ console.log('Listening at http://localhost:8085')
162
+ })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.62",
3
+ "version": "3.2.63",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -1,241 +1,241 @@
1
- <template>
2
- <div class="flex" @keyup.enter="search">
3
- <criteria-paged :model="model" v-ref:paged>
4
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
5
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
- <div class="row">
7
- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
8
- <label class="font_normal_body">组织机构</label>
9
- <res-select restype='organization'
10
- @res-select="$parent.$parent.getorg"
11
- :initresid='$parent.$parent.curorgid'>
12
- </res-select>
13
- </div>
14
- <div class="col-sm-4 form-group button-range">
15
- <button class="button_search button_spacing" @click="search()" >查询</button>
16
- <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('省市区')">省市区管理</button>
17
- <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('街道')">添加街道</button>
18
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
19
- <export-excel :data="$parent.$parent.getCondition"
20
- :field="$parent.$parent.getfield"
21
- sqlurl="rs/logic/exportfile"
22
- sql-name="manage_getstreetlist"
23
- template-name='街道信息查询导出'
24
- :choose-col="true"></export-excel>
25
- <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
26
- </div>
27
- </div>
28
- <div class="row" v-show="$parent.$parent.criteriaShow">
29
- <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}">
30
- <label class="font_normal_body">街道名称</label>
31
- <input type="text" class="input_search" style="width:60%" v-model="model.f_street"
32
- condition="f_street like '%{}%'" placeholder="街道名称"/>
33
- </div>
34
- <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}">
35
- <label class="font_normal_body">省&emsp;&emsp;份</label>
36
- <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
37
- condition="f_province like '%{}%'" placeholder="省份"
38
- :size="model.f_province ? model.f_province.length*2 : 6"/>
39
- </div>
40
- <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}">
41
- <label class="font_normal_body">城&emsp;&emsp;市</label>
42
- <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
43
- condition="f_city like '%{}%'" placeholder="城市"
44
- :size="model.f_city ? model.f_city.length*2 : 6"/>
45
- </div>
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
- <label class="font_normal_body">省&emsp;&emsp;份</label>
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"/>
51
- </div>
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
- <label class="font_normal_body">城&emsp;&emsp;市</label>
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"/>
57
- </div>
58
- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
59
- <label class="font_normal_body">区&emsp;&emsp;县</label>
60
- <input type="text" style="width:60%" class="input_search" v-model="model.f_district"
61
- condition="f_district like '%{}%'" placeholder="区县"
62
- :size="model.f_district ? model.f_district.length*2 : 6"/>
63
- </div>
64
- </div>
65
- </div>
66
- </criteria>
67
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
68
- <template partial='head'>
69
- <tr>
70
- <th><nobr>序号</nobr></th>
71
- <th><nobr>省份</nobr></th>
72
- <th><nobr>城市</nobr></th>
73
- <th><nobr>区/县</nobr></th>
74
- <th><data-order field="f_iscity" name="地区类型"
75
- :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
- <th><nobr>街道/乡镇</nobr></th>
77
- <th><data-order field="f_address" name="地址"
78
- :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
79
- <th><nobr>分公司</nobr></th>
80
- <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
81
- <th><nobr>操作</nobr></th>
82
- </tr>
83
- </template>
84
- <template partial='body'>
85
- <tr @click="$parent.$parent.changestyle()">
86
- <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
87
- <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
88
- <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
89
- <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
90
- <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
91
- <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
92
- <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
93
- <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
94
- <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
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>-->
98
- <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
99
- style="padding: 5px 12px"
100
- @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
101
- </nobr></td>
102
- </tr>
103
- </template>
104
- <template partial='foot'></template>
105
- </data-grid>
106
- </criteria-paged>
107
- </div>
108
- </template>
109
-
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,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
120
- addflag: false,
121
- getfield: {},
122
- //排序
123
- orderitem:'f_city,f_district,f_iscity,f_street desc',
124
- addtitle:'',
125
- // 公司下拉
126
- curorgid: [this.$login.f.orgid],
127
- f_orgid: '',
128
- config: {
129
- // 导出列要和查询列相同
130
- excelHeaders: {
131
- 'f_province':'省份',
132
- 'f_city':'城市',
133
- 'f_district':'区/县',
134
- 'f_street':'街道名称',
135
- 'f_org_name':'分公司',
136
- 'streenum':'小区数量'
137
- }
138
- },
139
- orderFields: {
140
- f_operate_date: 'no'
141
- },
142
- }
143
- },
144
- title: '街道管理',
145
- props:{
146
- f_filialeids:{
147
- type: String
148
- }
149
- },
150
- ready(){
151
- readyGen(this)
152
- this.search()
153
- },
154
- methods: {
155
- hidden() {
156
- this.criteriaShow = !this.criteriaShow
157
- },
158
- search () {
159
- this.$refs.paged.$refs.cri.search()
160
- },
161
- async delete(row){
162
- if(row.id >= 0 ){
163
- var id = row.id
164
- let useraredss = await this.$resetpost('rs/sql/address_singleTable',
165
- {data: {
166
- items: 'f_street_id',
167
- tablename: 't_area',
168
- condition: `f_street_id='${id}'`}
169
- },
170
- {resolveMsg: null, rejectMsg: null})
171
- if(useraredss.data.length>0){
172
- this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
173
- }else{
174
- this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
175
- this.$dispatch('cancel')
176
- })
177
- }
178
- }
179
- },
180
- add(val){
181
- if (this.f_filialeids) {
182
- this.$refs.paged.$refs.grid.selectStore.selected = null
183
- this.$dispatch('add',val)
184
- } else {
185
- this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
186
- }
187
- },
188
- modify(val){
189
- this.$refs.paged.$refs.grid.selectStore.selected = null
190
- this.$dispatch('modify',val)
191
- },
192
- selfSearch (args) {
193
- if (!this.f_orgid) {
194
- this.getorg([this.$login.f.orgid])
195
- }
196
- args.condition = `${args.condition} and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid = '1111')`
197
- this.model.search(args.condition, args.model)
198
- },
199
- //清空
200
- clear(){
201
- this.$refs.paged.$refs.cri.model = {}
202
- },
203
- getorg (val) {
204
- this.f_orgid = this.$login.convertToIn(val)
205
- this.f_filialeids = val[0]
206
- }
207
- },
208
- computed: {
209
- getCondition() {
210
- if (!this.f_orgid) {
211
- this.getorg([this.$login.f.orgid])
212
- }
213
- return {
214
- condition: `${this.$refs.paged.$refs.cri.condition}` + `and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid = '1111')`,
215
- orderitem: this.orderitem?`${this.orderitem}`: " id desc"
216
- }
217
- }
218
- },
219
- events:{
220
- 'sort' (field, rule) {
221
- // 将所有排序方式设为不排序,实现相互排斥
222
- console.log("field",field, rule)
223
- for (let key in this.orderFields) {
224
- if (key === field) {
225
- this.orderFields[key] = rule
226
- } else {
227
- this.orderFields[key] = 'no'
228
- }
229
- }
230
- // 如果新规则不排序,还原为默认排序
231
- if (rule === 'no') {
232
- this.model.paramSource.orderitem = `'${this.orderitem}'`
233
- } else {
234
- this.model.paramSource.orderitem = `'${field} ${rule}'`
235
- }
236
-
237
- this.search()
238
- },
239
- },
240
- }
241
- </script>
1
+ <template>
2
+ <div class="flex" @keyup.enter="search">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select restype='organization'
10
+ @res-select="$parent.$parent.getorg"
11
+ :initresid='$parent.$parent.curorgid'>
12
+ </res-select>
13
+ </div>
14
+ <div class="col-sm-4 form-group button-range">
15
+ <button class="button_search button_spacing" @click="search()" >查询</button>
16
+ <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('省市区')">省市区管理</button>
17
+ <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('街道')">添加街道</button>
18
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
19
+ <export-excel :data="$parent.$parent.getCondition"
20
+ :field="$parent.$parent.getfield"
21
+ sqlurl="rs/logic/exportfile"
22
+ sql-name="manage_getstreetlist"
23
+ template-name='街道信息查询导出'
24
+ :choose-col="true"></export-excel>
25
+ <div style="float: right" class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.hidden()"></div>
26
+ </div>
27
+ </div>
28
+ <div class="row" v-show="$parent.$parent.criteriaShow">
29
+ <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
30
+ <label class="font_normal_body">街道名称</label>
31
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_street"
32
+ condition="f_street like '%{}%'" placeholder="街道名称"/>
33
+ </div>
34
+ <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}">
35
+ <label class="font_normal_body">省&emsp;&emsp;份</label>
36
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
37
+ condition="f_province like '%{}%'" placeholder="省份"
38
+ :size="model.f_province ? model.f_province.length*2 : 6"/>
39
+ </div>
40
+ <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}">
41
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
42
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
43
+ condition="f_city like '%{}%'" placeholder="城市"
44
+ :size="model.f_city ? model.f_city.length*2 : 6"/>
45
+ </div>
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
+ <label class="font_normal_body">省&emsp;&emsp;份</label>
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"/>
51
+ </div>
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
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
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"/>
57
+ </div>
58
+ <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
59
+ <label class="font_normal_body">区&emsp;&emsp;县</label>
60
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_district"
61
+ condition="f_district like '%{}%'" placeholder="区县"
62
+ :size="model.f_district ? model.f_district.length*2 : 6"/>
63
+ </div>
64
+ </div>
65
+ </div>
66
+ </criteria>
67
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
68
+ <template partial='head'>
69
+ <tr>
70
+ <th><nobr>序号</nobr></th>
71
+ <th><nobr>省份</nobr></th>
72
+ <th><nobr>城市</nobr></th>
73
+ <th><nobr>区/县</nobr></th>
74
+ <th><data-order field="f_iscity" name="地区类型"
75
+ :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
+ <th><nobr>街道/乡镇</nobr></th>
77
+ <th><data-order field="f_address" name="地址"
78
+ :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
79
+ <th><nobr>分公司</nobr></th>
80
+ <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
81
+ <th><nobr>操作</nobr></th>
82
+ </tr>
83
+ </template>
84
+ <template partial='body'>
85
+ <tr @click="$parent.$parent.changestyle()">
86
+ <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
87
+ <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
88
+ <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
89
+ <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
90
+ <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
91
+ <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
92
+ <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
93
+ <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
94
+ <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
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>-->
98
+ <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
99
+ style="padding: 5px 12px"
100
+ @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
101
+ </nobr></td>
102
+ </tr>
103
+ </template>
104
+ <template partial='foot'></template>
105
+ </data-grid>
106
+ </criteria-paged>
107
+ </div>
108
+ </template>
109
+
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,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
120
+ addflag: false,
121
+ getfield: {},
122
+ //排序
123
+ orderitem:'f_city,f_district,f_iscity,f_street desc',
124
+ addtitle:'',
125
+ // 公司下拉
126
+ curorgid: [this.$login.f.orgid],
127
+ f_orgid: '',
128
+ config: {
129
+ // 导出列要和查询列相同
130
+ excelHeaders: {
131
+ 'f_province':'省份',
132
+ 'f_city':'城市',
133
+ 'f_district':'区/县',
134
+ 'f_street':'街道名称',
135
+ 'f_org_name':'分公司',
136
+ 'streenum':'小区数量'
137
+ }
138
+ },
139
+ orderFields: {
140
+ f_operate_date: 'no'
141
+ },
142
+ }
143
+ },
144
+ title: '街道管理',
145
+ props:{
146
+ f_filialeids:{
147
+ type: String
148
+ }
149
+ },
150
+ ready(){
151
+ readyGen(this)
152
+ this.search()
153
+ },
154
+ methods: {
155
+ hidden() {
156
+ this.criteriaShow = !this.criteriaShow
157
+ },
158
+ search () {
159
+ this.$refs.paged.$refs.cri.search()
160
+ },
161
+ async delete(row){
162
+ if(row.id >= 0 ){
163
+ var id = row.id
164
+ let useraredss = await this.$resetpost('rs/sql/address_singleTable',
165
+ {data: {
166
+ items: 'f_street_id',
167
+ tablename: 't_area',
168
+ condition: `f_street_id='${id}'`}
169
+ },
170
+ {resolveMsg: null, rejectMsg: null})
171
+ if(useraredss.data.length>0){
172
+ this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
173
+ }else{
174
+ this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
175
+ this.$dispatch('cancel')
176
+ })
177
+ }
178
+ }
179
+ },
180
+ add(val){
181
+ if (this.f_filialeids) {
182
+ this.$refs.paged.$refs.grid.selectStore.selected = null
183
+ this.$dispatch('add',val)
184
+ } else {
185
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
186
+ }
187
+ },
188
+ modify(val){
189
+ this.$refs.paged.$refs.grid.selectStore.selected = null
190
+ this.$dispatch('modify',val)
191
+ },
192
+ selfSearch (args) {
193
+ if (!this.f_orgid) {
194
+ this.getorg([this.$login.f.orgid])
195
+ }
196
+ args.condition = `${args.condition} and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid = '1111')`
197
+ this.model.search(args.condition, args.model)
198
+ },
199
+ //清空
200
+ clear(){
201
+ this.$refs.paged.$refs.cri.model = {}
202
+ },
203
+ getorg (val) {
204
+ this.f_orgid = this.$login.convertToIn(val)
205
+ this.f_filialeids = val[0]
206
+ }
207
+ },
208
+ computed: {
209
+ getCondition() {
210
+ if (!this.f_orgid) {
211
+ this.getorg([this.$login.f.orgid])
212
+ }
213
+ return {
214
+ condition: `${this.$refs.paged.$refs.cri.condition}` + `and (s.f_filialeid in ${this.f_orgid} or s.f_filialeid = '1111')`,
215
+ orderitem: this.orderitem?`${this.orderitem}`: " id desc"
216
+ }
217
+ }
218
+ },
219
+ events:{
220
+ 'sort' (field, rule) {
221
+ // 将所有排序方式设为不排序,实现相互排斥
222
+ console.log("field",field, rule)
223
+ for (let key in this.orderFields) {
224
+ if (key === field) {
225
+ this.orderFields[key] = rule
226
+ } else {
227
+ this.orderFields[key] = 'no'
228
+ }
229
+ }
230
+ // 如果新规则不排序,还原为默认排序
231
+ if (rule === 'no') {
232
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
233
+ } else {
234
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
235
+ }
236
+
237
+ this.search()
238
+ },
239
+ },
240
+ }
241
+ </script>
@@ -1,20 +1,20 @@
1
- // 分公司特殊组件页面注册
2
- let specialComp = {
3
- //小区列表
4
- 'area-list': (resolve) => { require(['./AreaList'], resolve) },
5
- //地址管理
6
- 'street-list': (resolve) => { require(['./StreetList'], resolve) },
7
- //地址管理
8
- 'address-list': (resolve) => { require(['./AddressList.vue'], resolve) },
9
-
10
- 'add-area-msg': (resolve) => { require(['./AddAreaMsg.vue'], resolve) },
11
- 'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
12
- 'city-manage': (resolve) => { require(['./CityManage.vue'], resolve) },
13
- 'address-manage': (resolve) => { require(['./AddressManage.vue'], resolve) },
14
- 'area-manage': (resolve) => { require(['./AreaManage.vue'], resolve) }
15
- }
16
- exports.specialComp = specialComp
17
-
18
-
19
-
20
-
1
+ // 分公司特殊组件页面注册
2
+ let specialComp = {
3
+ //小区列表
4
+ 'area-list': (resolve) => { require(['./AreaList'], resolve) },
5
+ //地址管理
6
+ 'street-list': (resolve) => { require(['./StreetList'], resolve) },
7
+ //地址管理
8
+ 'address-list': (resolve) => { require(['./AddressList.vue'], resolve) },
9
+
10
+ 'add-area-msg': (resolve) => { require(['./AddAreaMsg.vue'], resolve) },
11
+ 'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
12
+ 'city-manage': (resolve) => { require(['./CityManage.vue'], resolve) },
13
+ 'address-manage': (resolve) => { require(['./AddressManage.vue'], resolve) },
14
+ 'area-manage': (resolve) => { require(['./AreaManage.vue'], resolve) }
15
+ }
16
+ exports.specialComp = specialComp
17
+
18
+
19
+
20
+