safecheck-client 3.0.35-3 → 3.0.35-31

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. package/package.json +1 -1
  2. package/src/components/NewDefectList/DefectListNew.vue +617 -617
  3. package/src/components/Util/SafecheckUpload.vue +4 -0
  4. package/src/components/android/CheckPlanDown.vue +1 -1
  5. package/src/components/android/CivilCurrentCreate.vue +56 -41
  6. package/src/components/android/NoCivilCurrentCreate.vue +10 -0
  7. package/src/components/android/PhoneUpUserinfo.vue +25 -6
  8. package/src/components/android/SafecheckOrderV.vue +2805 -2805
  9. package/src/components/pc/SecurityCheckLedger.vue +113 -0
  10. package/src/components/planmanage/PlanManage.vue +47 -2
  11. package/src/components/report/CheckPlanAreaList.vue +25 -5
  12. package/src/components/rongcheng/AddPlanItem.vue +1 -1
  13. package/src/components/rongcheng/AspiratedAreaPlan.vue +1 -0
  14. package/src/components/rongcheng/AspiratedPaperFeedbackm.vue +4 -0
  15. package/src/components/rongcheng/AspiratedUserInfo.vue +12 -4
  16. package/src/components/rongcheng/CheckSearchUser.vue +1 -1
  17. package/src/components/rongcheng/SafecheckOrderV.vue +1 -1
  18. package/src/components/rongcheng/SafecheckUserInfo.vue +12 -12
  19. package/src/filiale/bayan/android/AddPlanItem.vue +22 -2
  20. package/src/filiale/bayan/android/CheckPlanDown.vue +2 -2
  21. package/src/filiale/bayan/android/CurrentCreate.vue +10 -0
  22. package/src/filiale/bayan/android/PhoneUpUserinfo.vue +908 -905
  23. package/src/filiale/bayan/android/SafecheckOrderV.vue +76 -20
  24. package/src/filiale/bayan/android/SafecheckUserInfo.vue +4 -0
  25. package/src/filiale/bayan/pc/PlanManage.vue +2 -0
  26. package/src/filiale/bayan/pc/SelectCheckPlan.vue +6 -1
  27. package/src/filiale/huaran/android/CheckPlanDown.vue +212 -0
  28. package/src/filiale/huaran/android.js +1 -0
  29. package/src/filiale/huaran/pc/PlanManage.vue +53 -6
  30. package/src/filiale/huaran/pc/checkUserList.vue +55 -22
  31. package/src/filiale/huaran/pc.js +1 -0
  32. package/src/filiale/jiaxian/android/SafecheckOrderV.vue +2807 -2807
  33. package/src/filiale/qianneng/android/SafecheckOrderV.vue +2785 -2785
  34. package/src/filiale/shanxian/android/AddPlanItem.vue +1 -1
  35. package/src/filiale/shanxian/android/SafecheckOrderV.vue +2979 -2979
  36. package/src/filiale/shanxian/pc/checkUserList.vue +1 -1
  37. package/src/filiale/siyang/pc/CheckSearchUser.vue +1035 -1035
  38. package/src/filiale/siyang/pc/checkUserList.vue +108 -133
  39. package/src/filiale/tongchuan/android/SafecheckOrderV.vue +3 -3
  40. package/src/filiale/tongchuan/pc/CheckSearchUser.vue +5 -13
  41. package/src/filiale/tongchuan/pc/PaperDefectMain.vue +1060 -1060
  42. package/src/filiale/weinan/pc/CheckBookSearchUserList.vue +735 -735
  43. package/src/filiale/weinan/pc/CheckDetail.vue +278 -278
  44. package/src/filiale/weinan/pc/checkUserList.vue +712 -712
  45. package/src/filiale/xilan/android/CurrentCreate.vue +1053 -1067
  46. package/src/filiale/xilan/android.js +0 -1
  47. package/src/safecheck.js +3 -0
  48. package/src/filiale/xilan/android/AddPlanItem.vue +0 -461
package/src/filiale/siyang/pc/checkUserList.vue CHANGED
@@ -96,55 +96,55 @@
96
96
  >
97
97
  </v-select>
98
98
  </div>
