address-client 3.0.23-2 → 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.
@@ -1,2 +1,2 @@
1
- #Thu May 14 14:22:27 CST 2020
2
- gradle.version=5.2.1
1
+ #Mon Nov 12 14:18:19 CST 2018
2
+ gradle.version=3.5.1
package/package.json CHANGED
@@ -1,97 +1,97 @@
1
- {
2
- "name": "address-client",
3
- "version": "3.0.23-2",
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.0.0",
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.0.6",
82
- "url-loader": "^0.5.7",
83
- "vue-client": "1.21.47",
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
- }
97
- }
1
+ {
2
+ "name": "address-client",
3
+ "version": "3.0.23-2-fx",
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.0.0",
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.0.6",
82
+ "url-loader": "^0.5.7",
83
+ "vue-client": "1.21.47",
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
+ }
97
+ }
@@ -1,250 +1,260 @@
1
- <template>
2
- <div class="flex">
3
- <criteria-paged :model="model" v-ref:paged>
4
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
-
7
- <div class="row">
8
-
9
- <div :class="$parent.$parent.style">
10
- <label class="font_normal_body">组织机构</label>
11
- <res-select
12
- restype='organization'
13
- @res-select="$parent.$parent.getorg"
14
- is-mul="false"
15
- :initresid='$parent.$parent.curorgid'
16
- >
17
- </res-select>
18
- </div>
19
- <div :class="$parent.$parent.style">
20
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
21
- <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
22
- condition="f_residential_area like '%{}%'" placeholder="小区"
23
- :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
24
- </div>
25
- <div :class="$parent.$parent.style">
26
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼号&nbsp;&nbsp;&nbsp;</label>
27
- <input type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
28
- condition="f_building like '%{}%'" placeholder="楼号"
29
- :size="model.f_building ? model.f_building.length*2 : 6"/>
30
- </div>
31
- <div :class="$parent.$parent.style">
32
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
33
- <input type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
34
- condition="f_unit like '%{}%'" placeholder="单元"
35
- :size="model.f_unit ? model.f_unit.length*2 : 6"/>
36
- </div>
37
- <div :class="$parent.$parent.style">
38
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;&nbsp;</label>
39
- <input type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
40
- condition="f_floor like '%{}%'" placeholder="楼层"
41
- :size="model.f_floor ? model.f_floor.length*2 : 6"/>
42
- </div>
43
- <div :class="$parent.$parent.style">
44
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;门牌号</label>
45
- <input type="text" class="input_search" style="width:60%" v-model="model.f_room" style="width:60%"
46
- condition="f_room like '%{}%'" placeholder="门牌号"
47
- :size="model.f_room ? model.f_room.length*2 : 6"/>
48
- </div>
49
- <div :class="$parent.$parent.style">
50
- <label class="font_normal_body">地址ID</label>
51
- <input type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
52
- condition="id = '{}'" placeholder="地址ID"
53
- />
54
- </div>
55
- <div :class="$parent.$parent.style">
56
- <label class="font_normal_body">详细地址</label>
57
- <input type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
58
- condition="f_address like '%{}%'" placeholder="详细地址"
59
- :size="model.f_address ? model.f_address.length*2 : 8"/>
60
- </div>
61
- <div class="span" style="float:right;">
62
- <button class="button_search button_spacing" @click="search()" >查询</button>
63
- <button class="button_new button_spacing" style="width:70px" @click="$parent.$parent.add('民用')">添加民用</button>
64
- <button class="button_new button_spacing" style="width:100px" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
65
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
66
- <button class="button_export button_spacing" @click="$parent.$parent.importAddress">导入地址</button>
67
- <!--<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>-->
68
- </div>
69
- </div>
70
- <!--<div class="row" v-show="$parent.$parent.criteriaShow">-->
71
- <!---->
72
- <!--</div>-->
73
- </div>
74
- </criteria>
75
- <data-grid :model="model" partial='list' style="overflow: auto" class="list_area table_sy" v-ref:grid>
76
- <template partial='head'>
77
- <tr>
78
- <th><nobr>序号</nobr></th>
79
- <th><nobr>区/县</nobr></th>
80
- <th><nobr>片区</nobr></th>
81
- <th><nobr>街道</nobr></th>
82
- <th><nobr>小区(单位)</nobr></th>
83
- <th><nobr>楼号</nobr></th>
84
- <th><nobr>单元</nobr></th>
85
- <th><nobr>楼层</nobr></th>
86
- <th><nobr>门牌号</nobr></th>
87
- <th><nobr>详细地址</nobr></th>
88
- <th><nobr>时间</nobr></th>
89
- <th><nobr>操作</nobr></th>
90
- </tr>
91
- </template>
92
- <template partial='body'>
93
- <tr>
94
- <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
95
- <td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
96
- <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
97
- <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
98
- <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
99
- <td style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
100
- <td style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
101
- <td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
102
- <td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
103
- <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
104
- <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
105
- <td style="text-align:center">
106
- <!-- <button type="button" name="button" class="btn btn-link"
107
- @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
108
- <button type="button" name="button" class="btn btn-link"
109
- @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
110
- </td>
111
- </tr>
112
- </template>
113
- <template partial='foot'></template>
114
- </data-grid>
115
- </criteria-paged>
116
- </div>
117
- <modal :show.sync="showFile" v-ref:modal backdrop="true">
118
- <header slot="modal-header" class="modal-header">
119
- <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
120
- <h4 class="modal-title">选择文件</h4>
121
- </header>
122
- <article slot="modal-body" class="modal-body">
123
- <div class="form-group">
124
- <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
125
- </div>
126
- </article>
127
- <footer slot="modal-footer" class="modal-footer"></footer>
128
- </modal>
129
- </template>
130
-
131
- <script>
132
- import { PagedList } from 'vue-client'
133
-
134
- export default {
135
- data () {
136
- return {
137
- criteriaShow: false,
138
- model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
139
- addflag: false,
140
- addtitle:'',
141
-
142
- // 公司下拉
143
- curorgid: [this.$login.f.orgid],
144
- f_orgid: '',
145
-
146
- //文件上传弹框
147
- showFile: false
148
- }
149
- },
150
- title: '地址列表',
151
- props:{
152
- f_filialeids:{
153
- type: String
154
- },
155
- style: {
156
- type: String,
157
- default: 'col-sm-2 '
158
- }
159
- },
160
- ready(){
161
- this.search()
162
- },
163
- methods: {
164
- hidden() {
165
- this.criteriaShow = !this.criteriaShow
166
- },
167
- //添加方法
168
- add(val){
169
- if (this.f_filialeids) {
170
- this.$refs.paged.$refs.grid.selectStore.selected = null
171
- this.$dispatch('add',val)
172
- } else {
173
- this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
174
- }
175
- },
176
- importAddress(){
177
- this.showFile = true
178
- },
179
- // 关闭文件上传对话框
180
- closeFile() {
181
- this.showFile = false
182
- // 将选的文件清空
183
- this.$refs.file.$el.querySelector('input').value = ''
184
- },
185
- //修改
186
- modify(val){
187
- this.$refs.paged.$refs.grid.selectStore.selected = null
188
- this.$dispatch('modify',val)
189
- },
190
- async delete(row){
191
- if(row.id){
192
- var id = row.id
193
- let service = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
194
- let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
195
- if(service.data.length || userfiles.data.length){
196
- this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
197
- }else{
198
- this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
199
- this.$dispatch('cancel')
200
- })
201
- }
202
- }
203
- },
204
-
205
- search () {
206
- this.$refs.paged.$refs.cri.search()
207
- },
208
-
209
- selfSearch (args) {
210
-
211
- if (!this.f_orgid) {
212
- this.getorg([this.$login.f.orgid])
213
- }
214
-
215
- args.condition = `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
216
- this.model.search(args.condition, args.model)
217
- },
218
-
219
- //清空
220
- clear(){
221
- this.$refs.paged.$refs.cri.model = {}
222
- },
223
- getorg (val) {
224
- this.f_orgid = this.$login.convertToIn(val)
225
- this.f_filialeids = val[0]
226
- }
227
- },
228
- events: {
229
- onFileUpload: async function (file, res) {
230
- console.log("上传完毕"+JSON.stringify(res))
231
- let data = {
232
- filepath: res.f_downloadpath,
233
- user:this.$login.f
234
- }
235
- console.log("filepath="+JSON.stringify(data))
236
- await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
237
- this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
238
- //关闭上传框
239
- this.closeFile()
240
- //重新查询
241
- this.init()
242
- })
243
- },
244
- 'onFileError'(error) {
245
- this.$showAlert(error, 'warning', 2000)
246
- }
247
- }
248
-
249
- }
250
- </script>
1
+ <template>
2
+ <div class="flex">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+
7
+ <div class="row">
8
+
9
+ <div :class="$parent.$parent.style">
10
+ <label class="font_normal_body">组织机构</label>
11
+ <res-select
12
+ restype='organization'
13
+ @res-select="$parent.$parent.getorg"
14
+ is-mul="false"
15
+ :initresid='$parent.$parent.curorgid'
16
+ >
17
+ </res-select>
18
+ </div>
19
+ <div :class="$parent.$parent.style">
20
+ <label class="font_normal_body">用户编号</label>
21
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
22
+ condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
23
+ </div>
24
+ <div :class="$parent.$parent.style">
25
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;姓名&nbsp;&nbsp;&nbsp;</label>
26
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" style="width:60%"
27
+ condition="f_user_name like '%{}%'" placeholder="姓名"/>
28
+ </div>
29
+ <div :class="$parent.$parent.style">
30
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
31
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
32
+ condition="f_residential_area like '%{}%'" placeholder="小区"
33
+ :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
34
+ </div>
35
+ <div :class="$parent.$parent.style">
36
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼号&nbsp;&nbsp;&nbsp;</label>
37
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
38
+ condition="f_building like '%{}%'" placeholder="楼号"
39
+ :size="model.f_building ? model.f_building.length*2 : 6"/>
40
+ </div>
41
+ <div :class="$parent.$parent.style">
42
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;单元&nbsp;&nbsp;&nbsp;</label>
43
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
44
+ condition="f_unit like '%{}%'" placeholder="单元"
45
+ :size="model.f_unit ? model.f_unit.length*2 : 6"/>
46
+ </div>
47
+ <div :class="$parent.$parent.style">
48
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;楼层&nbsp;&nbsp;&nbsp;</label>
49
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
50
+ condition="f_floor like '%{}%'" placeholder="楼层"
51
+ :size="model.f_floor ? model.f_floor.length*2 : 6"/>
52
+ </div>
53
+ <div :class="$parent.$parent.style">
54
+ <label class="font_normal_body">&nbsp;&nbsp;&nbsp;门牌号</label>
55
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_room" style="width:60%"
56
+ condition="f_room like '%{}%'" placeholder="门牌号"
57
+ :size="model.f_room ? model.f_room.length*2 : 6"/>
58
+ </div>
59
+ <div :class="$parent.$parent.style">
60
+ <label class="font_normal_body">地址ID</label>
61
+ <input type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
62
+ condition="id = '{}'" placeholder="地址ID"
63
+ />
64
+ </div>
65
+ <div :class="$parent.$parent.style">
66
+ <label class="font_normal_body">详细地址</label>
67
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
68
+ condition="f_address like '%{}%'" placeholder="详细地址"
69
+ :size="model.f_address ? model.f_address.length*2 : 8"/>
70
+ </div>
71
+ <div class="span" style="float:right;">
72
+ <button class="button_search button_spacing" @click="search()" >查询</button>
73
+ <button class="button_new button_spacing" style="width:70px" @click="$parent.$parent.add('民用')">添加民用</button>
74
+ <button class="button_new button_spacing" style="width:100px" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
75
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
76
+ <button class="button_export button_spacing" @click="$parent.$parent.importAddress">导入地址</button>
77
+ <!--<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>-->
78
+ </div>
79
+ </div>
80
+ <!--<div class="row" v-show="$parent.$parent.criteriaShow">-->
81
+ <!---->
82
+ <!--</div>-->
83
+ </div>
84
+ </criteria>
85
+ <data-grid :model="model" partial='list' style="overflow: auto" class="list_area table_sy" v-ref:grid>
86
+ <template partial='head'>
87
+ <tr>
88
+ <th><nobr>序号</nobr></th>
89
+ <th><nobr>区/县</nobr></th>
90
+ <th><nobr>片区</nobr></th>
91
+ <th><nobr>街道</nobr></th>
92
+ <th><nobr>小区(单位)</nobr></th>
93
+ <th><nobr>楼号</nobr></th>
94
+ <th><nobr>单元</nobr></th>
95
+ <th><nobr>楼层</nobr></th>
96
+ <th><nobr>门牌号</nobr></th>
97
+ <th><nobr>详细地址</nobr></th>
98
+ <th><nobr>时间</nobr></th>
99
+ <th><nobr>操作</nobr></th>
100
+ </tr>
101
+ </template>
102
+ <template partial='body'>
103
+ <tr>
104
+ <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
105
+ <td style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
106
+ <td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
107
+ <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
108
+ <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
109
+ <td style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
110
+ <td style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
111
+ <td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
112
+ <td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
113
+ <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
114
+ <td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
115
+ <td style="text-align:center">
116
+ <!-- <button type="button" name="button" class="btn btn-link"
117
+ @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
118
+ <button type="button" name="button" class="btn btn-link"
119
+ @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
120
+ </td>
121
+ </tr>
122
+ </template>
123
+ <template partial='foot'></template>
124
+ </data-grid>
125
+ </criteria-paged>
126
+ </div>
127
+ <modal :show.sync="showFile" v-ref:modal backdrop="true">
128
+ <header slot="modal-header" class="modal-header">
129
+ <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
130
+ <h4 class="modal-title">选择文件</h4>
131
+ </header>
132
+ <article slot="modal-body" class="modal-body">
133
+ <div class="form-group">
134
+ <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
135
+ </div>
136
+ </article>
137
+ <footer slot="modal-footer" class="modal-footer"></footer>
138
+ </modal>
139
+ </template>
140
+
141
+ <script>
142
+ import { PagedList } from 'vue-client'
143
+
144
+ export default {
145
+ data () {
146
+ return {
147
+ criteriaShow: false,
148
+ model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
149
+ addflag: false,
150
+ addtitle:'',
151
+
152
+ // 公司下拉
153
+ curorgid: [this.$login.f.orgid],
154
+ f_orgid: '',
155
+
156
+ //文件上传弹框
157
+ showFile: false
158
+ }
159
+ },
160
+ title: '地址列表',
161
+ props:{
162
+ f_filialeids:{
163
+ type: String
164
+ },
165
+ style: {
166
+ type: String,
167
+ default: 'col-sm-2 '
168
+ }
169
+ },
170
+ ready(){
171
+ this.search()
172
+ },
173
+ methods: {
174
+ hidden() {
175
+ this.criteriaShow = !this.criteriaShow
176
+ },
177
+ //添加方法
178
+ add(val){
179
+ if (this.f_filialeids) {
180
+ this.$refs.paged.$refs.grid.selectStore.selected = null
181
+ this.$dispatch('add',val)
182
+ } else {
183
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
184
+ }
185
+ },
186
+ importAddress(){
187
+ this.showFile = true
188
+ },
189
+ // 关闭文件上传对话框
190
+ closeFile() {
191
+ this.showFile = false
192
+ // 将选的文件清空
193
+ this.$refs.file.$el.querySelector('input').value = ''
194
+ },
195
+ //修改
196
+ modify(val){
197
+ this.$refs.paged.$refs.grid.selectStore.selected = null
198
+ this.$dispatch('modify',val)
199
+ },
200
+ async delete(row){
201
+ if(row.id){
202
+ var id = row.id
203
+ let service = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_addressid',tablename: 't_service',condition: `f_addressid='${id}'`}},{resolveMsg: null, rejectMsg: null})
204
+ let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
205
+ if(service.data.length || userfiles.data.length){
206
+ this.$showAlert('该地址下已有工单或档案,无法删除!','warning',1000)
207
+ }else{
208
+ this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
209
+ this.$dispatch('cancel')
210
+ })
211
+ }
212
+ }
213
+ },
214
+
215
+ search () {
216
+ this.$refs.paged.$refs.cri.search()
217
+ },
218
+
219
+ selfSearch (args) {
220
+
221
+ if (!this.f_orgid) {
222
+ this.getorg([this.$login.f.orgid])
223
+ }
224
+
225
+ args.condition = `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
226
+ this.model.search(args.condition, args.model)
227
+ },
228
+
229
+ //清空
230
+ clear(){
231
+ this.$refs.paged.$refs.cri.model = {}
232
+ },
233
+ getorg (val) {
234
+ this.f_orgid = this.$login.convertToIn(val)
235
+ this.f_filialeids = val[0]
236
+ }
237
+ },
238
+ events: {
239
+ onFileUpload: async function (file, res) {
240
+ console.log("上传完毕"+JSON.stringify(res))
241
+ let data = {
242
+ filepath: res.f_downloadpath,
243
+ user:this.$login.f
244
+ }
245
+ console.log("filepath="+JSON.stringify(data))
246
+ await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
247
+ this.$showAlert("成功导入"+res.data+'条地址', 'success', 2000)
248
+ //关闭上传框
249
+ this.closeFile()
250
+ //重新查询
251
+ this.init()
252
+ })
253
+ },
254
+ 'onFileError'(error) {
255
+ this.$showAlert(error, 'warning', 2000)
256
+ }
257
+ }
258
+
259
+ }
260
+ </script>
File without changes
Binary file
@@ -1,5 +0,0 @@
1
- distributionBase=GRADLE_USER_HOME
2
- distributionPath=wrapper/dists
3
- distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
4
- zipStoreBase=GRADLE_USER_HOME
5
- zipStorePath=wrapper/dists
package/gradlew DELETED
@@ -1,172 +0,0 @@
1
- #!/usr/bin/env sh
2
-
3
- ##############################################################################
4
- ##
5
- ## Gradle start up script for UN*X
6
- ##
7
- ##############################################################################
8
-
9
- # Attempt to set APP_HOME
10
- # Resolve links: $0 may be a link
11
- PRG="$0"
12
- # Need this for relative symlinks.
13
- while [ -h "$PRG" ] ; do
14
- ls=`ls -ld "$PRG"`
15
- link=`expr "$ls" : '.*-> \(.*\)$'`
16
- if expr "$link" : '/.*' > /dev/null; then
17
- PRG="$link"
18
- else
19
- PRG=`dirname "$PRG"`"/$link"
20
- fi
21
- done
22
- SAVED="`pwd`"
23
- cd "`dirname \"$PRG\"`/" >/dev/null
24
- APP_HOME="`pwd -P`"
25
- cd "$SAVED" >/dev/null
26
-
27
- APP_NAME="Gradle"
28
- APP_BASE_NAME=`basename "$0"`
29
-
30
- # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31
- DEFAULT_JVM_OPTS='"-Xmx64m"'
32
-
33
- # Use the maximum available, or set MAX_FD != -1 to use that value.
34
- MAX_FD="maximum"
35
-
36
- warn () {
37
- echo "$*"
38
- }
39
-
40
- die () {
41
- echo
42
- echo "$*"
43
- echo
44
- exit 1
45
- }
46
-
47
- # OS specific support (must be 'true' or 'false').
48
- cygwin=false
49
- msys=false
50
- darwin=false
51
- nonstop=false
52
- case "`uname`" in
53
- CYGWIN* )
54
- cygwin=true
55
- ;;
56
- Darwin* )
57
- darwin=true
58
- ;;
59
- MINGW* )
60
- msys=true
61
- ;;
62
- NONSTOP* )
63
- nonstop=true
64
- ;;
65
- esac
66
-
67
- CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68
-
69
- # Determine the Java command to use to start the JVM.
70
- if [ -n "$JAVA_HOME" ] ; then
71
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72
- # IBM's JDK on AIX uses strange locations for the executables
73
- JAVACMD="$JAVA_HOME/jre/sh/java"
74
- else
75
- JAVACMD="$JAVA_HOME/bin/java"
76
- fi
77
- if [ ! -x "$JAVACMD" ] ; then
78
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79
-
80
- Please set the JAVA_HOME variable in your environment to match the
81
- location of your Java installation."
82
- fi
83
- else
84
- JAVACMD="java"
85
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86
-
87
- Please set the JAVA_HOME variable in your environment to match the
88
- location of your Java installation."
89
- fi
90
-
91
- # Increase the maximum file descriptors if we can.
92
- if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93
- MAX_FD_LIMIT=`ulimit -H -n`
94
- if [ $? -eq 0 ] ; then
95
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96
- MAX_FD="$MAX_FD_LIMIT"
97
- fi
98
- ulimit -n $MAX_FD
99
- if [ $? -ne 0 ] ; then
100
- warn "Could not set maximum file descriptor limit: $MAX_FD"
101
- fi
102
- else
103
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104
- fi
105
- fi
106
-
107
- # For Darwin, add options to specify how the application appears in the dock
108
- if $darwin; then
109
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110
- fi
111
-
112
- # For Cygwin, switch paths to Windows format before running java
113
- if $cygwin ; then
114
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116
- JAVACMD=`cygpath --unix "$JAVACMD"`
117
-
118
- # We build the pattern for arguments to be converted via cygpath
119
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120
- SEP=""
121
- for dir in $ROOTDIRSRAW ; do
122
- ROOTDIRS="$ROOTDIRS$SEP$dir"
123
- SEP="|"
124
- done
125
- OURCYGPATTERN="(^($ROOTDIRS))"
126
- # Add a user-defined pattern to the cygpath arguments
127
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129
- fi
130
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
131
- i=0
132
- for arg in "$@" ; do
133
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135
-
136
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138
- else
139
- eval `echo args$i`="\"$arg\""
140
- fi
141
- i=$((i+1))
142
- done
143
- case $i in
144
- (0) set -- ;;
145
- (1) set -- "$args0" ;;
146
- (2) set -- "$args0" "$args1" ;;
147
- (3) set -- "$args0" "$args1" "$args2" ;;
148
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154
- esac
155
- fi
156
-
157
- # Escape application args
158
- save () {
159
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160
- echo " "
161
- }
162
- APP_ARGS=$(save "$@")
163
-
164
- # Collect all arguments for the java command, following the shell quoting and substitution rules
165
- eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166
-
167
- # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168
- if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169
- cd "$(dirname "$0")"
170
- fi
171
-
172
- exec "$JAVACMD" "$@"
package/gradlew.bat DELETED
@@ -1,84 +0,0 @@
1
- @if "%DEBUG%" == "" @echo off
2
- @rem ##########################################################################
3
- @rem
4
- @rem Gradle startup script for Windows
5
- @rem
6
- @rem ##########################################################################
7
-
8
- @rem Set local scope for the variables with windows NT shell
9
- if "%OS%"=="Windows_NT" setlocal
10
-
11
- set DIRNAME=%~dp0
12
- if "%DIRNAME%" == "" set DIRNAME=.
13
- set APP_BASE_NAME=%~n0
14
- set APP_HOME=%DIRNAME%
15
-
16
- @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17
- set DEFAULT_JVM_OPTS="-Xmx64m"
18
-
19
- @rem Find java.exe
20
- if defined JAVA_HOME goto findJavaFromJavaHome
21
-
22
- set JAVA_EXE=java.exe
23
- %JAVA_EXE% -version >NUL 2>&1
24
- if "%ERRORLEVEL%" == "0" goto init
25
-
26
- echo.
27
- echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28
- echo.
29
- echo Please set the JAVA_HOME variable in your environment to match the
30
- echo location of your Java installation.
31
-
32
- goto fail
33
-
34
- :findJavaFromJavaHome
35
- set JAVA_HOME=%JAVA_HOME:"=%
36
- set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37
-
38
- if exist "%JAVA_EXE%" goto init
39
-
40
- echo.
41
- echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42
- echo.
43
- echo Please set the JAVA_HOME variable in your environment to match the
44
- echo location of your Java installation.
45
-
46
- goto fail
47
-
48
- :init
49
- @rem Get command-line arguments, handling Windows variants
50
-
51
- if not "%OS%" == "Windows_NT" goto win9xME_args
52
-
53
- :win9xME_args
54
- @rem Slurp the command line arguments.
55
- set CMD_LINE_ARGS=
56
- set _SKIP=2
57
-
58
- :win9xME_args_slurp
59
- if "x%~1" == "x" goto execute
60
-
61
- set CMD_LINE_ARGS=%*
62
-
63
- :execute
64
- @rem Setup the command line
65
-
66
- set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67
-
68
- @rem Execute Gradle
69
- "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70
-
71
- :end
72
- @rem End local scope for the variables with windows NT shell
73
- if "%ERRORLEVEL%"=="0" goto mainEnd
74
-
75
- :fail
76
- rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77
- rem the _cmd.exe /c_ return code!
78
- if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79
- exit /b 1
80
-
81
- :mainEnd
82
- if "%OS%"=="Windows_NT" endlocal
83
-
84
- :omega