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

src/api/gasManage3_0/gasManageSYD.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 //气瓶使用-领用气瓶-列表
 export function receivingGasListByStu(query) {
   return request({
-    url: '/zd-bottle/bottleStorage/receivingGasListByStu',
+    url: '/bottle/bottleStorage/receivingGasListByStu',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function receivingGasListByStu(query) {
 //气瓶使用-归还气瓶-列表
 export function returnGasByStu(query) {
   return request({
-    url: '/zd-bottle/bottleStorage/returnGasByStu',
+    url: '/bottle/bottleStorage/returnGasByStu',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function returnGasByStu(query) {
 //气瓶使用-领用
 export function useRecord(data) {
   return request({
-    url: '/zd-bottle/useRecord',
+    url: '/bottle/useRecord',
     method: 'post',
     data: data
   })
@@ -28,7 +28,7 @@ export function useRecord(data) {
 //气瓶使用-领用
 export function returnRecord(data) {
   return request({
-    url: '/zd-bottle/useRecord',
+    url: '/bottle/useRecord',
     method: 'put',
     data: data
   })
@@ -37,7 +37,7 @@ export function returnRecord(data) {
 //用气审核-列表头部总数
 export function usegasTitle(query) {
   return request({
-    url: '/zd-bottle/usegasApply/applyTabCount',
+    url: '/bottle/usegasApply/applyTabCount',
     method: 'get',
     params: query
   })
@@ -45,7 +45,7 @@ export function usegasTitle(query) {
 //用气审核-待审核列表
 export function usegasWaitApplyList(query) {
   return request({
-    url: '/zd-bottle/usegasApply/waitApplyList',
+    url: '/bottle/usegasApply/waitApplyList',
     method: 'get',
     params: query
   })
@@ -53,7 +53,7 @@ export function usegasWaitApplyList(query) {
 //用气审核-已通过列表
 export function usegasPassApplyList(query) {
   return request({
-    url: '/zd-bottle/usegasApply/passApplyList',
+    url: '/bottle/usegasApply/passApplyList',
     method: 'get',
     params: query
   })
@@ -61,7 +61,7 @@ export function usegasPassApplyList(query) {
 //用气审核-未通过列表
 export function usegasRefuseApplyList(query) {
   return request({
-    url: '/zd-bottle/usegasApply/refuseApplyList',
+    url: '/bottle/usegasApply/refuseApplyList',
     method: 'get',
     params: query
   })
@@ -69,7 +69,7 @@ export function usegasRefuseApplyList(query) {
 //用气审核-审核记录
 export function usegasAuditRecordList(query) {
   return request({
-    url: '/zd-bottle/usegasAuditRecord/auditRecordList',
+    url: '/bottle/usegasAuditRecord/auditRecordList',
     method: 'get',
     params: query
   })
@@ -77,7 +77,7 @@ export function usegasAuditRecordList(query) {
 //用气审核-审核
 export function usegasCheck(data) {
   return request({
-    url: '/zd-bottle/usegasAuditRecord/auditPass',
+    url: '/bottle/usegasAuditRecord/auditPass',
     method: 'post',
     data: data
   })
@@ -86,15 +86,46 @@ export function usegasCheck(data) {
 //气瓶使用-领用气瓶-列表
 export function receivingGasList(query) {
   return request({
-    url: '/zd-bottle/bottleStorage/receivingGasList',
+    url: '/bottle/bottleStorage/receivingGasList',
     method: 'get',
     params: query
   })
 }
+//入库记录-列表
+export function enterRecordList(query) {
+  return request({
+    url: '/bottle/statistics/list',
+    method: 'get',
+    params: query
+  })
+}
+//入库记录-详情
+export function enterRecordDetail(data) {
+  return request({
+    url: '/bottle/statistics/'+data,
+    method: 'get',
+  })
+}
+//出库记录-列表
+export function outRecordList(query) {
+  return request({
+    url: '/bottle/statistics/outList',
+    method: 'get',
+    params: query
+  })
+}
+//出库记录-详情
+export function outRecordDetail(data) {
+  return request({
+    url: '/bottle/statistics/out/'+data,
+    method: 'get',
+  })
+}
+
 //气瓶使用-归还气瓶-列表
 export function returnGas(query) {
   return request({
-    url: '/zd-bottle/bottleStorage/returnGas',
+    url: '/bottle/bottleStorage/returnGas',
     method: 'get',
     params: query
   })
@@ -102,7 +133,7 @@ export function returnGas(query) {
 //报警记录
 export function alarmRecordList(query) {
   return request({
-    url: '/zd-bottle/alarmRecord/list',
+    url: '/bottle/alarmRecord/list',
     method: 'get',
     params: query
   })
@@ -110,7 +141,7 @@ export function alarmRecordList(query) {
 //使用记录
 export function useRecordList(query) {
   return request({
-    url: '/zd-bottle/useRecord/list',
+    url: '/bottle/useRecord/list',
     method: 'get',
     params: query
   })
@@ -118,7 +149,7 @@ export function useRecordList(query) {
 //使用记录-详情
 export function useRecordDetail(query) {
   return request({
-    url: '/zd-bottle/useRecord/getUseDetails/'+query,
+    url: '/bottle/useRecord/getUseDetails/'+query,
     method: 'get',
   })
 }
@@ -133,7 +164,7 @@ export function gasCategoryList(query) {
 //出入库信息统计
 export function outStatistics(query) {
   return request({
-    url: '/zd-bottle/useRecord/calcRepertory',
+    url: '/bottle/useRecord/calcRepertory',
     method: 'get',
     params: query
   })
@@ -141,7 +172,7 @@ export function outStatistics(query) {
 //气瓶申请统计
 export function gasApplyStatistics(query) {
   return request({
-    url: '/zd-bottle/useRecord/calcApply',
+    url: '/bottle/useRecord/calcApply',
     method: 'get',
     params: query
   })
@@ -149,7 +180,7 @@ export function gasApplyStatistics(query) {
 //用气量统计
 export function useGasStatistics(query) {
   return request({
-    url: '/zd-bottle/useRecord/calcAmount',
+    url: '/bottle/useRecord/calcAmount',
     method: 'get',
     params: query
   })
@@ -158,7 +189,7 @@ export function useGasStatistics(query) {
 //异常记录
 export function abnormalRecordList(query) {
   return request({
-    url: '/zd-bottle/bottleStorageError/list',
+    url: '/bottle/bottleStorageError/list',
     method: 'get',
     params: query
   })
@@ -166,7 +197,7 @@ export function abnormalRecordList(query) {
 //异常记录-详情
 export function abnormalRecordDetail(query) {
   return request({
-    url: '/zd-bottle/bottleStorageError/'+query,
+    url: '/bottle/bottleStorageError/'+query,
     method: 'get',
     params: query
   })
@@ -175,7 +206,7 @@ export function abnormalRecordDetail(query) {
 // RFID标签-新增
 export function RFIDtagAdd(data) {
   return request({
-    url: '/zd-bottle/rfidTag',
+    url: '/bottle/rfidTag',
     method: 'post',
     data: data
   })
@@ -183,7 +214,7 @@ export function RFIDtagAdd(data) {
 // RFID标签-列表
 export function RFIDtagList(query) {
   return request({
-    url: '/zd-bottle/rfidTag/list',
+    url: '/bottle/rfidTag/list',
     method: 'get',
     params: query
   })
@@ -191,7 +222,7 @@ export function RFIDtagList(query) {
 // RFID标签-删除
 export function RFIDtagDelete(data) {
   return request({
-    url: '/zd-bottle/rfidTag/'+data,
+    url: '/bottle/rfidTag/'+data,
     method: 'delete',
   })
 }
@@ -199,7 +230,7 @@ export function RFIDtagDelete(data) {
 // 气瓶管理-列表
 export function gasManageList(query) {
   return request({
-    url: '/zd-bottle/bottleStorage/list',
+    url: '/bottle/bottleStorage/list',
     method: 'get',
     params: query
   })
@@ -207,7 +238,7 @@ export function gasManageList(query) {
 // 气瓶管理-新增
 export function gasManageAdd(data) {
   return request({
-    url: '/zd-bottle/bottleStorage',
+    url: '/bottle/bottleStorage',
     method: 'post',
     data: data
   })
@@ -215,14 +246,67 @@ export function gasManageAdd(data) {
 // 气瓶管理-详情
 export function gasManageInfo(data) {
   return request({
-    url: '/zd-bottle/bottleStorage/'+data,
+    url: '/bottle/bottleStorage/'+data,
     method: 'get',
   })
 }
 // 气瓶管理-出库
 export function gasManageOut(data) {
   return request({
-    url: '/zd-bottle/bottleStorageOut',
+    url: '/bottle/bottleStorageOut',
+    method: 'post',
+    data: data
+  })
+}
+// 气瓶管理-新增-获取气瓶名称列表
+export function gasManageAirName(data) {
+  return request({
+    url: '/system/dict/data/listNotPower?dictType=bottle_type',
+    method: 'get',
+  })
+}
+// 气瓶管理-新增-获取气瓶规格列表
+export function gasManageConfigName(data) {
+  return request({
+    url: '/system/dict/data/listNotPower?dictType=bottle_specs_type',
+    method: 'get',
+  })
+}
+export function getLoginUser(query) {
+  return request({
+    url: '/bottle/usegasApply/getLoginUser',
+    method: 'get',
+    params: query
+  })
+}
+// 新增用气申请
+export function useAgsApplyAdd(data) {
+  return request({
+    url: '/bottle/usegasApply/addByUser',
+    method: 'post',
+    data: data
+  })
+}
+// 新增资格申请-重新提交
+export function useAgsApplyAnew(data) {
+  return request({
+    url: '/bottle/usegasApply/updateByUser',
+    method: 'post',
+    data: data
+  })
+}
+// 获取资格申请详情
+export function useAgsApplyDetail(data) {
+  return request({
+    url: '/bottle/usegasApply/detail',
+    method: 'post',
+    data: data
+  })
+}
+// 获取用气申请列表
+export function useAgsApplyList(data) {
+  return request({
+    url: '/bottle/usegasApply/listByUser',
     method: 'post',
     data: data
   })

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

@@ -88,7 +88,7 @@
     <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">
+      <el-form ref="form" :model="form" label-width="80px">
         <div style="margin-bottom: 20px">{{dialogContent}}</div>
         <el-input  v-model="form.pressure" placeholder="请输入气表实际压力，精确到小数点后一位" />
       </el-form>

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

@@ -7,8 +7,34 @@
     </div>
     <div class="addPage_b">
       <el-form class="addPage_b_b" :model="form" ref="form" :rules="rules" label-position="right" label-width="120px">
+        <el-form-item label="气体名称" prop="airName">
+          <el-select v-model="form.airName" clearable placeholder="请选择气体名称" style="width: 300px">
+            <el-option
+              v-for="item in airNameList"
+              :key="item.dictLabel"
+              :label="item.dictLabel"
+              :value="item.dictLabel">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="气瓶规格" prop="configName">
+          <el-select v-model="form.configName" clearable placeholder="请选择气瓶规格" style="width: 300px">
+            <el-option
+              v-for="item in configNameList"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="最低气压值" prop="minPressure">
+          <el-input  style="width: 300px" v-model="form.minPressure"  placeholder="请输入最低气压值" maxlength="8" />
+        </el-form-item>
+        <el-form-item label="气体组分" prop="airComponent">
+          <el-input  style="width: 300px" v-model="form.airComponent"  placeholder="请输入气体组分" maxlength="50" />
+        </el-form-item>
         <el-form-item label="气表压力" prop="gasPressure" >
-          <el-input  style="width: 300px" v-model="form.gasPressure"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="50" />
+          <el-input  style="width: 300px" v-model="form.gasPressure"  placeholder="请输入气表压力，精确到小数点后一位" maxlength="8" />
         </el-form-item>
         <el-form-item label="检验有效期" prop="dateRange" >
           <el-date-picker
@@ -19,44 +45,15 @@
             value-format="yyyy-MM-dd"
             type="daterange"
             range-separator="-"
-            :picker-options="pickerOptions0"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-<!--        <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="isHandwheel">
-          <el-radio-group v-model="form.isHandwheel">
-            <el-radio :label="1">有</el-radio>
-            <el-radio :label="0">无</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="是否固定" prop="isFixed">
-          <el-radio-group v-model="form.isFixed">
-            <el-radio :label="1">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="气瓶状态标牌" prop="isStatusSign">
-          <el-radio-group v-model="form.isStatusSign">
-            <el-radio :label="1">有</el-radio>
-            <el-radio :label="0">无</el-radio>
-          </el-radio-group>
+        <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="phone" >
-          <el-input type="textarea" style="width: 300px" v-model="form.remake"  placeholder="请输入验收备注" maxlength="200" />
+          <el-input type="textarea" style="width: 300px" v-model="form.validateRemark"  placeholder="请输入验收备注" maxlength="200" />
         </el-form-item>
         <p class="inquire-button-one" style="width:300px;margin-left: 100px" @click="submitForm()">提交申请</p>
       </el-form>
@@ -67,7 +64,7 @@
 <script>
 
 import { getToken } from "@/utils/auth";
-import { gasManageAdd  } from '@/api/gasManage3_0/gasManageSYD'
+import { gasManageAdd, gasManageAirName, gasManageConfigName } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -115,25 +112,27 @@ export default {
       },
       total:0,
       tableData:[],
+      airNameList:[],
+      configNameList:[],
       optionsListTwo:[],
       // 表单校验
       rules: {
-
+        airName: [
+          { required: true, message: "请选择气体名称", trigger: "change" }
+        ],
+        configName: [
+          { required: true, message: "请选择气体规格", trigger: "change" }
+        ],
+        minPressure: [
+          { required: true, message: "请输入最低气压值", trigger: "change" }
+        ],
         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" }
-        ],
+
         dateRange: [
           {required: true, validator: validateTime, trigger: 'blur' },
         ],
@@ -145,6 +144,27 @@ export default {
   },
   methods: {
 
+    /* 获取气体名称 */
+    getAirName(){
+      let _this=this;
+      gasManageAirName().then( response => {
+        let res=response.rows;
+        if(response.code==200){
+          _this.airNameList=res
+        }
+      });
+    },
+    /* 获取气规格 */
+    getConfigName(){
+      let _this=this;
+      gasManageConfigName().then( response => {
+        let res=response.rows;
+        if(response.code==200){
+          _this.configNameList=res
+        }
+      });
+    },
+
     /* 详情 */
     submitForm(){
       let _this=this;
@@ -168,7 +188,8 @@ export default {
 
   },
   mounted() {
-
+    this.getAirName()
+    this.getConfigName()
     //this.getInfo(this.pageData2.id);
   }
 

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

@@ -11,8 +11,8 @@
       <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>
+      <li><i>最低气压值：</i><i>{{form.bottleStorage.minPressure}}</i></li>
+      <li><i>气体组分：</i><i>{{form.bottleStorage.airComponent}}</i></li>
     </div>
     <div class="addPage_b">
       <!--审核记录-->

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

@@ -46,12 +46,12 @@
       </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="storageUser"/>
-        <el-table-column label="联系方式" align="left" prop="storageUserPhone"></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="userName"/>
+        <el-table-column label="联系方式" align="left" prop="userPhone"></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="createTime"></el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
@@ -87,7 +87,7 @@
   </div>
 </template>
 <script>
-import { enterRecordList, gasApplyList } from '@/api/gasManage3_0/gasManage'
+import { enterRecordList, gasApplyList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./enterRecordDetail.vue"
 export default {
@@ -164,7 +164,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/informationRecord/storageExport/', {...self.queryParams}, '入库记录导出-'+currentDate+'.xlsx')
+          self.download('/zd-bottle/statistics/export/', {...self.queryParams}, '入库记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -179,7 +179,7 @@ export default {
               airStatus:0,
             }
             console.log("obj",obj)
-            self.download(`/airbottle/storageManage/export/`,obj, '入库记录导出-'+currentDate+'.xlsx')
+            self.download(`/zd-bottle/statistics/export/`,obj, '入库记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

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

@@ -8,50 +8,28 @@
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
     <div class="info" v-if="formInfo">
-      <li><i>标签码：</i><i></i></li>
+      <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>
       <li><i>气瓶编号：</i><i>{{formInfo.airNumber}}</i></li>
       <li><i>气体名称：</i><i>{{formInfo.airName}}</i></li>
-      <li><i>气瓶规格：</i><i></i></li>
-      <li><i>最低气压值：</i><i></i></li>
-      <li><i>气体组分：</i><i>{{formInfo.airConstituents}}</i></li>
+      <li><i>气瓶规格：</i><i>{{formInfo.configName}}</i></li>
+      <li><i>最低气压值：</i><i>{{formInfo.minPressure}}Mpa</i></li>
+      <li><i>气体组分：</i><i>{{formInfo.airComponent}}</i></li>
     </div>
     <div class="small_title">入库信息</div>
     <div class="addPage_b" v-if="form.bottleStorage">
       <div class="addPage_b_t">
         <li><i>入库时间：</i><i>{{form.bottleStorage.createTime}}</i></li>
         <li><i>检验有效期：</i><i>{{form.bottleStorage.validateStartTime}}-{{form.bottleStorage.validateEndTime}}</i></li>
-        <li><i>入库气压值：</i><i></i></li>
+        <li><i>入库气压值：</i><i>{{form.bottleStorage.gasPressure}}Mpa</i></li>
         <li><i>验收备注</i><i>{{form.bottleStorage.validateRemark}}</i></li>
       </div>
-      <div class="addPage_b_b">
-        <el-form :model="form"   :inline="true">
-          <el-form-item label="有无手轮" prop="name">
-            <el-radio-group disabled v-model="form.bottleStorage.isHandwheel">
-              <el-radio :label="1">有</el-radio>
-              <el-radio :label="0">无</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="是否固定" prop="name">
-            <el-radio-group disabled v-model="form.bottleStorage.isFixed">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="气瓶状态标牌" prop="name">
-            <el-radio-group disabled v-model="form.bottleStorage.isStatusSign">
-              <el-radio :label="1">有</el-radio>
-              <el-radio :label="0">无</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-form>
-      </div>
     </div>
   </div>
 </template>
 <script>
 
 import { getToken } from "@/utils/auth";
-import { enterRecordDetail, } from '@/api/gasManage3_0/gasManage'
+import { enterRecordDetail, } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -105,7 +83,7 @@ export default {
     /* 详情 */
     getInfo(id){
       let _this=this;
-      enterRecordDetail({id:id}).then( response => {
+      enterRecordDetail(id).then( response => {
         let res=response.data;
         if(response.code==200){
           _this.form=res;

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

@@ -46,13 +46,13 @@
       </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="applyUserName"/>
+        <el-table-column label="操作人" align="left" prop="userName"/>
         <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=""></el-table-column>
+        <el-table-column label="气瓶规格" align="left" prop="configName"></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">
@@ -87,7 +87,7 @@
   </div>
 </template>
 <script>
-import { enterRecordList, outRecordList } from '@/api/gasManage3_0/gasManage'
+import { enterRecordList, outRecordList } from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import detailPage from "./outRecordDetail.vue"
 export default {
@@ -110,7 +110,6 @@ export default {
         searchValue:'',
         startTime:'',
         endTime:'',
-        airStatus:0,
       },
       total:0,
       tableData:[],
@@ -164,7 +163,7 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(async () => {
-          self.download('/airbottle/informationRecord/storageOutexport/', {...self.queryParamsData}, '出库记录导出-'+currentDate+'.xlsx')
+          self.download('/bottle/statistics/exportout/', {...self.queryParamsData}, '出库记录导出-'+currentDate+'.xlsx')
         }).catch(() => {})
       }else if(item.command == 2){
         if(self.ids.length>0) {
@@ -178,7 +177,7 @@ export default {
               ids :ids
             }
             console.log("obj",obj)
-            self.download(`/airbottle/storageOutManage/export/`,obj, '出库记录导出-'+currentDate+'.xlsx')
+            self.download(`/bottle/statistics/exportout/`,obj, '出库记录导出-'+currentDate+'.xlsx')
           }).catch(() => {})
         }else {
           this.msgError('请选择要导出的数据')

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

@@ -8,24 +8,24 @@
     <div class="small_title">气瓶信息</div>
      <!--基本信息-->
     <div class="info" v-if="formInfo">
-      <li><i>标签码：</i><i></i></li>
+      <li><i>标签码：</i><i>{{formInfo.electronicTag}}</i></li>
       <li><i>气瓶编号：</i><i>{{formInfo.airNumber}}</i></li>
       <li><i>气体名称：</i><i>{{formInfo.airName}}</i></li>
-      <li><i>气瓶规格：</i><i></i></li>
-      <li><i>最低气压值：</i><i></i></li>
-      <li><i>气体组分：</i><i>{{formInfo.airConstituents}}</i></li>
+      <li><i>气瓶规格：</i><i>{{formInfo.configName}}</i></li>
+      <li><i>最低气压值：</i><i>{{formInfo.minPressure}}Mpa</i></li>
+      <li><i>气体组分：</i><i>{{formInfo.airComponent}}</i></li>
     </div>
     <div class="small_title">出库信息</div>
     <div class="info" v-if="form.bottleStorageOut">
-      <li><i>出库人：</i><i></i></li>
-      <li><i>出库时间：</i><i></i></li>
+      <li><i>出库人：</i><i>{{form.bottleStorageOut.createTime}}</i></li>
+      <li><i>出库时间：</i><i>{{form.bottleStorageOut.userName}}</i></li>
     </div>
   </div>
 </template>
 <script>
 
 import { getToken } from "@/utils/auth";
-import { enterRecordDetail, outRecordDetail, subjectList } from '@/api/gasManage3_0/gasManage'
+import { enterRecordDetail, outRecordDetail, subjectList } from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -73,7 +73,7 @@ export default {
     /* 详情 */
     getInfo(id){
       let _this=this;
-      outRecordDetail({id:id}).then( response => {
+      outRecordDetail(id).then( response => {
         let res=response.data;
         if(response.code==200){
           _this.form=res;

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

@@ -48,7 +48,7 @@
     <!--    弹窗-->
     <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>
+        <div style="margin-bottom: 20px;color: #333;">{{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>

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

@@ -8,7 +8,7 @@
       </div>
       <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true">
         <el-form-item label="状态" prop="zgType" label-width="80px">
-          <el-select v-model="queryParams.auditStatus" placeholder="请选择" clearable size="small">
+          <el-select v-model="queryParams.leadAuditStaus" placeholder="请选择" clearable size="small">
             <el-option label="待审核" value="0" />
             <el-option label="已通过" value="1" />
             <el-option label="未通过" value="2" />
@@ -27,9 +27,9 @@
             {{scope.row.startTime}}至{{scope.row.endTime}}
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="left" prop="auditStatus">
+        <el-table-column label="状态" align="left" prop="leadAuditStaus">
           <template slot-scope="scope">
-            <p :class="scope.row.remark == 0?'color_warn':(scope.row.remark == 1?'color_14AE10':(scope.row.remark == 2?'color_red':''))">{{scope.row.remark == 0?'待审核':(scope.row.remark == 1?'通过':(scope.row.remark == 2?'驳回':''))}}</p>
+            <p :class="scope.row.leadAuditStaus == 0?'color_warn':(scope.row.leadAuditStaus == 1?'color_14AE10':(scope.row.leadAuditStaus == 2?'color_red':''))">{{scope.row.leadAuditStaus == 0?'待审核':(scope.row.leadAuditStaus == 1?'通过':(scope.row.leadAuditStaus == 2?'驳回':''))}}</p>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import { useAgsApplyList,} from '@/api/gasManage3_0/gasManage'
+import { useAgsApplyList,} from '@/api/gasManage3_0/gasManageSYD'
 import { getToken } from "@/utils/auth";
 import addPage from "./useGasAdd.vue"
 import detailPage from "./useGasDetail.vue"
@@ -81,7 +81,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize:20,
-        auditStatus:'',
+        leadAuditStaus:'',
       },
       total:0,
       tableData:[],
@@ -97,10 +97,11 @@ export default {
           _this.pageType=2;
         }else if(doType=='detail'){//查看
           _this.pageData2.id=row.id;
-          _this.pageData2.remark=row.remark;
+          _this.pageData2.leadAuditStaus=row.leadAuditStaus;
           _this.pageType=3;
         }else if(doType=='back'){//返回
           _this.pageType=1;
+          _this.getList()
         }else if(doType=='again'){//重新申请
           _this.pageType=2;
           _this.pageData.status=1;
@@ -114,7 +115,7 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.auditStatus = "";
+        this.queryParams.leadAuditStaus = "";
         this.handleQuery();
       },
       getList(){

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

@@ -16,27 +16,6 @@
           <el-form-item label="联系方式" prop="phone" >
             <el-input  style="width: 300px" v-model="form.phone"  placeholder="请输入联系方式" maxlength="50" />
           </el-form-item>
-<!--          <el-form-item label="实验地点" prop="subjectId">-->
-<!--            <el-select-->
-<!--              style="width:300px;"-->
-<!--              v-model="form.location"-->
-<!--              filterable-->
-<!--              remote-->
-<!--              clearable-->
-<!--              reserve-keyword-->
-<!--              @focus="selectFocus"-->
-<!--              @change="selectChange"-->
-<!--              placeholder="请选择实验地点"-->
-<!--              :remote-method="userSelectList"-->
-<!--              :loading="loading">-->
-<!--              <el-option-->
-<!--                v-for="item in laboratoryOptions"-->
-<!--                :key="item.id"-->
-<!--                :label="item.name"-->
-<!--                :value="item.id">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
           <el-form-item label="使用期限" prop="dateRange" >
             <el-date-picker
               :clearable="false"
@@ -51,13 +30,13 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="使用气体" prop="useGasId" >
-            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasId" filterable clearable  @change="useGasFun" style="width: 300px">
+          <el-form-item label="使用气体" prop="useGasName" >
+            <el-select class="min-width" placeholder="请选择使用气体" v-model="form.useGasName" filterable clearable   style="width: 300px">
               <el-option
                 v-for="(item,index) in useGasList"
-                :key="item.id"
-                :label="item.goodsName"
-                :value="item.id">
+                :key="item.dictLabel"
+                :label="item.dictLabel"
+                :value="item.dictLabel">
               </el-option>
             </el-select>
           </el-form-item>
@@ -90,13 +69,13 @@
 <script>
 import { getToken } from "@/utils/auth";
 import {
-  bottleList,
+  bottleList, gasManageAirName,
   getLoginUser, googsListGoogs,
   subjectList,
   useAgsApplyAdd,
   useAgsApplyAnew,
   useAgsApplyDetail
-} from '@/api/gasManage3_0/gasManage'
+} from '@/api/gasManage3_0/gasManageSYD'
 export default {
   name: "addPage",
   props:{
@@ -132,14 +111,11 @@ export default {
       form:{
         deptId:'',
         applyUser:'',
-        applyUserid:'',
+        userId:'',
         phone:'',
-        location:'',
-        subjectId:'',
         startTime:'',
         endTime:'',
         useGasName:'',
-        useGasId:'',
         gasUse:'',
         safetyPrecautions:'',
         applyCertificate:'',
@@ -168,7 +144,7 @@ export default {
         subjectId: [
           { required: true, message: "请选择实验地点", trigger: "blur" }
         ],
-        useGasId: [
+        useGasName: [
           { required: true, message: "请选择使用气体", trigger: "blur" }
         ],
         gasUse: [
@@ -218,7 +194,7 @@ export default {
       getLoginUser().then( response => {
         let res=response.data
         _this.form.applyUser=res.nickName
-        _this.form.applyUserid=res.userId
+        _this.form.userId=res.userId
         _this.form.phone=res.phonenumber
         _this.form.deptId=res.deptId
 
@@ -227,22 +203,12 @@ export default {
     /** 获取使用气体信息 */
     googsListGoogs() {
       let _this=this;
-      googsListGoogs().then( response => {
+      gasManageAirName().then( response => {
         let res=response.rows
         _this.useGasList=res;
 
       });
     },
-    useGasFun(){
-     let _this=this;
-      _this.useGasList.forEach(function(item){
-        if(_this.form.useGasId==item.id){
-          _this.form.useGasName=item.goodsName;
-        }
-      })
-      console.log(_this.form.useGasId)
-      console.log(_this.form.useGasName)
-    },
     //懒加载实验室
     userSelectList(e){
       subjectList({name:e,deptId:this.form.deptId}).then(response => {
@@ -284,20 +250,18 @@ export default {
         if(response.code==200){
           let dateRange=[];
           _this.totalNum=0;
-          dateRange.push(res.apply.startTime,res.apply.endTime)
-          _this.form.id=res.apply.id;
-          _this.form.applyUser=res.apply.applyUser;
-          _this.form.phone=res.apply.phone;
-          _this.form.location=res.apply.location;
-          _this.form.subjectId=String(res.apply.subjectId);
-          _this.form.startTime=res.apply.startTime;
-          _this.form.endTime=res.apply.endTime;
-          _this.form.gasUse=res.apply.gasUse;
-          _this.form.applyCertificate=res.apply.applyCertificate;
-          _this.form.safetyPrecautions=res.apply.safetyPrecautions;
-          _this.form.useGasId=res.apply.useGasId;
-          _this.form.useGasName=res.apply.useGasName;
-          _this.form.dateRange=dateRange;
+          dateRange.push(res.startTime,res.endTime)
+          _this.form.id=res.id;
+          _this.form.applyUser=res.applyUser;
+          _this.form.phone=res.phone;
+          _this.form.startTime=res.startTime;
+          _this.form.endTime=res.endTime;
+          _this.form.gasUse=res.gasUse;
+          _this.form.applyCertificate=res.applyCertificate;
+          _this.form.safetyPrecautions=res.safetyPrecautions;
+          _this.form.useGasName=res.useGasName;
+          _this.form.dateRange.push(_this.form.startTime);
+          _this.form.dateRange.push(_this.form.endTime);
         }
       });
 

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

@@ -3,22 +3,22 @@
   <div class="addPage">
     <div class="addPage_title">
       <p>查看</p>
-      <p v-if="pageData2.remark==2" style="width: 120px;" class="inquire-button-one" @click="handleClick('','','again')">重新申请</p>
+      <p v-if="pageData2.leadAuditStaus==2" style="width: 120px;" class="inquire-button-one" @click="handleClick('','','again')">重新申请</p>
       <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.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.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.applyCertificate)"><i>用气申请表：</i><i>查看图片</i></li>
     </div>
     <div class="addPage_b" v-if="form.auditlist !='undefined'">
       <!--气瓶信息-->
       <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="form.details" 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">
@@ -36,11 +36,8 @@
 
 import { getToken } from "@/utils/auth";
 import {
-  qualificationApplyDetail,
-  qualificationApplyList,
-  subjectList,
   useAgsApplyDetail
-} from '@/api/gasManage3_0/gasManage'
+} from '@/api/gasManage3_0/gasManageSYD'
 let Base64 = require('js-base64').Base64;
 export default {
   name: "addPage",
@@ -67,7 +64,7 @@ export default {
     handleClick(index,row,doType){
       let _this=this;
       if(doType=='again'){//重新申请
-        this.$parent.handleClick('',this.form.apply.id,'again');
+        this.$parent.handleClick('',this.form.id,'again');
       }
     },
     /**查看图片  */

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

@@ -8,12 +8,18 @@
     <div class="small_title">气瓶信息</div>
     <!--基本信息-->
     <div class="info" v-if="form">
-      <li><i>标签码：</i><i>{{form.electronicTag}}<</i></li>
-      <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
-      <li><i>气体名称：</i><i>{{form.airName}}</i></li>
-      <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
-      <li><i>最低气压值：</i><i></i></li>
-      <li><i>气体组分：</i><i>{{form.airConstituents}}</i></li>
+      <div class="info_l">
+        <img src="@/assets/ZDimages/gasManage3_0/icon_qp.png">
+        <p>已出库</p>
+      </div>
+      <div class="info_r">
+        <li><i>标签码：</i><i>{{form.electronicTag}}</i></li>
+        <li><i>气瓶编号：</i><i>{{form.airNumber}}</i></li>
+        <li><i>气体名称：</i><i>{{form.airName}}</i></li>
+        <li><i>气瓶规格：</i><i>{{form.configName}}</i></li>
+        <li><i>最低气压值：</i><i></i></li>
+        <li><i>气体组分：</i><i>{{form.airConstituents}}</i></li>
+      </div>
     </div>
     <div class="small_title">使用记录</div>
     <div class="addPage_b">
@@ -192,33 +198,59 @@ export default {
   .info{
     display: flex;
     justify-content: flex-start;
-    flex-wrap: wrap;
     height: 130px;
-    border: 1px solid #E0E0E0;
     margin: 20px;
     padding: 30px 48px;
     box-sizing: border-box;
-    >li{
-      list-style-type: none;
-      margin-right: 30px;
-      >i{
-        font-style: normal;
+    .info_l{
+      margin-right: 92px;
+      width: 100px;
+      text-align: center;
+      >img{
+        width: 38px;
+        height: 80px;
       }
-      >i:nth-of-type(1){
+      >P{
         font-size: 16px;
         font-family: Microsoft YaHei;
         font-weight: 400;
-        color: #999999;
+        color: #0183FA;
         line-height: 16px;
+        margin-top: 12px;
       }
-      >i:nth-of-type(2){
-        font-size: 16px;
-        font-family: Microsoft YaHei;
-        font-weight: 400;
-        color: #333333;
-        line-height: 16px;
+    }
+    .info_r{
+      display: flex;
+      justify-content: flex-start;
+      flex-wrap: wrap;
+
+      >li{
+        list-style-type: none;
+
+        >i{
+          font-style: normal;
+          display: inline-block;
+          margin-bottom: 30px;
+        }
+        >i:nth-of-type(1){
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #999999;
+          line-height: 16px;
+        }
+        >i:nth-of-type(2){
+          width: 200px;
+          font-size: 16px;
+          font-family: Microsoft YaHei;
+          font-weight: 400;
+          color: #333333;
+          line-height: 16px;
+
+        }
       }
     }
+
     .look_img{
       >i:nth-of-type(2){
         color: #0183FA;