safecheck-client 3.0.32-21 → 3.0.32-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.
@@ -1,15 +1,15 @@
1
- // 分公司特殊组件页面注册
2
- import Vue from "vue";
3
-
4
- //手机特殊目录注册到该文件中
5
- let specialComp = {
6
- 'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
7
- 'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
8
-
9
-
10
- }
11
- exports.specialComp = specialComp
12
-
13
-
14
-
15
-
1
+ // 分公司特殊组件页面注册
2
+ import Vue from "vue";
3
+
4
+ //手机特殊目录注册到该文件中
5
+ let specialComp = {
6
+ 'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
7
+ 'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
8
+
9
+
10
+ }
11
+ exports.specialComp = specialComp
12
+
13
+
14
+
15
+
@@ -777,7 +777,7 @@
777
777
  this.$showMessage("网络异常,请检查网络后再试!")
778
778
  })
779
779
  }else{
780
- this.$showMessage("该安检单已被上传!")
780
+ this.$showMessage("该安检单已被上传!请联系营业厅进行核查")
781
781
  }
782
782
  },
783
783
  makeAPhoneCall(phoneNumber) {
@@ -408,9 +408,10 @@
408
408
  args.condition +=` and ${this.uploadCodeCondition}`
409
409
  }
410
410
  if(args.model.f_last_check_state){
411
- args.condition += ` and ua.f_last_check_state = '${args.model.f_last_check_state}'`
412
411
  if (args.model.f_last_check_state == '未检'){
413
412
  args.condition += ` and (ua.f_last_check_date is null or ua.f_last_check_date is null) `
413
+ }else {
414
+ args.condition += ` and ua.f_last_check_state = '${args.model.f_last_check_state}'`
414
415
  }
415
416
  }
416
417
  if(args.model.f_start_time){