address-client 3.2.53 → 3.2.54

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 (8) hide show
  1. package/build/dev-server.js +1 -1
  2. package/build/webpack.base.conf.js +1 -0
  3. package/package.json +3 -2
  4. package/src/filiale/qinhua/AddressList.vue +12 -13
  5. package/src/filiale/qinhua/AreaList.vue +8 -9
  6. package/src/filiale/qinhua/StreetList.vue +5 -5
  7. package/src/filiale/qinhua/UserAddress.vue +18 -18
  8. package/src/main.js +2 -0
package/build/dev-server.js CHANGED
@@ -11,7 +11,7 @@ var proxy = httpProxy.createProxyServer()
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
14
- var str3= 'https://qnjtkf.cn:7400'
14
+ var str3= 'http://192.168.50.4:8400/'
15
15
  var proxyTable = {
16
16
  '/rs/sql':{
17
17
  target: str3,
package/build/webpack.base.conf.js CHANGED
@@ -39,6 +39,7 @@ module.exports = {
39
39
  `${projectRoot}\\node_modules\\vue-client\\src`,
40
40
  `${projectRoot}\\node_modules\\vue-strap\\src`,
41
41
  `${projectRoot}\\node_modules\\system-clients\\src`,
42
+ `${projectRoot}\\node_modules\\ldap-clients\\src`,
42
43
  `${projectRoot}\\node_modules\\sale-client\\src`,
43
44
  ]
44
45
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.53",
3
+ "version": "3.2.54",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -78,7 +78,8 @@
78
78
  "sinon-chai": "^2.8.0",
79
79
  "style": "0.0.3",
80
80
  "style-loader": "^0.20.3",
81
- "system-clients": "3.1.88-5",
81
+ "ldap-clients": "3.0.55-test-1",
82
+ "system-clients": "3.2.54-test-1",
82
83
  "url-loader": "^0.5.7",
83
84
  "vue-client": "1.24.27",
84
85
  "vue-hot-reload-api": "^1.2.0",
package/src/filiale/qinhua/AddressList.vue CHANGED
@@ -14,11 +14,11 @@
14
14
  >
15
15
  </res-select>
16
16
  </div>
17
- <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
18
- <label class="font_normal_body">客户编号</label>
19
- <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
20
- condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
21
- </div>
17
+ <!--<div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">-->
18
+ <!--<label class="font_normal_body">客户编号</label>-->
19
+ <!--<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"-->
20
+ <!--condition="f_userinfo_code = '{}'" placeholder="用户编号"/>-->
21
+ <!--</div>-->
22
22
  <div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style">
23
23
  <label class="font_normal_body">小&emsp;&emsp;区</label>
24
24
  <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
@@ -52,11 +52,11 @@
52
52
  </div>
53
53
  </div>
54
54
  <div class="row" v-show="$parent.$parent.criteriaShow">
55
- <div :class="$parent.$parent.style" v-if="!$parent.$parent.showrightchange">
56
- <label class="font_normal_body">用户编号</label>
57
- <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
58
- condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
59
- </div>
55
+ <!--<div :class="$parent.$parent.style" v-if="!$parent.$parent.showrightchange">-->
56
+ <!--<label class="font_normal_body">用户编号</label>-->
57
+ <!--<input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"-->
58
+ <!--condition="f_userinfo_code = '{}'" placeholder="用户编号"/>-->
59
+ <!--</div>-->
60
60
  <div v-if="!$parent.$parent.showrightchange" :class="$parent.$parent.style">
61
61
  <label class="font_normal_body">小&emsp;&emsp;区</label>
62
62
  <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
@@ -138,7 +138,7 @@
138
138
  <data-grid :model="model" partial='list' style="overflow: auto" class="list_area table_sy" :optional="true" v-ref:grid>
139
139
  <template partial='head'>
140
140
  <th><nobr>序号</nobr></th>
141
- <th><nobr>客户编号</nobr></th>
141
+ <!--<th><nobr>客户编号</nobr></th>-->
142
142
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>区/县</nobr></th>
143
143
  <th v-show="!$parent.$parent.$parent.$parent.useraddressShow"><nobr>片区/管理站</nobr></th>
144
144
  <th><nobr>街道/乡镇</nobr></th>
@@ -156,7 +156,7 @@
156
156
  </template>
157
157
  <template partial='body'>
158
158
  <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
159
- <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
159
+ <!--<td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>-->
160
160
  <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_pcd}}</nobr></td>
161
161
  <td v-show="!$parent.$parent.$parent.$parent.useraddressShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
162
162
  <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
@@ -262,7 +262,6 @@
262
262
  // 导出列要和查询列相同
