manage-client 3.2.124 → 3.2.125
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
CHANGED
|
@@ -44,7 +44,11 @@
|
|
|
44
44
|
<button @click="$parent.$parent.clearmsg" class="button_clear">清空</button>
|
|
45
45
|
<export-excel
|
|
46
46
|
:choose-col="true"
|
|
47
|
-
:data="{condition: $parent.$parent.condition
|
|
47
|
+
:data="{condition: $parent.$parent.condition,
|
|
48
|
+
f_orgid: $parent.$parent.f_orgid,
|
|
49
|
+
f_start_date: $parent.$parent.f_start_date,
|
|
50
|
+
f_end_date: $parent.$parent.f_end_date
|
|
51
|
+
}"
|
|
48
52
|
:field="$parent.$parent.getfield" sql-name="manage_getNewQueryInstruct" sqlurl="rs/logic/exportfile"
|
|
49
53
|
template-name='指令查看'></export-excel>
|
|
50
54
|
<div
|
|
@@ -310,6 +314,9 @@
|
|
|
310
314
|
orgcondition:'',
|
|
311
315
|
show: false,
|
|
312
316
|
condition:'',
|
|
317
|
+
f_orgid:'',
|
|
318
|
+
f_start_date:'',
|
|
319
|
+
f_end_date:'',
|
|
313
320
|
getfield: {},
|
|
314
321
|
config: {
|
|
315
322
|
excelHeaders: {
|
|
@@ -400,19 +407,25 @@
|
|
|
400
407
|
this.condition = args.condition
|
|
401
408
|
if( this.$refs.paged.$refs.criteria.model.f_start_date!=null && this.$refs.paged.$refs.criteria.model.f_start_date!=''){
|
|
402
409
|
this.model.params.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
|
|
410
|
+
this.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
|
|
403
411
|
}else{
|
|
404
412
|
this.model.params.f_start_date = '';
|
|
413
|
+
this.f_start_date = '';
|
|
405
414
|
}
|
|
406
415
|
if( this.$refs.paged.$refs.criteria.model.f_end_date!=null && this.$refs.paged.$refs.criteria.model.f_end_date!=''){
|
|
407
416
|
this.model.params.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
|
|
417
|
+
this.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
|
|
408
418
|
}else{
|
|
409
419
|
this.model.params.f_end_date = "";
|
|
420
|
+
this.f_end_date = "";
|
|
410
421
|
}
|
|
411
422
|
if(this.f_orgid_new == '' || this.f_orgid_new == null){
|
|
412
423
|
this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
|
|
424
|
+
this.f_orgid = `${this.$login.f.orgid}`;
|
|
413
425
|
//await this.$LoadParams.loadParam(this.$login.f.orgid)
|
|
414
426
|
}else{
|
|
415
427
|
this.model.params.f_orgid = `'${this.f_orgid_new}'`;
|
|
428
|
+
this.f_orgid = `${this.f_orgid_new}`;
|
|
416
429
|
//await this.$LoadParams.loadParam(this.f_orgid_new)
|
|
417
430
|
}
|
|
418
431
|
this.model.search(args.condition, args.model)
|