address-client 3.2.102-yulin → 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.
Files changed (8) hide show
  1. package/build/dev-server.js +70 -59
  2. package/package.json +1 -1
  3. package/src/components/AddAreaMsg.vue +135 -1
  4. package/src/components/AddressList.vue +1 -1
  5. package/src/components/AreaManage.vue +4 -0
  6. package/src/components/StreetList.vue +240 -240
  7. package/src/filiale/yangchun/AddAreaMsg.vue +7 -1
  8. package/src/main.js +2 -1
package/build/dev-server.js CHANGED
@@ -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-yulin",
3
+ "version": "3.2.103-yangchun",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
package/src/components/AddAreaMsg.vue CHANGED
@@ -47,6 +47,15 @@
47
47
  close-on-select search="true" @change="streetChange">
48
48
  </v-select>
49
49
  </div>
50
+ <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']">
51
+ <label class="font_normal_body">片&emsp;&emsp;区</label>
52
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
53
+ v-validate:slice='{required: true }'>
54
+ <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
55
+ :options='sliceArea' placeholder='片区/管理站' filer-key="name"
56
+ close-on-select v-ref:slice>
57
+ </v-select>
58
+ </div>
50
59
  <!--小区(特殊)信息-->
51
60
  <div v-if="!f_special"
52
61
  class="col-sm-6 form-group"
@@ -101,7 +110,132 @@
101
110
  <br/>
102
111
  </div>
103
112
  <!--表具信息-->
