Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-web

src/views/gasManage3_0/manage/infoRecord/infoRecord.vue

@@ -644,6 +644,8 @@ export default {
         font-style: normal;
         width: 208px;
         border-bottom: 1px dotted #0183FA;
+        position: relative;
+        top: -10px;
       }
     }
     .select_border{

src/views/gasManage3_0/manage/labCenterPerson/labCenterPerson.vue

@@ -43,7 +43,7 @@
         <el-table-column label="姓名" align="left" prop="userName"/>
         <el-table-column label="工号" align="left" prop="userNumber"></el-table-column>
         <el-table-column label="联系方式" align="left" prop="userTelephone"></el-table-column>
-        <el-table-column label="所属院系" align="left" prop="deptNames"></el-table-column>
+        <el-table-column label="所属院系" align="left" prop="deptName"></el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
             <div class="button-box">

src/views/gasManage3_0/manage/qualificationApply/qualificationApplyAdd.vue

@@ -105,7 +105,7 @@
           </el-form-item>
           <div class="selected" @click="handleClick('','','selected')">已选气瓶  {{totalNum}}</div>
         </el-form>
-        <el-table v-loading="loading" :data="tableData">
+        <el-table v-loading="loading" border :data="tableData">
           <el-table-column label="气体名称" align="left" prop="airName"/>
           <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>
           <el-table-column label="气瓶厂家" align="left" prop="companyName"></el-table-column>
@@ -131,7 +131,7 @@
         </div>
       </div>
     </div>
-    <el-dialog :title="'已选气瓶 '+totalNum"  :visible.sync="dialogVisible">
+    <el-dialog :title="'已选气瓶 '+totalNum" border :visible.sync="dialogVisible">
       <el-table border v-loading="loading" :data="form.listDetailVo">
         <el-table-column label="气体名称" align="left" prop="airName"/>
         <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>
@@ -186,6 +186,7 @@ export default {
       },
       loading:false,
       form:{
+        deptId:'',
         applyUser:'',
         applyUserid:'',
         phone:'',
@@ -270,12 +271,13 @@ export default {
         _this.form.applyUser=res.nickName
         _this.form.phone=res.phonenumber
         _this.form.applyUserid=res.userId
+        _this.form.deptId=res.deptId
 
       });
     },
     //懒加载实验室
     userSelectList(e){
-      subjectList({name:e}).then(response => {
+      subjectList({name:e,deptId:this.form.deptId}).then(response => {
         this.laboratoryOptions = response.data;
       });
     },
@@ -485,6 +487,8 @@ export default {
         width: 250px;
         height: 2px;
         background: #E0E0E0;
+        position: relative;
+        top: -24px;
       }
     }
     .addPage_b_b{

src/views/gasManage3_0/manage/qualificationManage/qualificationManage.vue

@@ -41,7 +41,7 @@
               <el-dropdown-item style="margin:0 10px;color:#666;" :command="{command:2}">导出选中数据</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <p  v-hasPermi="['airbottle:qualificationApplyManage:auditList']" class="inquire-button-one" style="width: 120px;margin-left: 10px;"   @click="handleClick('','','audit')">审核资格</p>
+          <p  v-hasPermi="['airbottle:qualificationAuditManage:list']" class="inquire-button-one" style="width: 120px;margin-left: 10px;"   @click="handleClick('','','audit')">审核资格</p>
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">

src/views/gasManage3_0/manage/useGas/useGasAdd.vue

@@ -130,6 +130,7 @@ export default {
       },
       loading:false,
       form:{
+        deptId:'',
         applyUser:'',
         applyUserid:'',
         phone:'',
@@ -219,6 +220,7 @@ export default {
         _this.form.applyUser=res.nickName
         _this.form.applyUserid=res.userId
         _this.form.phone=res.phonenumber
+        _this.form.deptId=res.deptId
 
       });
     },
@@ -243,7 +245,7 @@ export default {
     },
     //懒加载实验室
     userSelectList(e){
-      subjectList({name:e}).then(response => {
+      subjectList({name:e,deptId:this.form.deptId}).then(response => {
         this.laboratoryOptions = response.data;
       });
     },

src/views/gasManage3_0/manage/useGasManage/useGasManage.vue

@@ -41,7 +41,7 @@
               <el-dropdown-item style="margin:0 10px;color:#666;" :command="{command:2}">导出选中数据</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <p v-hasPermi="['airbottle:useAgsApplyManage:auditList']" class="inquire-button-one" style="width: 120px;margin-left: 10px;"   @click="handleClick('','','audit')">审核资格</p>
+          <p v-hasPermi="['airbottle:useAgsAuditManage:list']" class="inquire-button-one" style="width: 120px;margin-left: 10px;"   @click="handleClick('','','audit')">审核资格</p>
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">

src/views/gasManage3_0/student/qualificationApply/qualificationApplyAdd.vue

@@ -488,6 +488,8 @@ export default {
         width: 250px;
         height: 2px;
         background: #E0E0E0;
+        position: relative;
+        top: -24px;
       }
     }
     .addPage_b_b{