safecheck-client 4.0.1-40 → 4.0.1-42
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/components/android/NewCheckpaperAndroid.vue +1344 -1369
- package/src/components/querycheckpaper/CheckPaperList.vue +5 -2
- package/src/filiale/meihekou/android/SafecheckDevices.vue +5 -5
- package/src/filiale/meihekou/android/SafecheckOrderV.vue +2446 -2432
- package/src/filiale/meihekou/pc/NewCheckpaperNew.vue +2050 -0
- package/src/filiale/meihekou/pc/PaperList.vue +828 -0
- package/src/filiale/meihekou/pc.js +15 -13
- package/src/filiale/xinkang/android/AddPlanItem.vue +1 -1
- package/src/main.js +1 -1
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
// 分公司特殊组件页面注册
|
|
2
|
-
import Vue from "vue";
|
|
3
|
-
|
|
4
|
-
//手机特殊目录注册到该文件中
|
|
5
|
-
let specialComp = {
|
|
6
|
-
'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
|
|
7
|
-
'new-check-paper-
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
1
|
+
// 分公司特殊组件页面注册
|
|
2
|
+
import Vue from "vue";
|
|
3
|
+
|
|
4
|
+
//手机特殊目录注册到该文件中
|
|
5
|
+
let specialComp = {
|
|
6
|
+
'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
|
|
7
|
+
'new-check-paper-new': (resolve) => { require(['./pc/NewCheckpaperNew'], resolve) },
|
|
8
|
+
'new-check-paper-temp': (resolve) => { require(['./pc/NewCheckpaperTemp'], resolve) },
|
|
9
|
+
'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
|
|
10
|
+
}
|
|
11
|
+
exports.specialComp = specialComp
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
@@ -307,7 +307,7 @@
|
|
|
307
307
|
inspect (info){
|
|
308
308
|
// 当前系统时间
|
|
309
309
|
let newdate = Util.toStandardTimeString()
|
|
310
|
-
if(info.f_last_check_state == '入户' && info.f_last_check_date){
|
|
310
|
+
if(info.f_last_check_state == '入户' && info.f_last_check_date && info.f_user_type=='民用'){
|
|
311
311
|
// 解析上次安检时间
|
|
312
312
|
let lastCheckDate = new Date(info.f_last_check_date)
|
|
313
313
|
let currentDate = new Date(newdate)
|