|
@@ -413,6 +413,9 @@
|
413
|
413
|
|
414
|
414
|
<!-- 示闲弹窗 -->
|
415
|
415
|
<showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
|
|
416
|
+
|
|
417
|
+ <!-- 是否覆盖弹窗 -->
|
|
418
|
+ <showModel :title="models5.title" icon="models5.icon" :disjunctor="models5.disjunctor" :content="models5.content" @know="know5" @ok="ok5" @cancel="cancel5" :operate="models5.operate"></showModel>
|
416
|
419
|
<scanner></scanner>
|
417
|
420
|
<!-- 动态密钥 -->
|
418
|
421
|
<numberKeyModel v-if="showKey" :keyArr="keyArr" @cancel="showKey = false" @confirm="confirmKey($event)"></numberKeyModel>
|
|
@@ -448,6 +451,7 @@
|
448
|
451
|
export default {
|
449
|
452
|
data() {
|
450
|
453
|
return {
|
|
454
|
+ dutyDept: {},
|
451
|
455
|
workStateList: [],
|
452
|
456
|
clothingType: '',//被服回收扫码的类型,dept|user
|
453
|
457
|
isShowExecFilter: false,
|
|
@@ -552,6 +556,10 @@
|
552
|
556
|
models4: {
|
553
|
557
|
disjunctor: false,
|
554
|
558
|
},
|
|
559
|
+ // 弹窗model
|
|
560
|
+ models5: {
|
|
561
|
+ disjunctor: false,
|
|
562
|
+ },
|
555
|
563
|
// 悬浮按钮样式
|
556
|
564
|
pattern: {
|
557
|
565
|
buttonColor: "#6cc076",
|
|
@@ -2879,9 +2887,28 @@
|
2879
|
2887
|
},
|
2880
|
2888
|
// 更新用户所在科室
|
2881
|
2889
|
updateUser(dept) {
|
2882
|
|
- post("/user/data/bindDutyDept", {dutyDept: +dept.id}).then((res) => {
|
|
2890
|
+ let userData = uni.getStorageSync('userData');
|
|
2891
|
+ this.dutyDept = dept;
|
|
2892
|
+ post("/user/data/bindDutyDept", {dutyDept: +this.dutyDept.id}).then((res) => {
|
2883
|
2893
|
if (res.status == 200) {
|
2884
|
2894
|
this.getCurrentUserNow(true);
|
|
2895
|
+ }else if (res.status == 501) {
|
|
2896
|
+ if(this.dutyDept.id == userData.user.dutyDept){
|
|
2897
|
+ // 选择的科室与绑定科室一样
|
|
2898
|
+ this.getCurrentUserNow(true);
|
|
2899
|
+ }else{
|
|
2900
|
+ // 覆盖
|
|
2901
|
+ this.models5 = {
|
|
2902
|
+ disjunctor: true,
|
|
2903
|
+ title: "提示",
|
|
2904
|
+ content: res.msg,
|
|
2905
|
+ icon: "warn",
|
|
2906
|
+ operate: {
|
|
2907
|
+ ok: "确定",
|
|
2908
|
+ cancel: "取消",
|
|
2909
|
+ },
|
|
2910
|
+ };
|
|
2911
|
+ }
|
2885
|
2912
|
}else{
|
2886
|
2913
|
uni.showToast({
|
2887
|
2914
|
icon: "none",
|
|
@@ -2890,6 +2917,33 @@
|
2890
|
2917
|
}
|
2891
|
2918
|
})
|
2892
|
2919
|
},
|
|
2920
|
+ //确定
|
|
2921
|
+ ok5() {
|
|
2922
|
+ this.models5.disjunctor = false;
|
|
2923
|
+ uni.showLoading({
|
|
2924
|
+ title: "加载中",
|
|
2925
|
+ mask: true,
|
|
2926
|
+ });
|
|
2927
|
+ post("/user/data/bindDutyDept", {dutyDept: +this.dutyDept.id, confirm: 1}).then((res) => {
|
|
2928
|
+ uni.hideLoading();
|
|
2929
|
+ if (res.status == 200) {
|
|
2930
|
+ this.getCurrentUserNow(true);
|
|
2931
|
+ }else{
|
|
2932
|
+ uni.showToast({
|
|
2933
|
+ icon: "none",
|
|
2934
|
+ title: res.msg || "接口获取数据失败!",
|
|
2935
|
+ });
|
|
2936
|
+ }
|
|
2937
|
+ });
|
|
2938
|
+ },
|
|
2939
|
+ //取消
|
|
2940
|
+ cancel5() {
|
|
2941
|
+ this.models5.disjunctor = false;
|
|
2942
|
+ },
|
|
2943
|
+ //取消
|
|
2944
|
+ know5() {
|
|
2945
|
+ this.models5.disjunctor = false;
|
|
2946
|
+ },
|
2893
|
2947
|
// 重新获取用户信息
|
2894
|
2948
|
getCurrentUserNow(updateDept = false) {
|
2895
|
2949
|
get("/user/data/getCurrentUser").then((res) => {
|