|
|
@@ -46,22 +46,26 @@
|
|
|
min-width="10px"
|
|
|
align="center"
|
|
|
label="实验室类型"
|
|
|
- show-overflow-tooltip></el-table-column>
|
|
|
- <el-table-column prop="RoomDescribe"
|
|
|
+ show-overflow-tooltip
|
|
|
+ :formatter="formatRoomType"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column prop="Building"
|
|
|
min-width="10px"
|
|
|
align="center"
|
|
|
- label="实验室描述"
|
|
|
- show-overflow-tooltip></el-table-column>
|
|
|
+ label="楼宇"
|
|
|
+ show-overflow-tooltip
|
|
|
+ :formatter="formatBuilding"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column prop="PositionInformation"
|
|
|
min-width="10px"
|
|
|
align="center"
|
|
|
label="位置信息"
|
|
|
show-overflow-tooltip></el-table-column>
|
|
|
- <!-- <el-table-column prop="CreateBy"
|
|
|
+ <el-table-column prop="RoomDescribe"
|
|
|
min-width="10px"
|
|
|
align="center"
|
|
|
- label="使用人"
|
|
|
- show-overflow-tooltip></el-table-column> -->
|
|
|
+ label="实验室描述"
|
|
|
+ show-overflow-tooltip></el-table-column>
|
|
|
<el-table-column prop="CreateOn"
|
|
|
min-width="10px"
|
|
|
label="使用日期"
|
|
|
@@ -102,10 +106,16 @@
|
|
|
</el-table>
|
|
|
<addroom ref="addroom"
|
|
|
@closeAddDialog="handleCloseAdd"
|
|
|
- @initdata="searchroomdata"></addroom>
|
|
|
+ @initdata="searchroomdata"
|
|
|
+ :typeList="typeList"
|
|
|
+ :buildingList="buildingList"
|
|
|
+ ></addroom>
|
|
|
<editroom ref="editroom"
|
|
|
@closeEditDialog="handleCloseEdit"
|
|
|
- @initdata="searchroomdata"></editroom>
|
|
|
+ @initdata="searchroomdata"
|
|
|
+ :typeList="typeList"
|
|
|
+ :buildingList="buildingList"
|
|
|
+ ></editroom>
|
|
|
<role-user :role="role"
|
|
|
v-model="roleUserDialogVisible" />
|
|
|
<template slot="footer">
|
|
|
@@ -130,9 +140,8 @@ import {
|
|
|
import addroom from './_opera/add'
|
|
|
import editroom from './_opera/edit'
|
|
|
import roleUser from './instrumentrooms'
|
|
|
-import {
|
|
|
- getroomtypelist
|
|
|
-} from '@/api/setting/samplenoteitem'
|
|
|
+import itemDetailApi from '@/api/sysadmin/itemdetail'
|
|
|
+
|
|
|
export default {
|
|
|
components: {
|
|
|
addroom,
|
|
|
@@ -151,6 +160,7 @@ export default {
|
|
|
RoomType: '',
|
|
|
RoomDescribe: '',
|
|
|
PositionInformation: '',
|
|
|
+ buildingList:[], // 楼宇
|
|
|
name: '',
|
|
|
totalsize: 0,
|
|
|
currpage: 1,
|
|
|
@@ -177,23 +187,43 @@ export default {
|
|
|
},
|
|
|
mounted () {
|
|
|
this.searchroomdata()
|
|
|
- // this.getroomtypelist()
|
|
|
+ this.getRoomTypeList()
|
|
|
+ this.getBuildingList()
|
|
|
},
|
|
|
methods: {
|
|
|
// 获取所有实验室类型
|
|
|
- getroomtypelist () {
|
|
|
- let _this = this
|
|
|
- getroomtypelist()
|
|
|
- .then(res => {
|
|
|
- console.log('--getroomtypelist---res----', res)
|
|
|
- for (let type of res.info) {
|
|
|
- _this.typeList[type.Value] = type.Key
|
|
|
- }
|
|
|
- this.searchroomdata()
|
|
|
- })
|
|
|
- .catch(err => {
|
|
|
- console.error(err)
|
|
|
- })
|
|
|
+ getRoomTypeList () {
|
|
|
+ itemDetailApi.getItemDetailByItemCode({ ItemCode: 'RoomType' })
|
|
|
+ .then(res => {
|
|
|
+ this.typeList = res
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ formatRoomType(row, column) {
|
|
|
+ for (var i = 0; i < this.typeList.length; i++) {
|
|
|
+ if (parseInt(this.typeList[i].ItemValue) === parseInt(row.RoomType)) {
|
|
|
+ return this.typeList[i].ItemName
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ formatBuilding(row, column) {
|
|
|
+ for (var i = 0; i < this.buildingList.length; i++) {
|
|
|
+ if (parseInt(this.buildingList[i].ItemValue) === parseInt(row.Building)) {
|
|
|
+ return this.buildingList[i].ItemName
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 获取位置列表
|
|
|
+ getBuildingList () {
|
|
|
+ itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Local' })
|
|
|
+ .then(res => {
|
|
|
+ this.buildingList = res
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
},
|
|
|
// 添加 实验室
|
|
|
maintainlogadd () {
|
|
|
@@ -205,13 +235,8 @@ export default {
|
|
|
},
|
|
|
// 编辑
|
|
|
editmaintain (val) {
|
|
|
+ this.$refs.editroom.testlistform = val
|
|
|
this.$refs.editroom.dialogvisible = true
|
|
|
- this.$refs.editroom.testlistform.Id = val.Id
|
|
|
- this.$refs.editroom.testlistform.RoomNum = val.RoomNum
|
|
|
- this.$refs.editroom.testlistform.RoomName = val.RoomName
|
|
|
- this.$refs.editroom.testlistform.RoomType = val.RoomType
|
|
|
- this.$refs.editroom.testlistform.RoomDescribe = val.RoomDescribe
|
|
|
- this.$refs.editroom.testlistform.PositionInformation = val.PositionInformation
|
|
|
},
|
|
|
// 编辑 返回当前页面
|
|
|
handleCloseEdit () {
|
|
|
@@ -230,7 +255,6 @@ export default {
|
|
|
}
|
|
|
searchmanagingroomdata(params)
|
|
|
.then(function (response) {
|
|
|
- console.log('------searchmanagingroomdata---', response)
|
|
|
_this.entityList = response.info.items
|
|
|
_this.totalsize = response.info.currentItemCount
|
|
|
})
|
liuyang