1 液化石油气 监管-气瓶档案和 充装记录 个别字段梳理与 第三方开发人员沟通确认，并调整。

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgGasBottleFiles.java

@@ -21,6 +21,14 @@ public class TLpgGasBottleFiles extends BaseEntity
     /** id */
     private Long fGasBottleFilesId;
 
+    /** 生产(制造单位) */
+    @Excel(name = "生产(制造单位) ", width = 30 )
+    private String fMakeInfo;
+
+    /** 气瓶条码 */
+    @Excel(name = "气瓶条码", width = 30 )
+    private String fQRcode;
+
     /** 登记证号 */
     @Excel(name = "登记证号", width = 30 )
     private String fRegCode;
@@ -42,10 +50,6 @@ public class TLpgGasBottleFiles extends BaseEntity
     @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fMakeDate;
 
-    /** 生产(制造单位) */
-    @Excel(name = "生产(制造单位) ", width = 30 )
-    private String fMakeInfo;
-
     /** 单位内编号 */
     @Excel(name = "单位内编号", width = 30 )
     private String fSelfId;
@@ -55,14 +59,11 @@ public class TLpgGasBottleFiles extends BaseEntity
     private BigDecimal fPressure;
 
     /** 体积 */
-    @Excel(name = "体积", width = 30 )
     private BigDecimal fVolume;
 
     /** 电子标签 */
     private String fAppId;
 
-    /** 二维码 */
-    private String fQRcode;
 
     /** 使用单位 */
     @Excel(name = "使用单位", width = 30 )
@@ -79,7 +80,7 @@ public class TLpgGasBottleFiles extends BaseEntity
     private Date fUpTime;
 
     /** 状态1 新增、2 修改、-1、删除  （默认1） 3.注销 */
-    @Excel(name = "状态1 新增、2 修改、-1、删除  ", readConverterExp = "默=认1")
+    @Excel(name = "气瓶状态 ", readConverterExp = "1=新增,2=修改,-1=删除")
     private String fState;
 
     /** 修改人姓名 */

