safecheck-client 3.0.33-3 → 3.0.33-6

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 (17) hide show
  1. package/package.json +133 -133
  2. package/src/App.vue +31 -31
  3. package/src/filiale/dexin/android/SafecheckDevices.vue +1 -1
  4. package/src/filiale/dexin/android/WebMeterOpen.vue +1 -1
  5. package/src/filiale/fugou/pc/CheckBook.vue +301 -301
  6. package/src/filiale/fugou/pc/CheckBookDetails.vue +161 -161
  7. package/src/filiale/fugou/pc/CheckBookEntry.vue +66 -66
  8. package/src/filiale/fugou/pc/CheckBookList.vue +366 -366
  9. package/src/filiale/fugou/pc/CheckBookSearchArea.vue +560 -560
  10. package/src/filiale/fugou/pc/CheckBookSearchUser.vue +651 -651
  11. package/src/filiale/fugou/pc/checkPlanList.vue +371 -371
  12. package/src/filiale/wensu/pc/DefectPaperNew.vue +1 -1
  13. package/src/filiale/wensu/pc/PrintMaterialBill.vue +172 -172
  14. package/src/filiale/wensu/pc/SelectCheckPlan.vue +342 -342
  15. package/src/filiale/wensu/pc/checkUserList.vue +8 -8
  16. package/src/filiale/wenxi/android/SafecheckUserInfo.vue +651 -651
  17. package/src/main.js +33 -33
package/src/filiale/wensu/pc/checkUserList.vue CHANGED
@@ -246,8 +246,8 @@
246
246
  >
247
247
  </v-select>
248
248
  </div>
249
- <!--<div class="form-group col-sm-4" >
250
- <label class="font_normal_body">入户情况:</label>
249
+ <div class="form-group col-sm-4" >
250
+ <label class="font_normal_body">安检筛选:</label>
251
251
  <v-select
252
252
  class="select select_list"
253
253
  :value.sync="model.f_hasHousehold"
@@ -259,7 +259,7 @@
259
259
  value-single
260
260
  >
261
261
  </v-select>
262
- </div>-->
262
+ </div>
263
263
 
264
264
  </div>
265
265
  </div>
@@ -358,7 +358,7 @@
358
358
  gasproperties:[],//用气性质
359
359
  meter_classifys:[],//气表类型
360
360
  entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
361
- hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
361
+ hasHousehold:[{label:"全部",value:""},{label:"入户",value:"入户"},{label:"未入户",value:"未入户"}],
362
362
  yearCheckList:[{label:"全部",value:""},{label:"已在计划中",value:"ua.f_plan_id is not null"},{label:"未在计划中",value:"ua.f_plan_id is null"}],
363
363
  sliceArea:[],
364
364
  meterbooks:[],
@@ -399,11 +399,11 @@
399
399
  selfSearch (args) {
400
400
  //tag)
401
401
  args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
402
- /*if(args.model.f_hasHousehold=='已入户'){
403
- args.condition +=` and Extract(year from TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'))=2021 and ua.F_LAST_CHECK_STATE='入户'`
402
+ if(args.model.f_hasHousehold=='入户'){
403
+ args.condition +=` and ua.F_LAST_CHECK_STATE='入户'`
404
404
  }else if(args.model.f_hasHousehold=='未入户'){
405
- args.condition +=` and (Extract(year from nvl(TO_DATE(ua.f_last_check_date,'yyyy-mm-dd hh24:mi:ss'),'1990-01-01 00:00:00'))!=2021 or nvl(ua.F_LAST_CHECK_STATE,'未入户')!='入户')`
406
- }*/
405
+ args.condition +=` and (ua.F_LAST_CHECK_STATE !='入户' or ua.F_LAST_CHECK_STATE is null)`
406
+ }
407
407
  if(this.uploadCodeCondition){
408
408
  args.condition +=` and ${this.uploadCodeCondition}`
409
409
  }