heyang

src/views/gasManage_syd/manage/infoRecord/infoRecord.vue

@@ -3,27 +3,27 @@
   <div class="app-container approval_handle">
     <div class="approval_handle-page" v-if="pageType==1">
       <div class="info_title">
-        <li @click="handleClick('','','enter')">
+        <li @click="handleClick('','','enter')"  v-hasPermi="['bottle:statistics:list']">
           <img class="title-img" src="@/assets/ZDimages/gasManage3_0/icon_xxjl_rkjl.png">
           <i>入库记录</i>
         </li>
-        <i></i>
-        <li @click="handleClick('','','use')">
+        <i  v-hasPermi="['bottle:statistics:list']"></i>
+        <li @click="handleClick('','','use')"  v-hasPermi="['bottle:useRecordAdmin:list']">
           <img class="title-img" src="@/assets/ZDimages/gasManage3_0/icon_xxjl_syjl.png">
           <i>使用记录</i>
         </li>
-        <i></i>
-        <li @click="handleClick('','','out')">
+        <i v-hasPermi="['bottle:useRecordAdmin:list']"></i>
+        <li @click="handleClick('','','out')" v-hasPermi="['bottle:statistics:outList']">
           <img class="title-img" src="@/assets/ZDimages/gasManage3_0/icon_xxjl_ckjl.png">
           <i>出库记录</i>
         </li>
-        <i></i>
-        <li @click="handleClick('','','abnormal')">
+        <i v-hasPermi="['bottle:statistics:outList']"></i>
+        <li @click="handleClick('','','abnormal')" v-hasPermi="['bottle:storageRrror:list']">
           <img class="title-img" src="@/assets/ZDimages/gasManage3_0/icon_xxjl_ycjl.png">
           <i>异常记录</i>
         </li>
-        <i></i>
-        <li @click="handleClick('','','alarm')">
+        <i v-hasPermi="['bottle:storageRrror:list']"></i>
+        <li @click="handleClick('','','alarm')" v-hasPermi="['bottle:alarmRecord:list']">
           <img class="title-img" src="@/assets/ZDimages/gasManage3_0/icon_xxjl_bjjl.png">
           <i>报警记录</i>
         </li>

src/views/gasManage_syd/manage/infoRecord/useRecord.vue

@@ -31,7 +31,7 @@
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
         <el-form-item label="" prop="title" style="float: right">
-          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:useRecord:export']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:useRecordAdmin:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -76,7 +76,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['bottle:useRecord:query']"
+                 v-hasPermi="['bottle:useRecordAdmin:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

src/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail.vue

@@ -13,7 +13,7 @@
       <li><i>使用期限：</i><i>{{form.startTime}} 至 {{form.endTime}}</i></li>
       <li><i>气瓶用途：</i><i>{{form.gasUse}}</i></li>
       <li><i>主要安全措施：</i><i>{{form.safetyPrecautions}}</i></li>
-      <li class="look_img" @click="lookFile(form.useGasFile)"><i>用气申请表：</i><i>查看图片</i></li>
+      <li class="look_img" @click="lookFile(form.applyCertificate)"><i>用气申请表：</i><i>查看图片</i></li>
     </div>
     <div class="check_btn" v-if="status==0">
       <el-input type="textarea" class="apply_tree_b2" v-model="queryParams.remark" placeholder="请输入审核意见"  maxlength="200" />

src/views/gasManage_syd/student/useGas/useGasAdd.vue

@@ -291,6 +291,7 @@ export default {
 
   },
   mounted() {
+    console.log(this.status)
     this.getLoginUser()
     this.googsListGoogs()
     this.status=this.pageData.status;

src/views/gasManage_syd/student/useRecord/useRecord.vue

@@ -42,7 +42,6 @@
               <el-dropdown-item style="margin:0 10px;color:#666;" :command="{command:2}">导出选中数据</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <p class="reset-button-one" style="margin-left: 12px;" @click="backPage">返回</p>
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">

src/views/hierarchicalControl/hierarchicalControl/gradeManage/addPage.vue

@@ -116,7 +116,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="确认人员" :prop="'ruleList.'+ index +'.ruleUserList.'+ minIndex +'.type'" :rules="rules.type" class="info-for-min-box" label-width="100px">
-                  <el-select v-model="minItem.type" placeholder="请选择人员类型" clearable @change="(e)=>userTypeClick(e,minItem)" style="width:240px;">
+                  <el-select v-model="minItem.type" placeholder="请选择确认人员" clearable @change="(e)=>userTypeClick(e,minItem)" style="width:240px;">
                     <el-option label="实验室负责人" :value="1" />
                     <el-option label="实验室准入人员" :value="4" />
                     <el-option label="当天进入实验室人员" :value="2" />