address-client 3.2.102 → 3.2.103-yangchun

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.
@@ -12,83 +12,94 @@ var proxy = httpProxy.createProxyServer()
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var str = 'http://127.0.0.1:8288/', str2= 'http://172.168.1.11:9001/#'
14
14
  var str3= 'http://172.168.1.11:9001/#'
15
+ var str4='http://127.0.0.1:8080'
16
+ const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
15
17
  var proxyTable = {
16
- '/rs/entity': {
17
- target: str
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'
18
+ '/api': {
19
+ target: v4Url
27
20
  },
21
+ '/invoice/rs/logic/getInvoice': {
22
+ target: serverRul
23
+ },
24
+ '/rs/sql/address_getarealist':{
25
+ target:str4
26
+ },
27
+ '/rs/sql/filemanage_getUserfies':{
28
+ target: 'http://127.0.0.1:8080/'
29
+ },
30
+ '/rs/logic/importNetworkValve':{
31
+ target: 'http://127.0.0.1:8080/'
32
+ },
33
+ '/rs/file': {
34
+ target: localUrl
35
+ },
36
+ '/webapps': {
37
+ target: serverRul
38
+ },
39
+ '/rs/sql/singleTable': {
40
+ target: serverRul
41
+ },
42
+ '/invoice': {
43
+ target: serverRul
44
+ },
45
+ // 查找资源服务数据
46
+ '/rs/search': {
47
+ target: serverRul
48
+ },
49
+ // 查找资源服务数据
28
50
  '/rs/logic/getLogin': {
29
- target: str3,
30
- secure:true,
31
- changeOrigin:true
51
+ target: serverRul
32
52
  },
53
+ // 查找资源服务数据
33
54
  '/rs/logic/getInitData': {
34
- target: str3,
35
- secure:true,
36
- changeOrigin:true,
55
+ target: serverRul
37
56
  },
38
57
  '/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
58
+ target: serverRul
53
59
  },
60
+ // 用户登录服务地址
54
61
  '/rs/user': {
55
- target: str3,
56
- secure:true,
57
- changeOrigin:true
62
+ target: serverRul
63
+ },
64
+ '/rs/path': {
65
+ target: serverRul
66
+ },
67
+ '/rs/data': {
68
+ target: serverRul
69
+ },
70
+ '/rs/license': {
71
+ target: serverRul
58
72
  },
59
73
  '/rs/db': {
60
- target: str3,
61
- secure:true,
62
- changeOrigin:true
74
+ target: serverRul
63
75
  },
64
- '/rs/search': {
65
- target: str3,
66
- secure:true,
67
- changeOrigin:true
68
- // target: 'http://127.0.0.1:8080'
76
+ '/excel': {
77
+ target: serverRul
69
78
  },
70
- '/rs/data': {
71
- target: str3,
72
- secure:true,
73
- changeOrigin:true
79
+ '/rs/config': {
80
+ target: serverRul
74
81
  },
75
- '/rs/sql': {
76
- target: str
77
- // secure: true,
78
- // changeOrigin:true
79
- // target: 'http://127.0.0.1:8080'
82
+ '/rs/report': {
83
+ target: serverRul
84
+ },
85
+ '/rs/vue': {
86
+ target: serverRul
87
+ },
88
+ '/rs/logic/webHandReverse': {
89
+ target: 'http://localhost:8085'
80
90
  },
81
91
  '/rs/logic': {
82
- target: str
83
- // secure: true,
84
- // changeOrigin:true
85
- // target: 'http://127.0.0.1:8080'
92
+ target: localUrl
93
+ },
94
+ '/rs/sql': {
95
+ target: localUrl
96
+ },
97
+ '/webmeter': {
98
+ target: serverRul
86
99
  },
87
100
  '/rs': {
88
- // target: 'http://192.168.50.199:8300'
89
- target: str3,
90
- secure:true,
91
- changeOrigin:true
101
+ target: serverRul
102
+ // changeOrigin: true
92
103
  }
93
104
  }
94
105
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.102",
3
+ "version": "3.2.103-yangchun",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -66,6 +66,10 @@
66
66
  if (obj.val.f_adjustable_id != null && obj.val.f_adjustable_id != '' && !(obj.val.f_adjustable_id instanceof Array)) {
67
67
  this.$refs.addareamsg.areamodel.f_adjustable_id = parseInt(obj.val.f_adjustable_id)
68
68
  }
69
+ if(this.$refs.addareamsg.filtName()){
70
+ this.$refs.addareamsg.areamodel.selladd='0'}else {
71
+ this.$refs.addareamsg.areamodel.selladd='1'
72
+ }
69
73
  // this.$refs.addareamsg.initdata(obj.val)
70
74
  // this.$refs.addareamsg.initrow(obj.val)
71
75
  }
@@ -0,0 +1,416 @@
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' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div :class="$parent.$parent.style">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select restype='organization'
10
+ @res-select="$parent.$parent.getorg"
11
+ is-mul="false"
12
+ :initresid='$parent.$parent.curorgid'>
13
+ </res-select>
14
+ </div>
15
+ <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
16
+ <label class="font_normal_body">小区编号</label>
17
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_area_id"
18
+ condition="f_area_id = '{}'" placeholder="小区编号"/>
19
+ </div>
20
+ <div :class="$parent.$parent.style" v-if="false">
21
+ <label class="font_normal_body">省&emsp;&emsp;份</label>
22
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_province"
23
+ condition="f_province like '%{}%'" placeholder="省份"/>
24
+ </div>
25
+ <!--<div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">-->
26
+ <div :class="$parent.$parent.style" v-if="false">
27
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
28
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_city"
29
+ condition="f_city like '%{}%'" placeholder="城市"/>
30
+ </div>
31
+ <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
32
+ <label class="font_normal_body">区&emsp;&emsp;县</label>
33
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_district"
34
+ condition="f_district like '%{}%'" placeholder="区县"/>
35
+ </div>
36
+ <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.areaShow">
37
+ <label class="font_normal_body">街道/乡镇</label>
38
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_street"
39
+ condition="f_street like '%{}%'" placeholder="街道/乡镇"/>
40
+ </div>
41
+ <div class="col-sm-4 form-group button-range">
42
+ <button class="button_search button_spacing" @click="search()" >查询</button>
43
+ <button class="button_search button_spacing" @click="$parent.$parent.batchDelete()">批量删除</button>
44
+ <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
45
+ <button v-if="$parent.$parent.f_special"class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('单位')">添加单位</button>
46
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
47
+ <export-excel :data="$parent.$parent.getCondition"
48
+ :field="$parent.$parent.getfield"
49
+ sqlurl="rs/logic/exportfile"
50
+ sql-name="manage_getarealist"
51
+ template-name='小区信息查询导出'
52
+ :choose-col="true"></export-excel>
53
+ <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>
54
+ </div>
55
+ </div>
56
+ <div class="row" v-if="$parent.$parent.criteriaShow">
57
+ <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
58
+ <label class="font_normal_body">小区编号</label>
59
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_area_id"
60
+ condition="f_area_id = '{}'" placeholder="小区编号"/>
61
+ </div>
62
+ <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
63
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
64
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_city"
65
+ condition="f_city like '%{}%'" placeholder="城市"
66
+ :size="model.f_city ? model.f_city.length*2 : 6"/>
67
+ </div>
68
+ <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
69
+ <label class="font_normal_body">区&emsp;&emsp;县</label>
70
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_district"
71
+ condition="f_district like '%{}%'" placeholder="区县"
72
+ :size="model.f_district ? model.f_district.length*2 : 6"/>
73
+ </div>
74
+ <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
75
+ <label class="font_normal_body">街道/乡镇</label>
76
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_street"
77
+ condition="f_street like '%{}%'" placeholder="街道/乡镇"
78
+ :size="model.f_street ? model.f_street.length*2 : 6"/>
79
+ </div>
80
+ <div :class="$parent.$parent.style">
81
+ <label class="font_normal_body">小区名称</label>
82
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area"
83
+ condition="f_residential_area like '%{}%'" placeholder="小区"
84
+ :size="model.f_residential_area ? model.f_residential_area.length*2 : 6"/>
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>
92
+ <div :class="$parent.$parent.style">
93
+ <label class="font_normal_body">安装位置</label>
94
+ <v-select :options='$parent.$parent.position' :value.sync="model.f_position"
95
+ close-on-select condition="f_position='{}'"
96
+ placeholder='安装位置' v-model="model.f_position"></v-select>
97
+ </div>
98
+ <div :class="$parent.$parent.style">
99
+ <label class="font_normal_body">&emsp;抄表员</label>
100
+ <v-select :options='$parent.$parent.inputtores' :value.sync="model.f_inputtor"
101
+ close-on-select condition="f_inputtor='{}'"
102
+ placeholder='抄表员' v-model="model.f_inputtor"></v-select>
103
+ </div>
104
+ </div>
105
+ </div>
106
+ </criteria>
107
+
108
+ <data-grid :model="model" partial='list' class="list_area table_sy" :optional="true" v-ref:grid>
109
+ <template partial='head'>
110
+ <th><nobr>序号</nobr></th>
111
+ <th v-if="false"><nobr>省份</nobr></th>
112
+ <th v-if="false"><nobr>城市</nobr></th>
113
+ <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>区/县</nobr></th>
114
+ <th><nobr>街道/乡镇</nobr></th>
115
+ <!--民用小区信息开始-->
116
+ <th v-if="!$parent.$parent.$parent.f_special"><nobr>小区名称</nobr></th>
117
+ <th v-if="!$parent.$parent.$parent.f_special"><nobr>地址</nobr></th>
118
+ <th v-if="!$parent.$parent.$parent.f_special && !$parent.$parent.$parent.$parent.areaShow"><nobr>小区备注</nobr></th>
119
+ <!--民用小区信息结束-->
120
+ <!--非民用单位信息开始-->
121
+ <th v-if="$parent.$parent.$parent.f_special"><nobr>单位名称</nobr></th>
122
+ <th v-if="$parent.$parent.$parent.f_special"><nobr>单位地址</nobr></th>
123
+ <th v-if="$parent.$parent.$parent.f_special"><nobr>联系人</nobr></th>
124
+ <th v-if="$parent.$parent.$parent.f_special"><nobr>联系电话</nobr></th>
125
+ <!--非民用单位信息结束-->
126
+ <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>抄表员</nobr></th>
127
+ <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>房屋类型</nobr></th>
128
+ <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>安装位置</nobr></th>
129
+ <th v-show="!$parent.$parent.$parent.$parent.areaShow"><nobr>片区/管理站 </nobr></th>
130
+ <th><nobr>操作人</nobr></th>
131
+ <th><nobr>操作日期</nobr></th>
132
+ <th title="该小区下现有的地址数"><nobr>地址数</nobr></th>
133
+ <th title="该小区下现有的地址数"><nobr>立户合计</nobr></th>
134
+ <th title="该小区下现有的地址数"><nobr>未立户合计</nobr></th>
135
+ <th><nobr>操作</nobr></th>
136
+ </template>
137
+ <template partial='body'>
138
+ <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
139
+ <td style="text-align:center" v-if="false"><nobr>{{row.f_province}}</nobr></td>
140
+ <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
141
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
142
+ <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
143
+ <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
144
+ <td style="text-align:center"><nobr>{{row.f_area_address}}</nobr></td>
145
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_comments}}</nobr></td>
146
+ <!--非民用单位信息开始-->
147
+ <td v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkname}}</nobr></td>
148
+ <td v-if="$parent.$parent.$parent.f_special" style="text-align:center"><nobr>{{row.f_linkphone}}</nobr></td>
149
+ <!--非民用单位信息结束-->
150
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_inputtor}}</nobr></td>
151
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_house_type}}</nobr></td>
152
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_position}}</nobr></td>
153
+ <td v-show="!$parent.$parent.$parent.$parent.areaShow" style="text-align:center"><nobr>{{row.f_slice_area}}</nobr></td>
154
+ <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
155
+ <td style="text-align:center"><nobr>{{row.f_operate_date}}</nobr></td>
156
+ <td style="text-align:center"><nobr>{{row.addressnum}}</nobr></td>
157
+ <td style="text-align:center"><nobr>{{row.addressnum_contract}}</nobr></td>
158
+ <td style="text-align:center"><nobr>{{row.addressnum_uncontract}}</nobr></td>
159
+ <td><nobr>
160
+ <!--<button type="button" name="button" class="btn btn-link"
161
+ @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
162
+ <button v-if="!row.addressnum>0" type="button" name="button" class="btn btn-danger"
163
+ style="padding: 5px 12px"
164
+ @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
165
+ </nobr>
166
+ </td>
167
+ </template>
168
+ <template partial='foot'></template>
169
+ </data-grid>
170
+ </criteria-paged>
171
+ <modal :show="showDelete" large backdrop="false" :width="900">
172
+ <header slot="modal-header" class="modal-header">
173
+ <p class="bg-info text-center" style="padding: 8px;">提示</p>
174
+ </header>
175
+ <article slot="modal-body" class="modal-body">
176
+ <p>您一共选中{{selectDataLen}}个小区,您确定是否要删除吗?</p>
177
+ </article>
178
+ <footer slot="modal-footer" class="modal-footer">
179
+ <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
180
+ <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
181
+ </footer>
182
+ </modal>
183
+ </div>
184
+ </template>
185
+
186
+ <script>
187
+ import { PagedList } from 'vue-client'
188
+ let readyGen = async function (self) {
189
+ self.getfield = self.config.excelHeaders
190
+ self.search()
191
+ }
192
+ export default {
193
+
194
+ data () {
195
+ return {
196
+ showDelete: false,
197
+ criteriaShow: false,
198
+ model: new PagedList('rs/sql/address_getarealist',20),
199
+ selectDataLen: 0,
200
+ addflag: false,
201
+ addtitle:'',
202
+ getfield: {},
203
+ getRowData:[],
204
+ // 公司下拉
205
+ curorgid: [this.$login.f.orgid],
206
+ f_orgid: '',
207
+ //初始化小区数据
208
+ areaslist:[],
209
+ config: {
210
+ // 导出列要和查询列相同
211
+ excelHeaders: {
212
+ 'f_district':'区/县',
213
+ 'f_street':'街道名称',
214
+ 'f_residential_area':'小区名称',
215
+ 'f_area_address':'小区地址',
216
+ 'f_comments':'小区备注',
217
+ 'f_inputtor':'抄表员',
218
+ 'f_house_type':'房屋类型',
219
+ 'f_position':'安装位置',
220
+ 'f_slice_area':'片区/管理站',
221
+ 'f_operator':'操作人',
222
+ 'f_operate_date':'操作日期',
223
+ 'addressnum':'地址数',
224
+ 'addressnum_contract':'立户合计',
225
+ 'addressnum_uncontract':'未立户合计'
226
+ }
227
+ },
228
+ housetype:[{label:'全部',value:''},{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
229
+ position:this.$appdata.getParam('安装位置')?[{label:'全部',value:''},...this.$appdata.getParam('安装位置')]:[{label:'全部',value:''}]
230
+ }
231
+ },
232
+ title: '小区管理',
233
+ props:{
234
+ f_filialeids:{
235
+ type: String
236
+ },
237
+ style: {
238
+ type: String,
239
+ default: 'col-sm-2 form-group'
240
+ },
241
+ f_special:{
242
+ type: String
243
+ }
244
+ },
245
+ ready(){
246
+ readyGen(this)
247
+
248
+ },
249
+ methods: {
250
+ hidden() {
251
+ this.criteriaShow = !this.criteriaShow
252
+ },
253
+ search() {
254
+ this.$refs.paged.$refs.cri.search()
255
+ },
256
+
257
+ async delete(row){
258
+ if(row.id >= 0){
259
+ var id = row.id
260
+ let useraredss = await this.$resetpost('rs/sql/address_singleTable',
261
+ {data: {
262
+ items: 'f_residential_area_id',
263
+ tablename: 't_user_address',
264
+ condition: `f_residential_area_id='${id}'`}
265
+ },
266
+ {resolveMsg: null, rejectMsg: null})
267
+ if(useraredss.data.length>0){
268
+ this.$showAlert('该小区下已有地址信息,无法删除!','warning',1000)
269
+ }else{
270
+ this.$resetdelete('rs/entity/t_area', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
271
+ this.$dispatch('cancel')
272
+ })
273
+ }
274
+ }
275
+ },
276
+ add(val){
277
+ if (this.f_filialeids) {
278
+ this.$refs.paged.$refs.grid.selectStore.selected = null
279
+ this.$dispatch('add')
280
+ } else {
281
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
282
+ }
283
+ },
284
+ modify(val){
285
+ this.$refs.paged.$refs.grid.selectStore.selected = null
286
+ this.$dispatch('modify',val)
287
+ },
288
+ selfSearch (args) {
289
+
290
+ if (!this.f_orgid) {
291
+ this.getorg([this.$login.f.orgid])
292
+ }
293
+ if(this.f_special){
294
+ args.condition = `${args.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
295
+ }else{
296
+ args.condition = `${args.condition} and s.f_filialeid = ${this.f_orgid}`
297
+ }
298
+ this.model.search(args.condition, args.model)
299
+ },
300
+ //清空
301
+ clear(){
302
+ this.$refs.paged.$refs.cri.model = {}
303
+ },
304
+ getorg (val) {
305
+ this.f_orgid = this.$login.convertToIn(val)
306
+ this.f_filialeids = val[0]
307
+ },
308
+ async batchDelete () {
309
+ let flag = true
310
+ if (this.f_filialeids) {
311
+ if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
312
+ // 获取要批量删除的小区数据
313
+ this.getRowData = this.$refs.paged.$refs.grid.getRowData()
314
+ this.getRowData.forEach((row,n) => {
315
+ console.log(JSON.stringify(row) + '==========')
316
+ if (row.addressnum > 0 ) {
317
+ this.$showAlert('您所选择的小区下已有地址信息,无法删除!','warning',2000)
318
+ this.selectDataLen = 0
319
+ flag = false
320
+ }
321
+ })
322
+ if(flag){
323
+ this.selectDataLen = this.getRowData.length
324
+ console.log(this.selectDataLen + '-----------------------')
325
+ this.showDelete = true
326
+ }
327
+ } else {
328
+ this.$showAlert('请至少选择一项!', 'warning', 2000)
329
+ }
330
+ }else {
331
+ this.$showAlert('请先选择左上角的所在分公司!', 'warning', 2000)
332
+ }
333
+ },
334
+ confirmDelete () {
335
+ let msg = {
336
+ resolveMsg: '批量删除成功!',
337
+ rejectMsg: '批量删除失败!'
338
+ }
339
+ let oldAreaIds = this.getRowData
340
+ console.log('所选中的小区信息:=======' + JSON.stringify(oldAreaIds))
341
+ this.$resetpost('rs/logic/batchDelete',{
342
+ data:{
343
+ oldAreaIds:oldAreaIds,
344
+ f_operator: this.$login.f.name,
345
+ f_operatorid: this.$login.f.id,
346
+ f_orgid: this.$login.f.orgid,
347
+ f_orgname: this.$login.f.orgs,
348
+ f_depid: this.$login.f.depids,
349
+ f_depname: this.$login.f.deps
350
+ }
351
+ },msg)
352
+ this.$refs.paged.$refs.grid.selectInit()
353
+ this.$refs.paged.$refs.cri.search()
354
+ this.showDelete = false
355
+ },
356
+ cancelDelete () {
357
+ this.$refs.paged.$refs.grid.selectInit()
358
+ this.$refs.paged.$refs.cri.search()
359
+ this.showDelete = false
360
+ },
361
+ // areaChange(val){
362
+ // console.log("小区变化",val)
363
+ // let selectArea // 选中的小区数据
364
+ // for (let row of this.areaslist) {
365
+ // if (val == row.value) {
366
+ // selectArea = row.data
367
+ // break
368
+ // }
369
+ // }
370
+ // if (selectArea) {
371
+ // this.areamodel.f_residential_area_id = selectArea.id
372
+ // this.areamodel.f_pcd = selectArea.f_pcd
373
+ // this.areamodel.f_pcd_id = selectArea.f_pcd_id
374
+ // this.areamodel.f_street = selectArea.f_street
375
+ // this.areamodel.f_street_id = selectArea.f_street_id
376
+ // this.areamodel.f_slice_area = selectArea.f_slice_area
377
+ // this.areamodel.f_residential_area = selectArea.f_residential_area
378
+ // }
379
+ // this.$nextTick(() => {
380
+ // this.$resetValidation()
381
+ // })
382
+ // },
383
+ },
384
+ watch:{
385
+
386
+ },
387
+ computed:{
388
+ getCondition() {
389
+ var condition=''
390
+ if(this.f_special){
391
+ condition = `${this.$refs.paged.$refs.cri.condition} and s.f_special='1' and s.f_filialeid = '${this.f_filialeids}'`
392
+ }else{
393
+ condition = `${this.$refs.paged.$refs.cri.condition} and s.f_filialeid = ${this.f_orgid}`
394
+ }
395
+ return {
396
+ condition: condition
397
+ }
398
+ },
399
+ inputtores () {
400
+ // 获取抄表员
401
+ let rs = new Array()
402
+ if (this.$login.f.f_gasman.length > 0) {
403
+ for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
404
+ let temp = {
405
+ label: this.$login.f.f_gasman[i].name,
406
+ value: this.$login.f.f_gasman[i].name
407
+ }
408
+ rs.push(temp)
409
+ }
410
+ }
411
+ return rs
412
+ }
413
+ }
414
+
415
+ }
416
+ </script>
@@ -0,0 +1,12 @@
1
+ // 分公司特殊组件页面注册
2
+ import Vue from "vue";
3
+
4
+ let specialComp = {
5
+ //地址管理父组件
6
+ 'area-list':(resolve) => { require(['./AreaList'], resolve) }
7
+ }
8
+ exports.specialComp = specialComp
9
+
10
+
11
+
12
+
@@ -323,7 +323,8 @@ export default {
323
323
  f_meter_style:'',
324
324
  f_position:'',
325
325
  f_comments:'',
326
- f_meter_type: ''
326
+ f_meter_type: '',
327
+ selladd:'0'
327
328
  },
328
329
  // 初始化小区数据
329
330
  areaslist:[],
@@ -348,6 +349,11 @@ export default {
348
349
  initGen(this)
349
350
  },
350
351
  methods: {
352
+ filtName(){
353
+ console.log("小区名称",this.areamodel.f_residential_area)
354
+ console.log('权限限制',this.areamodel.f_residential_area.includes('L'))
355
+ return this.areamodel.f_residential_area.includes('L')
356
+ },
351
357
  loadMeterBooks(){
352
358
  this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
353
359
  },
package/src/main.js CHANGED
@@ -9,7 +9,8 @@ Vue.config.silent = true
9
9
 
10
10
  /** **************************通用组件******************************/
11
11
  all()
12
- address('WEINAN')
12
+ // address('WEINAN')
13
+ address('yangchun')
13
14
  system(false)
14
15
  ldap()
15
16
  // sale()