104
-
113
+ <div v-if="!f_special" class="col-sm-12 bg-info text-center" style="padding: 8px;font-size: 18px;font-weight: bold">
114
+ <span >默认表具信息</span>
115
+ </div>
116
+ <div v-if="!f_special" class="row">
117
+ <div class="col-sm-6 form-group">
118
+ <label class="font_normal_body">用户类型</label>
119
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_user_type">
120
+ <v-select
121
+ :value.sync="areamodel.f_user_type" :value-single="true"
122
+ :options='usertypes' placeholder='用户类型' @change="userTypeChange"
123
+ close-on-select >
124
+ </v-select>
125
+ </div>
126
+ <div class="col-sm-6 form-group">
127
+ <label class="font_normal_body">用气性质</label>
128
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_gasproperties">
129
+ <v-select
130
+ :value.sync="areamodel.f_gasproperties" :value-single="true"
131
+ :options='gasproperties' placeholder='用气性质'
132
+ close-on-select >
133
+ </v-select>
134
+ </div>
135
+ <div class="col-sm-6 form-group">
136
+ <label class="font_normal_body">气价类型</label>
137
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_type">
138
+ <v-select
139
+ :value.sync="areamodel.f_price_type" :value-single="true"
140
+ :options='f_price_types' placeholder='气价类型'
141
+ close-on-select >
142
+ </v-select>
143
+ </div>
144
+ <div class="col-sm-6 form-group">
145
+ <label class="font_normal_body">气价名称</label>
146
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_price_name">
147
+ <v-select
148
+ :value.sync="areamodel.f_price_name" :value-single="true"
149
+ :options='pricenames' placeholder='气价名称'
150
+ close-on-select >
151
+ </v-select>
152
+ </div>
153
+ <div class="col-sm-6 form-group">
154
+ <label class="font_normal_body">气表品牌</label>
155
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_brand">
156
+ <v-select
157
+ :value.sync="areamodel.f_meter_brand" :value-single="true"
158
+ :options='meterbrands' placeholder='气表品牌'
159
+ close-on-select >
160
+ </v-select>
161
+ </div>
162
+ <div class="col-sm-6 form-group">
163
+ <label class="font_normal_body">气表型号</label>
164
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_meter_style">
165
+ <v-select
166
+ :value.sync="areamodel.f_meter_style" :value-single="true"
167
+ :options='meterstyle' placeholder='气表型号'
168
+ close-on-select >
169
+ </v-select>
170
+ </div>
171
+ <div class="col-sm-6 form-group" :class="[$v.f_meter_type.required ? 'has-error' : 'has-success']">
172
+ <label class="font_normal_body">气表类型</label>
173
+ <input type="text" style="width:60%" class="input_search" v-show="false"
174
+ v-model="areamodel.f_meter_type">
175
+ <v-select :value.sync="areamodel.f_meter_type" :value-single="true"
176
+ :options='metertypes' placeholder='请选择'
177
+ close-on-select></v-select>
178
+ </div>
179
+ <div class="col-sm-6 form-group" v-if="isMachine">
180
+ <label class="font_normal_body">抄&ensp;表&ensp;册</label>
181
+ <input type="text" style="width:60%" class="input_search" v-show="false"
182
+ v-model="areamodel.f_meter_book">
183
+ <v-select
184
+ :value.sync="areamodel.f_meter_book" :value-single="true"
185
+ :options='meterbooks' placeholder='抄表册'
186
+ close-on-select >
187
+ </v-select>
188
+ </div>
189
+ <div class="col-sm-6 form-group" v-if="!isMachine" :class="[$v.f_meter_book.required ? 'has-error' : 'has-success']">
190
+ <label class="font_normal_body">抄&ensp;表&ensp;册</label>
191
+ <input type="text" style="width:60%" class="input_search" v-show="false"
192
+ v-model="areamodel.f_meter_book">
193
+ <v-select
194
+ :value.sync="areamodel.f_meter_book" :value-single="true"
195
+ :options='meterbooks' placeholder='抄表册'
196
+ close-on-select >
197
+ </v-select>
198
+ </div>
199
+ <div class="col-sm-6 form-group" :class="[$v.f_inputtor.required ? 'has-error' : 'has-success']">
200
+ <label class="font_normal_body">抄&ensp;表&ensp;员</label>
201
+ <input type="text" style="width:60%" class="input_search"
202
+ v-show="false" v-model="areamodel.f_inputtor">
203
+ <v-select
204
+ :value.sync="areamodel.f_inputtor" :value-single="true"
205
+ :options='inputtores' placeholder='抄表员'
206
+ close-on-select >
207
+ </v-select>
208
+ </div>
209
+ <div class="col-sm-6 form-group" :class="[$v.f_adjustable_id.required ? 'has-error' : 'has-success']">
210
+ <label class="font_normal_body">调&ensp;压&ensp;箱</label>
211
+ <input type="text" style="width:60%" class="input_search" v-show="false"
212
+ v-model="areamodel.f_adjustable_id">
213
+ <v-select
214
+ :value.sync="areamodel.f_adjustable_id" :value-single="true"
215
+ :options='adjustables' placeholder='调压箱'
216
+ close-on-select >
217
+ </v-select>
218
+ </div>
219
+ <div class="col-sm-6 form-group" :class="[$v.f_house_type.required ? 'has-error' : 'has-success']">
220
+ <label class="font_normal_body">房屋类型</label>
221
+ <input type="text" style="width:60%" class="input_search" v-show="false"
222
+ v-model="areamodel.f_house_type" >
223
+ <v-select
224
+ :value.sync="areamodel.f_house_type" :value-single="true"
225
+ :options='housetypeoptions' placeholder='房屋类型'
226
+ close-on-select >
227
+ </v-select>
228
+ </div>
229
+ <div class="col-sm-6 form-group" :class="[$v.f_position.required ? 'has-error' : 'has-success']">
230
+ <label class="font_normal_body">安装位置</label>
231
+ <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_position" >
232
+ <v-select
233
+ :value.sync="areamodel.f_position" :value-single="true"
234
+ :options='positions' placeholder='安装位置'
235
+ close-on-select >
236
+ </v-select>
237
+ </div>
238
+ </div>
105
239
  <div v-if="f_special" class="col-sm-6 form-group">
106
240
  <br/>
107
241
  </div>
package/src/components/AddressList.vue CHANGED
@@ -38,7 +38,7 @@
38
38
  <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
39
39
  <button class="button_new button_spacing" style="width: max-content" v-show="this.$login.r.includes('批量修改')" @click="$parent.$parent.modifyBatch()">批量修改</button>
40
40
  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
41
- <!-- <button class="button_export button_spacing" @click="$parent.$parent.importAddress('导入')">模板导入</button>-->
41
+ <button class="button_export button_spacing" @click="$parent.$parent.importAddress('导入')">模板导入</button>
42
42
  <button class="button_export button_spacing"
43
43
  v-show="this.$login.r.includes('完善地址')"
