房间管理 运行记录提交

frontend_web/src/api/instrument.js

@@ -43,6 +43,15 @@ export default {
       data: data
     })
   },
- 
+
+
+    // 产品方案 ----获取产品信息列表
+    getRoomNumber(params) {
+      return request({
+        url: process.env.VUE_APP_API02 + 'instrument/getroomnumber',
+        method: 'get', 
+        params: params
+      })
+    },
   
 }

frontend_web/src/api/instrumentroom.js

@@ -163,7 +163,7 @@ export function deleteInstrument (operaid) {
     method: 'delete'
   })
 }
-// 房间记录展示
+// 实验室记录展示
 export function searchmanagingroomdata (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getmanagingrooms',
@@ -171,7 +171,7 @@ export function searchmanagingroomdata (params) {
     params: params
   })
 }
-// 房间信息  保存
+// 实验室信息  保存
 export function saveroomdata (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/addmanaingrooms',
@@ -179,7 +179,7 @@ export function saveroomdata (params) {
     data: params
   })
 }
-// 房间信息 编辑修改
+// 实验室信息 编辑修改
 export function savedatamanagingrooms (Id, params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/updatmanagingrooms/' + Id,
@@ -187,14 +187,14 @@ export function savedatamanagingrooms (Id, params) {
     data: params
   })
 }
-// 删除房间信息
+// 删除实验室信息
 export function deletemanagingrooms (Id) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/deletemanagingrooms/' + Id,
     method: 'delete'
   })
 }
-// 房间信息 编辑修改
+// 实验室信息 编辑修改
 export function initdatamanagingrooms (Id, params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getmanagingroomedit/' + Id,
@@ -202,7 +202,7 @@ export function initdatamanagingrooms (Id, params) {
     data: params
   })
 }
-// 设备关联房间
+// 设备关联实验室
 export function searchroominstrumentdata (Id, params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/initroomdata/' + Id,
@@ -210,7 +210,7 @@ export function searchroominstrumentdata (Id, params) {
     params: params
   })
 }
-// 房间记录展示
+// 实验室记录展示
 export function searchmanagingroomtree (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getmanagingroomstree',
@@ -218,7 +218,7 @@ export function searchmanagingroomtree (params) {
     params: params
   })
 }
-// 删除房间关联设备信息信息
+// 删除实验室关联设备信息信息
 export function deleteinstrumentrooms (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/deleteinstrumentrooms',
@@ -226,7 +226,7 @@ export function deleteinstrumentrooms (params) {
     params: params
   })
 }
-// 添加设备关联房间
+// 添加设备关联实验室
 export function getinstrumentinit (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getinstrumentinit',
@@ -234,7 +234,7 @@ export function getinstrumentinit (params) {
     params: params
   })
 }
-// 设备关联房间  保存
+// 设备关联实验室  保存
 export function savesinstrumentinrooms (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/addinstrumentinrooms',
@@ -258,7 +258,7 @@ export function getsupplierlist (params) {
     params: params
   })
 }
-// 获取房间号
+// 获取实验室号
 export function getRoomNum (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getroomnum',
@@ -266,7 +266,17 @@ export function getRoomNum (params) {
     params: params
   })
 }
-// 通过房间id获取房间信息
+
+// 获取实验室号
+export function getRoomNumber (params) {
+  return request({
+    url: process.env.VUE_APP_API02 + 'instrument/getroomnumber',
+    method: 'get',
+    params: params
+  })
+}
+
+// 通过实验室id获取实验室信息
 export function getRoomDataById (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getroombyid',
@@ -275,7 +285,7 @@ export function getRoomDataById (params) {
   })
 }
 
