safecheck-client 3.0.34-7 → 3.0.34-70

package/src/filiale/jingyang/android.js

@@ -1,15 +1,15 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-// 手机特殊目录注册到该文件中
-let specialComp = {
-  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
-  'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
-  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
-}
-
-exports.specialComp = specialComp
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+// 手机特殊目录注册到该文件中
+let specialComp = {
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
+  'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
+  'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
+}
+
+exports.specialComp = specialComp
+

package/src/filiale/kelai/pc/CheckPlanAreaList.vue

@@ -42,9 +42,15 @@
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                      @click="$parent.$parent.hidden()">
                 </div>
-                <button id="btnaaaa" style="float: right" class="button_search"
+                <export-excel-safe   :data="$parent.$parent.exportParameter"
+                                     :field="$parent.$parent.exportExcelField"
+                                     sqlurl="rs/logic/SafeExportExcel"
+                                     sql-name="getCheckPlanAreaList"
+                                     template-name='安检汇总' :choose-col="true">
+                </export-excel-safe>
+<!--                <button id="btnaaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.exportexcel()"
-                        v-el:cx>导出</button>
+                        v-el:cx>导出</button>-->
                 <button id="btnaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
                         v-el:cx>查询</button>
@@ -258,7 +264,7 @@
             this.exportExcelField.f_plan_month='计划月份'
           }
           if (ff==='f_no_checkplan') {
-            this.exportExcelField.f_checker_name='计划类型'
+            this.exportExcelField.f_no_checkplan='计划类型'
           }
           if (ff==='f_plan_name') {
             this.exportExcelField.f_plan_name='计划名称'
@@ -266,9 +272,9 @@
           if (ff==='f_checker_name') {
             this.exportExcelField.f_checker_name='安检员'
           }if (ff==='f_residential_area') {
-            this.exportExcelField.f_checker_name='小区名称'
+            this.exportExcelField.f_residential_area='小区名称'
           }if (ff==='f_user_number') {
-            this.exportExcelField.f_checker_name='档案数量'
+            this.exportExcelField.f_user_number='档案数量'
           }
         }
       },
@@ -427,8 +433,10 @@
         // excel 导出条件拼接
         return {
             condition: this.$refs.paged.model.condition,
-            groupName: this.groupNameForSql
-          }
+            groupName: this.groupNameForSql,
+            f_start_time:this.f_start_time,
+            f_end_time:this.f_end_time
+        }
       }
     }
   }