zh-baseversion-system/src/main/resources/mapper/system/TLpgAirChargeFilesMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTLpgAirChargeFilesVo"/>
         <where>  
             <if test="fVaseCode != null  and fVaseCode != ''"> and f_vase_code like concat('%', #{fVaseCode}, '%') </if>
+            <if test="fBarCode != null  and fBarCode != ''"> and f_bar_code like concat('%', #{fBarCode}, '%') </if>
         </where>
     </select>
     

zh-baseversion-system/src/main/resources/mapper/system/TLpgGasBottleFilesMapper.xml

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fSelfWeight != null "> and f_self_weight = #{fSelfWeight}</if>
             <if test="fPermitNo != null  and fPermitNo != ''"> and f_permit_no = #{fPermitNo}</if>
             <if test="fValveName != null "> and f_valve_name like concat('%', #{fValveName}, '%')</if>
+            <if test="fQRcode != null and fQRcode != ''"> and f_q_rcode like concat('%', #{fQRcode}, '%')</if>
             <if test="fState != null "> and f_state = #{fState}</if>
         </where>
     </select>

zh-baseversion-web/src/views/lpgRegulation/airchargefiles/index.vue

@@ -10,6 +10,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="气瓶条码" prop="fBarCode">
+        <el-input
+          v-model="queryParams.fBarCode"
+          placeholder="请输入气瓶条码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/components/indexInfo.vue

@@ -4,15 +4,25 @@
 
       <el-form label-width="180px">
         <el-row class="el-row-table">
+          
           <el-col :span="12">
-            <el-form-item label="登记证号">
-              <span v-if="detailInfo.fRegCode">{{ detailInfo.fRegCode }}</span>
+            <el-form-item label="生产(制造)单位">
+              <span v-if="detailInfo.fMakeInfo">{{ detailInfo.fMakeInfo }}</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>
 
+
           <el-col :span="12">
-            <el-form-item label="钢印号(出厂编号)">
+            <el-form-item label="气瓶条码">
+              <span v-if="detailInfo.fQRcode">{{ detailInfo.fQRcode }}</span>
+              <span v-else>-</span>
+            </el-form-item>
+          </el-col>
+          
+
+          <el-col :span="12">
+            <el-form-item label="产品编号">
               <span v-if="detailInfo.fEquNo">{{ detailInfo.fEquNo }}</span>
               <span v-else>-</span>
             </el-form-item>
@@ -33,18 +43,19 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="制造年月">
-              <span v-if="detailInfo.fMakeDate">{{ detailInfo.fMakeDate }}</span>
+            <el-form-item label="生产日期">
+              <span v-if="detailInfo.fProductDate">{{ detailInfo.fProductDate }}</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>
           
           <el-col :span="12">
-            <el-form-item label="生产(制造)单位">
-              <span v-if="detailInfo.fMakeInfo">{{ detailInfo.fMakeInfo }}</span>
+            <el-form-item label="登记证号">
+              <span v-if="detailInfo.fRegCode">{{ detailInfo.fRegCode }}</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="单位内编号">
               <span v-if="detailInfo.fSelfId">{{ detailInfo.fSelfId }}</span>
@@ -277,7 +288,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态">
+            <el-form-item label="钢瓶状态">
               <span v-if="detailInfo.fState">{{ detailInfo.fState}}</span>
               <span v-else>-</span>
             </el-form-item>

zh-baseversion-web/src/views/lpgRegulation/gasbottlefiles/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="阀类型名称" prop="fValveName">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="生产(制造)单位" prop="fMakeInfo">
         <el-input
-          v-model="queryParams.fValveName"
-          placeholder="请输入阀类型名称"
+          v-model="queryParams.fMakeInfo"
+          placeholder="请输入生产(制造)单位"
           clearable
           size="small"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="fState">
-        <el-select v-model="queryParams.fState" placeholder="请选择状态" clearable>
+
+      <el-form-item label="气瓶条码" prop="fQRcode">
+        <el-input
+          v-model="queryParams.fQRcode"
+          placeholder="请输入气瓶条码"
+          clearable
+          size="small"
+        />
+      </el-form-item>
+
+      <el-form-item label="钢瓶状态" prop="fState">
+        <el-select v-model="queryParams.fState" placeholder="请选择钢瓶状态" clearable>
           <el-option
             v-for="item in fStateOptions"
             :key="item.value"
@@ -42,10 +52,10 @@
 
     <el-table v-loading="loading" :data="filesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="阀类型名称" align="center" prop="fValveName" :show-overflow-tooltip="true"/>
+      <el-table-column label="生产(制造)单位" align="center" prop="fMakeInfo" :show-overflow-tooltip="true"/>
+      <el-table-column label="气瓶条码" align="center" prop="fQRcode" :show-overflow-tooltip="true"/>
       <el-table-column label="钢瓶规格名称" align="center" prop="fBotSpecName" :show-overflow-tooltip="true"/>
       <el-table-column label="钢瓶型号" align="center" prop="fBottleType" :show-overflow-tooltip="true"/>
-      <el-table-column label="气瓶许可证号" align="center" prop="fPermitNo" :show-overflow-tooltip="true"/>
       <el-table-column label="上检日期" align="center" prop="fPChkDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fPChkDate, '{y}-{m}-{d}') }}</span>
@@ -72,7 +82,7 @@
         </template>
       </el-table-column>
       <el-table-column label="已检验次数" align="center" prop="fInspectedTimes"/>
-      <el-table-column label="状态" align="center"  prop="fState"/>
+      <el-table-column label="钢瓶状态" align="center"  prop="fState"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -158,6 +168,7 @@ export default {
         fPermitNo: null,
         fValveName: null,
         fState: null,
+        fMakeInfo: null
       },
       // 表单参数
       form: {},

zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue

@@ -109,7 +109,6 @@
       </el-row>
     </el-form>
 
-    
     <el-divider content-position="left">上报时态</el-divider>
     <el-form label-width="170px">
       <el-row class="el-row-table">