safecheck-client 3.0.33-40 → 3.0.33-41
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 +133 -133
- package/src/App.vue +2 -2
- package/src/filiale/Util.js +337 -337
- package/src/filiale/hanzhong/pc/CheckUserList.vue +9 -30
- package/src/filiale/rongchuang/android/SafecheckDevices.vue +1400 -1400
- package/src/filiale/rongchuang/android/SafecheckOrderV.vue +2692 -2692
- package/src/filiale/rongchuang/android.js +13 -13
- package/src/filiale/yangchunboneng/android/SafecheckOrderV.vue +2832 -2832
- package/src/main.js +1 -1
|
@@ -221,7 +221,7 @@
|
|
|
221
221
|
:show-rest-button="reset"
|
|
222
222
|
:value.sync="model.f_start_time"
|
|
223
223
|
v-model="model.f_start_time"
|
|
224
|
-
|
|
224
|
+
condition="ui.f_last_check_date >='{} 00:00:00'">
|
|
225
225
|
</datepicker>
|
|
226
226
|
</div>
|
|
227
227
|
<div class="form-group col-sm-4" >
|
|
@@ -234,7 +234,7 @@
|
|
|
234
234
|
:show-rest-button="reset"
|
|
235
235
|
:value.sync="model.f_end_time"
|
|
236
236
|
v-model="model.f_end_time"
|
|
237
|
-
|
|
237
|
+
condition="ui.f_last_check_date <='{} 23:59:59'">
|
|
238
238
|
</datepicker>
|
|
239
239
|
</div>
|
|
240
240
|
<div class="form-group col-sm-4">
|
|
@@ -246,6 +246,7 @@
|
|
|
246
246
|
v-model="model.f_last_check_state"
|
|
247
247
|
:options='$parent.$parent.entry_status'
|
|
248
248
|
placeholder='请选择'
|
|
249
|
+
condition="ui.f_last_check_state = '{}'"
|
|
249
250
|
:search="false"
|
|
250
251
|
close-on-select
|
|
251
252
|
value-single
|
|
@@ -493,34 +494,12 @@
|
|
|
493
494
|
args.condition +=` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
|
|
494
495
|
}
|
|
495
496
|
}
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
// args.condition +=` and ui.f_last_check_state = ${args.model.f_last_check_state?args.model.f_last_check_state:''} and ui.f_last_check_date >='${args.model.f_start_time}' and ui.f_last_check_date <='${args.model.f_start_time}' `
|
|
503
|
-
// }
|
|
504
|
-
if (!Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )){
|
|
505
|
-
if (args.model.f_last_check_state == '未检'){
|
|
506
|
-
var lscon = args.model.f_start_time ? ` or ui.f_last_check_date <= '${args.model.f_start_time} 00:00:00'` :''
|
|
507
|
-
lscon += lscon ? (args.model.f_end_time ? ` or ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :''): (args.model.f_end_time ? `ui.f_last_check_date >= '${args.model.f_end_time} 23:59:59'` :'')
|
|
508
|
-
args.condition +=`and (ui.f_last_check_state is null or ui.f_last_check_state ='' ${lscon} ) `
|
|
509
|
-
}else {
|
|
510
|
-
var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
|
|
511
|
-
lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
|
|
512
|
-
args.condition += `and ui.f_last_check_state = '${args.model.f_last_check_state}' ${lscon}`
|
|
513
|
-
}
|
|
514
|
-
|
|
515
|
-
}else if (Util.isEmpty(args.model.f_last_check_state) && (!Util.isEmpty(args.model.f_start_time) || !Util.isEmpty(args.model.f_end_time) )) {
|
|
516
|
-
var lscon = args.model.f_start_time ? ` and ui.f_last_check_date >= '${args.model.f_start_time} 00:00:00'` :''
|
|
517
|
-
lscon += lscon ? (args.model.f_end_time ? ` and ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'') : (args.model.f_end_time ? ` ui.f_last_check_date <= '${args.model.f_end_time} 23:59:59'` :'')
|
|
518
|
-
args.condition += lscon
|
|
519
|
-
}else if (!Util.isEmpty(args.model.f_last_check_state) && Util.isEmpty(args.model.f_start_time) && Util.isEmpty(args.model.f_end_time)){
|
|
520
|
-
this.$showMessage("选择安检状态时，需要选择安检时间区间！")
|
|
521
|
-
return
|
|
522
|
-
}else{
|
|
523
|
-
console.log('这块无条件')
|
|
497
|
+
if (args.model.f_last_check_state == '未检'){
|
|
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 ")
|
|
524
503
|
}
|
|
525
504
|
if(this.uploadCodeCondition){
|
|
526
505
|
args.condition +=` and ${this.uploadCodeCondition}`
|