99
- <div class="form-group col-sm-4" >
100
- <label class="font_normal_body">气表类型:</label>
101
- <v-select
102
- class="select select_list"
103
- :value.sync="model.meter_classify"
104
- v-model="model.meter_classify"
105
- :options='$parent.$parent.meter_classifys'
106
- placeholder='请选择'
107
- condition="uf.F_METER_CLASSIFY='{}'"
108
- :search="false"
109
- close-on-select
110
- value-single
111
- >
112
- </v-select>
113
- </div>
114
- <div class="form-group col-sm-4" >
115
- <label class="font_normal_body">街&emsp;&emsp;道:</label>
116
- <v-select
117
- class="select select_list"
118
- :value.sync="model.f_street"
119
- v-model="model.f_street"
120
- :options='$parent.$parent.streets'
121
- placeholder='请选择'
122
- condition="ua.f_street_id='{}'"
123
- close-on-select
124
- value-single
125
- >
126
- </v-select>
127
- </div>
99
+ <!-- <div class="form-group col-sm-4" >-->
100
+ <!-- <label class="font_normal_body">气表类型:</label>-->
101
+ <!-- <v-select-->
102
+ <!-- class="select select_list"-->
103
+ <!-- :value.sync="model.meter_classify"-->
104
+ <!-- v-model="model.meter_classify"-->
105
+ <!-- :options='$parent.$parent.meter_classifys'-->
106
+ <!-- placeholder='请选择'-->
107
+ <!-- condition="uf.F_METER_CLASSIFY='{}'"-->
108
+ <!-- :search="false"-->
109
+ <!-- close-on-select-->
110
+ <!-- value-single-->
111
+ <!-- >-->
112
+ <!-- </v-select>-->
113
+ <!-- </div>-->
114
+ <!-- <div class="form-group col-sm-4" >-->
115
+ <!-- <label class="font_normal_body">街&emsp;&emsp;道:</label>-->
116
+ <!-- <v-select-->
117
+ <!-- class="select select_list"-->
118
+ <!-- :value.sync="model.f_street"-->
119
+ <!-- v-model="model.f_street"-->
120
+ <!-- :options='$parent.$parent.streets'-->
121
+ <!-- placeholder='请选择'-->
122
+ <!-- condition="ua.f_street_id='{}'"-->
123
+ <!-- close-on-select-->
124
+ <!-- value-single-->
125
+ <!-- >-->
126
+ <!-- </v-select>-->
127
+ <!-- </div>-->
128
128
  <!--<div class="form-group col-sm-4" >
129
129
  <label class="font_normal_body">小区名称:</label>
130
130
  <input type="text" class="input_search" v-model="model.f_userinfo_code"
131
131
  style="width: 60%" placeholder="请选择" condition="ua.f_residential_area = '{}'">
132
132
  </div>-->
133
- <div class="form-group col-sm-4" >
134
- <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>
135
- <input type="text" class="input_search" v-model="model.f_building"
136
- style="width: 60%" placeholder="请选择" condition="ua.f_building='{}'">
137
- </div>
138
- <div class="form-group col-sm-4" >
139
- <label class="font_normal_body">单&ensp;元&ensp;号:</label>
140
- <input type="text" class="input_search" v-model="model.f_unit"
141
- style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">
142
- </div>
143
- <div class="form-group col-sm-4" >
144
- <label class="font_normal_body">楼&ensp;层&ensp;号:</label>
145
- <input type="text" class="input_search" v-model="model.f_floor"
146
- style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">
147
- </div>
133
+ <!-- <div class="form-group col-sm-4" >-->
134
+ <!-- <label class="font_normal_body">楼&ensp;栋&ensp;号:</label>-->
135
+ <!-- <input type="text" class="input_search" v-model="model.f_building"-->
136
+ <!-- style="width: 60%" placeholder="请选择" condition="ua.f_building='{}'">-->
137
+ <!-- </div>-->
138
+ <!-- <div class="form-group col-sm-4" >-->
139
+ <!-- <label class="font_normal_body">单&ensp;元&ensp;号:</label>-->
140
+ <!-- <input type="text" class="input_search" v-model="model.f_unit"-->
141
+ <!-- style="width: 60%" placeholder="请选择" condition="ua.f_unit='{}'">-->
142
+ <!-- </div>-->
143
+ <!-- <div class="form-group col-sm-4" >-->
144
+ <!-- <label class="font_normal_body">楼&ensp;层&ensp;号:</label>-->
145
+ <!-- <input type="text" class="input_search" v-model="model.f_floor"-->
146
+ <!-- style="width: 60%" placeholder="请选择" condition="ua.f_floor='{}'">-->
147
+ <!-- </div>-->
148
148
  <div class="form-group col-sm-4" >