-// 获取房间id和设备大类获取设备列表
+// 获取实验室id和设备大类获取设备列表
 export function getEquipCode (params) {
   return request({
     url: process.env.VUE_APP_API02 + 'instrument/getequipcode',

frontend_web/src/router/routes.js

@@ -260,12 +260,12 @@ const frameIn = [
         },
         component: _import('sysadmin/item/index')
       },
-       // 房间管理
+       // 实验室管理
        {
         path: 'managingrooms',
         name: 'managingrooms',
         meta: {
-          title: '房间管理',
+          title: '实验室管理',
           auth: true
         },
         component: _import('managingrooms')

frontend_web/src/views/instrument/components/instrumentadd.vue

@@ -57,7 +57,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="规格"
                         prop="Spec"
                         label-width="120px">
@@ -65,7 +65,7 @@
                       placeholder="请输入规格"
                       style="width:100%"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :span="8">
           <el-form-item label="品牌名称"
@@ -86,7 +86,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="供应商"
                         prop="SupplierId"
                         label-width="120px">
@@ -102,7 +102,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <!-- <el-col :span="8">
           <el-form-item label="设备状态" required prop="State" label-width="120px">
@@ -158,7 +158,29 @@
           </el-form-item>
         </el-col>
 
+        <!-- <el-col :span="8">
+          <el-form-item label="位置"
+                        prop="Location"
+                        label-width="120px">
+            <el-input v-model="testlistform.Location"
+                      placeholder="请输入设备所在位置"></el-input>
+          </el-form-item>
+        </el-col> -->
         <el-col :span="8">
+          <el-form-item label="实验室位置"
+                        prop="RoomType"
+                        label-width="120px">
+            <el-select v-model="testlistform.Location"
+                       placeholder="请选择实验室类型"
+                       style="width:100%">
+              <el-option v-for="item in typeList"
+                         :key="item.Id"
+                         :label="item.RoomName"
+                         :value="item.RoomName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!-- <el-col :span="8">
           <el-form-item label="校验有效期提醒"
                         label-width="120px">
             <el-switch style="margin-left:30px"
@@ -167,9 +189,9 @@
                        inactive-color="#CCCCCC">
             </el-switch>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="维护保养周期"
                         label-width="120px"
                         prop="Cycle">
@@ -188,7 +210,7 @@
                          :value="4"></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <!-- <el-col :span="2">
           <el-form-item label-width="0px">
@@ -244,6 +266,9 @@
 //   getsupplierlist
 // } from '@/api/instrument'
 import InstrumentApi from '@/api/instrument'
+import {
+  getRoomNumber
+} from '@/api/instrumentroom'
 import axios from 'axios'
 import uploadajax from '@/assets/js/uploadajax.js'
 // import { addTrigger,
@@ -258,6 +283,7 @@ export default {
       uploadFile: {},
       dialogvisible: false,
       formtype: '1',
+      typeList: [],
       disabledbarcode: false,
       testlistform: {
         Code: '',
@@ -356,9 +382,26 @@ export default {
   created () {
     // let _this = this
     // this.getclassificationlist()
-    // this.getSupplier()
+    this.getroomtypelist()
   },
   methods: {
+    // 获取所有实验室类型
+    getroomtypelist () {
+      let _this = this
+      let params = {
+      }
+      getRoomNumber(params)
+        .then(res => {
+          // for (let type of res.info) {
+          //   _this.typeList[type.Value] = type.RoomType
+          // }
+          _this.typeList = res.info
+          // this.searchroomdata()
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
     // 操作规程文件上传
     uploadrequest (option) {
       let _this = this

frontend_web/src/views/instrument/components/instrumentedit.vue

@@ -69,11 +69,10 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="供应商"
                         prop="SupplierId"
                         label-width="120px">
-            <!-- <el-input v-model="testlistform.Supplier" placeholder="请输入供应商" style="width:100%"></el-input> -->
             <el-select ref="reftube"
                        v-model="testlistform.SupplierId"
                        placeholder="请输入设备大类"
@@ -85,7 +84,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :span="8">
           <el-form-item label="设备状态"
@@ -132,44 +131,32 @@
                          :value="item.Id">
               </el-option>
             </el-select>
-
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="位置"
-                        prop="Location"
+          <el-form-item label="责任人"
                         label-width="120px">
-            <el-input v-model="testlistform.Location"
-                      placeholder="请输入设备所在位置"></el-input>
+            <el-input v-model="testlistform.Responsible"
+                      placeholder="请输入责任人">
+            </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="有效期提醒">
-            <el-switch v-model="TimeNotification"
-                       active-color="#13ce66"
-                       inactive-color="#CCCCCC">
-            </el-switch>
-          </el-form-item>
-        </el-col>
-
-        <!-- <el-col :span="16">
-          <el-form-item label="法规文件"
+          <el-form-item label="实验室位置"
+                        prop="RoomType"
                         label-width="120px">
-            <el-upload style="height:65px"
-                       ref="uploader"
-                       action=""
-                       :file-list="fileList"
-                       :on-success="handleUploadSuccess"
-                       :on-remove="handleRemove"
-                       :http-request="uploadrequest"
-                       :limit="1">
-              <el-button size="mini"
-                         type="primary">点击上传</el-button>
-            </el-upload>
+            <el-select v-model="testlistform.Location"
+                       placeholder="请选择实验室类型"
+                       style="width:100%">
+              <el-option v-for="item in typeList"
+                         :key="item.Id"
+                         :label="item.RoomName"
+                         :value="item.RoomName"></el-option>
+            </el-select>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :span="24">
           <el-form-item label="备注信息"
                         label-width="120px">
@@ -197,16 +184,9 @@
 import axios from 'axios'
 import uploadajax from '@/assets/js/uploadajax.js'
 import InstrumentApi from '@/api/instrument'
-// import {
-//   initData,
-//   classificationlist,
-//   savedataedit,
-//   getsupplierlist
-// } from '@/api/instrument'
-// import { addTrigger,
-//   gettriggerlist,
-//   deletetriggerlistfordid
-// } from '@/api/trigger'
+import {
+  getRoomNumber
+} from '@/api/instrumentroom'
 export default {
   name: 'instrumentadd',
   props: {
@@ -222,6 +202,7 @@ export default {
       dialogvisible: false,
       formtype: '1',
       disabledbarcode: false,
+      typeList: [],
       testlistform: {
         Code: '',
         Name: '',
@@ -278,11 +259,11 @@ export default {
           message: '请输入设备名称',
           trigger: 'blur'
         }],
-        Supplier: [{
-          required: true,
-          message: '请输入供应商',
-          trigger: 'blur'
-        }],
+        // Supplier: [{
+        //   required: true,
+        //   message: '请输入供应商',
+        //   trigger: 'blur'
+        // }],
         Model: [{
           required: true,
           message: '请输入型号',
@@ -310,9 +291,26 @@ export default {
   created () {
     //  this.getEntity(this.InstrumentId)
     // this.getclassificationlist()
-    // this.getSupplier()
+    this.getroomtypelist()
   },
   methods: {
+    // 获取所有实验室类型
+    getroomtypelist () {
+      let _this = this
+      let params = {
+      }
+      getRoomNumber(params)
+        .then(res => {
+          // for (let type of res.info) {
+          //   _this.typeList[type.Value] = type.RoomType
+          // }
+          _this.typeList = res.info
+          // this.searchroomdata()
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
     // 操作规程文件上传
     uploadrequest (option) {
       let _this = this
@@ -352,7 +350,6 @@ export default {
       this.FileUrl = URL.createObjectURL(file.raw)
     },
     savedata () {
-      let _this = this
       InstrumentApi.UpdateInstrument(this.testlistform, {})
         .then(res => {
           // savedataedit(_this.testlistform.Id, _this.testlistform)
@@ -384,7 +381,6 @@ export default {
           // handle error
           console.error(err)
         })
-
     },
     getEntity (pid) {
       let _this = this
@@ -498,16 +494,16 @@ export default {
       // this.$refs['uploader'].clearFiles()
       this.fileList = []
       this.$emit('closeEditDialog')
-    },
-    deletedataforDid (val) {
-      deletetriggerlistfordid(val)
-        .then(res => {
-        })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
     }
+    // deletedataforDid (val) {
+    //   deletetriggerlistfordid(val)
+    //     .then(res => {
+    //     })
+    //     .catch(err => {
+    //       // handle error
+    //       console.error(err)
+    //     })
+    // }
 
   }
   // watch: {

frontend_web/src/views/instrument/index.vue

@@ -111,11 +111,11 @@
                        align="center"
                        min-width="120px"
                        show-overflow-tooltip></el-table-column>
-      <el-table-column prop="Spec"
+      <!-- <el-table-column prop="Spec"
                        align="center"
                        min-width="120px"
                        label="规格"
-                       show-overflow-tooltip></el-table-column>
+                       show-overflow-tooltip></el-table-column> -->
       <el-table-column prop="Classification"
                        align="center"
                        min-width="120px"
@@ -177,7 +177,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="Type"
+      <!-- <el-table-column prop="Type"
                        label="有效期状态"
                        align="center"
                        min-width="100"
@@ -202,8 +202,8 @@
                     type="info"
                     center></el-alert>
         </template>
-      </el-table-column>
-      <el-table-column prop="TimeNotification"
+      </el-table-column> -->
+      <!-- <el-table-column prop="TimeNotification"
                        label="校准提醒"
                        align="center"
                        min-width="100"
@@ -222,7 +222,7 @@
                     type="warning"
                     center></el-alert>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="Remarks"
                        min-width="160px"
                        label="备注"

frontend_web/src/views/managingrooms/_opera/add.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="添加房间信息"
+  <el-dialog title="添加实验室信息"
              :visible.sync="dialogvisible"
              width="65%"
              :before-close="handleCloseAdd"
@@ -13,32 +13,32 @@
       <el-row :gutter="20"
               class="donorsaddformcss">
         <el-col :span="8">
-          <el-form-item label="房间号"
+          <el-form-item label="实验室号"
                         required
                         prop="RoomNum"
                         label-width="100px">
             <el-input v-model="testlistform.RoomNum"
-                      placeholder="请输入房间号"
+                      placeholder="请输入实验室号"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="房间名称"
+          <el-form-item label="实验室名称"
                         required
                         prop="RoomName"
                         label-width="100px">
             <el-input v-model="testlistform.RoomName"
-                      placeholder="请输入房间名称"
+                      placeholder="请输入实验室名称"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="房间类型"
+          <el-form-item label="实验室类型"
                         required
                         prop="RoomType"
                         label-width="100px">
             <el-select v-model="testlistform.RoomType"
-                       placeholder="请选择房间类型"
+                       placeholder="请选择实验室类型"
                        style="width:100%">
               <el-option v-for="item in typeList"
                          :key="item.Key"
@@ -53,18 +53,18 @@
                         prop="PositionInformation"
                         label-width="100px">
             <el-input v-model="testlistform.PositionInformation"
-                      placeholder="请输入房间位置"
+                      placeholder="请输入实验室位置"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="房间描述"
+          <el-form-item label="实验室描述"
                         label-width="100px"
                         prop="RoomDescribe">
             <el-input v-model="testlistform.RoomDescribe"
                       type="textarea"
                       :rows=3
-                      placeholder="请输入房间描述"
+                      placeholder="请输入实验室描述"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
@@ -116,17 +116,17 @@ export default {
 
         RoomName: [{
           required: true,
-          message: '请输入房间名称',
+          message: '请输入实验室名称',
           trigger: 'blur'
         }],
         RoomNum: [{
           required: true,
-          message: '请输入房间号',
+          message: '请输入实验室号',
           trigger: 'blur'
         }],
         RoomType: [{
           required: true,
-          message: '请选择房间类型',
+          message: '请选择实验室类型',
           trigger: 'blur'
         }]
 
@@ -137,7 +137,7 @@ export default {
     this.getroomtypelist()
   },
   methods: {
-    // 保存房间信息
+    // 保存实验室信息
     savedata () {
       let _this = this
 
@@ -171,6 +171,7 @@ export default {
       getroomtypelist()
         // _this.$axios.get('/sampletype/materialbrandlist', {})
         .then(res => {
+          console.log('---res.info----', res.info)
           _this.typeList = res.info
         })
     },

frontend_web/src/views/managingrooms/_opera/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="修改房间信息"
+  <el-dialog title="修改实验室信息"
              :visible.sync="dialogvisible"
              width="65%"
              @close="resetData">
@@ -13,32 +13,32 @@
       <el-row :gutter="20"
               class="donorsaddformcss">
         <el-col :span="8">
-          <el-form-item label="房间号"
+          <el-form-item label="实验室号"
                         required
                         prop="RoomNum"
                         label-width="100px">
             <el-input v-model="testlistform.RoomNum"
-                      placeholder="请输入房间号"
+                      placeholder="请输入实验室号"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="房间名称"
+          <el-form-item label="实验室名称"
                         required
                         prop="RoomName"
                         label-width="100px">
             <el-input v-model="testlistform.RoomName"
-                      placeholder="请输入房间名称"
+                      placeholder="请输入实验室名称"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="房间类型"
+          <el-form-item label="实验室类型"
                         prop="RoomType"
                         label-width="100px">
             <el-select v-model="testlistform.RoomType"
-                       placeholder="请选择房间类型"
+                       placeholder="请选择实验室类型"
                        style="width:100%">
               <el-option v-for="item in typeList"
                          :key="item.Key"
@@ -48,8 +48,8 @@
           </el-form-item>
         </el-col>
         <!-- <el-col :span="8">
-            <el-form-item label="房间操作人"  prop="ContractNo" label-width="120px">
-              <el-input v-model="testlistform.ContractNo" placeholder="请输入房间操作人" style="width:100%"></el-input>
+            <el-form-item label="实验室操作人"  prop="ContractNo" label-width="120px">
+              <el-input v-model="testlistform.ContractNo" placeholder="请输入实验室操作人" style="width:100%"></el-input>
             </el-form-item>
           </el-col> -->
 
@@ -64,13 +64,13 @@
         </el-col>
 
         <el-col :span="24">
-          <el-form-item label="房间描述"
+          <el-form-item label="实验室描述"
                         prop="RoomDescribe"
                         label-width="100px">
             <el-input v-model="testlistform.RoomDescribe"
                       type="textarea"
                       :rows=3
-                      placeholder="请输入房间描述"
+                      placeholder="请输入实验室描述"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
@@ -116,17 +116,17 @@ export default {
       rulestestlistform: {
         RoomName: [{
           required: true,
-          message: '请输入房间名称',
+          message: '请输入实验室名称',
           trigger: 'blur'
         }],
         RoomNum: [{
           required: true,
-          message: '请输入房间号',
+          message: '请输入实验室号',
           trigger: 'blur'
         }],
         RoomType: [{
           required: true,
-          message: '请选择房间类型',
+          message: '请选择实验室类型',
           trigger: 'blur'
         }]
 

frontend_web/src/views/managingrooms/index.vue

@@ -6,10 +6,10 @@
                ref="form"
                :inline="true"
                style="height: 25px; margin-top: -7px; padding:20px; text-align:right;">
-        <el-form-item label="房间号">
+        <el-form-item label="实验室号">
           <el-input style="width:140px"
                     v-model="search.RoomNum"
-                    placeholder="请输入房间号"></el-input>
+                    placeholder="请输入实验室号"></el-input>
         </el-form-item>
         <el-button size="mini"
                    type="primary"
@@ -35,17 +35,17 @@
       <el-table-column prop="RoomNum"
                        min-width="10px"
                        align="center"
-                       label="房间号"
+                       label="实验室号"
                        show-overflow-tooltip></el-table-column>
       <el-table-column prop="RoomName"
                        min-width="10px"
                        align="center"
-                       label="房间名称"
+                       label="实验室名称"
                        show-overflow-tooltip></el-table-column>
       <el-table-column prop="RoomType"
                        min-width="10px"
                        align="center"
-                       label="房间类型"
+                       label="实验室类型"
                        show-overflow-tooltip>
         <template slot-scope="scope">
           {{ typeList[scope.row.RoomType] }}
@@ -54,18 +54,18 @@
       <el-table-column prop="RoomDescribe"
                        min-width="10px"
                        align="center"
-                       label="房间描述"
+                       label="实验室描述"
                        show-overflow-tooltip></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="CreateBy"
                        min-width="10px"
                        align="center"
                        label="使用人"
-                       show-overflow-tooltip></el-table-column>
+                       show-overflow-tooltip></el-table-column> -->
       <el-table-column prop="CreateOn"
                        min-width="10px"
                        label="使用日期"
@@ -184,7 +184,7 @@ export default {
     // this.getroomtypelist()
   },
   methods: {
-    // 获取所有房间类型
+    // 获取所有实验室类型
     getroomtypelist () {
       let _this = this
       getroomtypelist()
@@ -199,7 +199,7 @@ export default {
           console.error(err)
         })
     },
-    // 添加 房间
+    // 添加 实验室
     maintainlogadd () {
       this.$refs.addroom.dialogvisible = true
     },

frontend_web/src/views/managingrooms/instrumentrooms.vue

@@ -364,7 +364,7 @@ export default {
           console.error(err)
         })
     },
-    // // 获取房间树
+    // // 获取实验室树
     // getorgtreelist () {
     //   let _this = this
     //   let params = {