safecheck-client 3.0.34-20 → 3.0.34-22
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 +1 -1
- package/src/App.vue +33 -31
- package/src/components/android/AndroidDefectDeal.vue +634 -634
- package/src/filiale/baiyin/android/SafecheckOrderV.vue +2798 -2798
- package/src/filiale/baiyin/android.js +11 -11
- package/src/filiale/fugou/android.js +11 -11
- package/src/filiale/fugou/pc/CheckBookSearchUser.vue +830 -810
- package/src/filiale/fugou/pc/DefectMainNew.vue +63 -63
- package/src/filiale/fugou/pc/DefectPaperNew.vue +1085 -1085
- package/src/filiale/fugou/pc/PaperDefectMain.vue +928 -928
- package/src/filiale/fugou/pc/PaperList.vue +911 -911
- package/src/filiale/fugou/pc/PlanManage.vue +1061 -1061
- package/src/filiale/kelai/pc/CheckPlanAreaList.vue +15 -7
- package/src/filiale/weinan/android/SafecheckDevices.vue +1307 -1307
- package/src/filiale/weinan/android/SafecheckOrderV.vue +3345 -3345
- package/src/filiale/weinan/pc/DefectPaperNew.vue +1096 -1096
- package/src/main.js +1 -2
|
@@ -42,9 +42,15 @@
|
|
|
42
42
|
:class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
|
|
43
43
|
@click="$parent.$parent.hidden()">
|
|
44
44
|
</div>
|
|
45
|
-
<
|
|
45
|
+
<export-excel-safe :data="$parent.$parent.exportParameter"
|
|
46
|
+
:field="$parent.$parent.exportExcelField"
|
|
47
|
+
sqlurl="rs/logic/SafeExportExcel"
|
|
48
|
+
sql-name="getCheckPlanAreaList"
|
|
49
|
+
template-name='安检汇总' :choose-col="true">
|
|
50
|
+
</export-excel-safe>
|
|
51
|
+
<!-- <button id="btnaaaa" style="float: right" class="button_search"
|
|
46
52
|
@click="$parent.$parent.exportexcel()"
|
|
47
|
-
v-el:cx>导出</button
|
|
53
|
+
v-el:cx>导出</button>-->
|
|
48
54
|
<button id="btnaaa" style="float: right" class="button_search"
|
|
49
55
|
@click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
|
|
50
56
|
v-el:cx>查询</button>
|
|
@@ -258,7 +264,7 @@
|
|
|
258
264
|
this.exportExcelField.f_plan_month='计划月份'
|
|
259
265
|
}
|
|
260
266
|
if (ff==='f_no_checkplan') {
|
|
261
|
-
this.exportExcelField.
|
|
267
|
+
this.exportExcelField.f_no_checkplan='计划类型'
|
|
262
268
|
}
|
|
263
269
|
if (ff==='f_plan_name') {
|
|
264
270
|
this.exportExcelField.f_plan_name='计划名称'
|
|
@@ -266,9 +272,9 @@
|
|
|
266
272
|
if (ff==='f_checker_name') {
|
|
267
273
|
this.exportExcelField.f_checker_name='安检员'
|
|
268
274
|
}if (ff==='f_residential_area') {
|
|
269
|
-
this.exportExcelField.
|
|
275
|
+
this.exportExcelField.f_residential_area='小区名称'
|
|
270
276
|
}if (ff==='f_user_number') {
|
|
271
|
-
this.exportExcelField.
|
|
277
|
+
this.exportExcelField.f_user_number='档案数量'
|
|
272
278
|
}
|
|
273
279
|
}
|
|
274
280
|
},
|
|
@@ -427,8 +433,10 @@
|
|
|
427
433
|
// excel 导出条件拼接
|
|
428
434
|
return {
|
|
429
435
|
condition: this.$refs.paged.model.condition,
|
|
430
|
-
groupName: this.groupNameForSql
|
|
431
|
-
|
|
436
|
+
groupName: this.groupNameForSql,
|
|
437
|
+
f_start_time:this.f_start_time,
|
|
438
|
+
f_end_time:this.f_end_time
|
|
439
|
+
}
|
|
432
440
|
}
|
|
433
441
|
}
|
|
434
442
|
}
|