apply-clients 3.3.110-238 → 3.3.110-241

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 (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/android/AppServiceView.vue +6 -3
  3. package/src/components/product/GroupByApply/ApplyGroupByList.vue +68 -22
  4. package/src/components/product/Process/Service/ServiceControl.vue +1867 -1867
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.3.110-238",
3
+ "version": "3.3.110-241",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/android/AppServiceView.vue CHANGED
@@ -445,9 +445,12 @@ export default {
445
445
  console.log("区域为空禁止提交:",this.areaData)
446
446
  flag = true
447
447
  }
448
- if (this.areaData.mapvalue ==null){
449
- console.log("坐标为空禁止提交:",this.areaData.mapvalue)
450
- flag = true
448
+ for (const fields of this.areaData.mapvalue) {
449
+ // console.log("报警器数据:",fields.f_bjq_lng)
450
+ if (fields.f_bjq_lng ==null || fields.f_bjq_lng.length ==0){
451
+ console.log("坐标为空禁止提交44444:",this.areaData.mapvalue)
452
+ flag = true
453
+ }
451
454
  }
452
455
  }
453
456
  }
package/src/components/product/GroupByApply/ApplyGroupByList.vue CHANGED
@@ -3,10 +3,53 @@
3
3
  <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
4
4
  <div class="form-horizontal select-overspread container-fluid auto" partial>
5
5
  <div class="row">
6
-
7
-
8
- <div class="form-group col-sm-4">
9
- <label class="font_normal_body">地址状态：</label>
6
+ <div class="form-group col-sm-6">
7
+ <label class="font_normal_body">客户编号：</label>
8
+ <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
9
+ v-on:keyup.enter="$parent.$parent.search()" condition="ui.f_userinfo_code like '%{}%'" placeholder='客户编号'>
10
+ </div>
11
+ <div class="form-group col-sm-6">
12
+ <label class="font_normal_body">客户名称：</label>
13
+ <input type="text" style="width:60%" class="input_search" placeholder='客户名称' v-model="model.f_user_name"
14
+ v-on:keyup.enter="$parent.$parent.search()"
15
+ condition="ui.f_user_name like '%{}%'">
16
+ </div>
17
+ <div class="form-group col-sm-6">
18
+ <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区：</label>
19
+ <input type="text" style="width:60%" class="input_search" placeholder='小区' v-model="model.f_residential_area"
20
+ v-on:keyup.enter="$parent.$parent.search()"
21
+ condition="ua.f_residential_area like '%{}%'">
22
+ </div>
23
+ <div class="form-group col-sm-6">
24
+ <label class="font_normal_body">客户地址：</label>
25
+ <input type="text" style="width:60%" class="input_search" placeholder='客户地址' v-model="model.f_address"
26
+ v-on:keyup.enter="$parent.$parent.search()"
27
+ condition="ua.f_address like '%{}%'">
28
+ </div>
29
+ <div class="form-group col-sm-6">
30
+ <label for="startDate" class="font_normal_body">开始时间：</label>
31
+ <datepicker id="startDate" placeholder="开始日期"
32
+ style="width: 60%!important;"
33
+ v-model="model.startDate"
34
+ :value.sync="model.startDate"
35
+ :format="'yyyy-MM-dd 00:00:00'"
36
+ :show-reset-button="true"
37
+ condition="ua.f_create_date >= '{}'">
38
+ </datepicker>
39
+ </div>
40
+ <div class="form-group col-sm-6">
41
+ <label for="endDate" class="font_normal_body">结束时间：</label>
42
+ <datepicker id="endDate" placeholder="结束日期"
43
+ style="width: 60%!important;"
44
+ v-model="model.endDate"
45
+ :value.sync="model.endDate"
46
+ :format="'yyyy-MM-dd 23:59:59'"
47
+ :show-reset-button="true"
48
+ condition="ua.f_create_date <= '{}'">
49
+ </datepicker>
50
+ </div>
51
+ <div class="form-group col-sm-6">
52
+ <label class="font_normal_body">通气状态：</label>
10
53
  <v-select
11
54
  v-model="model.f_address_state"
12
55
  placeholder='请选择'
@@ -39,17 +82,17 @@
39
82
  <template partial='head'>
40
83
  <tr>
41
84
  <th class="textNoLineBreak">序号</th>
