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
|
@@ -53,6 +53,7 @@
|
|
|
53
53
|
import {PagedList} from 'vue-client'
|
|
54
54
|
import Vue from "vue";
|
|
55
55
|
import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
|
|
56
|
+
import {isEmpty} from "../Util";
|
|
56
57
|
|
|
57
58
|
let asyncReady = async function (self) {
|
|
58
59
|
// 获取配置信息
|
|
@@ -86,9 +87,11 @@ export default {
|
|
|
86
87
|
}
|
|
87
88
|
},
|
|
88
89
|
ready() {
|
|
89
|
-
//tag
|
|
90
90
|
this.rowdata = this.row
|
|
91
|
-
var condition =
|
|
91
|
+
var condition =' 1=1 '
|
|
92
|
+
if(!isEmpty(this.row.f_userinfo_id)){
|
|
93
|
+
condition+= " and f_userinfoid = '" + this.row.f_userinfo_id + "'"
|
|
94
|
+
}
|
|
92
95
|
if (this.row.filialeCon){
|
|
93
96
|
condition += ` and ${this.row.filialeCon}`
|
|
94
97
|
}
|
|
@@ -992,7 +992,7 @@ export default {
|
|
|
992
992
|
if(typeof this.config[this.device.device].items[item]=='function'){
|
|
993
993
|
continue
|
|
994
994
|
}
|
|
995
|
-
|
|
995
|
+
let index = item
|
|
996
996
|
this.$set('page.options' + index, [])
|
|
997
997
|
//tag)
|
|
998
998
|
//tag)
|
|
@@ -1036,9 +1036,9 @@ export default {
|
|
|
1036
1036
|
//tag)
|
|
1037
1037
|
let it = {
|
|
1038
1038
|
type: this.config[this.device.device].items[item].type,
|
|
1039
|
-
f_item_name: item,
|
|
1039
|
+
f_item_name: this.config[this.device.device].items[item].itemname,
|
|
1040
1040
|
checkmust: this.config[this.device.device].items[item].checkmust,
|
|
1041
|
-
f_item_value: f_item_value,
|
|
1041
|
+
f_item_value: this.config[this.device.device].items[item].f_item_value || f_item_value,
|
|
1042
1042
|
is_verification:this.config[this.device.device].items[item].is_verification,
|
|
1043
1043
|
verification_text:'',
|
|
1044
1044
|
verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
|
|
@@ -1051,7 +1051,7 @@ export default {
|
|
|
1051
1051
|
unit: this.config[this.device.device].items[item].unit ? this.config[this.device.device].items[item].unit : '',
|
|
1052
1052
|
tooltip:'',
|
|
1053
1053
|
f_live_dispose:'',
|
|
1054
|
-
f_deal_dispose:
|
|
1054
|
+
f_deal_dispose: this.config[this.device.device].items[item].f_process_mode,
|
|
1055
1055
|
f_else: '',
|
|
1056
1056
|
f_p1_path: '',
|
|
1057
1057
|
f_p2_path: '',
|
|
@@ -1116,7 +1116,7 @@ export default {
|
|
|
1116
1116
|
if(!this.piece || JSON.stringify(this.piece) == '{}') {
|
|
1117
1117
|
// 如果没有，则新建
|
|
1118
1118
|
this.$set('piece.f_items',this.f_items)
|
|
1119
|
-
this.$set('piece.f_device_type',this.device.device)
|
|
1119
|
+
this.$set('piece.f_device_type', this.config[this.device.device].itemname)
|
|
1120
1120
|
} else {
|
|
1121
1121
|
// 已经存在，把之前的数据重新填入
|
|
1122
1122
|
for (let f in this.f_items){
|