heyang

src/api/gasManage3_0/gasManageSYD.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+/** 学生端----------------------------------------------------------------------- */
+
+/** 管理端----------------------------------------------------------------------- */
+//用气审核-列表头部总数
+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
+  })
+}

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/student/gasUseManage/gasUseManage.vue

@@ -0,0 +1,188 @@
+<!--气瓶使用-->
+<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="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" 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,'return')"
+              >归还</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">您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。</div>
+        <el-input v-model="form.txt" 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'
+export default {
+  name: "Approval",
+  data() {
+    return {
+      activeName:'1',
+      dialogTitle:'领用气瓶提示',
+      dialogVisible:false,
+      //页面状态
+      pageType:1,
+      loading:false,
+      headers: {
+        Authorization: "Bearer " + getToken()
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize:20,
+        remark:'login',
+        searchValue:'',
+        startTime:'',
+        endTime:'',
+      },
+      total:0,
+      tableData:[{}],
+      dateRange:[],
+      pageData2:{},
+      form:{
+
+      },
+      rules:{
+        txt:[
+          {required: true, message: '请输入播放文字', trigger: 'blur'},
+          { required: true, message: "请输入播放文字", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+      },
+    };
+
+
+  },
+  methods: {
+      handleTabClick(tab, event) {
+        console.log(tab, event);
+      },
+      handleClick(index,row,doType){
+        let _this=this;
+        if(doType=='receive'){//领用
+          this.dialogTitle='领用气瓶提示';
+          this.dialogVisible=true;
+
+        }else if(doType=='return'){//归还
+          this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+
+          }).catch(() => {});
+        }
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams.searchValue = "";
+        this.dateRange=[];
+        this.queryParams.startTime=null;
+        this.queryParams.endTime=null
+        this.handleQuery();
+      },
+      // 取消按钮
+      cancel() {
+        this.form = {};
+        this.dialogVisible = false;
+      },
+      /*提交*/
+      submitForm(){
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            let id = this.subId;
+
+          }
+        });
+      },
+      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
+        }
+        gasApplyList(_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>