149
149
  <label class="font_normal_body">开户起始:</label>
150
150
  <datepicker
@@ -171,16 +171,16 @@
171
171
  condition="ui.f_createfile_date <= '{} 23:59:59'">
172
172
  </datepicker>
173
173
  </div>
174
- <div class="form-group col-sm-4" >
175
- <label class="font_normal_body">表&ensp;箱&ensp;号:</label>
176
- <input type="text" class="input_search" v-model="model.f_metertitles"
177
- style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">
178
- </div>
179
- <div class="form-group col-sm-4" >
180
- <label class="font_normal_body">用户电话:</label>
181
- <input type="text" class="input_search" v-model="model.f_user_phone"
182
- style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">
183
- </div>
174
+ <!-- <div class="form-group col-sm-4" >-->
175
+ <!-- <label class="font_normal_body">表&ensp;箱&ensp;号:</label>-->
176
+ <!-- <input type="text" class="input_search" v-model="model.f_metertitles"-->
177
+ <!-- style="width: 60%" placeholder="请输入" condition="uf.f_metertitles='{}'">-->
178
+ <!-- </div>-->
179
+ <!-- <div class="form-group col-sm-4" >-->
180
+ <!-- <label class="font_normal_body">用户电话:</label>-->
181
+ <!-- <input type="text" class="input_search" v-model="model.f_user_phone"-->
182
+ <!-- style="width: 60%" placeholder="请输入" condition="ui.f_user_phone='{}'">-->
183
+ <!-- </div>-->
184
184
  <div class="form-group col-sm-4" >
185
185
  <label class="font_normal_body">片&ensp;&ensp;&ensp;&ensp;区:</label>
186
186
  <v-select
@@ -196,20 +196,20 @@
196
196
  >
197
197
  </v-select>
198
198
  </div>
199
- <div class="form-group col-sm-4" >
200
- <label class="font_normal_body">抄&ensp;表&ensp;册:</label>
201
- <v-select
202
- class="select select_list"
203
- :value.sync="model.f_meter_book_num"
204
- v-model="model.f_meter_book_num"
205
- :options='$parent.$parent.cbc'
206
- placeholder='请选择'
207
- condition="uf.f_meter_book_num='{}'"
208
- close-on-select
209
- value-single
210
- >
211
- </v-select>
212
- </div>
199
+ <!-- <div class="form-group col-sm-4" >-->
200
+ <!-- <label class="font_normal_body">抄&ensp;表&ensp;册:</label>-->
201
+ <!-- <v-select-->
202
+ <!-- class="select select_list"-->
203
+ <!-- :value.sync="model.f_meter_book_num"-->
204
+ <!-- v-model="model.f_meter_book_num"-->
205
+ <!-- :options='$parent.$parent.cbc'-->
206
+ <!-- placeholder='请选择'-->
207
+ <!-- condition="uf.f_meter_book_num='{}'"-->
208
+ <!-- close-on-select-->
209
+ <!-- value-single-->
210
+ <!-- >-->
211
+ <!-- </v-select>-->
212
+ <!-- </div>-->
213
213
  <div class="form-group col-sm-4" >
214
214
  <label class="font_normal_body">派发情况:</label>
215
215
  <v-select
@@ -265,76 +265,51 @@
265
265
  >
266
266
  </v-select>
267
267
  </div>