263
263
  excelHeaders: {
264
264
  'f_user_name':'用户姓名',
265
- 'f_userinfo_code':'用户编号',
266
265
  'id':'地址ID',
267
266
  'f_pcd':'区/县',
268
267
  'f_slice_area':'片区',
package/src/filiale/qinhua/AreaList.vue CHANGED
@@ -83,12 +83,12 @@
83
83
  condition="f_residential_area like '%{}%'" placeholder="小区"
84
84
  :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
85
85
  </div>
86
- <div :class="$parent.$parent.style">
87
- <label class="font_normal_body">房屋类型</label>
88
- <v-select :options='$parent.$parent.housetype' :value.sync="model.f_house_type"
89
- close-on-select condition="f_house_type='{}'"
90
- placeholder='房屋类型' v-model="model.f_house_type"></v-select>
91
- </div>
86
+ <!--<div :class="$parent.$parent.style">-->
87
+ <!--<label class="font_normal_body">房屋类型</label>-->
88
+ <!--<v-select :options='$parent.$parent.housetype' :value.sync="model.f_house_type"-->
89
+ <!--close-on-select condition="f_house_type='{}'"-->
90
+ <!--placeholder='房屋类型' v-model="model.f_house_type"></v-select>-->
91
+ <!--</div>-->
92
92
  <!--<div :class="$parent.$parent.style">-->
93
93
  <!--<label class="font_normal_body">安装位置</label>-->
94
94
  <!--<v-select :options='$parent.$parent.position' :value.sync="model.f_position"-->
@@ -124,7 +124,7 @@
124
124
  <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
125
125
  <!--非民用单位信息结束-->
126
126
  <!--<th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>抄表员</nobr></th>-->
127
- <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>
127
+ <!--<th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>-->
128
128
  <!--<th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>-->
129
129
  <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
130
130
  <th><nobr>操作人</nobr></th>
@@ -146,7 +146,7 @@
146
146
  <td v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
147
147
  <!--非民用单位信息结束-->
148
148
  <!--<td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></td>-->
149
- <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_house_type}}</nobr></td>
149
+ <!--<td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_house_type}}</nobr></td>-->
150
150
  <!--<td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_position}}</nobr></td>-->
151
151
  <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
152
152
  <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
@@ -228,7 +228,6 @@
228
228
  'f_residential_area':'小区名称',
229
229
  'f_area_address':'小区地址',
230
230
  'f_comments':'小区备注',
231
- 'f_house_type':'房屋类型',
232
231
  'f_slice_area':'片区/管理站',
233
232
  'f_operator':'操作人',
234
233
  'f_operate_date':'操作日期',
package/src/filiale/qinhua/StreetList.vue CHANGED
@@ -11,11 +11,6 @@
11
11
  :initresid='$parent.$parent.curorgid'>
12
12
  </res-select>
13
13
  </div>
14
- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
15
- <label class="font_normal_body">街道名称</label>
16
- <input type="text" class="input_search" style="width:60%" v-model="model.f_street"
17
- condition="f_street like '%{}%'" placeholder="街道名称"/>
18
- </div>
19
14
  <div class="col-sm-4 form-group button-range">
20
15
  <button class="button_search button_spacing" @click="search()" >查询</button>
21
16
  <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('省市区')">省市区管理</button>
@@ -31,6 +26,11 @@
31
26
  </div>
32
27
  </div>
33
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
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
35
  <label class="font_normal_body">省&emsp;&emsp;份</label>
36
36
  <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
package/src/filiale/qinhua/UserAddress.vue CHANGED
@@ -130,25 +130,25 @@
130
130
  close-on-select>
131
131
  </v-select>
132
132
  </div>
133
- <div v-if="!usertype" class="col-sm-8 form-group ">
134
- <label class="font_normal_body">经&ensp;纬&ensp;度</label>
135
- <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
136
- <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
137
- &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
138
- </div>
133
+ <!--<div v-if="!usertype" class="col-sm-8 form-group ">-->
134
+ <!--<label class="font_normal_body">经&ensp;纬&ensp;度</label>-->
135
+ <!--<input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>-->
136
+ <!--<input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>-->
137
+ <!--&ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
138
+ <!--</div>-->
139
139
 
140
- <div v-if="usertype" class="col-sm-12 form-group "
141
- :class="[$v.f_address.required ? 'has-error' : 'has-success']">
142
- <label for="f_address" class="font_normal_body">详细地址</label>
143
- <input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"
144
- v-validate:f_address='{required: true }'/>
145
- </div>
146
- <div v-if="usertype" class="col-sm-8 form-group ">
147
- <label class="font_normal_body">经&ensp;纬&ensp;度</label>
148
- <input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>
149
- <input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>
150
- &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
151
- </div>
140
+ <!--<div v-if="usertype" class="col-sm-12 form-group "-->
141
+ <!--:class="[$v.f_address.required ? 'has-error' : 'has-success']">-->
142
+ <!--<label for="f_address" class="font_normal_body">详细地址</label>-->
143
+ <!--<input type="text" style="width:80%" v-model="model.f_address" class="input_search" placeholder="详细地址"-->
144
+ <!--v-validate:f_address='{required: true }'/>-->
145
+ <!--</div>-->
146
+ <!--<div v-if="usertype" class="col-sm-8 form-group ">-->
147
+ <!--<label class="font_normal_body">经&ensp;纬&ensp;度</label>-->
148
+ <!--<input type="text" style="width:30%" v-model="model.f_lng" class="input_search" placeholder="经度"/>-->
149
+ <!--<input type="text" style="width:30%" v-model="model.f_lat" class="input_search" placeholder="纬度"/>-->
150
+ <!--&ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>-->
151
+ <!--</div>-->
152
152
  <div class="col-sm-6 form-group " v-if="config.hasnumber"
153
153
  :class="[$v.f_standard_number.required ? 'has-error' : 'has-success']">
154
154
  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;规范号</label>
package/src/main.js CHANGED
@@ -2,6 +2,7 @@ import Vue from 'vue'
2
2
  import App from './App'
3
3
  import { all } from 'vue-client'
4
4
  import { system } from 'system-clients'
5
+ import { ldap } from 'ldap-clients'
5
6
  import { sale } from 'sale-client'
6
7
  import address from './address'
7
8
 
@@ -11,6 +12,7 @@ Vue.config.silent = true
11
12
  all()
12
13
  address('qinhua')
13
14
  system(false)
15
+ ldap()
14
16
  // sale()
15
17
  require('system-clients/src/styles/less/bootstrap.less')
16
18