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

src/api/gasManage3_0/gasManageSYD.js

@@ -0,0 +1,229 @@
+import request from '@/utils/request'
+/** 学生端----------------------------------------------------------------------- */
+
+//气瓶使用-领用气瓶-列表
+export function receivingGasListByStu(query) {
+  return request({
+    url: '/zd-bottle/bottleStorage/receivingGasListByStu',
+    method: 'get',
+    params: query
+  })
+}
+//气瓶使用-归还气瓶-列表
+export function returnGasByStu(query) {
+  return request({
+    url: '/zd-bottle/bottleStorage/returnGasByStu',
+    method: 'get',
+    params: query
+  })
+}
+//气瓶使用-领用
+export function useRecord(data) {
+  return request({
+    url: '/zd-bottle/useRecord',
+    method: 'post',
+    data: data
+  })
+}
+//气瓶使用-领用
+export function returnRecord(data) {
+  return request({
+    url: '/zd-bottle/useRecord',
+    method: 'put',
+    data: data
+  })
+}
+/** 管理端----------------------------------------------------------------------- */
+//用气审核-列表头部总数
+export function usegasTitle(query) {
+  return request({
+    url: '/zd-bottle/usegasApply/applyTabCount',
+    method: 'get',
+    params: query
+  })
+}
+//用气审核-待审核列表
+export function usegasWaitApplyList(query) {
+  return request({
+    url: '/zd-bottle/usegasApply/waitApplyList',
+    method: 'get',
+    params: query
+  })
+}
+//用气审核-已通过列表
+export function usegasPassApplyList(query) {
+  return request({
+    url: '/zd-bottle/usegasApply/passApplyList',
+    method: 'get',
+    params: query
+  })
+}
+//用气审核-未通过列表
+export function usegasRefuseApplyList(query) {
+  return request({
+    url: '/zd-bottle/usegasApply/refuseApplyList',
+    method: 'get',
+    params: query
+  })
+}
+//用气审核-审核记录
+export function usegasAuditRecordList(query) {
+  return request({
+    url: '/zd-bottle/usegasAuditRecord/auditRecordList',
+    method: 'get',
+    params: query
+  })
+}
+//用气审核-审核
+export function usegasCheck(data) {
+  return request({
+    url: '/zd-bottle/usegasAuditRecord/auditPass',
+    method: 'post',
+    data: data
+  })
+}
+
+//气瓶使用-领用气瓶-列表
+export function receivingGasList(query) {
+  return request({
+    url: '/zd-bottle/bottleStorage/receivingGasList',
+    method: 'get',
+    params: query
+  })
+}
+//气瓶使用-归还气瓶-列表
+export function returnGas(query) {
+  return request({
+    url: '/zd-bottle/bottleStorage/returnGas',
+    method: 'get',
+    params: query
+  })
+}
+//报警记录
+export function alarmRecordList(query) {
+  return request({
+    url: '/zd-bottle/alarmRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+//使用记录
+export function useRecordList(query) {
+  return request({
+    url: '/zd-bottle/useRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+//使用记录-详情
+export function useRecordDetail(query) {
+  return request({
+    url: '/zd-bottle/useRecord/getUseDetails/'+query,
+    method: 'get',
+  })
+}
+//气瓶类目-列表
+export function gasCategoryList(query) {
+  return request({
+    url: '/system/dict/data/listNotPower?dictType=qp_specification_category',
+    method: 'get',
+    params: query
+  })
+}
+//出入库信息统计
+export function outStatistics(query) {
+  return request({
+    url: '/zd-bottle/useRecord/calcRepertory',
+    method: 'get',
+    params: query
+  })
+}
+//气瓶申请统计
+export function gasApplyStatistics(query) {
+  return request({
+    url: '/zd-bottle/useRecord/calcApply',
+    method: 'get',
+    params: query
+  })
+}
+//用气量统计
+export function useGasStatistics(query) {
+  return request({
+    url: '/zd-bottle/useRecord/calcAmount',
+    method: 'get',
+    params: query
+  })
+}
+
+//异常记录
+export function abnormalRecordList(query) {
+  return request({
+    url: '/zd-bottle/bottleStorageError/list',
+    method: 'get',
+    params: query
+  })
+}
+//异常记录-详情
+export function abnormalRecordDetail(query) {
+  return request({
+    url: '/zd-bottle/bottleStorageError/'+query,
+    method: 'get',
+    params: query
+  })
+}
+
+// RFID标签-新增
+export function RFIDtagAdd(data) {
+  return request({
+    url: '/zd-bottle/rfidTag',
+    method: 'post',
+    data: data
+  })
+}
+// RFID标签-列表
+export function RFIDtagList(query) {
+  return request({
+    url: '/zd-bottle/rfidTag/list',
+    method: 'get',
+    params: query
+  })
+}
+// RFID标签-删除
+export function RFIDtagDelete(data) {
+  return request({
+    url: '/zd-bottle/rfidTag/'+data,
+    method: 'delete',
+  })
+}
+
+// 气瓶管理-列表
+export function gasManageList(query) {
+  return request({
+    url: '/zd-bottle/bottleStorage/list',
+    method: 'get',
+    params: query
+  })
+}
+// 气瓶管理-新增
+export function gasManageAdd(data) {
+  return request({
+    url: '/zd-bottle/bottleStorage',
+    method: 'post',
+    data: data
+  })
+}
+// 气瓶管理-详情
+export function gasManageInfo(data) {
+  return request({
+    url: '/zd-bottle/bottleStorage/'+data,
+    method: 'get',
+  })
+}
+// 气瓶管理-出库
+export function gasManageOut(data) {
+  return request({
+    url: '/zd-bottle/bottleStorageOut',
+    method: 'post',
+    data: data
+  })
+}

src/views/gasManage_syd/RFIDManage/RFIDManage.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="标签内码"
+            placeholder="标签码/识别码"
             clearable
             maxLength="30"
             size="small"
@@ -44,7 +44,7 @@
       </el-form>
       <el-table border v-loading="loading" :data="tableData">
         <el-table-column label="标签码" align="left" prop="tagCode"/>
-        <el-table-column label="识别码" align="left" prop=""/>
+        <el-table-column label="识别码" align="left" prop="authCode"/>
         <el-table-column label="是否绑定" align="left" prop="isBind">
           <template slot-scope="scope">
             <span v-if="scope.row.isBind == 1">绑定</span>
@@ -99,7 +99,7 @@ import {
   RFIDtagAdd,
   RFIDtagDelete,
   RFIDtagList
-} from '@/api/gasManage3_0/gasManage'
+} from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import { getLodop } from "@/utils/LodopFuncs";
 import vueQr from 'vue-qr'
@@ -127,6 +127,7 @@ export default {
       form:{
         tagCode:'',
       },
+      authCode:'',//识别码
       total:0,
       tableData:[],
       dateRange:[],
@@ -146,7 +147,7 @@ export default {
       LODOP.PRINT_INIT('') //打印初始化
 
       LODOP.SET_PRINT_STYLE('Bold', 1) //设置对象风格
-      LODOP.ADD_PRINT_TEXT(80,20,300,200,this.form.tagCode,) //增加纯文本项
+      LODOP.ADD_PRINT_TEXT(80,20,300,200,this.authCode,) //增加纯文本项
       LODOP.SET_PRINT_STYLEA(0,'FontSize', 16) //设置对象风格
       LODOP.SET_PRINT_PAGESIZE(1, 500, 300, '') //设定纸张大小
       LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '60%')//设置缩放
@@ -168,7 +169,7 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            _this.form.tagCode=row.tagCode
+            _this.authCode=row.authCode
             setTimeout(function () {
               _this.CreateOneFormPage()
               LODOP.PREVIEW() //打印预览
@@ -240,6 +241,9 @@ export default {
       submitForm(){
         let _this = this;
         RFIDtagAdd(_this.form).then(res => {
+          if(res.code==200){
+            _this.authCode=res.data.authCode
+          }
           this.$message({
             type: 'success',
             message: '操作成功!',

src/views/gasManage_syd/gasManage/gasManage.vue

@@ -43,14 +43,22 @@
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData">
-        <el-table-column label="标签码" align="left" prop="location"/>
-        <el-table-column label="气瓶编号" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="气体名称" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="气瓶规格" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="使用人数" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="当前气压" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="最后使用时间" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="状态" align="left" prop="createTime"></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"/>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
+        <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></el-table-column>
+        <el-table-column label="使用人数" align="left" prop="numberPersons"></el-table-column>
+        <el-table-column label="当前气压" align="left" prop="currentPressure">
+          <template slot-scope="scope">
+            <span >{{scope.row.currentPressure}}Mpa</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后使用时间" align="left" prop="lastTime"></el-table-column>
+        <el-table-column label="状态" align="left" prop="storageStatus">
+          <template slot-scope="scope">
+            <p :class="scope.row.storageStatus == 1?'color_warn':(scope.row.storageStatus == 2?'color_14AE10':(scope.row.storageStatus == 3?'color_red':''))">{{scope.row.storageStatus == 1?'闲置':(scope.row.storageStatus == 2?'使用':(scope.row.storageStatus == 3?'出库':''))}}</p>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160">
           <template slot-scope="scope">
             <div class="button-box">
@@ -78,14 +86,25 @@
     <add-page v-if="pageType==2" :pageData="pageData"></add-page>
      <!--详情页面-->
     <detail-page v-if="pageType==3" :pageData2="pageData2"></detail-page>
+    <!--    弹窗-->
+    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div style="margin-bottom: 20px">{{dialogContent}}</div>
+        <el-input  v-model="form.pressure" placeholder="请输入气表实际压力，精确到小数点后一位" />
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">出库</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { gasApplyList, } from '@/api/gasManage3_0/gasManage'
 import { getToken } from "@/utils/auth";
 import addPage from "./gasManageAdd.vue"
 import detailPage from "./gasManageDetail.vue"
+import { gasManageList, gasManageOut, returnRecord, useRecord } from '@/api/gasManage3_0/gasManageSYD'
 export default {
   name: "Approval",
   components: {
@@ -100,6 +119,9 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken()
       },
+      dialogTitle:'气瓶出库提示',
+      dialogContent:'请输入当前气压值',
+      dialogVisible:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -109,6 +131,9 @@ export default {
         startTime:'',
         endTime:'',
       },
+      form:{
+        pressure:'',
+      },
       total:0,
       tableData:[{}],
       dateRange:[],
@@ -127,15 +152,18 @@ export default {
           _this.pageData2.id=row.id;
           _this.pageType=3;
         }else if(doType=='out'){//出库
-          this.$confirm('是否确认出库?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-
-          }).catch(() => {});
+          _this.dialogVisible=true;
+          _this.form.storageId=row.id
+          // this.$confirm('是否确认出库?', '提示', {
+          //   confirmButtonText: '确定',
+          //   cancelButtonText: '取消',
+          //   type: 'warning'
+          // }).then(() => {
+          //
+          // }).catch(() => {});
         }else if(doType=='back'){//返回
           _this.pageType=1;
+          _this.getList()
         }
       },
       /** 搜索按钮操作 */
@@ -151,6 +179,28 @@ export default {
         this.queryParams.endTime=null
         this.handleQuery();
       },
+      // 取消按钮
+      cancel() {
+        this.form = {};
+        this.dialogVisible = false;
+      },
+      //出库
+        submitForm(){
+        let _this=this;
+
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            gasManageOut(this.form).then( response => {
+              let res=response.data;
+              if(response.code==200){
+                _this.dialogVisible=false;
+                _this.getList()
+              }
+            });
+
+          }
+        });
+      },
       getList(){
         let _this=this;
         if(this.dateRange&&this.dateRange.length>0) {
@@ -160,7 +210,7 @@ export default {
           this.queryParams.startTime=null;
           this.queryParams.endTime=null
         }
-        gasApplyList(_this.queryParams).then( response => {
+        gasManageList(_this.queryParams).then( response => {
           let res=response.rows;
           _this.tableData=res;
           _this.total=response.total;
@@ -168,7 +218,7 @@ export default {
       },
   },
   mounted() {
-   // this.getList()
+    this.getList()
   }
 };
 </script>

src/views/gasManage_syd/gasManage/gasManageAdd.vue

@@ -6,9 +6,9 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
     <div class="addPage_b">
-      <el-form class="addPage_b_b" :model="form" ref="form" :rules="rules" label-position="right" label-width="100px">
-        <el-form-item label="气表压力" prop="phone" >
-          <el-input  style="width: 300px" v-model="form.phone"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="50" />
+      <el-form class="addPage_b_b" :model="form" ref="form" :rules="rules" label-position="right" label-width="120px">
+        <el-form-item label="气表压力" prop="gasPressure" >
+          <el-input  style="width: 300px" v-model="form.gasPressure"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="50" />
         </el-form-item>
         <el-form-item label="检验有效期" prop="dateRange" >
           <el-date-picker
@@ -24,38 +24,41 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="电子标签" prop="status">
-          <el-select v-model="form.status" clearable placeholder="请选择电子标签" style="width: 300px">
-            <el-option
-              v-for="item in optionsListTwo"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+<!--        <el-form-item label="电子标签" prop="electronicTag">-->
+<!--          <el-select v-model="form.electronicTag" clearable placeholder="请选择电子标签" style="width: 300px">-->
+<!--            <el-option-->
+<!--              v-for="item in optionsListTwo"-->
+<!--              :key="item.id"-->
+<!--              :label="item.name"-->
+<!--              :value="item.id">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="电子标签" prop="electronicTag">
+          <el-input  style="width: 300px" v-model="form.electronicTag"  placeholder="请输入电子标签" maxlength="50" />
         </el-form-item>
-        <el-form-item label="有无手轮" prop="type">
-          <el-radio-group v-model="form.type">
+        <el-form-item label="有无手轮" prop="isHandwheel">
+          <el-radio-group v-model="form.isHandwheel">
             <el-radio :label="1">有</el-radio>
-            <el-radio :label="2">无</el-radio>
+            <el-radio :label="0">无</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="是否固定" prop="type">
-          <el-radio-group v-model="form.type">
+        <el-form-item label="是否固定" prop="isFixed">
+          <el-radio-group v-model="form.isFixed">
             <el-radio :label="1">是</el-radio>
-            <el-radio :label="2">否</el-radio>
+            <el-radio :label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="气瓶状态标牌" prop="type">
-          <el-radio-group v-model="form.type">
+        <el-form-item label="气瓶状态标牌" prop="isStatusSign">
+          <el-radio-group v-model="form.isStatusSign">
             <el-radio :label="1">有</el-radio>
-            <el-radio :label="2">无</el-radio>
+            <el-radio :label="0">无</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="验收备注" prop="phone" >
-          <el-input type="textarea" style="width: 300px" v-model="form.phone"  placeholder="请输入验收备注" maxlength="200" />
+          <el-input type="textarea" style="width: 300px" v-model="form.remake"  placeholder="请输入验收备注" maxlength="200" />
         </el-form-item>
-        <p class="inquire-button-one" style="width:300px;margin-left: 100px" @click="handleClick('','form','next')">提交申请</p>
+        <p class="inquire-button-one" style="width:300px;margin-left: 100px" @click="submitForm()">提交申请</p>
       </el-form>
 
     </div>
@@ -64,7 +67,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasApplyDetail, } from '@/api/gasManage3_0/gasManage'
+import { gasManageAdd  } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -76,13 +79,13 @@ export default {
     const validateTime = (rule, value, callback) => {
       console.log(value)
       if(value && value.length>0){
-        this.form.startTime=value[0]
-        this.form.endTime=value[1]
+        this.form.validateStartTime=value[0]
+        this.form.validateEndTime=value[1]
         callback();
       }else{
-        this.form.startTime=null;
-        this.form.endTime=null
-        callback(new Error('请选择使用期限'))
+        this.form.validateStartTime=null;
+        this.form.validateEndTime=null
+        callback(new Error('请选择检验有效期'))
       }
     }
     return {
@@ -100,6 +103,9 @@ export default {
 
       loading:false,
       form:{
+        isHandwheel:1,
+        isFixed:1,
+        isStatusSign:1,
       },
 
       // 查询参数
@@ -108,15 +114,25 @@ export default {
         pageSize:20,
       },
       total:0,
-      tableData:[{
-        num:0,
-      }],
+      tableData:[],
       optionsListTwo:[],
       // 表单校验
       rules: {
 
+        gasPressure: [
+          { required: true, message: "请输入气表压力，精确到小数点后一位", trigger: "change" }
+        ],
+        electronicTag: [
+          { required: true, message: "请选择电子标签", trigger: "change" }
+        ],
+        isStatusSign: [
+          { required: true, message: "请选择有无手轮", trigger: "change" }
+        ],
+        isFixed: [
+          { required: true, message: "请选择是否固定", trigger: "change" }
+        ],
         applyCertificate: [
-          { required: true, message: "请上传用气申请表", trigger: "change" }
+          { required: true, message: "请选择气瓶状态标牌", trigger: "change" }
         ],
         dateRange: [
           {required: true, validator: validateTime, trigger: 'blur' },
@@ -130,12 +146,17 @@ export default {
   methods: {
 
     /* 详情 */
-    getInfo(id){
+    submitForm(){
       let _this=this;
-      gasApplyDetail(id).then( response => {
-        let res=response.data;
-        if(response.code==200){
-          _this.form=res;
+
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          gasManageAdd(this.form).then(response => {
+           if(response.code==200){
+             this.msgSuccess("入库成功");
+             this.$parent.handleClick('','','back');
+           }
+          });
         }
       });
 

src/views/gasManage_syd/gasManage/gasManageDetail.vue

@@ -6,28 +6,29 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
      <!--基本信息-->
-    <div class="info" v-if="form.qpTask">
-      <li><i>标签码：</i><i>{{form.qpTask.userName}}</i></li>
-      <li><i>气瓶编号：</i><i>{{form.qpTask.userName}}</i></li>
-      <li><i>气体名称：</i><i>{{form.qpTask.phone}}</i></li>
-      <li><i>气瓶规格：</i><i>{{form.qpTask.location}}</i></li>
-      <li><i>最低气压值：</i><i>{{form.qpTask.createTime}}</i></li>
-      <li><i>气体组分：</i><i>{{form.qpTask.createTime}}</i></li>
+    <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.createTime}}</i></li>
+      <li><i>气体组分：</i><i>{{form.bottleStorage.airConstituents}}</i></li>
     </div>
     <div class="addPage_b">
       <!--审核记录-->
       <div  class="addPage_b_t">
         <div class="addPage_b_t_title">使用人</div>
-        <el-table border v-loading="loading" :data="form.detailList">
-          <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>
-          <el-table-column label="总使用量" align="left" prop="airConstituents">
+        <el-table border v-loading="loading" :data="form.list">
+          <el-table-column label="实验人" align="left" prop="contacts"/>
+          <el-table-column label="联系方式" align="left" prop="phone"></el-table-column>
+          <el-table-column label="使用次数" align="left" prop="countNumber"></el-table-column>
+          <el-table-column label="总使用量" align="left" prop="amount">
             <template slot-scope="scope">
-              <span>1Mpa</span>
+              <span>{{scope.row.amount}}1Mpa</span>
+
             </template>
           </el-table-column>
-          <el-table-column label="最后使用时间" align="left" prop="bottleNumber"></el-table-column>
+          <el-table-column label="最后使用时间" align="left" prop="useTime"></el-table-column>
         </el-table>
       </div>
     </div>
@@ -36,7 +37,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasApplyDetail, } from '@/api/gasManage3_0/gasManage'
+import { gasManageInfo } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -74,7 +75,7 @@ export default {
     /* 详情 */
     getInfo(id){
       let _this=this;
-      gasApplyDetail(id).then( response => {
+      gasManageInfo(id).then( response => {
         let res=response.data;
         if(response.code==200){
           _this.form=res;
@@ -90,7 +91,7 @@ export default {
   },
   mounted() {
     console.log(this.pageData2.id)
-    //this.getInfo(this.pageData2.id);
+    this.getInfo(this.pageData2.id);
   }
 
 };

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

@@ -0,0 +1,234 @@
+<!--气瓶使用-->
+<template>
+  <div class="app-container approval_handle">
+    <div class="approval_handle-page">
+      <template>
+        <el-tabs v-model="activeName"  @tab-click="handleTabClick">
+          <el-tab-pane label="领用气瓶" name="1"></el-tab-pane>
+          <el-tab-pane label="归还气瓶" name="2"></el-tab-pane>
+        </el-tabs>
+      </template>
+      <el-table border v-loading="loading" :data="tableData">
+        <el-table-column label="标签码" align="left" prop="electronicTag"/>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
+        <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></el-table-column>
+        <el-table-column label="当前气压" align="left" prop="currentPressure">
+          <template slot-scope="scope">
+            <span>{{scope.row.currentPressure}}Mpa</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领用时间" align="left" prop="receivingTime" v-if="activeName==2"></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">
+              <p class="table-min-button"
+                 v-if="activeName==1"
+                 v-hasPermi="['airbottle:taskManage:query']"
+                 @click="handleClick('',scope.row,'receive')"
+              >领用</p>
+              <p class="table-min-button"
+                 v-if="activeName==2"
+                 v-hasPermi="['airbottle:taskManage:query']"
+                 @click="handleClick('',scope.row,'give')"
+              >归还</p>
+            </div>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  :total="total"
+                  layout="total, prev, pager, next, sizes, jumper"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
+    <!--    弹窗-->
+    <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div style="margin-bottom: 20px">{{dialogContent}}</div>
+        <el-input v-if="activeName==1" v-model="form.beforeUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-if="activeName==2" v-model="form.afterUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">领用</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { gasApplyList, } from '@/api/gasManage3_0/gasManage'
+import { getToken } from "@/utils/auth";
+import { mangerVoice } from '@/api/laboratory/subject'
+import {
+  receivingGasList,
+  returnGas,
+  returnRecord,
+  useRecord
+} from '@/api/gasManage3_0/gasManageSYD'
+export default {
+  name: "Approval",
+  data() {
+    return {
+      activeName:'1',
+      dialogTitle:'领用气瓶提示',
+      dialogContent:'您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。',
+      dialogVisible:false,
+      //页面状态
+      pageType:1,
+      loading:false,
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize:20,
+      },
+      total:0,
+      tableData:[{}],
+      dateRange:[],
+      pageData2:{},
+      form:{
+        beforeUse:'',//领用
+        afterUse:'',//归还
+      },
+      rules:{
+        txt:[
+          {required: true, message: '请输入播放文字', trigger: 'blur'},
+          { required: true, message: "请输入播放文字", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+      },
+    };
+
+
+  },
+  methods: {
+    handleTabClick(tab, event) {
+      console.log(tab, event);
+      this.getList()
+    },
+    handleClick(index,row,doType){
+      let _this=this;
+      if(doType=='receive'){//领用
+        this.dialogTitle='领用气瓶提示';
+        this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。';
+        this.dialogVisible=true;
+
+        this.form.bottleName=row.airName;
+        this.form.isSurplus=0;
+        this.form.subjectName=row.subjectName;
+        this.form.subjectId=row.subjectId;
+        this.form.storageId=row.id;
+        if(!this.form.beforeUse){
+          this.form.beforeUse=row.currentPressure
+        }
+
+      }else if(doType=='give'){//归还
+        this.dialogTitle='归还气瓶提示';
+        this.dialogContent='请输入当前气压值。';
+        this.dialogVisible=true;
+        _this.form.storageId=row.id
+        /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          returnRecord(this.form).then( response => {
+            let res=response.data;
+
+          });
+        }).catch(() => {}); */
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.handleQuery();
+    },
+    // 取消按钮
+    cancel() {
+      this.form = {};
+      this.dialogVisible = false;
+    },
+    /*领用提交*/
+    submitForm(){
+      let _this=this;
+      console.log(this.activeName)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if(_this.activeName==1){//领用
+            useRecord(this.form).then( response => {
+              let res=response.data;
+              if(response.code==200){
+                _this.dialogVisible=false;
+                _this.getList()
+              }
+            });
+          }else if(_this.activeName==2){//归还
+
+            returnRecord(this.form).then( response => {
+              let res=response.data;
+              if(response.code==200){
+                _this.dialogVisible=false;
+                _this.getList()
+
+              }
+            });
+          }
+
+        }
+      });
+    },
+    getList(){
+      let _this=this;
+
+      if(_this.activeName==1){//领用
+        receivingGasList(_this.queryParams).then( response => {
+          let res=response.rows;
+          _this.tableData=res;
+          _this.total=response.total;
+        });
+      }else if(_this.activeName==2){//归还
+        returnGas(_this.queryParams).then( response => {
+          let res=response.rows;
+          _this.tableData=res;
+          _this.total=response.total;
+        });
+      }
+    },
+  },
+  mounted() {
+    this.getList()
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.approval_handle {
+  display: flex!important;
+  flex-direction: column;
+  .approval_handle-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;
+
+    .button-box{
+      width:200px;
+      display: flex;
+    }
+  }
+
+}
+</style>

src/views/gasManage_syd/infoRecord/abnormalRecord.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="操作人/联系方式/实验地点"
+            placeholder="操作人/联系方式"
             clearable
             maxLength="30"
             size="small"
@@ -48,10 +48,10 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="操作人" align="left" prop="createBy"/>
         <el-table-column label="联系方式" align="left" prop="phone"></el-table-column>
-        <el-table-column label="标签码" align="left" prop=""></el-table-column>
-        <el-table-column label="气瓶编号" align="left" prop=""></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"></el-table-column>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
         <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
-        <el-table-column label="气瓶规格" align="left" prop=""></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></el-table-column>
         <el-table-column label="修改前气压" align="left" prop="beforeEdit">
           <template slot-scope="scope">
             <span >{{scope.row.beforeEdit}}Mpa</span>
@@ -97,7 +97,7 @@
   </div>
 </template>
 <script>
-import { abnormalRecordList, useRecordList } from '@/api/gasManage3_0/gasManage'
+import { abnormalRecordList, useRecordList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./abnormalRecordDetail.vue"
 export default {
@@ -171,7 +171,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/bottle/error/export/', {...self.queryParamsData}, '异常记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/bottleStorageError/export/', {...self.queryParamsData}, '异常记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -185,7 +185,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/bottle/error/export/`,obj, '异常记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/bottleStorageError/export/`,obj, '异常记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

src/views/gasManage_syd/infoRecord/abnormalRecordDetail.vue

@@ -61,7 +61,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { abnormalRecordDetail, subjectList, useRecordDetail } from '@/api/gasManage3_0/gasManage'
+import { abnormalRecordDetail,} from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",

src/views/gasManage_syd/infoRecord/alarmRecord.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="姓名/联系方式/实验地点"
+            placeholder="姓名/联系方式"
             clearable
             maxLength="30"
             size="small"
@@ -46,10 +46,10 @@
       </el-form>
       <el-table border v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
         <el-table-column type="selection" width="50" align="center"/>
-        <el-table-column label="标签码" align="left" prop=""></el-table-column>
-        <el-table-column label="气瓶编号" align="left" prop=""></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"></el-table-column>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
         <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
-        <el-table-column label="气瓶规格" align="left" prop=""></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></el-table-column>
         <el-table-column label="气体余量" align="left" prop="currentPressure">
           <template slot-scope="scope">
             <span >{{scope.row.currentPressure}}Mpa</span>
@@ -80,7 +80,7 @@
   </div>
 </template>
 <script>
-import { alarmRecordList, useRecordList } from '@/api/gasManage3_0/gasManage'
+import { alarmRecordList, useRecordList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./abnormalRecordDetail.vue"
 export default {
@@ -154,7 +154,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/alarm/record/export/', {...self.queryParamsData}, '报警记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/alarmRecord/export/', {...self.queryParamsData}, '报警记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -168,7 +168,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/alarm/record/export/`,obj, '报警记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/alarmRecord/export/`,obj, '报警记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

src/views/gasManage_syd/infoRecord/infoRecord.vue

@@ -88,7 +88,7 @@ import {
   outStatistics,
   supplierList,
   useGasStatistics
-} from '@/api/gasManage3_0/gasManage'
+} from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import echarts from 'echarts'
 import applyRecord from "./applyRecord.vue"
@@ -586,9 +586,6 @@ export default {
   },
 
   mounted(){
-
-
-
     this.gasCategoryList()
     this.outStatistics()
     this.gasApplyStatistics()

src/views/gasManage_syd/infoRecord/useRecord.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="使用人/联系方式/实验地点"
+            placeholder="使用人/联系方式"
             clearable
             maxLength="30"
             size="small"
@@ -49,8 +49,8 @@
         <el-table-column type="selection" width="50" align="center"/>
         <el-table-column label="使用人" align="left" prop="contacts"/>
         <el-table-column label="联系方式" align="left" prop="phone"></el-table-column>
-        <el-table-column label="标签码" align="left" prop=""></el-table-column>
-        <el-table-column label="气瓶编号" align="left" prop=""></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"></el-table-column>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
         <el-table-column label="气瓶名称" align="left" prop="airName"></el-table-column>
         <el-table-column label="使用前气压" align="left" prop="beforeUse">
           <template slot-scope="scope">
@@ -106,7 +106,7 @@
   </div>
 </template>
 <script>
-import { gasApplyList, useRecordList } from '@/api/gasManage3_0/gasManage'
+import { gasApplyList, useRecordList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./useRecordDetail.vue"
 export default {
@@ -182,7 +182,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/use/record/export/', {...self.queryParamsData}, '使用记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/useRecord/export', {...self.queryParamsData}, '使用记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -196,7 +196,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/use/record/export/`,obj, '使用记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/useRecord/export/`,obj, '使用记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

src/views/gasManage_syd/infoRecord/useRecordDetail.vue

@@ -8,10 +8,10 @@
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
     <div class="info" v-if="form">
-      <li><i>标签码：</i><i></i></li>
+      <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></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>
@@ -52,7 +52,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasApplyDetail, subjectList, useRecordDetail } from '@/api/gasManage3_0/gasManage'
+import {useRecordDetail } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",

src/views/gasManage_syd/useGasCheck/useGasCheck.vue

@@ -4,14 +4,14 @@
     <div class="approval_handle-page" v-if="pageType==1">
       <template>
         <el-tabs v-model="activeName"  @tab-click="handleTabClick">
-          <el-tab-pane label="待审核(10)" name="1"></el-tab-pane>
-          <el-tab-pane label="已通过(99)" name="2"></el-tab-pane>
-          <el-tab-pane label="未通过(9)" name="3"></el-tab-pane>
+          <el-tab-pane :label="'待审核('+totalWait+')'" name="1"></el-tab-pane>
+          <el-tab-pane :label="'已通过('+totalPass+')'" name="2"></el-tab-pane>
+          <el-tab-pane :label="'未通过('+totalRefuse+')'" name="3"></el-tab-pane>
         </el-tabs>
       </template>
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
         <el-form-item label="关键字" prop="safetyPrecautions" >
-          <el-input v-model="form.safetyPrecautions"  placeholder="申请人/联系电话" maxlength="50" />
+          <el-input v-model="queryParams.searchValue"  placeholder="申请人/联系电话" maxlength="50" />
         </el-form-item>
         <el-form-item>
           <p class="inquire-button-one" @click="handleQuery">查询</p>
@@ -19,10 +19,10 @@
         </el-form-item>
       </el-form>
       <el-table border v-loading="loading" :data="tableData">
-        <el-table-column label="申请人" align="left" prop="location"/>
-        <el-table-column label="联系方式" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="使用气体" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="申请时间" align="left" prop="createTime"></el-table-column>
+        <el-table-column label="申请人" align="left" prop="applyUserName"/>
+        <el-table-column label="联系方式" align="left" prop="applyUserPhone"></el-table-column>
+        <el-table-column label="使用气体" align="left" prop="useGasName"></el-table-column>
+        <el-table-column label="申请时间" align="left" prop="applyTime"></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">
@@ -55,9 +55,12 @@
 </template>
 
 <script>
-import { gasApplyList, } from '@/api/gasManage3_0/gasManage'
+import { usegasPassApplyList, usegasRefuseApplyList,
+  usegasTitle,
+  usegasWaitApplyList
+} from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
-import detailPage from '@/views/gasManage_syd/useGasCheck/useGasCheckDetail'
+import detailPage from '@/views/gasManage_syd/manage/useGasCheck/useGasCheckDetail'
 export default {
   name: "Approval",
   components: {
@@ -76,13 +79,14 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        remark:'login',
         searchValue:'',
-        startTime:'',
-        endTime:'',
       },
       total:0,
-      tableData:[{}],
+      totalWait:0,
+      totalPass:0,
+      totalRefuse:0,
+
+      tableData:[],
       dateRange:[],
       pageData2:{},
       form:{
@@ -100,20 +104,23 @@ export default {
   },
   methods: {
       handleTabClick(tab, event) {
-        console.log(tab, event);
+       // console.log(tab, event);
+        console.log(this.activeName)
+        this.getList()
       },
       handleClick(index,row,doType){
         let _this=this;
         if(doType=='check'){//审核
           this.pageType=2;
           _this.pageData2.status=0;
-          _this.pageData2.id=row.id;
+          _this.pageData2.item=row;
         }else if(doType=='detail'){//详情
           this.pageType=2;
           _this.pageData2.status=1;
-          _this.pageData2.id=row.id;
+          _this.pageData2.item=row;
         }else if(doType=='back'){//详情
           this.pageType=1;
+          this.getList()
         }
       },
       /** 搜索按钮操作 */
@@ -124,9 +131,6 @@ export default {
       /** 重置按钮操作 */
       resetQuery() {
         this.queryParams.searchValue = "";
-        this.dateRange=[];
-        this.queryParams.startTime=null;
-        this.queryParams.endTime=null
         this.handleQuery();
       },
       // 取消按钮
@@ -143,23 +147,43 @@ export default {
           }
         });
       },
+      //tab头部数值
+      usegasTitle(){
+        usegasTitle().then( response => {
+          let res=response.data;
+           this.totalWait=res.waitApplyCount;
+          this.totalPass=res.passApplyCount;
+          this.totalRefuse=res.refuseApplyCount;
+
+        });
+      },
       getList(){
         let _this=this;
-        if(this.dateRange&&this.dateRange.length>0) {
-          this.queryParams.startTime=this.dateRange[0]
-          this.queryParams.endTime=this.dateRange[1]
-        } else {
-          this.queryParams.startTime=null;
-          this.queryParams.endTime=null
+        if(this.activeName==1){
+          usegasWaitApplyList(_this.queryParams).then( response => {
+            let res=response.rows;
+            _this.tableData=res;
+            _this.total=response.total;
+          });
+        }else if(this.activeName==2){
+          usegasPassApplyList(_this.queryParams).then( response => {
+            let res=response.rows;
+            _this.tableData=res;
+            _this.total=response.total;
+          });
+        }else if(this.activeName==3){
+          usegasRefuseApplyList(_this.queryParams).then( response => {
+            let res=response.rows;
+            _this.tableData=res;
+            _this.total=response.total;
+          });
         }
-        gasApplyList(_this.queryParams).then( response => {
-          let res=response.rows;
-          //_this.tableData=res;
-          _this.total=response.total;
-        });
+
+
       },
   },
   mounted() {
+    this.usegasTitle()
     this.getList()
   }
 };

src/views/gasManage_syd/useGasCheck/useGasCheckDetail.vue

@@ -6,27 +6,27 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
     <!--基本信息-->
-    <div class="info" v-if="form.apply">
-      <li><i>申请人：</i><i>{{form.apply.useGasName}}</i></li>
-      <li><i>联系方式：</i><i>{{form.apply.useGasName}}</i></li>
-      <li><i>使用气体：</i><i>{{form.apply.useGasName}}</i></li>
-      <li><i>使用期限：</i><i>{{form.apply.startTime}}至{{form.apply.endTime}}</i></li>
-      <li><i>气瓶用途：</i><i>{{form.apply.gasUse}}</i></li>
-      <li><i>主要安全措施：</i><i>{{form.apply.safetyPrecautions}}</i></li>
-      <li class="look_img" @click="lookFile(form.apply.applyCertificate)"><i>用气申请表：</i><i>查看图片</i></li>
+    <div class="info" v-if="form">
+      <li><i>申请人：</i><i>{{form.applyUserName}}</i></li>
+      <li><i>联系方式：</i><i>{{form.applyUserPhone}}</i></li>
+      <li><i>使用气体：</i><i>{{form.useGasName}}</i></li>
+      <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>
     </div>
     <div class="check_btn" v-if="status==0">
-      <el-input type="textarea" class="apply_tree_b2" v-model="form.auditContent" placeholder="请输入审核意见"  maxlength="50" />
+      <el-input type="textarea" class="apply_tree_b2" v-model="queryParams.remark" placeholder="请输入审核意见"  maxlength="50" />
       <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>
       </div>
     </div>
-    <div class="addPage_b" v-if="form.auditlist !='undefined'">
+    <div class="addPage_b" v-if="tableData">
       <!--气瓶信息-->
       <div  class="addPage_b_t">
         <div class="addPage_b_t_title">审核记录</div>
-        <el-table border v-loading="loading" :data="form.auditlist" height="300px">
+        <el-table border v-loading="loading" :data="tableData" height="300px">
           <el-table-column label="审核人" align="left" prop="auditUser"/>
           <el-table-column label="审核时间" align="left" prop="auditTime"></el-table-column>
           <el-table-column label="审核操作" align="left" prop="auditStatus">
@@ -49,6 +49,7 @@ import {
   subjectList,
   useAgsApplyDetail
 } from '@/api/gasManage3_0/gasManage'
+import { usegasAuditRecordList, usegasCheck } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -63,20 +64,27 @@ export default {
       },
       loading:false,
       form:{
-
       },
       status:0,
       total:0,
-      tableData:[{
-        num:0,
-      }],
+      tableData:[],
+      queryParams:{
+        usegasApplyId:'',
+        remark:'',
+        auditStatus:'',//0未审核1.通过 2.驳回
+      }
     };
   },
   methods: {
     handleClick(index,row,doType){
       let _this=this;
-      if(doType=='again'){//重新申请
-        this.$parent.handleClick('',this.form.apply.id,'again');
+      _this.queryParams.usegasApplyId=_this.form.id
+      if(doType=='pass'){//审核通过
+        _this.queryParams.auditStatus=1
+        _this.usegasCheck()
+      }else if(doType=='reject'){//审核驳回
+        _this.queryParams.auditStatus=2
+        _this.usegasCheck()
       }
     },
     /**查看图片  */
@@ -85,14 +93,23 @@ export default {
       console.log(visitUrl)
       window.open(window.location.href.split('://')[0]+'://'  + process.env.VUE_APP_BASE_FILE_API + '/onlinePreview?url='+encodeURIComponent(Base64.encode(visitUrl)));
     },
-    /* 详情 */
-    getInfo(id){
+    //审核
+    usegasCheck(){
       let _this=this;
-      useAgsApplyDetail({id:id}).then( response => {
+      usegasCheck(_this.queryParams).then( response => {
         let res=response.data;
         if(response.code==200){
-          _this.form=res;
+          this.$parent.handleClick('','','back');
         }
+
+      });
+    },
+    /* 审核记录 */
+    getRecordList(id){
+      let _this=this;
+      usegasAuditRecordList({usegasApplyId:id}).then( response => {
+        let res=response.rows;
+        _this.tableData=res;
       });
 
     },
@@ -104,7 +121,8 @@ export default {
   },
   mounted() {
     this.status=this.pageData2.status;
-    //this.getInfo(this.pageData2.id);
+    this.form=this.pageData2.item;
+    this.getRecordList(this.pageData2.item.id);
   }
 
 };
@@ -174,6 +192,7 @@ export default {
   }
   /*审核按钮*/
   .check_btn{
+    text-align: center;
     .apply_tree_b2{
       width: 800px;
       margin: 46px 0 38px 70px;

src/views/gasManage_syd/gasUseManage/gasUseManage.vue

@@ -9,11 +9,16 @@
         </el-tabs>
       </template>
       <el-table border v-loading="loading" :data="tableData">
-        <el-table-column label="标签码" align="left" prop="location"/>
-        <el-table-column label="气瓶编号" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="气体名称" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="气瓶规格" align="left" prop="createTime"></el-table-column>
-        <el-table-column label="当前气压" align="left" prop="createTime"></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"/>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
+        <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></el-table-column>
+        <el-table-column label="当前气压" align="left" prop="currentPressure">
+          <template slot-scope="scope">
+            <span>{{scope.row.currentPressure}}Mpa</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="领用时间" align="left" prop="receivingTime" v-if="activeName==2"></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">
@@ -25,7 +30,7 @@
               <p class="table-min-button"
                  v-if="activeName==2"
                  v-hasPermi="['airbottle:taskManage:query']"
-                 @click="handleClick('',scope.row,'return')"
+                 @click="handleClick('',scope.row,'give')"
               >归还</p>
             </div>
 
@@ -43,8 +48,9 @@
     <!--    弹窗-->
     <el-dialog :title=dialogTitle :visible.sync="dialogVisible" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <div style="margin-bottom: 20px">您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。</div>
-        <el-input v-model="form.txt" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <div style="margin-bottom: 20px">{{dialogContent}}</div>
+        <el-input v-if="activeName==1" v-model="form.beforeUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
+        <el-input v-if="activeName==2" v-model="form.afterUse" placeholder="请输入气表实际压力，精确到小数点后一位" />
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
@@ -58,12 +64,14 @@
 import { gasApplyList, } from '@/api/gasManage3_0/gasManage'
 import { getToken } from "@/utils/auth";
 import { mangerVoice } from '@/api/laboratory/subject'
+import { receivingGasListByStu, returnGasByStu, returnRecord, useRecord } from '@/api/gasManage3_0/gasManageSYD'
 export default {
   name: "Approval",
   data() {
     return {
       activeName:'1',
       dialogTitle:'领用气瓶提示',
+      dialogContent:'您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。',
       dialogVisible:false,
       //页面状态
       pageType:1,
@@ -75,17 +83,14 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        remark:'login',
-        searchValue:'',
-        startTime:'',
-        endTime:'',
       },
       total:0,
       tableData:[{}],
       dateRange:[],
       pageData2:{},
       form:{
-
+        beforeUse:'',//领用
+        afterUse:'',//归还
       },
       rules:{
         txt:[
@@ -100,21 +105,39 @@ export default {
   methods: {
       handleTabClick(tab, event) {
         console.log(tab, event);
+        this.getList()
       },
       handleClick(index,row,doType){
         let _this=this;
         if(doType=='receive'){//领用
           this.dialogTitle='领用气瓶提示';
+          this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。';
           this.dialogVisible=true;
 
-        }else if(doType=='return'){//归还
-          this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
+          this.form.bottleName=row.airName;
+          this.form.isSurplus=0;
+          this.form.subjectName=row.subjectName;
+          this.form.subjectId=row.subjectId;
+          this.form.storageId=row.id;
+          if(!this.form.beforeUse){
+            this.form.beforeUse=row.currentPressure
+          }
+
+        }else if(doType=='give'){//归还
+          this.dialogTitle='归还气瓶提示';
+          this.dialogContent='请输入当前气压值。';
+          this.dialogVisible=true;
+          _this.form.storageId=row.id
+          /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
+            returnRecord(this.form).then( response => {
+              let res=response.data;
 
-          }).catch(() => {});
+            });
+          }).catch(() => {}); */
         }
       },
       /** 搜索按钮操作 */
@@ -124,10 +147,6 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.searchValue = "";
-        this.dateRange=[];
-        this.queryParams.startTime=null;
-        this.queryParams.endTime=null
         this.handleQuery();
       },
       // 取消按钮
@@ -135,29 +154,51 @@ export default {
         this.form = {};
         this.dialogVisible = false;
       },
-      /*提交*/
+      /*领用提交*/
       submitForm(){
+        let _this=this;
+        console.log(this.activeName)
         this.$refs["form"].validate(valid => {
           if (valid) {
-            let id = this.subId;
+            if(_this.activeName==1){//领用
+              useRecord(this.form).then( response => {
+                let res=response.data;
+                if(response.code==200){
+                  _this.dialogVisible=false;
+                  _this.getList()
+                }
+              });
+            }else if(_this.activeName==2){//归还
+
+              returnRecord(this.form).then( response => {
+                let res=response.data;
+                if(response.code==200){
+                  _this.dialogVisible=false;
+                  _this.getList()
+
+                }
+              });
+            }
 
           }
         });
       },
       getList(){
         let _this=this;
-        if(this.dateRange&&this.dateRange.length>0) {
-          this.queryParams.startTime=this.dateRange[0]
-          this.queryParams.endTime=this.dateRange[1]
-        } else {
-          this.queryParams.startTime=null;
-          this.queryParams.endTime=null
+
+        if(_this.activeName==1){//领用
+          receivingGasListByStu(_this.queryParams).then( response => {
+            let res=response.rows;
+            _this.tableData=res;
+            _this.total=response.total;
+          });
+        }else if(_this.activeName==2){//归还
+          returnGasByStu(_this.queryParams).then( response => {
+            let res=response.rows;
+            _this.tableData=res;
+            _this.total=response.total;
+          });
         }
-        gasApplyList(_this.queryParams).then( response => {
-          let res=response.rows;
-          //_this.tableData=res;
-          _this.total=response.total;
-        });
       },
   },
   mounted() {

src/views/gasManage_syd/useRecord/useRecord.vue

@@ -6,7 +6,7 @@
         <el-form-item label="关键字" prop="name">
           <el-input
             v-model="queryParams.searchValue"
-            placeholder="使用人/联系方式/实验地点"
+            placeholder="使用人/联系方式"
             clearable
             maxLength="30"
             size="small"
@@ -30,11 +30,28 @@
           <p class="inquire-button-one" @click="handleQuery">查询</p>
           <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="['airbottle:use:record:export']">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
+              <p>导出</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:1}">导出全部数据</el-dropdown-item>
+              <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">
-        <el-table-column label="标签码" align="left" prop=""></el-table-column>
-        <el-table-column label="气瓶编号" align="left" prop=""></el-table-column>
-        <el-table-column label="气体名称" align="left" prop=""></el-table-column>
+      <el-table border v-loading="loading" :data="tableData" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
+        <el-table-column type="selection" width="50" align="center"/>
+        <el-table-column label="使用人" align="left" prop="contacts"/>
+        <el-table-column label="联系方式" align="left" prop="phone"></el-table-column>
+        <el-table-column label="标签码" align="left" prop="electronicTag"></el-table-column>
+        <el-table-column label="气瓶编号" align="left" prop="airNumber"></el-table-column>
+        <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>
@@ -74,22 +91,22 @@
         </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>
 <script>
-import { gasApplyList, useRecordList } from '@/api/gasManage3_0/gasManage'
+import { gasApplyList, useRecordList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./useRecordDetail.vue"
 export default {
@@ -113,7 +130,7 @@ export default {
         searchType:0,
       },
       total:0,
-      tableData:[{}],
+      tableData:[],
       dateRange:[],
       pageData2:{},
       tabDateName:'使用时间',
@@ -165,7 +182,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/use/record/export/', {...self.queryParamsData}, '使用记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/useRecord/export', {...self.queryParamsData}, '使用记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -179,7 +196,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/use/record/export/`,obj, '使用记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/useRecord/export/`,obj, '使用记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')
@@ -210,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 = "";
@@ -241,7 +258,7 @@ export default {
       }
       useRecordList(_this.queryParams).then( response => {
         let res=response.rows;
-        //_this.tableData=res;
+        _this.tableData=res;
         _this.total=response.total;
       });
     },
@@ -253,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/useRecord/useRecordDetail.vue

@@ -6,12 +6,12 @@
       <p  class="reset-button-one" @click="backPage">返回</p>
     </div>
     <div class="small_title">气瓶信息</div>
-     <!--基本信息-->
+    <!--基本信息-->
     <div class="info" v-if="form">
-      <li><i>标签码：</i><i></i></li>
+      <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></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>
@@ -52,7 +52,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasApplyDetail, subjectList, useRecordDetail } from '@/api/gasManage3_0/gasManage'
+import {useRecordDetail } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -143,7 +143,7 @@ export default {
 
 <style scoped lang="scss">
 .el-table__row .warning-row{
-    background: #333333;
+  background: #333333;
 
 }