dedsudiyu 2 anni fa
parent
commit
856650e0ec

+ 1 - 1
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -57,7 +57,7 @@
             <el-table-column label="重大危险源辨识指标" align="left" prop="riskIndicator" width="150" show-overflow-tooltip/>
             <el-table-column label="学院" align="left" prop="deptName" width="150" show-overflow-tooltip/>
             <el-table-column label="实验室责任人" align="left" prop="adminName" width="120" show-overflow-tooltip/>
-            <el-table-column label="安全责任人" align="left" prop="adminName" width="200" show-overflow-tooltip/>
+            <el-table-column label="安全责任人" align="left" prop="safeUserName" width="200" show-overflow-tooltip/>
             <el-table-column label="操作" align="left" width="160">
               <template slot-scope="scope">
                 <div style="display: flex;height:30px;">

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

@@ -67,7 +67,7 @@
         <div class="infoPage-left-text-box-one">
           <div>
             <p>过期时间:</p>
-            <p>{{infoData.expirationTime}}</p>
+            <p>{{infoData.expirationTime}} 丨 30天前提醒</p>
           </div>
           <div>
             <p>领用时效:</p>
@@ -96,7 +96,7 @@
             <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
           </div>
           <div class="table-title-box-one">
-            <p>领用时净重</p>
+            <p>领用时库存净重</p>
             <p>损耗量</p>
             <p>领用净重</p>
             <p>操作人</p>
@@ -251,8 +251,10 @@
         border-radius:10px;
         .infoPage-left-text-box-one{
           display: flex;
-          div{
+          div:nth-child(1){
             flex:1;
+          }
+          div{
             display: flex;
             p{
               font-size:14px;
@@ -268,6 +270,9 @@
               flex:1;
             }
           }
+          div:nth-child(2){
+            width:260px;
+          }
         }
         .infoPage-left-text-box-two{
           display: flex;

+ 8 - 3
src/views/studentViews/chemicalManagement/studentUsageRecord/infoPage.vue

@@ -67,7 +67,7 @@
           <div class="infoPage-left-text-box-one">
             <div>
               <p>过期时间:</p>
-              <p>{{infoData.expirationTime}}</p>
+              <p>{{infoData.expirationTime}} 丨 30天前提醒</p>
             </div>
             <div>
               <p>领用时效:</p>
@@ -96,7 +96,7 @@
               <p class="inquire-button-one" @click="lockVideo(3)">开关锁视频</p>
             </div>
             <div class="table-title-box-one">
-              <p>领用时净重</p>
+              <p>领用时库存净重</p>
               <p>损耗量</p>
               <p>领用净重</p>
               <p>双人验证</p>
@@ -245,8 +245,10 @@
         border-radius:10px;
         .infoPage-left-text-box-one{
           display: flex;
-          div{
+          div:nth-child(1){
             flex:1;
+          }
+          div{
             display: flex;
             p{
               font-size:14px;
@@ -262,6 +264,9 @@
               flex:1;
             }
           }
+          div:nth-child(2){
+            width:260px;
+          }
         }
         .infoPage-left-text-box-two{
           display: flex;