safecheck-client 4.0.1-68 → 4.0.1-69
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.
|
@@ -285,6 +285,41 @@
|
|
|
285
285
|
<input type="number" class="input_search" v-model="model.f_check_date"
|
|
286
286
|
style="width: 60%" placeholder="距上次安检天数" >
|
|
287
287
|
</div>
|
|
288
|
+
<div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
|
|
289
|
+
<label class="font_normal_body">回访状态</label>
|
|
290
|
+
<v-select id="f_entry"
|
|
291
|
+
class="select_list select"
|
|
292
|
+
placeholder='回访状态' style="width: 60%"
|
|
293
|
+
v-model='model.f_is_visit'
|
|
294
|
+
:value.sync="$parent.$parent.model.f_is_visit"
|
|
295
|
+
:options='$parent.$parent.is_visit'
|
|
296
|
+
:value-single="true"
|
|
297
|
+
close-on-select clear-button></v-select>
|
|
298
|
+
</div>
|
|
299
|
+
<div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
|
|
300
|
+
<label class="font_normal_body">回访时间</label>
|
|
301
|
+
<datepicker
|
|
302
|
+
:value.sync="model.f_visit_datestart"
|
|
303
|
+
placeholder='开始时间' style="width: 60%"
|
|
304
|
+
:disabled-days-of-week="[]"
|
|
305
|
+
:format="'yyyy-MM-dd'"
|
|
306
|
+
:show-rest-button="reset"
|
|
307
|
+
v-model="model.f_visit_datestart"
|
|
308
|
+
condition="f_visit_date > ='{} 00:00:00' and f_is_visit ='已回访'">
|
|
309
|
+
</datepicker>
|
|
310
|
+
</div>
|
|
311
|
+
<div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
|
|
312
|
+
<label class="font_normal_body">回访时间</label>
|
|
313
|
+
<datepicker
|
|
314
|
+
:value.sync="model.f_visit_dateend"
|
|
315
|
+
placeholder='结束时间' style="width: 60%"
|
|
316
|
+
:disabled-days-of-week="[]"
|
|
317
|
+
:format="'yyyy-MM-dd'"
|
|
318
|
+
:show-rest-button="reset"
|
|
319
|
+
v-model="model.f_visit_dateend"
|
|
320
|
+
condition="f_visit_date <= '{} 23:59:59' and f_is_visit ='已回访'">
|
|
321
|
+
</datepicker>
|
|
322
|
+
</div>
|
|
288
323
|
</div>
|
|
289
324
|
<modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
|
|
290
325
|
<div slot="modal-header" class="modal-header">
|
|
@@ -745,6 +780,7 @@ export default {
|
|
|
745
780
|
showinfo4:false,
|
|
746
781
|
shouinfodata:{},
|
|
747
782
|
tableBrands: [{label: '全部', value: ''}],
|
|
783
|
+
is_visit: [{label: '全部', value: ''},{label: '已回访', value: '已回访'},{label: '未回访', value: '未回访'}],
|
|
748
784
|
audioshow: false,
|
|
749
785
|
safeAudit: this.$login.f.rolestr.includes('安检审核'),
|
|
750
786
|
searchData: {
|
|
@@ -1081,6 +1117,13 @@ export default {
|
|
|
1081
1117
|
console.error('f_check_date不是一个有效的正整数');
|
|
1082
1118
|
}
|
|
1083
1119
|
}
|
|
1120
|
+
if (args.model.f_is_visit){
|
|
1121
|
+
if (args.model.f_is_visit == '已回访'){
|
|
1122
|
+
args.condition += ` and f_is_visit ='已回访'`
|
|
1123
|
+
}else {
|
|
1124
|
+
args.condition += ` and f_is_visit is null`
|
|
1125
|
+
}
|
|
1126
|
+
}
|
|
1084
1127
|
this.model.search(args.condition, args.model, args.condValue)
|
|
1085
1128
|
}
|
|
1086
1129
|
},
|