|
@@ -891,7 +891,7 @@
|
891
|
891
|
<el-form-item label="分区:" required prop="zone">
|
892
|
892
|
<el-select v-model="userform.zone" placeholder="请选择" class="a">
|
893
|
893
|
<el-option
|
894
|
|
- v-for="item in bedZone"
|
|
894
|
+ v-for="item in bedZoneTwo"
|
895
|
895
|
:key="item.id"
|
896
|
896
|
:label="item.name"
|
897
|
897
|
:value="item.id">
|
|
@@ -1251,9 +1251,9 @@
|
1251
|
1251
|
<el-select v-model="userform.sign_name" placeholder="请选择" >
|
1252
|
1252
|
<el-option
|
1253
|
1253
|
v-for="item in autograph"
|
1254
|
|
- :key="item.id"
|
|
1254
|
+ :key="item.admin_user_id"
|
1255
|
1255
|
:label="item.user_name"
|
1256
|
|
- :value="item.id"
|
|
1256
|
+ :value="item.admin_user_id"
|
1257
|
1257
|
style="width:100px">
|
1258
|
1258
|
</el-option>
|
1259
|
1259
|
</el-select>
|
|
@@ -1273,7 +1273,7 @@
|
1273
|
1273
|
</el-form>
|
1274
|
1274
|
</el-tab-pane>
|
1275
|
1275
|
<el-tab-pane label="使用登记列表" name="second">
|
1276
|
|
- <user-form></user-form>
|
|
1276
|
+ <user-form ref="userForm" :userdata="userdata"></user-form>
|
1277
|
1277
|
</el-tab-pane>
|
1278
|
1278
|
</el-tabs>
|
1279
|
1279
|
</div>
|
|
@@ -2084,6 +2084,7 @@ export default {
|
2084
|
2084
|
],
|
2085
|
2085
|
autograph: [],
|
2086
|
2086
|
bedZone: [],
|
|
2087
|
+ bedZoneTwo:[],
|
2087
|
2088
|
forms: {
|
2088
|
2089
|
zone_id: '', // 分区号
|
2089
|
2090
|
class_id: '', // 班次
|
|
@@ -2410,7 +2411,8 @@ export default {
|
2410
|
2411
|
UserShow:true,
|
2411
|
2412
|
Ushow:false,
|
2412
|
2413
|
restaurants: [],
|
2413
|
|
- state: ''
|
|
2414
|
+ state: '',
|
|
2415
|
+ userdata: 0,
|
2414
|
2416
|
}
|
2415
|
2417
|
},
|
2416
|
2418
|
methods: {
|
|
@@ -2456,7 +2458,9 @@ export default {
|
2456
|
2458
|
zone.push({ id: item.id, name: item.name });
|
2457
|
2459
|
}
|
2458
|
2460
|
var devicenumber = response.data.data.devicenumber;
|
|
2461
|
+ console.log("devicenumber",devicenumber)
|
2459
|
2462
|
this.bedZone = zone
|
|
2463
|
+ this.bedZoneTwo = zones
|
2460
|
2464
|
this.bedNumber = numbers
|
2461
|
2465
|
this.Number = devicenumber
|
2462
|
2466
|
})
|
|
@@ -2491,6 +2495,7 @@ export default {
|
2491
|
2495
|
this.$forceUpdate()
|
2492
|
2496
|
this.getMachineDetailById(val.id)
|
2493
|
2497
|
this.equimentid = val.id
|
|
2498
|
+ this.userdata = val.id
|
2494
|
2499
|
this.getAllPlanDetail(val.id)
|
2495
|
2500
|
this.getPatientInfo(val.id)
|
2496
|
2501
|
// 获取基本信息
|
|
@@ -2699,15 +2704,13 @@ export default {
|
2699
|
2704
|
}
|
2700
|
2705
|
arr2.push(obj.id)
|
2701
|
2706
|
})
|
2702
|
|
- console.log("arr2是什么",arr2)
|
|
2707
|
+
|
2703
|
2708
|
this.form.treat_type = arr2
|
2704
|
2709
|
|
2705
|
2710
|
var device_type = this.form.devicetype
|
2706
|
2711
|
var device_types = parseInt(device_type)
|
2707
|
2712
|
this.form.devicetype = device_types
|
2708
|
2713
|
|
2709
|
|
- console.log('机号是什么东西', this.form.bed_number)
|
2710
|
|
-
|
2711
|
2714
|
if (this.form.rubbish_reason === '') {
|
2712
|
2715
|
this.form.rubbish_reason = 0
|
2713
|
2716
|
}
|
|
@@ -2733,6 +2736,8 @@ export default {
|
2733
|
2736
|
var addmacher = response.data.data.addmacher
|
2734
|
2737
|
console.log('addmacher', addmacher)
|
2735
|
2738
|
this.$message.success('修改成功')
|
|
2739
|
+ this.getAllMachine()
|
|
2740
|
+ this.getAllSubregion()
|
2736
|
2741
|
}
|
2737
|
2742
|
})
|
2738
|
2743
|
})
|
|
@@ -3263,7 +3268,8 @@ export default {
|
3263
|
3268
|
this.userform.zone = zone.id
|
3264
|
3269
|
var number = response.data.data.number
|
3265
|
3270
|
console.log('nubmer', number)
|
3266
|
|
- this.userform.bed_number = number.number
|
|
3271
|
+ this.userform.bed_number = number.id
|
|
3272
|
+ // this.userform.bed_number = number.number
|
3267
|
3273
|
var order = response.data.data.order
|
3268
|
3274
|
console.log('orgder', order)
|
3269
|
3275
|
this.userform.start_time = uParseTime(order.start_time, '{y}-{m}-{d} {h}:{i}')
|
|
@@ -3422,6 +3428,7 @@ export default {
|
3422
|
3428
|
getAllOrganization().then(response => {
|
3423
|
3429
|
if (response.data.state === 1) {
|
3424
|
3430
|
var approle = response.data.data.approle
|
|
3431
|
+ console.log("approle签名",approle)
|
3425
|
3432
|
this.autograph = approle
|
3426
|
3433
|
this.sampling = approle
|
3427
|
3434
|
}
|