|
|
@@ -41,6 +41,14 @@
|
|
41
|
41
|
<view>{{item.dept}}</view>
|
|
42
|
42
|
</label>
|
|
43
|
43
|
</radio-group>
|
|
|
44
|
+ <view>
|
|
|
45
|
+ <label class="df uni-list-cell uni-list-cell-pd">固定并存放标本间</label>
|
|
|
46
|
+ <checkbox-group @change="checkChange">
|
|
|
47
|
+ <label class="df uni-list-cell uni-list-cell-pd">
|
|
|
48
|
+ <checkbox color="#49B856" value="1" :checked="depositCheck" />是否开启
|
|
|
49
|
+ </label>
|
|
|
50
|
+ </checkbox-group>
|
|
|
51
|
+ </view>
|
|
44
|
52
|
<view class="execFilterFooter">
|
|
45
|
53
|
<view class="btn" @click="filterCacel()" v-if="isDept || specimenData.length==0">取消</view>
|
|
46
|
54
|
<view class="btn" @click="filterOk()">确认</view>
|
|
|
@@ -80,6 +88,7 @@
|
|
80
|
88
|
otherData:null,
|
|
81
|
89
|
isApp:false,
|
|
82
|
90
|
isUpdate:false,
|
|
|
91
|
+ depositCheck:false,
|
|
83
|
92
|
}
|
|
84
|
93
|
},
|
|
85
|
94
|
components: {
|
|
|
@@ -106,6 +115,15 @@
|
|
106
|
115
|
|
|
107
|
116
|
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
|
|
108
|
117
|
},
|
|
|
118
|
+ // 选择check
|
|
|
119
|
+ checkChange(e){
|
|
|
120
|
+ let values = e.detail.value;
|
|
|
121
|
+ if(values[0]=='1'){
|
|
|
122
|
+ this.depositCheck = true
|
|
|
123
|
+ }else{
|
|
|
124
|
+ this.depositCheck = false
|
|
|
125
|
+ }
|
|
|
126
|
+ },
|
|
109
|
127
|
// 打开科室选择
|
|
110
|
128
|
filterClick() {
|
|
111
|
129
|
this.isShowFilter = true
|
|
|
@@ -148,28 +166,29 @@
|
|
148
|
166
|
dept:{
|
|
149
|
167
|
id:this.deptId?this.deptId:userInfo.dept.id
|
|
150
|
168
|
},
|
|
151
|
|
- id:userInfo.id
|
|
|
169
|
+ id:userInfo.id,
|
|
|
170
|
+ fixedStoredSpecimenRoom:this.depositCheck ? 1 : 0
|
|
152
|
171
|
},
|
|
153
|
172
|
}
|
|
154
|
173
|
post('/data/updData/user', query).then(res => {
|
|
155
|
174
|
uni.hideLoading();
|
|
156
|
175
|
this.filterCacel();
|
|
157
|
|
- this.getNewDept()
|
|
|
176
|
+ this.getCurrentUserNow()
|
|
158
|
177
|
this.idx = 0
|
|
159
|
178
|
this.getList()
|
|
160
|
179
|
});
|
|
161
|
180
|
},
|
|
162
|
|
- getNewDept(){
|
|
163
|
|
- let postData = {
|
|
164
|
|
- currentHosId: this.hosId,
|
|
165
|
|
- loginType: "Wechat",
|
|
166
|
|
- };
|
|
167
|
|
- post('/auth/changeHospital',postData).then((result) => {
|
|
168
|
|
- if (result.status == 200) {
|
|
169
|
|
- this.getCurrentUserNow();
|
|
170
|
|
- }
|
|
171
|
|
- });
|
|
172
|
|
- },
|
|
|
181
|
+ // getNewDept(){
|
|
|
182
|
+ // let postData = {
|
|
|
183
|
+ // currentHosId: this.hosId,
|
|
|
184
|
+ // loginType: "Wechat",
|
|
|
185
|
+ // };
|
|
|
186
|
+ // post('/auth/changeHospital',postData).then((result) => {
|
|
|
187
|
+ // if (result.status == 200) {
|
|
|
188
|
+ // this.getCurrentUserNow();
|
|
|
189
|
+ // }
|
|
|
190
|
+ // });
|
|
|
191
|
+ // },
|
|
173
|
192
|
// 获取当前用户信息
|
|
174
|
193
|
getCurrentUserNow() {
|
|
175
|
194
|
get('/user/data/getCurrentUser').then((data) => {
|
|
|
@@ -179,9 +198,13 @@
|
|
179
|
198
|
user.user.dept = data["data"].dept;
|
|
180
|
199
|
user.user.currentHospital = data["data"].currentHospital;
|
|
181
|
200
|
this.userInfo.dept.dept = data["data"].dept.dept;
|
|
|
201
|
+ user.user.fixedStoredSpecimenRoom = data["data"].fixedStoredSpecimenRoom;
|
|
182
|
202
|
uni.setStorageSync('userData',user)
|
|
183
|
203
|
let userInfo = uni.getStorageSync('userData').user
|
|
184
|
204
|
this.isDept = this.specimenData.find(i=>i.id == userInfo.dept.id)
|
|
|
205
|
+ if(userInfo.fixedStoredSpecimenRoom!=null){
|
|
|
206
|
+ this.depositCheck = userInfo.fixedStoredSpecimenRoom == 1 ? true : false
|
|
|
207
|
+ }
|
|
185
|
208
|
}
|
|
186
|
209
|
});
|
|
187
|
210
|
},
|
|
|
@@ -197,7 +220,7 @@
|
|
197
|
220
|
},
|
|
198
|
221
|
// 查看详情
|
|
199
|
222
|
detail(item){
|
|
200
|
|
- // this.padChange('979522445312\n')
|
|
|
223
|
+ // this.padChange('862420344832\n')
|
|
201
|
224
|
uni.navigateTo({
|
|
202
|
225
|
url: `/pages/specimenPort/detail?detailId=${item.id}`
|
|
203
|
226
|
});
|
|
|
@@ -228,6 +251,9 @@
|
|
228
|
251
|
this.isShowFilter = true
|
|
229
|
252
|
}
|
|
230
|
253
|
let userInfo = uni.getStorageSync('userData').user
|
|
|
254
|
+ if(userInfo.fixedStoredSpecimenRoom!=null){
|
|
|
255
|
+ this.depositCheck = userInfo.fixedStoredSpecimenRoom == 1 ? true : false
|
|
|
256
|
+ }
|
|
231
|
257
|
this.isDept = this.specimenData.find(i=>i.id == userInfo.dept.id)
|
|
232
|
258
|
this.$nextTick(_=>{
|
|
233
|
259
|
if(this.isDept){
|
|
|
@@ -294,7 +320,15 @@
|
|
294
|
320
|
uni.hideLoading();
|
|
295
|
321
|
if(res.status==200){
|
|
296
|
322
|
let data = res.data[0]
|
|
297
|
|
- let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
|
|
|
323
|
+ let item = null
|
|
|
324
|
+ let str = null
|
|
|
325
|
+ if(scannerCode.indexOf(':')!=-1){
|
|
|
326
|
+ str = scannerCode.split(':')
|
|
|
327
|
+ item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == str[1])
|
|
|
328
|
+ }else{
|
|
|
329
|
+ item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
|
|
|
330
|
+ }
|
|
|
331
|
+ // let item = data.pathologySpecimenDTOList.find(i=>i.specimenCode == scannerCode)
|
|
298
|
332
|
if(!item.fixationTime && data.pathologyFormType==0){
|
|
299
|
333
|
if(data.status.value==2 || data.status.value==3 ||
|
|
300
|
334
|
data.status.value==4){
|
