safecheck-client 3.0.34-1 → 3.0.34-100

package/src/filiale/jiaxian/android.js

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

package/src/filiale/jiaxian/pc.js

@@ -1,12 +1,12 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/jingyang/android/PaperFeedback.vue

@@ -625,7 +625,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -646,6 +645,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/filiale/jingyang/android/SafecheckUserInfo.vue

@@ -417,7 +417,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic (type ,prop, title) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -443,6 +442,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       let page = 'com.aofeng.hybrid.android.peripheral.CameraActivity'

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
+        }
       }
     }
   }

package/src/filiale/pingxiang/android/PaperFeedback.vue

@@ -532,7 +532,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -553,6 +552,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({

package/src/filiale/qianneng/android/SafecheckOrderV.vue

@@ -1043,7 +1043,7 @@ export default {
           data: {
             items: "f_entry_status, case when f_upload_date is not null then DATEDIFF(day,CONVERT(varchar(100), f_upload_date,23),CONVERT(varchar(100), GETDATE(), 23)) else 0 end as daycount",
             tablename: 't_check_paper',
-            condition: `f_userinfoid ='${this.data.f_userinfoid}'`,
+            condition: `f_userinfoid ='${this.data.f_userinfoid}' AND f_upload_date > CONVERT(datetime, CONVERT(varchar(4), YEAR(GETDATE())) + '0101', 112)`,
             orderitem: 'f_upload_date desc'
           }
         }, {resolveMsg: null, rejectMsg: null}).then(res => {