268
- <div class="form-group col-sm-4" >
269
- <label class="font_normal_body">通气起始:</label>
270
- <datepicker
271
- placeholder='通气开始时间'
272
- style="width:60%"
273
- :disabled-days-of-week="[]"
274
- :format="'yyyy-MM-dd'"
275
- :show-rest-button="reset"
276
- :value.sync="model.f_startgas_time"
277
- v-model="model.f_startgas_time"
278
- condition="ui.f_uservent_date >= '{} 00:00:00'">
279
- </datepicker>
280
- </div>
281
- <div class="form-group col-sm-4" >
282
- <label class="font_normal_body">通气截止:</label>
283
- <datepicker
284
- placeholder='通气结束时间'
285
- :disabled-days-of-week="[]"
286
- style="width:60%"
287
- :format="'yyyy-MM-dd'"
288
- :show-rest-button="reset"
289
- :value.sync="model.f_endgas_time"
290
- v-model="model.f_endgas_time"
291
- condition="ui.f_uservent_date <= '{} 23:59:59'">
292
- </datepicker>
293
- </div>
294
- <div class="form-group col-sm-4">
295
- <label class="font_normal_body">安检册:</label>
296
- <v-select
297
- class="select select_list"
298
- :value.sync="model.checkBook"
299
- v-model="model.checkBook"
300
- :options='$parent.$parent.checkBooks'
301
- placeholder='请选择'
302
- :search="false"
303
- close-on-select
304
- value-single
305
- >
306
- </v-select>
307
- </div>
268
+ <!-- <div class="form-group col-sm-4" >-->
269
+ <!-- <label class="font_normal_body">通气起始:</label>-->
270
+ <!-- <datepicker-->
271
+ <!-- placeholder='通气开始时间'-->
272
+ <!-- style="width:60%"-->
273
+ <!-- :disabled-days-of-week="[]"-->
274
+ <!-- :format="'yyyy-MM-dd'"-->
275
+ <!-- :show-rest-button="reset"-->
276
+ <!-- :value.sync="model.f_startgas_time"-->
277
+ <!-- v-model="model.f_startgas_time"-->
278
+ <!-- condition="ui.f_uservent_date >= '{} 00:00:00'">-->
279
+ <!-- </datepicker>-->
280
+ <!-- </div>-->
281
+ <!-- <div class="form-group col-sm-4" >-->
282
+ <!-- <label class="font_normal_body">通气截止:</label>-->
283
+ <!-- <datepicker-->
284
+ <!-- placeholder='通气结束时间'-->
285
+ <!-- :disabled-days-of-week="[]"-->
286
+ <!-- style="width:60%"-->
287
+ <!-- :format="'yyyy-MM-dd'"-->
288
+ <!-- :show-rest-button="reset"-->
289
+ <!-- :value.sync="model.f_endgas_time"-->
290
+ <!-- v-model="model.f_endgas_time"-->
291
+ <!-- condition="ui.f_uservent_date <= '{} 23:59:59'">-->
292
+ <!-- </datepicker>-->
293
+ <!-- </div>-->
294
+ <!-- <div class="form-group col-sm-4">-->
295
+ <!-- <label class="font_normal_body">安检册:</label>-->
296
+ <!-- <v-select-->
297
+ <!-- class="select select_list"-->
298
+ <!-- :value.sync="model.checkBook"-->
299
+ <!-- v-model="model.checkBook"-->
300
+ <!-- :options='$parent.$parent.checkBooks'-->
301
+ <!-- placeholder='请选择'-->
302
+ <!-- :search="false"-->
303
+ <!-- close-on-select-->
304
+ <!-- value-single-->
305
+ <!-- >-->
306
+ <!-- </v-select>-->
307
+ <!-- </div>-->
308
308
  <div class="form-group col-sm-4">
309
309
  <label class="font_normal_body">安检时间:</label>
310
310
  <input type="number" class="input_search" v-model="model.month"
311
311
  style="width: 60%" placeholder="距上次安检时间(月)">
312
312
  </div>
