address-client 3.2.57 → 3.2.59

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "address-client",
3
- "version": "3.2.57",
3
+ "version": "3.2.59",
4
4
  "description": "地址管理前台组件",
5
5
  "author": "wanbochao",
6
6
  "license": "ISC",
@@ -431,7 +431,10 @@
431
431
  this.areaslist = []
432
432
  // this.model.f_residential_area_id = null
433
433
  // this.model.f_residential_area = null
434
- let condition = `isnull(f_iscity,'') = isnull('${this.model.f_iscity}','') and a.f_orgid = '${this.$login.f.orgid}'`
434
+ let condition = `a.f_orgid = '${this.$login.f.orgid}'`
435
+ if(this.model.f_iscity) {
436
+ condition = condition + ` and f_iscity = '${this.model.f_iscity}'`
437
+ }
435
438
  let req = await this.$resetpost('rs/sql/address_getresidential', {
436
439
  data: {
437
440
  condition: condition
@@ -94,12 +94,7 @@
94
94
  <!-- :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>-->
95
95
  <!-- </div>-->
96
96
 
97
- <div :class="$parent.$parent.style">
98
- <label class="font_normal_body">地址&emsp;ID</label>
99
- <input type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
100
- condition="a.id = '{}'" placeholder="地址ID"
101
- />
102
- </div>
97
+
103
98
  <div :class="$parent.$parent.style" >
104
99
  <label class="font_normal_body">客户地址</label>
105
100
  <input type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
@@ -12,11 +12,6 @@
12
12
  :initresid='$parent.$parent.curorgid'>
13
13
  </res-select>
14
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
15
  <div :class="$parent.$parent.style" v-if="false">
21
16
  <label class="font_normal_body">省&emsp;&emsp;份</label>
22
17
  <input type="text" class="input_search" style="width:60%" v-model="model.f_province"
@@ -54,11 +49,6 @@
54
49
  </div>
55
50
  </div>
56
51
  <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
52
  <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.areaShow">
63
53
  <label class="font_normal_body">城&emsp;&emsp;市</label>
64
54
  <input type="text" class="input_search" style="width:60%" v-model="model.f_city"
@@ -74,7 +74,6 @@
74
74
  <th><data-order field="f_iscity" name="地区类型"
75
75
  :order.sync="$parent.$parent.$parent.$parent.orderFields.f_iscity"></data-order></th>
76
76
  <th><nobr>街道/乡镇</nobr></th>
77
- <th><nobr>街道编号</nobr></th>
78
77
  <th><data-order field="f_address" name="地址"
79
78
  :order.sync="$parent.$parent.$parent.$parent.orderFields.f_address"></data-order></th>
80
79
  <th><nobr>分公司</nobr></th>
@@ -90,7 +89,6 @@
90
89
  <td style="text-align:center"><nobr>{{row.f_district}}</nobr></td>
91
90
  <td style="text-align:center"><nobr>{{row.f_iscity}}</nobr></td>
92
91
  <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
92
  <td style="text-align:center"><nobr>{{row.f_pcd}}{{row.f_street}}</nobr></td>
95
93
  <td style="text-align:center"><nobr>{{row.f_org_name}}</nobr></td>
96
94
  <td style="text-align:center"><nobr>{{row.streenum}}</nobr></td>