address-client 3.0.24-9 → 3.0.25-aode
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +0 -3
- package/build/dev-server.js +2 -2
- package/package.json +103 -97
- package/src/address.js +4 -8
- package/src/components/AddAreaMsg.vue +14 -10
- package/src/components/AddressList.vue +84 -83
- package/src/components/AreaList.vue +12 -1
- package/src/components/AreaManage.vue +16 -2
- package/src/components/UserAddress.vue +394 -393
- package/src/components/areauser/AreaUser.vue +233 -0
- package/src/main.js +1 -1
- package/.npmignore +0 -10
- package/AddressClient.iml +0 -9
- package/build/.npmignore +0 -1
- package/src/filiale/rongcheng/AddressList.vue +0 -308
- package/src/filiale/rongcheng/UserAddress.vue +0 -708
- package/src/filiale/rongcheng/sale.js +0 -11
package/CHANGELOG.md
CHANGED
package/build/dev-server.js
CHANGED
|
@@ -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:
|
|
13
|
+
var str = 'http://127.0.0.1:8091/ldap', str2= 'http://192.168.10.14:8300'
|
|
14
14
|
var proxyTable = {
|
|
15
15
|
|
|
16
16
|
'/rs/logic/getLogin': {
|
|
@@ -36,7 +36,7 @@ var proxyTable = {
|
|
|
36
36
|
},
|
|
37
37
|
'/rs': {
|
|
38
38
|
// target: 'http://192.168.50.199:8300'
|
|
39
|
-
target:
|
|
39
|
+
target: str2
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
|
package/package.json
CHANGED
|
@@ -1,97 +1,103 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "address-client",
|
|
3
|
-
"version": "3.0.
|
|
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": "
|
|
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.
|
|
82
|
-
"url-loader": "^0.5.7",
|
|
83
|
-
"vue-client": "1.
|
|
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.25-aode",
|
|
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": "1.0.66-aode",
|
|
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.84",
|
|
82
|
+
"url-loader": "^0.5.7",
|
|
83
|
+
"vue-client": "1.22.20-5",
|
|
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
|
+
},
|
|
98
|
+
"directories": {
|
|
99
|
+
"doc": "doc",
|
|
100
|
+
"example": "examples",
|
|
101
|
+
"test": "test"
|
|
102
|
+
}
|
|
103
|
+
}
|
package/src/address.js
CHANGED
|
@@ -3,7 +3,7 @@ import App from './App'
|
|
|
3
3
|
import { all } from 'vue-client'
|
|
4
4
|
// import 'babel-polyfill'
|
|
5
5
|
|
|
6
|
-
export default function (
|
|
6
|
+
export default function () {
|
|
7
7
|
Vue.config.silent = false
|
|
8
8
|
/** ********************** pc端 *********************** **/
|
|
9
9
|
Vue.component('address-select', (resolve) => { require(['./components/AddressModel'], resolve) })
|
|
@@ -27,6 +27,8 @@ export default function (filiale) {
|
|
|
27
27
|
Vue.component('add-street-pcd', (resolve) => { require(['./components/AddStreetOrPcd'], resolve) })
|
|
28
28
|
//小区列表
|
|
29
29
|
Vue.component('area-list', (resolve) => { require(['./components/AreaList'], resolve) })
|
|
30
|
+
// 使用该小区的用户信息
|
|
31
|
+
Vue.component('area-user', (resolve) => { require(['./components/areauser/AreaUser.vue'], resolve) })
|
|
30
32
|
//小区管理（包含修改表具，小区的添加）
|
|
31
33
|
Vue.component('area-manage', (resolve) => { require(['./components/AreaManage'], resolve) })
|
|
32
34
|
//单位管理（）
|
|
@@ -43,11 +45,5 @@ export default function (filiale) {
|
|
|
43
45
|
Vue.component('user-address-change', (resolve) => { require(['./components/UserAddressChange'], resolve) })
|
|
44
46
|
//批量置换接单
|
|
45
47
|
Vue.component('batch_orders', (resolve) => { require(['./components/selectAddress/BatchOrders'], resolve) })
|
|
46
|
-
|
|
47
|
-
if (filiale) {
|
|
48
|
-
let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
|
|
49
|
-
for (let key in filialeComp) {
|
|
50
|
-
Vue.component(key, filialeComp[key])
|
|
51
|
-
}
|
|
52
|
-
}
|
|
48
|
+
|
|
53
49
|
}
|
|
@@ -298,18 +298,22 @@
|
|
|
298
298
|
|
|
299
299
|
async initSlice (val) {
|
|
300
300
|
if (val) {
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
301
|
+
this.sliceArea = [];
|
|
302
|
+
let getAllArea = await this.$resetpost('/rs/sql/address_singleTableOrderBy', {
|
|
303
|
+
data:{
|
|
304
|
+
items: '*',
|
|
305
|
+
tablename: 't_zone',
|
|
306
|
+
orderitem: 'id',
|
|
307
|
+
condition: ` parentid = ${val}`
|
|
308
|
+
}
|
|
304
309
|
}, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
|
|
305
310
|
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
})
|
|
311
|
+
if(getAllArea.data){
|
|
312
|
+
getAllArea.data.forEach((res) => {
|
|
313
|
+
this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
|
|
314
|
+
})
|
|
315
|
+
}
|
|
316
|
+
|
|
313
317
|
}
|
|
314
318
|
},
|
|
315
319
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="flex" @keyup.enter="search">
|
|
3
3
|
<criteria-paged :model="model" v-ref:paged>
|
|
4
4
|
<criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
|
|
5
|
-
|
|
5
|
+
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
6
6
|
|
|
7
7
|
<div class="row">
|
|
8
8
|
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
<label class="font_normal_body">组织机构</label>
|
|
11
11
|
<res-select
|
|
12
12
|
restype='organization'
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
@res-select="$parent.$parent.getorg"
|
|
14
|
+
is-mul="false"
|
|
15
|
+
:initresid='$parent.$parent.curorgid'
|
|
16
16
|
>
|
|
17
17
|
</res-select>
|
|
18
18
|
</div>
|
|
@@ -59,19 +59,19 @@
|
|
|
59
59
|
<div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
|
|
60
60
|
<label class="font_normal_body">楼  号</label>
|
|
61
61
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
|
|
62
|
-
condition="a.f_building like '
|
|
62
|
+
condition="a.f_building like '{}'" placeholder="楼号"
|
|
63
63
|
:size="model.f_building ? model.f_building.length*2 : 6"/>
|
|
64
64
|
</div>
|
|
65
65
|
<div :class="$parent.$parent.style" >
|
|
66
66
|
<label class="font_normal_body">单  元</label>
|
|
67
67
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
|
|
68
|
-
condition="a.f_unit like '
|
|
68
|
+
condition="a.f_unit like '{}'" placeholder="单元"
|
|
69
69
|
:size="model.f_unit ? model.f_unit.length*2 : 6"/>
|
|
70
70
|
</div>
|
|
71
71
|
<div :class="$parent.$parent.style">
|
|
72
72
|
<label class="font_normal_body">楼  层</label>
|
|
73
73
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
|
|
74
|
-
condition="a.f_floor like '
|
|
74
|
+
condition="a.f_floor like '{}'" placeholder="楼层"
|
|
75
75
|
:size="model.f_floor ? model.f_floor.length*2 : 6"/>
|
|
76
76
|
</div>
|
|
77
77
|
<div :class="$parent.$parent.style">
|
|
@@ -80,13 +80,6 @@
|
|
|
80
80
|
condition="a.f_room like '%{}%'" placeholder="门牌号"
|
|
81
81
|
:size="model.f_room ? model.f_room.length*2 : 6"/>
|
|
82
82
|
</div>
|
|
83
|
-
<div :class="$parent.$parent.style">
|
|
84
|
-
<label class="font_normal_body">小  区</label>
|
|
85
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
|
|
86
|
-
condition="a.f_residential_area like '%{}%'" placeholder="小区"
|
|
87
|
-
:size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
|
|
88
|
-
</div>
|
|
89
|
-
|
|
90
83
|
<div :class="$parent.$parent.style">
|
|
91
84
|
<label class="font_normal_body">地址 ID</label>
|
|
92
85
|
<input type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
|
|
@@ -100,15 +93,14 @@
|
|
|
100
93
|
:size="model.f_address ? model.f_address.length*2 : 8"/>
|
|
101
94
|
</div>
|
|
102
95
|
<div :class="$parent.$parent.style" >
|
|
103
|
-
<label class="font_normal_body"
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
close-on-select>
|
|
110
|
-
</v-select>
|
|
96
|
+
<label class="font_normal_body">特殊地址</label>
|
|
97
|
+
<v-select :value.sync="model.f_special"
|
|
98
|
+
v-model="model.f_special"
|
|
99
|
+
:options='$parent.$parent.specialoptions' placeholder='请选择'
|
|
100
|
+
condition=" {} "
|
|
101
|
+
close-on-select></v-select>
|
|
111
102
|
</div>
|
|
103
|
+
|
|
112
104
|
</div>
|
|
113
105
|
</div>
|
|
114
106
|
</criteria>
|
|
@@ -126,7 +118,6 @@
|
|
|
126
118
|
<th><nobr>楼层</nobr></th>
|
|
127
119
|
<th><nobr>门牌号</nobr></th>
|
|
128
120
|
<th><nobr>详细地址</nobr></th>
|
|
129
|
-
<th><nobr>地址状态</nobr></th>
|
|
130
121
|
<th><nobr>时间</nobr></th>
|
|
131
122
|
<th><nobr>操作</nobr></th>
|
|
132
123
|
</tr>
|
|
@@ -144,11 +135,10 @@
|
|
|
144
135
|
<td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
|
|
145
136
|
<td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</nobr></td>
|
|
146
137
|
<td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
|
|
147
|
-
<td style="text-align:center"><nobr>{{row.f_address_state}}</nobr></td>
|
|
148
138
|
<td style="text-align:center"><nobr>{{row.f_create_date}}</nobr></td>
|
|
149
139
|
<td style="text-align:center">
|
|
150
|
-
|
|
151
|
-
|
|
140
|
+
<!-- <button type="button" name="button" class="btn btn-link"
|
|
141
|
+
@click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
|
|
152
142
|
<button type="button" name="button" class="btn btn-link"
|
|
153
143
|
@click.stop="$parent.$parent.$parent.delete(row)">删除</button>
|
|
154
144
|
</td>
|
|
@@ -170,6 +160,8 @@
|
|
|
170
160
|
</article>
|
|
171
161
|
<footer slot="modal-footer" class="modal-footer"></footer>
|
|
172
162
|
</modal>
|
|
163
|
+
<work-busy :is-busy="iswork" v-show="iswork"></work-busy>
|
|
164
|
+
|
|
173
165
|
</template>
|
|
174
166
|
|
|
175
167
|
<script>
|
|
@@ -178,6 +170,7 @@
|
|
|
178
170
|
export default {
|
|
179
171
|
data () {
|
|
180
172
|
return {
|
|
173
|
+
iswork: false,
|
|
181
174
|
criteriaShow: false,
|
|
182
175
|
model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
|
|
183
176
|
addflag: false,
|
|
@@ -189,7 +182,8 @@
|
|
|
189
182
|
|
|
190
183
|
//文件上传弹框
|
|
191
184
|
showFile: false,
|
|
192
|
-
showrightchange:true
|
|
185
|
+
showrightchange:true,
|
|
186
|
+
specialoptions:[{label:"全部",value:""},{label:"是",value:"a.f_special ='1'"},{label:"否",value:"a.f_special is null"}]
|
|
193
187
|
}
|
|
194
188
|
},
|
|
195
189
|
title: '地址列表',
|
|
@@ -234,73 +228,80 @@
|
|
|
234
228
|
this.$dispatch('modify',val)
|
|
235
229
|
},
|
|
236
230
|
async delete(row){
|
|
237
|
-
if(row.id){
|
|
238
|
-
var id = row.id
|
|
239
|
-
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})
|
|
240
|
-
if(userfiles.data.length){
|
|
241
|
-
this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
|
|
242
|
-
}else{
|
|
243
|
-
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
244
|
-
this.$dispatch('cancel')
|
|
245
|
-
})
|
|
246
|
-
}
|
|
247
|
-
}
|
|
248
|
-
},
|
|
249
231
|
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
232
|
+
if(row.id){
|
|
233
|
+
var id = row.id
|
|
234
|
+
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 in ('正常','待开通')`}},{resolveMsg: null, rejectMsg: null})
|
|
235
|
+
let isdelete = await this.$resetpost('rs/sql/isDeleteAddress', {data: {f_addressid: id}},{resolveMsg: null, rejectMsg: null})
|
|
236
|
+
if(userfiles.data.length){
|
|
237
|
+
this.$showAlert('该地址下已有正常/待开通表具档案,无法删除！','warning',1000)
|
|
238
|
+
return
|
|
239
|
+
}
|
|
240
|
+
if(isdelete.data.length){
|
|
241
|
+
this.$showAlert('该地址下已有正在工作的置换单,无法删除！','warning',1000)
|
|
242
|
+
return
|
|
258
243
|
}
|
|
244
|
+
this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
|
|
245
|
+
this.$dispatch('cancel')
|
|
246
|
+
})
|
|
247
|
+
}
|
|
248
|
+
},
|
|
259
249
|
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
250
|
+
search () {
|
|
251
|
+
this.$refs.paged.$refs.cri.search()
|
|
252
|
+
},
|
|
263
253
|
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
this.f_filialeids = val[0]
|
|
254
|
+
selfSearch (args) {
|
|
255
|
+
debugger
|
|
256
|
+
//去除空格
|
|
257
|
+
for(let key in args.model){
|
|
258
|
+
if(args.model[key] instanceof String){
|
|
259
|
+
args.model[key] = args.model[key].trim();
|
|
271
260
|
}
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
console.log("filepath="+JSON.stringify(data))
|
|
281
|
-
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
282
|
-
if(res.data.type=="success"){
|
|
283
|
-
this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
|
|
284
|
-
}else{
|
|
285
|
-
this.$showMessage(res.data.msg);
|
|
286
|
-
}
|
|
261
|
+
}
|
|
262
|
+
if (!this.f_orgid) {
|
|
263
|
+
this.getorg([this.$login.f.orgid])
|
|
264
|
+
}
|
|
265
|
+
console.log("xxx"+this.f_filialeids)
|
|
266
|
+
args.condition = `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
|
|
267
|
+
this.model.search(args.condition, args.model)
|
|
268
|
+
},
|
|
287
269
|
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
270
|
+
//清空
|
|
271
|
+
clear(){
|
|
272
|
+
this.$refs.paged.$refs.cri.model = {}
|
|
273
|
+
},
|
|
274
|
+
getorg (val) {
|
|
275
|
+
this.f_orgid = this.$login.convertToIn(val)
|
|
276
|
+
if (!this.f_orgid) {
|
|
277
|
+
this.f_orgid = this.f_filialeids
|
|
278
|
+
}
|
|
279
|
+
this.f_filialeids = val[0]
|
|
280
|
+
}
|
|
281
|
+
},
|
|
282
|
+
events: {
|
|
283
|
+
onFileUpload: async function (file, res) {
|
|
284
|
+
this.$showAlert('文件上传成功','success',1000);
|
|
285
|
+
this.iswork = true
|
|
286
|
+
console.log("上传完毕"+JSON.stringify(res))
|
|
287
|
+
let data = {
|
|
288
|
+
filepath: res.f_downloadpath,
|
|
289
|
+
user:this.$login.f
|
|
290
|
+
}
|
|
291
|
+
this.closeFile();
|
|
292
|
+
try{
|
|
293
|
+
await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
|
|
294
|
+
this.$showAlert("导入成功",'success', 2000);
|
|
295
|
+
this.iswork = false
|
|
291
296
|
this.init()
|
|
292
297
|
})
|
|
293
|
-
}
|
|
294
|
-
'onFileError'(error) {
|
|
295
|
-
this.$showAlert(error, 'warning', 2000)
|
|
298
|
+
}catch(e){
|
|
296
299
|
}
|
|
297
300
|
},
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
getaddresstate() {
|
|
301
|
-
return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
|
|
302
|
-
}
|
|
301
|
+
'onFileError'(error) {
|
|
302
|
+
this.$showAlert(error, 'warning', 2000)
|
|
303
303
|
}
|
|
304
|
+
}
|
|
304
305
|
|
|
305
306
|
}
|
|
306
307
|
</script>
|
|
@@ -97,6 +97,8 @@
|
|
|
97
97
|
<th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
|
|
98
98
|
<!--非民用单位信息结束-->
|
|
99
99
|
<th><nobr>片区/管理站 </nobr></th>
|
|
100
|
+
<th><nobr>使用人数 </nobr></th>
|
|
101
|
+
<th><nobr>关联地址 </nobr></th>
|
|
100
102
|
<th><nobr>操作人</nobr></th>
|
|
101
103
|
<th><nobr>操作日期</nobr></th>
|
|
102
104
|
<th><nobr>操作</nobr></th>
|
|
@@ -118,6 +120,8 @@
|
|
|
118
120
|
<td v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
|
|
119
121
|
<!--非民用单位信息结束-->
|
|
120
122
|
<td style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
|
|
123
|
+
<td style="text-align:center"><button @click.stop="$parent.$parent.$parent.operate(row.id,row.f_residential_area)" class="btn btn-link">{{row.areacount}}</button></td>
|
|
124
|
+
<td style="text-align:center"><nobr>{{row.addresscount}}</nobr></td>
|
|
121
125
|
<td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
|
|
122
126
|
<td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
|
|
123
127
|
<td><nobr>
|
|
@@ -168,6 +172,12 @@
|
|
|
168
172
|
this.search()
|
|
169
173
|
},
|
|
170
174
|
methods: {
|
|
175
|
+
operate (f_residential_area_id,f_residential_area) {
|
|
176
|
+
this.$parent.areaShow = false;
|
|
177
|
+
this.$parent.usershow=true
|
|
178
|
+
this.$parent.f_residential_area_id=f_residential_area_id
|
|
179
|
+
this.$parent.f_residential_area=f_residential_area
|
|
180
|
+
},
|
|
171
181
|
hidden() {
|
|
172
182
|
this.criteriaShow = !this.criteriaShow
|
|
173
183
|
},
|
|
@@ -207,7 +217,8 @@
|
|
|
207
217
|
this.$dispatch('modify',val)
|
|
208
218
|
},
|
|
209
219
|
selfSearch (args) {
|
|
210
|
-
|
|
220
|
+
this.$parent.usershow = false;
|
|
221
|
+
this.$parent.areaShow = false;
|
|
211
222
|
if (!this.f_orgid) {
|
|
212
223
|
this.getorg([this.$login.f.orgid])
|
|
213
224
|
}
|