313
- <!--<div class="form-group col-sm-4" >
314
- <label class="font_normal_body">入户情况:</label>
315
- <v-select
316
- class="select select_list"
317
- :value.sync="model.f_hasHousehold"
318
- v-model="model.f_hasHousehold"
319
- :options='$parent.$parent.hasHousehold'
320
- placeholder='请选择'
321
- close-on-select
322
- :search="false"
323
- value-single
324
- >
325
- </v-select>
326
- </div>-->
327
- <!--先注掉，-->
328
- <!-- <div class="form-group col-sm-4" >-->
329
- <!-- <label class="font_normal_body">年龄起始:</label>-->
330
- <!-- <input type="text" class="input_search" v-model="model.f_yearstart_time"-->
331
- <!-- style="width: 60%" placeholder="请输入">-->
332
- <!-- </div>-->
333
- <!-- <div class="form-group col-sm-4" >-->
334
- <!-- <label class="font_normal_body">年龄截止:</label>-->
335
- <!-- <input type="text" class="input_search" v-model="model.f_yearend_time"-->
336
- <!-- style="width: 60%" placeholder="请输入">-->
337
- <!-- </div>-->
338
313
  </div>
339
314
  </div>
340
315
  <div slot="modal-footer" class="modal-footer" style="text-align: center">
package/src/filiale/tongchuan/android/SafecheckOrderV.vue CHANGED
@@ -983,8 +983,8 @@
983
983
  //tag)
984
984
  if(Vue.android && (!this.data.f_overall_imgs || this.data.f_overall_imgs.length == 0) && this.data.f_entry_status == '入户')
985
985
  return prefix + '必须有安检总体照片'
986
- // if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
987
- // return prefix + '必须有用户签名'
986
+ if(Vue.android && (!this.data.f_sign_path || this.data.f_sign_path.length == 0) && this.data.f_entry_status == '入户')
987
+ return prefix + '必须有用户签名'
988
988
  console.log("666666",Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic)
989
989
  if(Vue.android && this.data.f_issign_hetong=='是' && this.data.f_hetong_path == Vue.nopic){
990
990
  return prefix + '签订合同必须拍照'
@@ -1849,7 +1849,7 @@
1849
1849
  //tag
1850
1850
  this.$dispatch('confirm')
1851
1851
  }else if(res.code == 710){
1852
- this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
1852
+ this.$showMessage('上传照片失败,请检查本地图片是否损坏或者网络是否正常！')
1853
1853
  this.onlySave = true
1854
1854
  return
1855
1855
  }else if(res.code == 712){
package/src/filiale/tongchuan/pc/CheckSearchUser.vue CHANGED
@@ -217,18 +217,6 @@
217
217
  :value-single="true"
218
218
  close-on-select clear-button></v-select>
219
219
  </div>
220
- <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
221
- <label class="font_normal_body">是否通气</label>
222
- <v-select
223
- class="select_list select"
224
- placeholder='是否通气' style="width: 60%"
225
- v-model='model.f_is_gas'
226
- :value.sync="model.f_is_gas"
227
- :options='$parent.$parent.isgas'
228
- condition="uf.f_gas_data {}"
229
- :value-single="true"
230
- close-on-select clear-button></v-select>
231
- </div>
232
220
  </div>
233
221
 
234
222
  <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -444,6 +432,9 @@
444
432
  <th>
445
433
  <nobr>安检员备注</nobr>
446
434
  </th>
435
+ <th>
436
+ <nobr>表具出厂日期</nobr>
437
+ </th>
447
438
  <th>
448
439
  <nobr>最后一次安检日期</nobr>
449
440
  </th>
@@ -468,6 +459,7 @@
468
459
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
469
460
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
470
461
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_comments }}</td>
462
+ <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_factory_date }}</td>
471
463
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
472
464
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
473
465
  <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
@@ -534,6 +526,7 @@
534
526
  'f_slice_area': '区域',
535
527
  'f_residential_area': '小区名称',
536
528
  'f_address': '地址',
529
+ 'f_factory_date': '表具出厂日期',
537
530
  'f_last_check_date': '最后一次安检日期',
538
531
  'f_last_check_state': '最后一次安检状态',
539
532
  'f_defect_content': '安检结果'
@@ -584,7 +577,6 @@
584
577
  cbcs: [],
585
578
  cbc: [],
586
579
  pcds: [],
587
- isgas: [{label: '全部', value: ''},{label: '是', value: 'is not null '},{label: '否', value: ' is null '}]
588
580
 
589
581
  }
590
582
  },