heyang

src/api/gasManage3_0/gasManageSYD.js

@@ -33,6 +33,28 @@ export function returnRecord(data) {
     data: data
   })
 }
+//使用记录
+export function useRecordList(query) {
+  return request({
+    url: '/bottle/useRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+//使用记录-详情
+export function useRecordDetail(data) {
+  return request({
+    url: '/bottle/useRecord/bottle/'+data,
+    method: 'get',
+  })
+}
+//使用记录-详情-列表
+export function useRecordListDetail(data) {
+  return request({
+    url: '/bottle/useRecord/getUseDetails?id='+data,
+    method: 'get',
+  })
+}
 /** 管理端----------------------------------------------------------------------- */
 //用气审核-列表头部总数
 export function usegasTitle(query) {
@@ -139,24 +161,24 @@ export function alarmRecordList(query) {
   })
 }
 //使用记录
-export function useRecordList(query) {
+export function useRecordManageList(query) {
   return request({
-    url: '/bottle/useRecord/list',
+    url: '/bottle/useRecord/listByAdmin',
     method: 'get',
     params: query
   })
 }
-//使用记录-详情-
-export function useRecordDetail(data) {
+//使用记录-详情
+export function useRecordManageDetail(data) {
   return request({
-    url: '/bottle/useRecord/bottle/'+data,
+    url: '/bottle/useRecord/bottleByAdmin/'+data,
     method: 'get',
   })
 }
 //使用记录-详情-列表
-export function useRecordListDetail(data) {
+export function useRecordListManageDetail(data) {
   return request({
-    url: '/bottle/useRecord/getUseDetails?id='+data,
+    url: '/bottle/useRecord/getUseDetailsByAdmin?id='+data,
     method: 'get',
   })
 }

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

@@ -37,7 +37,7 @@
               icon="el-icon-plus"
               size="mini"
               @click="handleClick('','','add')"
-              v-hasPermi="['airbottle:flowDetail:add']"
+              v-hasPermi="['bottle:bottleStorage:add']"
             >气瓶入库</el-button>
           </el-col>
         </el-form-item>
@@ -63,11 +63,11 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:bottleStorage:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:bottleStorageOut:add']"
                  @click="handleClick('',scope.row,'out')"
               >出库</p>
             </div>

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

@@ -24,12 +24,12 @@
             <div class="button-box">
               <p class="table-min-button"
                  v-if="activeName==1"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:useRecord:add']"
                  @click="handleClick('',scope.row,'receive')"
               >领用</p>
               <p class="table-min-button"
                  v-if="activeName==2"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:useRecord:edit']"
                  @click="handleClick('',scope.row,'give')"
               >归还</p>
             </div>
@@ -54,7 +54,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button type="primary" @click="submitForm">领用</el-button>
+        <el-button type="primary" @click="submitForm">{{subName}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -77,6 +77,7 @@ export default {
       activeName:'1',
       dialogTitle:'领用气瓶提示',
       dialogContent:'您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。',
+      subName:'领用',
       dialogVisible:false,
       //页面状态
       pageType:1,
@@ -117,6 +118,7 @@ export default {
       if(doType=='receive'){//领用
         this.dialogTitle='领用气瓶提示';
         this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。';
+        this.subName='领用';
         this.dialogVisible=true;
 
         this.form.bottleName=row.airName;
@@ -131,6 +133,7 @@ export default {
       }else if(doType=='give'){//归还
         this.dialogTitle='归还气瓶提示';
         this.dialogContent='请输入当前气压值。';
+        this.subName='归还';
         this.dialogVisible=true;
         _this.form.storageId=row.id
         /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {

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

@@ -30,7 +30,7 @@
           <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:bottle:error:export']">
+          <el-dropdown @command="exportButton" style="float: left"   v-hasPermi="['bottle:storageRrror:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -67,7 +67,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:bottle:error:query']"
+                 v-hasPermi="['bottle:storageRrror:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

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

@@ -10,7 +10,7 @@
     <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>
+        <p>{{form.storageStatus == 1?'闲置':(form.storageStatus == 2?'使用':(form.storageStatus == 3?'出库':''))}}</p>
       </div>
       <div class="info_r">
         <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>

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

@@ -30,7 +30,7 @@
           <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:alarm:record:export']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:alarmRecord:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>

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

@@ -30,7 +30,7 @@
           <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:informationRecord:storageExport']">
+          <el-dropdown @command="exportButton" style="float: left"     v-hasPermi="['bottle:statistics:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -57,7 +57,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:storageManage:query']"
+                 v-hasPermi="['bottle:statistics:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

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

@@ -10,7 +10,7 @@
     <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>
+        <p>{{formInfo.storageStatus == 1?'闲置':(formInfo.storageStatus == 2?'使用':(formInfo.storageStatus == 3?'出库':''))}}</p>
       </div>
       <div class="info_r">
         <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>

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

@@ -30,7 +30,7 @@
           <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:informationRecord:storageOutexport']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:statistics:exportout']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -57,7 +57,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:storageOutManage:query']"
+                 v-hasPermi="['bottle:statistics:queryout']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

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

@@ -31,7 +31,7 @@
           <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']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:useRecord:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -76,7 +76,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:use:record:query']"
+                 v-hasPermi="['bottle:useRecord:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>
@@ -106,7 +106,7 @@
   </div>
 </template>
 <script>
-import { gasApplyList, useRecordList } from '@/api/gasManage3_0/gasManageSYD'
+import { gasApplyList, useRecordManageList } 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('/zd-bottle/useRecord/export', {...self.queryParamsData}, '使用记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/useRecord/exportByAdmin', {...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(`/zd-bottle/useRecord/export/`,obj, '使用记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/useRecord/exportByAdmin/`,obj, '使用记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')
@@ -256,7 +256,7 @@ export default {
         this.queryParams.startTime=null;
         this.queryParams.endTime=null
       }
-      useRecordList(_this.queryParams).then( response => {
+      useRecordManageList(_this.queryParams).then( response => {
         let res=response.rows;
         _this.tableData=res;
         _this.total=response.total;

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

@@ -10,7 +10,7 @@
     <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>
+        <p>{{form.storageStatus == 1?'闲置':(form.storageStatus == 2?'使用':(form.storageStatus == 3?'出库':''))}}</p>
       </div>
       <div class="info_r">
         <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>
@@ -58,7 +58,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { useRecordDetail, useRecordListDetail } from '@/api/gasManage3_0/gasManageSYD'
+import { useRecordManageDetail, useRecordListManageDetail } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -125,7 +125,7 @@ export default {
     /* 详情 */
     getInfo(id){
       let _this=this;
-      useRecordDetail(id).then( response => {
+      useRecordManageDetail(id).then( response => {
         let res=response.data;
         if(response.code==200){
           _this.form=res;
@@ -136,7 +136,7 @@ export default {
     /* 详情 */
     getList(id){
       let _this=this;
-      useRecordListDetail(id).then( response => {
+      useRecordListManageDetail(id).then( response => {
         let res=response.rows;
         if(response.code==200){
           _this.tableData=res;

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

@@ -28,12 +28,12 @@
             <div class="button-box">
               <p class="table-min-button"
                  v-if="activeName==1"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:usegasAuditRecord:add']"
                  @click="handleClick('',scope.row,'check')"
               >审核</p>
               <p class="table-min-button"
                  v-if="activeName==2 || activeName==3"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:usegasAuditRecord:list']"
                  @click="handleClick('',scope.row,'detail')"
               >详情</p>
             </div>

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

@@ -24,12 +24,12 @@
             <div class="button-box">
               <p class="table-min-button"
                  v-if="activeName==1"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:useRecord:add']"
                  @click="handleClick('',scope.row,'receive')"
               >领用</p>
               <p class="table-min-button"
                  v-if="activeName==2"
-                 v-hasPermi="['airbottle:taskManage:query']"
+                 v-hasPermi="['bottle:useRecord:edit']"
                  @click="handleClick('',scope.row,'give')"
               >归还</p>
             </div>
@@ -54,7 +54,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button type="primary" @click="submitForm">领用</el-button>
+        <el-button type="primary" @click="submitForm">{{subName}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -72,6 +72,7 @@ export default {
       activeName:'1',
       dialogTitle:'领用气瓶提示',
       dialogContent:'您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。',
+      subName:'领用',
       dialogVisible:false,
       //页面状态
       pageType:1,
@@ -112,6 +113,7 @@ export default {
         if(doType=='receive'){//领用
           this.dialogTitle='领用气瓶提示';
           this.dialogContent='您在领用气瓶前需要确认气表压力与系统显示的压力值是否一致，如不一致则需要在下方填写实际气压值。';
+          this.subName='领用';
           this.dialogVisible=true;
 
           this.form.bottleName=row.airName;
@@ -126,6 +128,7 @@ export default {
         }else if(doType=='give'){//归还
           this.dialogTitle='归还气瓶提示';
           this.dialogContent='请输入当前气压值。';
+          this.subName='归还';
           this.dialogVisible=true;
           _this.form.storageId=row.id
           /* this.$confirm('请确认已将气瓶放置在气瓶存放点，您是否确认归还?', '提示', {

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

@@ -4,7 +4,7 @@
     <div class="approval_handle-page" v-if="pageType == 1">
       <div class="top-click-img-box">
         <img src="@/assets/ZDimages/icon_banner_yqsq.png" alt="">
-          <p v-hasPermi="['airbottle:useAgsApplyManage:add']" @click="handleClick('','','apply')">开始申请</p>
+          <p  @click="handleClick('','','apply')">开始申请</p>
       </div>
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
         <el-form-item label="状态" prop="zgType" label-width="80px">
@@ -36,7 +36,6 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:useAgsApplyManage:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

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

@@ -31,7 +31,7 @@
           <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']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['bottle:useRecord:export']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -76,7 +76,7 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['airbottle:use:record:query']"
+                 v-hasPermi="['bottle:useRecord:query']"
                  @click="handleClick('',scope.row,'detail')"
               >查看</p>
             </div>

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

@@ -10,7 +10,7 @@
     <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>
+        <p>{{form.storageStatus == 1?'闲置':(form.storageStatus == 2?'使用':(form.storageStatus == 3?'出库':''))}}</p>
       </div>
       <div class="info_r">
         <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>