heyang

src/api/gasManage3_0/gasManageSYD.js

@@ -146,10 +146,17 @@ export function useRecordList(query) {
     params: query
   })
 }
-//使用记录-详情
-export function useRecordDetail(query) {
+//使用记录-详情-
+export function useRecordDetail(data) {
   return request({
-    url: '/bottle/useRecord/getUseDetails/'+query,
+    url: '/bottle/useRecord/bottle/'+data,
+    method: 'get',
+  })
+}
+//使用记录-详情-列表
+export function useRecordListDetail(data) {
+  return request({
+    url: '/bottle/useRecord/getUseDetails?id='+data,
     method: 'get',
   })
 }

src/views/gasManage_syd/manage/gasManage/gasManageDetail.vue

@@ -6,13 +6,19 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
      <!--基本信息-->
-    <div class="info" v-if="form.bottleStorage">
-      <li><i>标签码：</i><i>{{form.bottleStorage.electronicTag}}</i></li>
-      <li><i>气瓶编号：</i><i>{{form.bottleStorage.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{form.bottleStorage.airName}}</i></li>
-      <li><i>气瓶规格：</i><i>{{form.bottleStorage.configName}}</i></li>
-      <li><i>最低气压值：</i><i>{{form.bottleStorage.minPressure}}</i></li>
-      <li><i>气体组分：</i><i>{{form.bottleStorage.airComponent}}</i></li>
+    <div class="info"   v-if="form.bottleStorage">
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{form.bottleStorage.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{form.bottleStorage.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{form.bottleStorage.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{form.bottleStorage.configName}}</i></li>
+        <li><i>最低气压值：</i><i>{{form.bottleStorage.minPressure}}Mpa</i></li>
+        <li><i>气体组分：</i><i>{{form.bottleStorage.airComponent}}</i></li>
+      </div>
     </div>
     <div class="addPage_b">
       <!--审核记录-->
@@ -24,8 +30,7 @@
           <el-table-column label="使用次数" align="left" prop="countNumber"></el-table-column>
           <el-table-column label="总使用量" align="left" prop="amount">
             <template slot-scope="scope">
-              <span>{{scope.row.amount}}1Mpa</span>
-
+              <span>{{scope.row.amount}}Mpa</span>
             </template>
           </el-table-column>
           <el-table-column label="最后使用时间" align="left" prop="useTime"></el-table-column>
@@ -130,28 +135,61 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
-    align-items: center;
-    >li{
-      list-style-type: none;
-      margin: 20px;
-      >i{
-        font-style: normal;
+    margin: 20px;
+    box-sizing: border-box;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      margin-left: 100px;
+      >img{
+        width: 38px;
+        height: 80px;
       }
-      >i:nth-of-type(1){
+      >P{
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #999999;
+        color: #0183FA;
         line-height: 16px;
+        margin-top: 12px;
       }
-      >i:nth-of-type(2){
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #333333;
-        line-height: 16px;
+    }
+    .info_r{
+      display: flex;
+      flex: 1;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      >li{
+        list-style-type: none;
+        margin: 20px 0;
+        >i{
+          font-style: normal;
+          display: inline-block;
+          vertical-align:text-top;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+          width: 120px;
+          text-align: right;
+        }
+        >i:nth-of-type(2){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+          width: 200px;
+          text-align: left;
+
+        }
       }
     }
+
     .look_img{
       >i:nth-of-type(2){
         color: #0183FA;

src/views/gasManage_syd/manage/gasUseManage/gasUseManage.vue

@@ -120,7 +120,7 @@ export default {
         this.dialogVisible=true;
 
         this.form.bottleName=row.airName;
-        this.form.isSurplus=0;
+        this.form.isSurplus=1;
         this.form.subjectName=row.subjectName;
         this.form.subjectId=row.subjectId;
         this.form.storageId=row.id;

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

@@ -7,16 +7,22 @@
     </div>
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
-    <div class="info" v-if="form">
-      <li><i>标签码：</i><i></i></li>
-      <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{form.airName}}</i></li>
-      <li><i>气瓶规格：</i><i></i></li>
-      <li><i>最低气压值：</i><i></i></li>
-      <li><i>气体组分：</i><i>{{form.airConstituents}}</i></li>
+    <div class="info"   v-if="form">
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{form.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
+        <li><i>最低气压值：</i><i>{{form.minPressure}}Mpa</i></li>
+        <li><i>气体组分：</i><i>{{form.airComponent}}</i></li>
+      </div>
     </div>
     <div class="small_title">异常信息</div>
-    <div class="info">
+    <div class="info2">
       <li><i>操作人：</i><i>{{form.createBy}}</i></li>
       <li><i>联系方式：</i><i>{{form.phone}}</i></li>
       <li><i>原气压值：</i><i>{{form.beforeEdit}}Mpa</i></li>
@@ -189,6 +195,73 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
+    margin: 20px;
+    box-sizing: border-box;
+    border: 1px solid #E0E0E0;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      margin-left: 100px;
+      margin-top: 20px;
+      >img{
+        width: 38px;
+        height: 80px;
+      }
+      >P{
+        font-size: 16px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #0183FA;
+        line-height: 16px;
+        margin-top: 12px;
+      }
+    }
+    .info_r{
+      display: flex;
+      flex: 1;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      >li{
+        list-style-type: none;
+        margin: 20px 0;
+        >i{
+          font-style: normal;
+          display: inline-block;
+          vertical-align:text-top;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+          width: 120px;
+          text-align: right;
+        }
+        >i:nth-of-type(2){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+          width: 200px;
+          text-align: left;
+
+        }
+      }
+    }
+
+    .look_img{
+      >i:nth-of-type(2){
+        color: #0183FA;
+      }
+    }
+  }
+  .info2{
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
     height: 130px;
     border: 1px solid #E0E0E0;
     margin: 20px;

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

@@ -7,13 +7,19 @@
     </div>
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
-    <div class="info" v-if="formInfo">
-      <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>
-      <li><i>气瓶编号：</i><i>{{formInfo.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{formInfo.airName}}</i></li>
-      <li><i>气瓶规格：</i><i>{{formInfo.configName}}</i></li>
-      <li><i>最低气压值：</i><i>{{formInfo.minPressure}}Mpa</i></li>
-      <li><i>气体组分：</i><i>{{formInfo.airComponent}}</i></li>
+    <div class="info"   v-if="formInfo">
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{formInfo.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{formInfo.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{formInfo.configName}}</i></li>
+        <li><i>最低气压值：</i><i>{{formInfo.minPressure}}Mpa</i></li>
+        <li><i>气体组分：</i><i>{{formInfo.airComponent}}</i></li>
+      </div>
     </div>
     <div class="small_title">入库信息</div>
     <div class="addPage_b" v-if="form.bottleStorage">
@@ -145,32 +151,63 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
-    height: 130px;
-    border: 1px solid #E0E0E0;
     margin: 20px;
-    padding: 30px 48px;
     box-sizing: border-box;
-    >li{
-      list-style-type: none;
-      margin-right: 30px;
-      >i{
-        font-style: normal;
+    border: 1px solid #E0E0E0;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      margin-left: 100px;
+      margin-top: 20px;
+      >img{
+        width: 38px;
+        height: 80px;
       }
-      >i:nth-of-type(1){
+      >P{
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #999999;
+        color: #0183FA;
         line-height: 16px;
+        margin-top: 12px;
       }
-      >i:nth-of-type(2){
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #333333;
-        line-height: 16px;
+    }
+    .info_r{
+      display: flex;
+      flex: 1;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      >li{
+        list-style-type: none;
+        margin: 20px 0;
+        >i{
+          font-style: normal;
+          display: inline-block;
+          vertical-align:text-top;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+          width: 120px;
+          text-align: right;
+        }
+        >i:nth-of-type(2){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+          width: 200px;
+          text-align: left;
+
+        }
       }
     }
+
     .look_img{
       >i:nth-of-type(2){
         color: #0183FA;
@@ -179,7 +216,6 @@ export default {
   }
   /*入库信息*/
   .addPage_b{
-    border: 1px solid #E0E0E0;
     margin: 20px;
     padding: 30px 48px;
     box-sizing: border-box;
@@ -189,10 +225,11 @@ export default {
       flex-wrap: wrap;
       >li{
         list-style-type: none;
-        margin-right: 30px;
+
         margin-bottom: 12px;
         >i{
           font-style: normal;
+          display: inline-block;
         }
         >i:nth-of-type(1){
           font-size: 16px;
@@ -207,6 +244,7 @@ export default {
           font-weight: 400;
           color: #333333;
           line-height: 16px;
+          width: 200px;
         }
       }
     }

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

@@ -2,23 +2,29 @@
 <template>
   <div class="addPage">
     <div class="addPage_title">
-      <p>查看气瓶</p>
+      <p> 出库记录详情</p>
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
-    <div class="info" v-if="formInfo">
-      <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>
-      <li><i>气瓶编号：</i><i>{{formInfo.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{formInfo.airName}}</i></li>
-      <li><i>气瓶规格：</i><i>{{formInfo.configName}}</i></li>
-      <li><i>最低气压值：</i><i>{{formInfo.minPressure}}Mpa</i></li>
-      <li><i>气体组分：</i><i>{{formInfo.airComponent}}</i></li>
+    <div class="info"   v-if="form">
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{form.bottleStorage.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{form.bottleStorage.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{form.bottleStorage.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{form.bottleStorage.configName}}</i></li>
+        <li><i>最低气压值：</i><i>{{form.bottleStorage.minPressure}}Mpa</i></li>
+        <li><i>气体组分：</i><i>{{form.bottleStorage.airComponent}}</i></li>
+      </div>
     </div>
     <div class="small_title">出库信息</div>
-    <div class="info" v-if="form.bottleStorageOut">
-      <li><i>出库人：</i><i>{{form.bottleStorageOut.createTime}}</i></li>
-      <li><i>出库时间：</i><i>{{form.bottleStorageOut.userName}}</i></li>
+    <div class="info2" v-if="form.bottleStorageOut">
+      <li><i>出库人：</i><i>{{form.bottleStorageOut.userName}}</i></li>
+      <li><i>出库时间：</i><i>{{form.bottleStorageOut.createTime}}</i></li>
     </div>
   </div>
 </template>
@@ -135,25 +141,95 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
+    margin: 20px;
+    box-sizing: border-box;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      margin-left: 100px;
+      margin-top: 20px;
+      >img{
+        width: 38px;
+        height: 80px;
+      }
+      >P{
+        font-size: 16px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #0183FA;
+        line-height: 16px;
+        margin-top: 12px;
+      }
+    }
+    .info_r{
+      display: flex;
+      flex: 1;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      >li{
+        list-style-type: none;
+        margin: 20px 0;
+        >i{
+          font-style: normal;
+          display: inline-block;
+          vertical-align:text-top;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+          width: 120px;
+          text-align: right;
+        }
+        >i:nth-of-type(2){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+          width: 200px;
+          text-align: left;
+
+        }
+      }
+    }
+
+    .look_img{
+      >i:nth-of-type(2){
+        color: #0183FA;
+      }
+    }
+  }
+
+  .info2 {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
     height: 130px;
-    border: 1px solid #E0E0E0;
     margin: 20px;
     padding: 30px 48px;
     box-sizing: border-box;
-    >li{
+
+    > li {
       list-style-type: none;
       margin-right: 30px;
-      >i{
+
+      > i {
         font-style: normal;
       }
-      >i:nth-of-type(1){
+
+      > i:nth-of-type(1) {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
         color: #999999;
         line-height: 16px;
       }
-      >i:nth-of-type(2){
+
+      > i:nth-of-type(2) {
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
@@ -161,11 +237,6 @@ export default {
         line-height: 16px;
       }
     }
-    .look_img{
-      >i:nth-of-type(2){
-        color: #0183FA;
-      }
-    }
   }
   /*入库信息*/
   .addPage_b{

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

@@ -54,20 +54,20 @@
         <el-table-column label="气瓶名称" align="left" prop="airName"></el-table-column>
         <el-table-column label="使用前气压" align="left" prop="beforeUse">
           <template slot-scope="scope">
-            <span >{{scope.row.beforeUse}}Mpa</span>
+            <span v-if="scope.row.beforeUse">{{scope.row.beforeUse}}Mpa</span>
           </template>
         </el-table-column>
         <el-table-column label="使用后气压" align="left" prop="afterUse">
           <template slot-scope="scope">
-            <span >{{scope.row.afterUse}}Mpa</span>
+            <span v-if="scope.row.afterUse">{{scope.row.afterUse}}Mpa</span>
           </template>
         </el-table-column>
-        <el-table-column label="使用时间" align="left" prop="useTime">
+        <el-table-column label="使用时间" align="left" prop="useTime" width="180">
           <template slot-scope="scope">
             <span >{{scope.row.useTime?scope.row.useTime:'-'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="归还时间" align="left" prop="backTime">
+        <el-table-column label="归还时间" align="left" prop="backTime"  width="180">
           <template slot-scope="scope">
             <span >{{scope.row.backTime?scope.row.backTime:'-'}}</span>
           </template>
@@ -91,17 +91,17 @@
         </p>
         <div style="flex:5;">
           <pagination :page-sizes="[20, 30, 40, 50]"
-            v-show="total>0"
-            :total="total"
-            style="margin:0;"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+                      v-show="total>0"
+                      :total="total"
+                      style="margin:0;"
+                      :page.sync="queryParams.pageNum"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
           />
         </div>
       </div>
     </div>
-     <!--详情页面-->
+    <!--详情页面-->
     <detail-page v-if="pageType==2" :pageData2="pageData2"></detail-page>
   </div>
 </template>
@@ -227,18 +227,18 @@ export default {
         _this.tabDateName='归还时间'
       }
     },
-      //返回
-      backPage(){
-        this.$parent.handleClick('','','back');
-        this.$parent.outStatistics()
-        this.$parent.gasApplyStatistics()
-        this.$parent.useGasStatistics()
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
+    //返回
+    backPage(){
+      this.$parent.handleClick('','','back');
+      this.$parent.outStatistics()
+      this.$parent.gasApplyStatistics()
+      this.$parent.useGasStatistics()
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams.searchValue = "";
@@ -270,48 +270,48 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  /*导出按钮样式*/
-  .form-dropdown-box{
-    display: flex;
+/*导出按钮样式*/
+.form-dropdown-box{
+  display: flex;
+  margin:0;
+  padding:0 10px;
+  cursor: pointer;
+  height:40px;
+  img:nth-child(1){
+    width:16px;
+    height:16px;
+    margin-top:12px;
+  }
+  p{
+    width:47px;
+    text-align: center;
+    font-size:14px;
     margin:0;
-    padding:0 10px;
-    cursor: pointer;
-    height:40px;
-    img:nth-child(1){
-      width:16px;
-      height:16px;
-      margin-top:12px;
-    }
-    p{
-      width:47px;
-      text-align: center;
-      font-size:14px;
-      margin:0;
-      line-height:40px;
-    }
-    img:nth-child(3){
-      width:10px;
-      height:6px;
-      margin-top:17px;
-    }
+    line-height:40px;
+  }
+  img:nth-child(3){
+    width:10px;
+    height:6px;
+    margin-top:17px;
   }
-  .apply {
+}
+.apply {
+  flex:1;
+  display: flex!important;
+  flex-direction: column;
+  .apply_page{
     flex:1;
     display: flex!important;
     flex-direction: column;
-    .apply_page{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-      padding:20px 20px 20px!important;
-      border-radius:10px;
+    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
+    padding:20px 20px 20px!important;
+    border-radius:10px;
 
-      .button-box{
-        width:200px;
-        display: flex;
-      }
+    .button-box{
+      width:200px;
+      display: flex;
     }
-
   }
+
+}
 </style>

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

@@ -6,18 +6,24 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
     <div class="small_title">气瓶信息</div>
-     <!--基本信息-->
-    <div class="info" v-if="form">
-      <li><i>标签码：</i><i>{{form.electronicTag}}<</i></li>
-      <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{form.airName}}</i></li>
-      <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
-      <li><i>最低气压值：</i><i></i></li>
-      <li><i>气体组分：</i><i>{{form.airConstituents}}</i></li>
+    <!--基本信息-->
+    <div class="info"  v-if="form">
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{form.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
+        <li><i>最低气压值：</i><i>{{form.minPressure}}</i></li>
+        <li><i>气体组分：</i><i>{{form.airComponent}}</i></li>
+      </div>
     </div>
     <div class="small_title">使用记录</div>
     <div class="addPage_b">
-      <el-table border v-loading="loading" :data="form.recordVos" height="300px" >
+      <el-table border v-loading="loading" :data="tableData" height="300px" >
         <el-table-column label="使用量" align="left" prop="amount">
           <template slot-scope="scope">
             <span>{{scope.row.amount}}Mpa</span>
@@ -26,13 +32,13 @@
         <el-table-column label="使用前气压" align="left" prop="beforeUsePic">
           <template slot-scope="scope">
             <span>{{scope.row.beforeUse}}Mpa</span>
-            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;"   @click="handleClick('',scope.row,'before')">查看图片</span>
+            <!--            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;"   @click="handleClick('',scope.row,'before')">查看图片</span>-->
           </template>
         </el-table-column>
         <el-table-column label="使用后气压" align="left" prop="afterUse">
           <template slot-scope="scope">
             <span>{{scope.row.afterUse}}Mpa</span>
-            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;" @click="handleClick('',scope.row,'after')">查看图片</span>
+            <!--            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;" @click="handleClick('',scope.row,'after')">查看图片</span>-->
           </template>
         </el-table-column>
         <el-table-column label="使用时间" align="left" prop="useTime">
@@ -52,7 +58,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import {useRecordDetail } from '@/api/gasManage3_0/gasManageSYD'
+import { useRecordDetail, useRecordListDetail } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -127,6 +133,17 @@ export default {
       });
 
     },
+    /* 详情 */
+    getList(id){
+      let _this=this;
+      useRecordListDetail(id).then( response => {
+        let res=response.rows;
+        if(response.code==200){
+          _this.tableData=res;
+        }
+      });
+
+    },
     //返回
     backPage(){
       this.$parent.handleClick('','','back');
@@ -134,8 +151,9 @@ export default {
 
   },
   mounted() {
-    this.formInfo=this.pageData2.item
+    this.form=this.pageData2.item
     this.getInfo(this.pageData2.item.id);
+    this.getList(this.pageData2.item.id);
   }
 
 };
@@ -143,7 +161,7 @@ export default {
 
 <style scoped lang="scss">
 .el-table__row .warning-row{
-    background: #333333;
+  background: #333333;
 
 }
 
@@ -193,32 +211,61 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
-    height: 130px;
-    border: 1px solid #E0E0E0;
     margin: 20px;
-    padding: 30px 48px;
     box-sizing: border-box;
-    >li{
-      list-style-type: none;
-      margin-right: 30px;
-      >i{
-        font-style: normal;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      margin-left: 100px;
+      >img{
+        width: 38px;
+        height: 80px;
       }
-      >i:nth-of-type(1){
+      >P{
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #999999;
+        color: #0183FA;
         line-height: 16px;
+        margin-top: 12px;
       }
-      >i:nth-of-type(2){
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #333333;
-        line-height: 16px;
+    }
+    .info_r{
+      display: flex;
+      flex: 1;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+      >li{
+        list-style-type: none;
+        margin: 20px 0;
+        >i{
+          font-style: normal;
+          display: inline-block;
+          vertical-align:text-top;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+          width: 120px;
+          text-align: right;
+        }
+        >i:nth-of-type(2){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+          width: 200px;
+          text-align: left;
+
+        }
       }
     }
+
     .look_img{
       >i:nth-of-type(2){
         color: #0183FA;

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

@@ -120,6 +120,7 @@ export default {
           _this.pageData2.item=row;
         }else if(doType=='back'){//详情
           this.pageType=1;
+          this.usegasTitle()
           this.getList()
         }
       },

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

@@ -16,7 +16,7 @@
       <li class="look_img" @click="lookFile(form.useGasFile)"><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="50" />
+      <el-input type="textarea" class="apply_tree_b2" v-model="queryParams.remark" placeholder="请输入审核意见"  maxlength="200" />
       <div class="sub_btn">
         <p class="reset-button-one" style="width:150px;margin-right: 30px" @click="handleClick('','','reject')">审核驳回</p>
         <p class="inquire-button-one" style="width:150px;" @click="handleClick('','','pass')">审核通过</p>
@@ -161,12 +161,13 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
-    align-items: center;
     >li{
       list-style-type: none;
-      margin: 20px;
+      margin: 20px 0;
       >i{
         font-style: normal;
+        display: inline-block;
+        vertical-align:text-top;
       }
       >i:nth-of-type(1){
         font-size: 16px;
@@ -174,6 +175,8 @@ export default {
         font-weight: 400;
         color: #999999;
         line-height: 16px;
+        width: 120px;
+        text-align: right;
       }
       >i:nth-of-type(2){
         font-size: 16px;
@@ -181,6 +184,8 @@ export default {
         font-weight: 400;
         color: #333333;
         line-height: 16px;
+        width: 240px;
+        text-align: left;
       }
     }
     .look_img{
@@ -194,8 +199,8 @@ export default {
   .check_btn{
     text-align: center;
     .apply_tree_b2{
-      width: 800px;
-      margin: 46px 0 38px 70px;
+      width: 90%;
+      margin: 46px 30px 38px 30px;
     }
     .sub_btn{
       display: flex;

src/views/gasManage_syd/student/gasUseManage/gasUseManage.vue

@@ -115,7 +115,7 @@ export default {
           this.dialogVisible=true;
 
           this.form.bottleName=row.airName;
-          this.form.isSurplus=0;
+          this.form.isSurplus=1;
           this.form.subjectName=row.subjectName;
           this.form.subjectId=row.subjectId;
           this.form.storageId=row.id;

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

@@ -130,12 +130,13 @@ export default {
     display: flex;
     justify-content: flex-start;
     flex-wrap: wrap;
-    align-items: center;
     >li{
       list-style-type: none;
-      margin: 20px;
+      margin: 20px 0;
       >i{
         font-style: normal;
+        display: inline-block;
+        vertical-align:text-top;
       }
       >i:nth-of-type(1){
         font-size: 16px;
@@ -143,6 +144,8 @@ export default {
         font-weight: 400;
         color: #999999;
         line-height: 16px;
+        width: 120px;
+        text-align: right;
       }
       >i:nth-of-type(2){
         font-size: 16px;
@@ -150,6 +153,8 @@ export default {
         font-weight: 400;
         color: #333333;
         line-height: 16px;
+        width: 240px;
+        text-align: left;
       }
     }
     .look_img{

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

@@ -54,20 +54,20 @@
         <el-table-column label="气瓶名称" align="left" prop="airName"></el-table-column>
         <el-table-column label="使用前气压" align="left" prop="beforeUse">
           <template slot-scope="scope">
-            <span >{{scope.row.beforeUse}}Mpa</span>
+            <span v-if="scope.row.beforeUse">{{scope.row.beforeUse}}Mpa</span>
           </template>
         </el-table-column>
         <el-table-column label="使用后气压" align="left" prop="afterUse">
           <template slot-scope="scope">
-            <span >{{scope.row.afterUse}}Mpa</span>
+            <span v-if="scope.row.afterUse">{{scope.row.afterUse}}Mpa</span>
           </template>
         </el-table-column>
-        <el-table-column label="使用时间" align="left" prop="useTime">
+        <el-table-column label="使用时间" align="left" prop="useTime" width="180">
           <template slot-scope="scope">
             <span >{{scope.row.useTime?scope.row.useTime:'-'}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="归还时间" align="left" prop="backTime">
+        <el-table-column label="归还时间" align="left" prop="backTime"  width="180">
           <template slot-scope="scope">
             <span >{{scope.row.backTime?scope.row.backTime:'-'}}</span>
           </template>

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

@@ -7,23 +7,23 @@
     </div>
     <div class="small_title">气瓶信息</div>
     <!--基本信息-->
-    <div class="info" v-if="form">
+    <div class="info"  v-if="form">
       <div class="info_l">
         <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
-        <p>已出库</p>
+        <p>{{form.bottleStorage.storageStatus == 1?'闲置':(form.bottleStorage.storageStatus == 2?'使用':(form.bottleStorage.storageStatus == 3?'出库':''))}}</p>
       </div>
       <div class="info_r">
         <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>
         <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
         <li><i>气体名称：</i><i>{{form.airName}}</i></li>
         <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
-        <li><i>最低气压值：</i><i></i></li>
-        <li><i>气体组分：</i><i>{{form.airConstituents}}</i></li>
+        <li><i>最低气压值：</i><i>{{form.minPressure}}</i></li>
+        <li><i>气体组分：</i><i>{{form.airComponent}}</i></li>
       </div>
     </div>
     <div class="small_title">使用记录</div>
     <div class="addPage_b">
-      <el-table border v-loading="loading" :data="form.recordVos" height="300px" >
+      <el-table border v-loading="loading" :data="tableData" height="300px" >
         <el-table-column label="使用量" align="left" prop="amount">
           <template slot-scope="scope">
             <span>{{scope.row.amount}}Mpa</span>
@@ -32,13 +32,13 @@
         <el-table-column label="使用前气压" align="left" prop="beforeUsePic">
           <template slot-scope="scope">
             <span>{{scope.row.beforeUse}}Mpa</span>
-            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;"   @click="handleClick('',scope.row,'before')">查看图片</span>
+<!--            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;"   @click="handleClick('',scope.row,'before')">查看图片</span>-->
           </template>
         </el-table-column>
         <el-table-column label="使用后气压" align="left" prop="afterUse">
           <template slot-scope="scope">
             <span>{{scope.row.afterUse}}Mpa</span>
-            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;" @click="handleClick('',scope.row,'after')">查看图片</span>
+<!--            <span style="color: #0183FA;margin-left: 10px;cursor: pointer;" @click="handleClick('',scope.row,'after')">查看图片</span>-->
           </template>
         </el-table-column>
         <el-table-column label="使用时间" align="left" prop="useTime">
@@ -58,7 +58,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import {useRecordDetail } from '@/api/gasManage3_0/gasManageSYD'
+import { useRecordDetail, useRecordListDetail } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -133,6 +133,17 @@ export default {
       });
 
     },
+    /* 详情 */
+    getList(id){
+      let _this=this;
+      useRecordListDetail(id).then( response => {
+        let res=response.rows;
+        if(response.code==200){
+          _this.tableData=res;
+        }
+      });
+
+    },
     //返回
     backPage(){
       this.$parent.handleClick('','','back');
@@ -140,8 +151,9 @@ export default {
 
   },
   mounted() {
-    this.formInfo=this.pageData2.item
-    this.getInfo(this.pageData2.item.id);
+    this.form=this.pageData2.item
+   this.getInfo(this.pageData2.item.id);
+   this.getList(this.pageData2.item.id);
   }
 
 };
@@ -198,14 +210,14 @@ export default {
   .info{
     display: flex;
     justify-content: flex-start;
-    height: 130px;
+    flex-wrap: wrap;
     margin: 20px;
-    padding: 30px 48px;
     box-sizing: border-box;
     .info_l{
       margin-right: 92px;
       width: 100px;
       text-align: center;
+      margin-left: 100px;
       >img{
         width: 38px;
         height: 80px;
@@ -221,16 +233,16 @@ export default {
     }
     .info_r{
       display: flex;
+      flex: 1;
       justify-content: flex-start;
       flex-wrap: wrap;
-
       >li{
         list-style-type: none;
-
+        margin: 20px 0;
         >i{
           font-style: normal;
           display: inline-block;
-          margin-bottom: 30px;
+          vertical-align:text-top;
         }
         >i:nth-of-type(1){
           font-size: 16px;
@@ -238,14 +250,17 @@ export default {
           font-weight: 400;
           color: #999999;
           line-height: 16px;
+          width: 120px;
+          text-align: right;
         }
         >i:nth-of-type(2){
-          width: 200px;
           font-size: 16px;
           font-family: Microsoft YaHei;
           font-weight: 400;
           color: #333333;
           line-height: 16px;
+          width: 200px;
+          text-align: left;
 
         }
       }