zc

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -32,10 +32,12 @@
             <div class="button-box" style="display: flex">
               <p class="table-min-button"
                  style="margin:0!important;"
+                 v-if="scope.row.joinVideo"
                  @click="lockVideo(1,scope.row)"
               >操作视频</p>
               <p class="table-min-button"
                  style="margin:0!important;"
+                 v-if="scope.row.closeLockVideo"
                  @click="lockVideo(2,scope.row)"
               >开关锁视频</p>
             </div>

src/views/medicUniversity-3_1/chemicalManagement/alarmRecord/infoPage.vue

@@ -68,10 +68,6 @@
       //处理报警记录
       handle(){
         let self = this;
-        if(self.propsInfoData.buttonType != 1){
-          self.msgError('只有该实验室负责人可以处理')
-          return
-        }
         this.$confirm('确定要处理吗?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/operationRecord.vue

@@ -63,7 +63,7 @@
         <el-table-column label="操作" align="center" width="110" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <div class="button-box">
-              <p class="table-min-button" @click="pageToggle(2,scope.row)">操作视频</p>
+              <p class="table-min-button" v-if="scope.row.closeLockVideo" @click="pageToggle(2,scope.row)">操作视频</p>
             </div>
           </template>
         </el-table-column>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue

@@ -59,7 +59,7 @@
         <!--</el-form-item>-->
         <el-form-item style="float: right;">
           <el-col :span="1.5" v-hasPermi="['laboratory:hardware9:joinCabinet']">
-            <p class="add-button-one-90"
+            <p class="add-button-one-120"
                @click="pageToggle(5)"
             >关联化学品柜</p>
           </el-col>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/operationRecord.vue

@@ -63,7 +63,7 @@
         <el-table-column label="操作" align="center" width="110" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <div class="button-box">
-              <p class="table-min-button" @click="pageToggle(2,scope.row)">操作视频</p>
+              <p class="table-min-button" v-if="scope.row.closeLockVideo" @click="pageToggle(2,scope.row)">操作视频</p>
             </div>
           </template>
         </el-table-column>

src/views/medicUniversity-3_1/chemicalManagement/usageRecord/infoPage.vue

@@ -4,7 +4,7 @@
       <p>使用详情</p>
       <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
     </div>
-    <div class="infoPage-max-box">
+    <div class="infoPage-max-box scrollbar-box">
       <div class="infoPage-left-box scrollbar-box">
         <div class="infoPage-left-text-box-one">
           <div>
@@ -92,8 +92,10 @@
             <p></p>
             <p>领用</p>
             <p>{{infoData.collectTime}}</p>
-            <p class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
-            <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
+            <p v-if="infoData.outDetail.outVideo"
+              class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
+            <p v-if="infoData.outDetail.outLockVideo"
+              class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
           </div>
           <div class="table-title-box-one">
             <p>领用时库存净重</p>
@@ -119,8 +121,10 @@
             <p></p>
             <p>归还</p>
             <p>{{infoData.returnTime}}</p>
-            <p class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
-            <p class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
+            <p v-if="infoData.returnDetail.returnVideo"
+              class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
+            <p v-if="infoData.returnDetail.returnLockVideo"
+              class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
           </div>
           <div class="table-title-box-two">
             <p>本次使用量</p>
@@ -241,12 +245,14 @@
     }
     .infoPage-max-box{
       flex:1;
-      display: flex;
-      overflow: hidden;
       font-weight: 500;
+      padding:44px 0 44px 80px;
+      height:586px;
       .infoPage-left-box{
-        flex:1;
-        margin:44px 22px 37px 80px;
+        display: inline-block;
+        margin-right:22px;
+        overflow: hidden;
+        /*margin:44px 22px 37px 80px;*/
         padding:13px 0;
         box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
         border-radius:10px;
@@ -293,8 +299,11 @@
         }
       }
       .infoPage-right-box{
+        display: inline-block;
         width:839px;
-        margin:44px 80px 37px 0;
+        overflow: hidden;
+        height:586px;
+        /*margin:44px 0 37px 0;*/
         box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
         border-radius:10px;
         .infoPage-right-title{

src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -92,8 +92,10 @@
               <p></p>
               <p>领用</p>
               <p>{{infoData.collectTime}}</p>
-              <p class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
-              <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
+              <p v-if="infoData.outDetail.outVideo"
+                class="inquire-button-one" @click="lockVideo(1)">操作视频</p>
+              <p v-if="infoData.outDetail.outLockVideo"
+                class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
             </div>
             <div class="table-title-box-one">
               <p>领用时库存净重</p>
@@ -115,8 +117,10 @@
               <p></p>
               <p>归还</p>
               <p>{{infoData.returnTime}}</p>
-              <p class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
-              <p class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
+              <p v-if="infoData.returnDetail.returnVideo"
+                class="inquire-button-one" @click="lockVideo(2)">操作视频</p>
+              <p v-if="infoData.returnDetail.returnLockVideo"
+                class="inquire-button-one" @click="lockVideo(4)">开关锁视频</p>
             </div>
             <div class="table-title-box-two">
               <p>本次使用量</p>

src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -32,10 +32,12 @@
             <div class="button-box" style="display: flex">
               <p class="table-min-button"
                  style="margin:0!important;"
+                 v-if="scope.row.joinVideo"
                  @click="lockVideo(1,scope.row)"
               >操作视频</p>
               <p class="table-min-button"
                  style="margin:0!important;"
+                 v-if="scope.row.closeLockVideo"
                  @click="lockVideo(2,scope.row)"
               >开关锁视频</p>
             </div>