问题修改

src/api/system/user.js

@@ -168,3 +168,12 @@ export const addInvoice = (data) =>{
     data
   })
 }
+
+// 根据部门id查部门名字  /blade-system/dept/getDeptName?deptId=1887682530864697346
+export const getDeptName = (query) =>{
+  return request({
+    url:'/api/blade-system/dept/getDeptName',
+    method:'get',
+    params:query
+  })
+}

src/option/user/info.js

@@ -51,12 +51,13 @@ export default {
         prop: 'realName',
         formslot:true,
       },
-      //  {
+       {
-      //   label: '用户名',
+        label: '所属实验室',
-      //   span: 12,
+        span: 12,
-      //   row: true,
+        row: true,
-      //   prop: 'name'
+        prop: 'deptName',
-      // }, 
+        display:false,
+      },
       {
         label: '手机号',
         span: 12,

src/router/page/index.js

@@ -67,17 +67,6 @@ export default [{
     }
 
   },
-  {
-    path: '/deviceCategory',
-    name: '设备分类',
-    meta: {
-      keepAlive: true,
-      isTab: false,
-      isAuth: false
-    },
-    component: () =>
-      import( /* webpackChunkName: "views" */ '@/views/device/deviceCategory')
-  },
   {
     path: '/403',
     component: () =>

src/views/device/deviceSystem.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-col :span="5">
+    <el-col :span="5" v-if="dataTypes!=1">
       <div class="box">
         <el-scrollbar>
           <basic-container>
@@ -9,7 +9,7 @@
         </el-scrollbar>
       </div>
     </el-col>
-    <el-col :span="19">
+    <el-col :span="dataTypes!=1?19:24">
       <basic-container style="max-height: 800px; overflow: hidden">
         <avue-crud :option="option" :table-loading="loading" :data="data" :search.sync="searchForm" :page.sync="page"
           ref="crud" v-model="form" :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose"
@@ -122,17 +122,20 @@
                 </el-form-item>
                 <el-form-item label="单位" prop="supplier">
                   <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入单位"
-                    v-model="addForm.limsName"></el-input>
+                    v-model="addForm.unit"></el-input>
                 </el-form-item>
 
                 <el-form-item label="备注" prop="supplier">
                   <el-input style="width: 98%;" :disabled="viewType == 'view'" placeholder="请输入备注"
                     v-model="addForm.description"></el-input>
                 </el-form-item>
-                <el-form-item label="关联实验室" prop="lab">
+                <el-form-item label="关联实验室" prop="lab" v-if="dataTypes!=1">
                   <el-cascader :props="labProps" style="width:98%;" v-model="addForm.lab" :disabled="viewType == 'view'"
                     ref="labRef" clearable></el-cascader>
                 </el-form-item>
+                <el-form-item label="关联实验室" prop="lab" v-else>
+                  {{ addForm.limsName }}/{{ addForm.floorName }}/{{ addForm.roomName }}
+                </el-form-item>
 
               </div>
               <div>
@@ -440,7 +443,7 @@ export default {
           {
             label: "单位",
             labelWidth: 120,
-            prop: "limsName",
+            prop: "unit",
             overHidden: true,
             search: true,
           },
@@ -1079,7 +1082,7 @@ export default {
               query.limsId = this.addForm.lab[0]
               query.floorId = this.addForm.lab[1]
               query.roomId = this.addForm.lab[2]
-              query.limsNmae = labNameList[0].label
+              query.limsName = labNameList[0].label
               query.floorName = labNameList[1].label
               query.roomName = labNameList[2].label
             }

src/views/system/userinfo.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <basic-container>
-      <avue-form :option="option1" v-model="form" @tab-click="handleTabClick" @submit="handleSubmit" @row-del="handleDelete">
+      <avue-form :option="option1" v-model="form" @tab-click="handleTabClick" @submit="handleSubmit"
+        @row-del="handleDelete">
         <template slot-scope="{disabled,size}" slot="realName">
           <div style="display: flex;">
             <el-input style="width: 600px;" :disabled="nameDisabled" :size="size" v-model="form.realName"
@@ -16,6 +17,11 @@
             <el-button style="margin-left: 10px;" type="primary" @click="changePhone">修改</el-button>
           </div>
         </template>
+        <template slot-scope="{disabled,size}" slot="deptName">
+          <div style="display: flex;">
+            <el-input style="width: 600px;" disabled :size="size" v-model="deptName" placeholder="请输入所属实验室"></el-input>
+          </div>
+        </template>
         <template slot-scope="{disabled,size}" slot="address">
           <div style="display: flex;">
             <el-input style="width: 600px;" :disabled="positionDisabled" :size="size" v-model="form.address"
@@ -32,7 +38,7 @@
 <script>
 import mapSel from "@/components/mapSel/index.vue";
 import option from "@/option/user/info";
-import { getUserInfo,updateInfo,getInvoiceList,addInvoice } from "@/api/system/user";
+import { getUserInfo, updateInfo, getInvoiceList, addInvoice, getDeptName } from "@/api/system/user";
 import md5 from 'js-md5';
 import func from "@/util/func";
 import { mapGetters } from "vuex";
@@ -59,7 +65,8 @@ export default {
       infoPosition: { lng: '', lat: '' },
       isMarker: false,
       point: '',
-      option1:{}
+      option1: {},
+      deptName: ''
     };
   },
   computed: {
@@ -74,8 +81,27 @@ export default {
       this.option1 = option
     }
     this.handleWitch();
+    console.log(9999,this.userInfo.dataType)
+    if (this.userInfo.dataType == 1) {
+      this.getDeptName()
+      let column = this.findObject(this.option.group[0].column, "deptName");
+      column.display=true
+    }
+
   },
   methods: {
+    // 根据部门id查询部门名字
+    getDeptName() {
+      let query = {
+        deptId: this.userInfo.dept_id
+      }
+
+      getDeptName(query).then(res => {
+        this.deptName = res.data.data
+      }).catch(err => {
+
+      })
+    },
     // 点击修改负责人姓名按钮
     changeRealName() {
       this.nameDisabled = false