|
@@ -142,6 +142,7 @@
|
142
|
142
|
if (!this.gotoFlag) {
|
143
|
143
|
return;
|
144
|
144
|
}
|
|
145
|
+ this.gotoFlag = false;
|
145
|
146
|
let content = null
|
146
|
147
|
if(this.configs.sendingMergeOrder &&
|
147
|
148
|
this.configs.sendingMergeOrder==1 &&
|
|
@@ -150,7 +151,6 @@
|
150
|
151
|
}else{
|
151
|
152
|
content = "请确认是否接单并签到?"
|
152
|
153
|
}
|
153
|
|
- this.gotoFlag = false;
|
154
|
154
|
uni.showModal({
|
155
|
155
|
title: "提示",
|
156
|
156
|
content: content,
|
|
@@ -180,6 +180,7 @@
|
180
|
180
|
}
|
181
|
181
|
});
|
182
|
182
|
} else if (result.cancel) {
|
|
183
|
+ this.gotoFlag = true;
|
183
|
184
|
console.log("用户点击取消");
|
184
|
185
|
}
|
185
|
186
|
},
|
|
@@ -219,6 +220,7 @@
|
219
|
220
|
}
|
220
|
221
|
});
|
221
|
222
|
} else if (result.cancel) {
|
|
223
|
+ this.gotoFlag = true;
|
222
|
224
|
console.log("用户点击取消");
|
223
|
225
|
}
|
224
|
226
|
},
|
|
@@ -322,6 +324,7 @@
|
322
|
324
|
this.gotoFlag = true;
|
323
|
325
|
},
|
324
|
326
|
onLoad(options) {
|
|
327
|
+ this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
|
325
|
328
|
console.log(options);
|
326
|
329
|
this.options = options;
|
327
|
330
|
if (this.options.qrcode) {
|
|
@@ -338,7 +341,6 @@
|
338
|
341
|
// #endif
|
339
|
342
|
},
|
340
|
343
|
created(){
|
341
|
|
- this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
|
342
|
344
|
}
|
343
|
345
|
};
|
344
|
346
|
</script>
|