42
- <th class="textNoLineBreak">区/县</th>
43
- <th class="textNoLineBreak">片区</th>
44
- <th class="textNoLineBreak">街道</th>
45
- <th class="textNoLineBreak">小区</th>
46
- <th class="textNoLineBreak">详细地址</th>
47
- <th class="textNoLineBreak">地址状态</th>
48
85
  <th class="textNoLineBreak">客户编号</th>
49
86
  <th class="textNoLineBreak">用户姓名</th>
50
87
  <th class="textNoLineBreak">电话</th>
88
+ <th class="textNoLineBreak">通气状态</th>
51
89
  <th class="textNoLineBreak">证件类型</th>
52
90
  <th class="textNoLineBreak">证件号码</th>
91
+ <th class="textNoLineBreak">区/县</th>
92
+ <th class="textNoLineBreak">片区</th>
93
+ <th class="textNoLineBreak">街道</th>
94
+ <th class="textNoLineBreak">小区</th>
95
+ <th class="textNoLineBreak">详细地址</th>
53
96
  <th class="textNoLineBreak">时间</th>
54
97
  <th class="textNoLineBreak">备注</th>
55
98
  <th class="textNoLineBreak">
@@ -67,37 +110,37 @@
67
110
  <nobr>{{$index+1}}</nobr>
68
111
  </td>
69
112
  <td style="text-align: center;">
70
- <nobr>{{row.f_pcd}}</nobr>
113
+ <nobr>{{row.f_userinfo_code}}</nobr>
71
114
  </td>
72
115
  <td style="text-align: center;">
73
- <nobr>{{row.f_slice_area}}</nobr>
116
+ <nobr>{{row.f_user_name}}</nobr>
74
117
  </td>
75
118
  <td style="text-align: center;">
76
- <nobr>{{row.f_street}}</nobr>
119
+ <nobr>{{row.f_user_phone}}</nobr>
77
120
  </td>
78
121
  <td style="text-align: center;">
79
- <nobr>{{row.f_residential_area}}</nobr>
122
+ <nobr>{{row.f_address_state}}</nobr>
80
123
  </td>
81
124
  <td style="text-align: center;">
82
- <nobr>{{row.f_address}}</nobr>
125
+ <nobr>{{row.f_credentials}}</nobr>
83
126
  </td>
84
127
  <td style="text-align: center;">
85
- <nobr>{{row.f_address_state}}</nobr>
128
+ <nobr>{{row.f_idnumber}}</nobr>
86
129
  </td>
87
130
  <td style="text-align: center;">
88
- <nobr>{{row.f_userinfo_code}}</nobr>
131
+ <nobr>{{row.f_pcd}}</nobr>
89
132
  </td>
90
133
  <td style="text-align: center;">
91
- <nobr>{{row.f_user_name}}</nobr>
134
+ <nobr>{{row.f_slice_area}}</nobr>
92
135
  </td>
93
136
  <td style="text-align: center;">
94
- <nobr>{{row.f_user_phone}}</nobr>
137
+ <nobr>{{row.f_street}}</nobr>
95
138
  </td>
96
139
  <td style="text-align: center;">
97
- <nobr>{{row.f_credentials}}</nobr>
140
+ <nobr>{{row.f_residential_area}}</nobr>
98
141
  </td>
99
142
  <td style="text-align: center;">
100
- <nobr>{{row.f_idnumber}}</nobr>
143
+ <nobr>{{row.f_address}}</nobr>
101
144
  </td>
102
145
  <td style="text-align: center;">
103
146
  <nobr>{{row.f_create_date}}</nobr>
@@ -132,7 +175,7 @@ export default {
132
175
  model: model,
133
176
  f_process_id: '',
134
177
  f_filialeid: '',
135
- address_state: [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')],
178
+ address_state: [{label: '全部', value: ''}, ...this.$appdata.getParam('通气状态')],
136
179
  istongqi: [{label: '全部', value: ''},
137
180
  {label: '是', value: '是'},
138
181
  {label: '否', value: '否'}
@@ -204,4 +247,7 @@ export default {
204
247
  </script>
205
248
 
206
249
  <style scoped>
250
+ .textNoLineBreak {
251
+ white-space: nowrap;
252
+ }
207
253
  </style>