safecheck-client 3.0.33-35 → 3.0.33-37
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 +3 -3
- package/src/App.vue +31 -31
- package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue +713 -713
- package/src/filiale/hanzhong/pc/CheckSafeDetail.vue +573 -573
- package/src/filiale/hanzhong/pc/CheckSafeStatus.vue +508 -508
- package/src/filiale/hanzhong/pc/CheckUserList.vue +5 -7
- package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue +595 -595
- package/src/filiale/rongchuang/pc/NewCheckpaper.vue +1289 -1353
- package/src/filiale/rongchuang/pc/PaperList.vue +812 -0
- package/src/filiale/rongchuang/pc.js +15 -14
- package/src/filiale/weinan/android/SafecheckDevices.vue +1291 -1291
- package/src/filiale/weinan/pc/DefectPaperNew.vue +1059 -1059
- package/src/main.js +1 -1
|
@@ -485,13 +485,7 @@
|
|
|
485
485
|
this.excelUserCondtion=true
|
|
486
486
|
},
|
|
487
487
|
selfSearch (args) {
|
|
488
|
-
//tag)
|
|
489
488
|
args.condition += ` and ui.f_filialeid='${this.userlogin.orgid}'`
|
|
490
|
-
/*if(args.model.f_hasHousehold=='已入户'){
|
|
491
|
-
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='入户'`
|
|
492
|
-
}else if(args.model.f_hasHousehold=='未入户'){
|
|
493
|
-
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,'未入户')!='入户')`
|
|
494
|
-
}*/
|
|
495
489
|
if(args.model.checkBook){
|
|
496
490
|
let arr=args.model.checkBook.split('-')
|
|
497
491
|
if(arr[1] == '用户'){
|
|
@@ -501,7 +495,11 @@
|
|
|
501
495
|
}
|
|
502
496
|
}
|
|
503
497
|
if (args.model.f_last_check_state == '未检'){
|
|
504
|
-
args.condition = args.condition.replace("ui.f_last_check_state = '未检'"," ui.f_last_check_state is null or ui.f_last_check_date is null ")
|
|
498
|
+
args.condition = args.condition.replace("ui.f_last_check_state = '未检'"," (ui.f_last_check_state is null or ui.f_last_check_date is null) ")
|
|
499
|
+
}
|
|
500
|
+
if (!this.isTimeSelected){
|
|
501
|
+
args.model.f_last_check_state = ''
|
|
502
|
+
args.condition = args.condition.replace("(ui.f_last_check_state is null or ui.f_last_check_date is null)"," 1=1 ")
|
|
505
503
|
}
|
|
506
504
|
if(this.uploadCodeCondition){
|
|
507
505
|
args.condition +=` and ${this.uploadCodeCondition}`
|