ZC

src/api/gasManage3_0/gasManage.js

@@ -353,10 +353,18 @@ export function useGasManagecenterCheck(data) {
   })
 }
 /* 信息记录------------- */
+//申领记录-列表
+export function applyRecordList(query) {
+  return request({
+    url: '/airbottle/informationRecord/taskList',
+    method: 'get',
+    params: query
+  })
+}
 //入库记录-列表
 export function enterRecordList(query) {
   return request({
-    url: '/airbottle/storageManage/list',
+    url: '/airbottle/informationRecord/storageList',
     method: 'get',
     params: query
   })
@@ -372,7 +380,7 @@ export function enterRecordDetail(query) {
 //出库记录-列表
 export function outRecordList(query) {
   return request({
-    url: '/airbottle/storageOutManage/list',
+    url: '/airbottle/informationRecord/storageOutlist',
     method: 'get',
     params: query
   })
@@ -524,7 +532,7 @@ export function specificationDelete(query) {
 //气瓶类目-列表
 export function gasCategoryList(query) {
   return request({
-    url: '/system/dict/data/list?dictType=qp_specification_category',
+    url: '/system/dict/data/listNotPower?dictType=qp_specification_category',
     method: 'get',
     params: query
   })

src/views/gasManage3_0/manage/infoRecord/applyRecord.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:taskManage:export']">
+          <el-dropdown @command="exportButton" style="float: left"   v-hasPermi="['airbottle:informationRecord:taskExport']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -83,7 +83,7 @@
   </div>
 </template>
 <script>
-import { applyRecordList, enterRecordList, gasApplyList } from '@/api/gasManage3_0/gasManage'
+import { applyRecordList, enterRecordList, } from '@/api/gasManage3_0/gasManage'
 import { getToken } from "@/utils/auth";
 import detailPage from "./applyRecordDetail.vue"
 export default {
@@ -157,7 +157,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/taskManage/export/', {...self.queryParamsData}, '申领记录导出-'+currentDate+'.xlsx')
+          self.download('/airbottle/informationRecord/taskExport/', {...self.queryParamsData}, '申领记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -221,7 +221,7 @@ export default {
         this.queryParams.startTime=null;
         this.queryParams.endTime=null
       }
-      gasApplyList(_this.queryParams).then( response => {
+      applyRecordList(_this.queryParams).then( response => {
         let res=response.rows;
         _this.tableData=res;
         _this.total=response.total;

src/views/gasManage3_0/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:storageManage:export']">
+          <el-dropdown @command="exportButton" style="float: left"     v-hasPermi="['airbottle:informationRecord:storageExport']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -163,7 +163,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/storageManage/export/', {...self.queryParams}, '入库记录导出-'+currentDate+'.xlsx')
+          self.download('/airbottle/informationRecord/storageExport/', {...self.queryParams}, '入库记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {

src/views/gasManage3_0/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:storageOutManage:export']">
+          <el-dropdown @command="exportButton" style="float: left"    v-hasPermi="['airbottle:informationRecord:storageOutexport']">
             <div class="form-dropdown-box">
               <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
               <p>导出</p>
@@ -167,7 +167,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/storageOutManage/export/', {...self.queryParamsData}, '出库记录导出-'+currentDate+'.xlsx')
+          self.download('/airbottle/informationRecord/storageOutexport/', {...self.queryParamsData}, '出库记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {

src/views/gasManage3_0/student/useGas/useGasAdd.vue

@@ -240,8 +240,6 @@ export default {
           _this.form.useGasName=item.goodsName;
         }
       })
-      console.log(_this.form.useGasId)
-      console.log(_this.form.useGasName)
     },
     //懒加载实验室
     userSelectList(e){