44
44
  @click="$parent.$parent.importAddress('完善')">完善地址</button>
package/src/components/AreaManage.vue CHANGED
@@ -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
  }
package/src/components/StreetList.vue CHANGED
@@ -1,240 +1,240 @@
1
- <template>
2
- <div class="flex" @keyup.enter="search">
3
- <criteria-paged :model="model" v-ref:paged>
4
- <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
5
- <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
- <div class="row">
7
- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
8
- <label class="font_normal_body">组织机构</label>
9
- <res-select restype='organization'
10
- @res-select="$parent.$parent.getorg"
11
- :initresid='$parent.$parent.curorgid'>
12
- </res-select>
13
- </div>
14
- <div class="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
- <div class="col-sm-4 form-group button-range">
20
- <button class="button_search button_spacing" @click="search()" >查询</button>
21
- <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('省市区')">省市区管理</button>
22
- <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('街道')">添加街道</button>
23
- <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
24
- <export-excel :data="$parent.$parent.getCondition"
25
- :field="$parent.$parent.getfield"
26
- sqlurl="rs/logic/exportfile"
27
- sql-name="manage_getstreetlist"
28
- template-name='街道信息查询导出'
29
- :choose-col="true"></export-excel>
30
- <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>
31
- </div>
32
- </div>
33
- <div class="row" v-show="$parent.$parent.criteriaShow">
34
- <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
35
- <label class="font_normal_body">省&emsp;&emsp;份</label>
36
- <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
37
- condition="f_province like '%{}%'" placeholder="省份"
38
- :size="model.f_province ? model.f_province.length*2 : 6"/>
39
- </div>
40
- <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
41
- <label class="font_normal_body">城&emsp;&emsp;市</label>
42
- <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
43
- condition="f_city like '%{}%'" placeholder="城市"
44
- :size="model.f_city ? model.f_city.length*2 : 6"/>
45
- </div>
46
- <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
47
- <label class="font_normal_body">省&emsp;&emsp;份</label>
48
- <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
49
- condition="f_province like '%{}%'" placeholder="省份"
50
- :size="model.f_province ? model.f_province.length*2 : 6"/>
51
- </div>
52
- <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
53
- <label class="font_normal_body">城&emsp;&emsp;市</label>
54
- <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
55
- condition="f_city like '%{}%'" placeholder="城市"
56
- :size="model.f_city ? model.f_city.length*2 : 6"/>
57
- </div>
58
- <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
59
- <label class="font_normal_body">区&emsp;&emsp;县</label>
60
- <input type="text" style="width:60%" class="input_search" v-model="model.f_district"
61
- condition="f_district like '%{}%'" placeholder="区县"
62
- :size="model.f_district ? model.f_district.length*2 : 6"/>
63
- </div>
64
- </div>
65
- </div>
66
- </criteria>
67
- <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
68
- <template partial='head'>
69
- <tr>
70
- <th><nobr>序号</nobr></th>
71
- <th><nobr>省份</nobr></th>
72
- <th><nobr>城市</nobr></th>
73
- <th><nobr>区/县</nobr></th>
74
- <th><data-order field="f_iscity" name="地区类型"
75
- :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
- <th><nobr>街道/乡镇</nobr></th>
77
- <th><nobr>街道编号</nobr></th>
78
- <th><data-order field="f_address" name="地址"
79
- :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
80
- <th><nobr>分公司</nobr></th>
81
- <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
82
- <th><nobr>操作</nobr></th>
83
- </tr>
84
- </template>
85
- <template partial='body'>
86
- <tr @click="$parent.$parent.changestyle()">
87
- <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
88
- <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
89
- <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
90
- <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
91
- <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
92
- <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
93
- <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
94
- <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
95
- <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
96
- <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
97
- <td style="text-align:center"><nobr>
98
- <!-- <button type="button" name="button" class="btn btn-link"
99
- @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
100
- <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
101
- style="padding: 5px 12px"
102
- @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
103
- </nobr></td>
104
- </tr>
105
- </template>
106
- <template partial='foot'></template>
107
- </data-grid>
108
- </criteria-paged>
109
- </div>
110
- </template>
111
-
112
- <script>
113
- import { PagedList } from 'vue-client'
114
- let readyGen = async function (self) {
115
- self.getfield = self.config.excelHeaders
116
- }
117
- export default {
118
- data () {
119
- return {
120
- criteriaShow: false,
121
- model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
122
- addflag: false,
123
- getfield: {},
124
- //排序
125
- orderitem:'f_city,f_district,f_iscity,f_street desc',
126
- addtitle:'',
127
- // 公司下拉
128
- curorgid: [this.$login.f.orgid],
129
- f_orgid: '',
130
- config: {
131
- // 导出列要和查询列相同
132
- excelHeaders: {
133
- 'f_province':'省份',
134
- 'f_city':'城市',
135
- 'f_district':'区/县',
136
- 'f_street':'街道名称',
137
- 'f_org_name':'分公司',
138
- 'streenum':'小区数量'
139
- }
140
- },
141
- orderFields: {
142
- f_operate_date: 'no'
143
- },
144
- }
145
- },
146
- title: '街道管理',
147
- props:{
148
- f_filialeids:{
149
- type: String
150
- }
151
- },
152
- ready(){
153
- readyGen(this)
154
- this.search()
155
- },
156
- methods: {
157
- hidden() {
158
- this.criteriaShow = !this.criteriaShow
159
- },
160
- search () {
161
- this.$refs.paged.$refs.cri.search()
162
- },
163
- async delete(row){
164
- if(row.id >= 0 ){
165
- var id = row.id
166
- let useraredss = await this.$resetpost('rs/sql/address_singleTable',
167
- {data: {
168
- items: 'f_street_id',
169
- tablename: 't_area',
170
- condition: `f_street_id='${id}'`}
171
- },
172
- {resolveMsg: null, rejectMsg: null})
173
- if(useraredss.data.length>0){
174
- this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
175
- }else{
176
- this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
177
- this.$dispatch('cancel')
178
- })
179
- }
180
- }
181
- },
182
- add(val){
183
- if (this.f_filialeids) {
184
- this.$refs.paged.$refs.grid.selectStore.selected = null
185
- this.$dispatch('add',val)
186
- } else {
187
- this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
188
- }
189
- },
190
- modify(val){
191
- this.$refs.paged.$refs.grid.selectStore.selected = null
192
- this.$dispatch('modify',val)
193
- },
194
- selfSearch (args) {
195
- if (!this.f_orgid) {
196
- this.getorg([this.$login.f.orgid])
197
- }
198
- args.condition = `${args.condition} and s.f_filialeid in ${this.f_orgid}`
199
- this.model.search(args.condition, args.model)
200
- },
201
- //清空
202
- clear(){
203
- this.$refs.paged.$refs.cri.model = {}
204
- },
205
- getorg (val) {
206
- this.f_orgid = this.$login.convertToIn(val)
207
- this.f_filialeids = val[0]
208
- }
209
- },
210
- computed: {
211
- getCondition() {
212
- return {
213
- condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
214
- orderitem: this.orderitem?`${this.orderitem}`: " id desc"
215
- }
216
- }
217
- },
218
- events:{
219
- 'sort' (field, rule) {
220
- // 将所有排序方式设为不排序，实现相互排斥
221
- console.log("field",field, rule)
222
- for (let key in this.orderFields) {
223
- if (key === field) {
224
- this.orderFields[key] = rule
225
- } else {
226
- this.orderFields[key] = 'no'
227
- }
228
- }
229
- // 如果新规则不排序，还原为默认排序
230
- if (rule === 'no') {
231
- this.model.paramSource.orderitem = `'${this.orderitem}'`
232
- } else {
233
- this.model.paramSource.orderitem = `'${field} ${rule}'`
234
- }
235
-
236
- this.search()
237
- },
238
- },
239
- }
240
- </script>
1
+ <template>
2
+ <div class="flex" @keyup.enter="search">
3
+ <criteria-paged :model="model" v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' @sort="sort()" v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select restype='organization'
10
+ @res-select="$parent.$parent.getorg"
11
+ :initresid='$parent.$parent.curorgid'>
12
+ </res-select>
13
+ </div>
14
+ <div class="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
+ <div class="col-sm-4 form-group button-range">
20
+ <button class="button_search button_spacing" @click="search()" >查询</button>
21
+ <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('省市区')">省市区管理</button>
22
+ <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('街道')">添加街道</button>
23
+ <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
24
+ <export-excel :data="$parent.$parent.getCondition"
25
+ :field="$parent.$parent.getfield"
26
+ sqlurl="rs/logic/exportfile"
27
+ sql-name="manage_getstreetlist"
28
+ template-name='街道信息查询导出'
29
+ :choose-col="true"></export-excel>
30
+ <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>
31
+ </div>
32
+ </div>
33
+ <div class="row" v-show="$parent.$parent.criteriaShow">
34
+ <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
35
+ <label class="font_normal_body">省&emsp;&emsp;份</label>
36
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
37
+ condition="f_province like '%{}%'" placeholder="省份"
38
+ :size="model.f_province ? model.f_province.length*2 : 6"/>
39
+ </div>
40
+ <div class="form-group" v-if="$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
41
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
42
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
43
+ condition="f_city like '%{}%'" placeholder="城市"
44
+ :size="model.f_city ? model.f_city.length*2 : 6"/>
45
+ </div>
46
+ <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
47
+ <label class="font_normal_body">省&emsp;&emsp;份</label>
48
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_province"
49
+ condition="f_province like '%{}%'" placeholder="省份"
50
+ :size="model.f_province ? model.f_province.length*2 : 6"/>
51
+ </div>
52
+ <div class="form-group" v-if="!$parent.$parent.$parent.areaShow" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
53
+ <label class="font_normal_body">城&emsp;&emsp;市</label>
54
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_city"
55
+ condition="f_city like '%{}%'" placeholder="城市"
56
+ :size="model.f_city ? model.f_city.length*2 : 6"/>
57
+ </div>
58
+ <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
59
+ <label class="font_normal_body">区&emsp;&emsp;县</label>
60
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_district"
61
+ condition="f_district like '%{}%'" placeholder="区县"
62
+ :size="model.f_district ? model.f_district.length*2 : 6"/>
63
+ </div>
64
+ </div>
65
+ </div>
66
+ </criteria>
67
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
68
+ <template partial='head'>
69
+ <tr>
70
+ <th><nobr>序号</nobr></th>
71
+ <th><nobr>省份</nobr></th>
72
+ <th><nobr>城市</nobr></th>
73
+ <th><nobr>区/县</nobr></th>
74
+ <th><data-order field="f_iscity" name="地区类型"
75
+ :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
+ <th><nobr>街道/乡镇</nobr></th>
77
+ <th><nobr>街道编号</nobr></th>
78
+ <th><data-order field="f_address" name="地址"
79
+ :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
80
+ <th><nobr>分公司</nobr></th>
81
+ <th title="该街道下现有的小区数"><nobr>小区数量</nobr></th>
82
+ <th><nobr>操作</nobr></th>
83
+ </tr>
84
+ </template>
85
+ <template partial='body'>
86
+ <tr @click="$parent.$parent.changestyle()">
87
+ <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
88
+ <td style="text-align:center"><nobr>{{row.f_province}}</nobr></td>
89
+ <td style="text-align:center"><nobr>{{row.f_city}}</nobr></td>
90
+ <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
91
+ <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
92
+ <td style="text-align:center"><nobr>{{row.f_street}}</nobr></td>
93
+ <td style="text-align:center"><nobr>{{row.f_street_number}}</nobr></td>
94
+ <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
95
+ <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
96
+ <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>
97
+ <td style="text-align:center"><nobr>
98
+ <!-- <button type="button" name="button" class="btn btn-link"
99
+ @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
100
+ <button v-if="!row.streetid" type="button" name="button" class="btn btn-danger"
101
+ style="padding: 5px 12px"
102
+ @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
103
+ </nobr></td>
104
+ </tr>
105
+ </template>
106
+ <template partial='foot'></template>
107
+ </data-grid>
108
+ </criteria-paged>
109
+ </div>
110
+ </template>
111
+
112
+ <script>
113
+ import { PagedList } from 'vue-client'
114
+ let readyGen = async function (self) {
115
+ self.getfield = self.config.excelHeaders
116
+ }
117
+ export default {
118
+ data () {
119
+ return {
120
+ criteriaShow: false,
121
+ model: new PagedList('rs/sql/address_getstreetlist',20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_city,f_district,f_iscity,f_street desc'`}),
122
+ addflag: false,
123
+ getfield: {},
124
+ //排序
125
+ orderitem:'f_city,f_district,f_iscity,f_street desc',
126
+ addtitle:'',
127
+ // 公司下拉
128
+ curorgid: [this.$login.f.orgid],
129
+ f_orgid: '',
130
+ config: {
131
+ // 导出列要和查询列相同
132
+ excelHeaders: {
133
+ 'f_province':'省份',
134
+ 'f_city':'城市',
135
+ 'f_district':'区/县',
136
+ 'f_street':'街道名称',
137
+ 'f_org_name':'分公司',
138
+ 'streenum':'小区数量'
139
+ }
140
+ },
141
+ orderFields: {
142
+ f_operate_date: 'no'
143
+ },
144
+ }
145
+ },
146
+ title: '街道管理',
147
+ props:{
148
+ f_filialeids:{
149
+ type: String
150
+ }
151
+ },
152
+ ready(){
153
+ readyGen(this)
154
+ this.search()
155
+ },
156
+ methods: {
157
+ hidden() {
158
+ this.criteriaShow = !this.criteriaShow
159
+ },
160
+ search () {
161
+ this.$refs.paged.$refs.cri.search()
162
+ },
163
+ async delete(row){
164
+ if(row.id >= 0 ){
165
+ var id = row.id
166
+ let useraredss = await this.$resetpost('rs/sql/address_singleTable',
167
+ {data: {
168
+ items: 'f_street_id',
169
+ tablename: 't_area',
170
+ condition: `f_street_id='${id}'`}
171
+ },
172
+ {resolveMsg: null, rejectMsg: null})
173
+ if(useraredss.data.length>0){
174
+ this.$showAlert('该街道下已有小区信息,无法删除!','warning',1000)
175
+ }else{
176
+ this.$resetdelete('rs/entity/t_street', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
177
+ this.$dispatch('cancel')
178
+ })
179
+ }
180
+ }
181
+ },
182
+ add(val){
183
+ if (this.f_filialeids) {
184
+ this.$refs.paged.$refs.grid.selectStore.selected = null
185
+ this.$dispatch('add',val)
186
+ } else {
187
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
188
+ }
189
+ },
190
+ modify(val){
191
+ this.$refs.paged.$refs.grid.selectStore.selected = null
192
+ this.$dispatch('modify',val)
193
+ },
194
+ selfSearch (args) {
195
+ if (!this.f_orgid) {
196
+ this.getorg([this.$login.f.orgid])
197
+ }
198
+ args.condition = `${args.condition} and s.f_filialeid in ${this.f_orgid}`
199
+ this.model.search(args.condition, args.model)
200
+ },
201
+ //清空
202
+ clear(){
203
+ this.$refs.paged.$refs.cri.model = {}
204
+ },
205
+ getorg (val) {
206
+ this.f_orgid = this.$login.convertToIn(val)
207
+ this.f_filialeids = val[0]
208
+ }
209
+ },
210
+ computed: {
211
+ getCondition() {
212
+ return {
213
+ condition: `${this.$refs.paged.$refs.cri.condition}` + `and s.f_filialeid = '${this.f_filialeids}'`,
214
+ orderitem: this.orderitem?`${this.orderitem}`: " id desc"
215
+ }
216
+ }
217
+ },
218
+ events:{
219
+ 'sort' (field, rule) {
220
+ // 将所有排序方式设为不排序，实现相互排斥
221
+ console.log("field",field, rule)
222
+ for (let key in this.orderFields) {
223
+ if (key === field) {
224
+ this.orderFields[key] = rule
225
+ } else {
226
+ this.orderFields[key] = 'no'
227
+ }
228
+ }
229
+ // 如果新规则不排序，还原为默认排序
230
+ if (rule === 'no') {
231
+ this.model.paramSource.orderitem = `'${this.orderitem}'`
232
+ } else {
233
+ this.model.paramSource.orderitem = `'${field} ${rule}'`
234
+ }
235
+
236
+ this.search()
237
+ },
238
+ },
239
+ }
240
+ </script>
package/src/filiale/yangchun/AddAreaMsg.vue CHANGED
@@ -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()