工商业基础信息问题修改

huaxin-system/src/main/resources/mapper/system/TIndustryMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTIndustryList" parameterType="TIndustry" resultMap="TIndustryResult">
         <include refid="selectTIndustryVo"/>
         <where>  
-            <if test="usernum != null  and usernum != ''"> and u.usernum = #{usernum}</if>
+            <if test="usernum != null  and usernum != ''"> and u.usernum like concat('%', #{usernum}, '%')</if>
             <if test="company != null  and company != ''"> and u.company like concat('%', #{company}, '%')</if>
             <if test="username != null  and username != ''"> and u.username like concat('%', #{username}, '%')</if>
             <if test="soutext!=null and soutext!=''">

huaxin-web/src/views/baseinfo/businessinfo/components/DetailInfo.vue

@@ -5,7 +5,7 @@
         <el-form label-width="100px">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="餐饮用户">
+              <el-form-item label="商业用户">
                 <span>{{ detailInfo.username }}</span>
               </el-form-item>
             </el-col>
@@ -80,8 +80,10 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="表具类型">
-                <span v-if="detailInfo.meterType == 1">皮膜</span>
-                <span v-if="detailInfo.meterType == 2">超声</span>
+                <!--<span v-if="detailInfo.meterType == 1">皮膜</span>
+                <span v-if="detailInfo.meterType == 2">超声</span>-->
+                <span v-if="detailInfo.meterType">{{ $parent.typeFormatter(detailInfo) }}</span>
+                <span>-</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -183,7 +185,7 @@
       getDetailInfo(businessId){
         getBusiness(businessId).then(response => {
           this.detailInfo = response.data;
-          this.title = "餐饮用户信息详情";
+          this.title = "商业用户信息详情";
           this.gasUseDevice = JSON.parse(this.detailInfo.device);
           this.open = true;
           this.initMap();

huaxin-web/src/views/baseinfo/businessinfo/index.vue

@@ -122,7 +122,7 @@
       <el-table-column label="单位名称" align="center" prop="company" width="120" :show-overflow-tooltip="true"/>
       <el-table-column label="联系电话" align="center" prop="phone" width="120"/>
       <!--<el-table-column label="表计类型" align="center" prop="type" :formatter="typeFormatter" :show-overflow-tooltip="true"/>-->
-      <el-table-column label="表计型号" align="center" prop="meterModel" :formatter="meterModelFormatter" :show-overflow-tooltip="true"/>
+      <el-table-column label="表具型号" align="center" prop="meterModel" :formatter="meterModelFormatter" :show-overflow-tooltip="true"/>
       <el-table-column label="开通状态" align="center" prop="status" :formatter="statusFormatter" :show-overflow-tooltip="true"/>
       <el-table-column label="通气日期" align="center" prop="starttime" width="180">
         <template slot-scope="scope">
@@ -268,7 +268,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <!--<el-col :span="12">
             <el-form-item label="表计类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择表计类型" style="width: 100%">
                 <el-option
@@ -279,7 +279,7 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col>-->
         </el-row>
 
         <el-row>
@@ -320,8 +320,12 @@
           <el-col :span="12">
             <el-form-item label="表具类型" prop="meterType">
               <el-select v-model="form.meterType" placeholder="请选择表具类型" style="width: 100%">
-                <el-option label="皮膜" :value="1" />
-                <el-option label="超声" :value="2" />
+                <el-option
+                  v-for="item in meterType"
+                  :key="item.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -334,7 +338,7 @@
                 <el-option
                   v-for="dict in meterCompany"
                   :key="dict.dictValue"
-                  :value="dict.dictValue"
+                  :value="parseInt(dict.dictValue)"
                   :label="dict.dictLabel"
                 />
               </el-select>
@@ -347,7 +351,7 @@
                 <el-option
                   v-for="dict in meterModelOptional"
                   :key="dict.dictValue"
-                  :value="dict.dictValue"
+                  :value="parseInt(dict.dictValue)"
                   :label="dict.dictLabel"
                 />
               </el-select>

huaxin-web/src/views/baseinfo/industry/components/DetailInfo.vue

@@ -4,17 +4,21 @@
       <el-col :span="14">
         <el-form label-width="100px">
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="单位名称">
                 <span>{{ detailInfo.company }}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
               <el-form-item label="生产品种">
                 <span>{{ detailInfo.contract }}</span>
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
             <el-col :span="12">
               <el-form-item label="联系人">
@@ -31,7 +35,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="流量计品牌">
-                <span v-if="detailInfo.usernum">{{ $parent.meterModelCompanyFormatter(this.detailInfo) }}</span>
+                <span v-if="detailInfo.usernum">{{ detailInfo.usernum }}</span>
                 <span v-else>-</span>
               </el-form-item>
             </el-col>

huaxin-web/src/views/baseinfo/industry/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="流量计品牌" prop="usernum">
+      <el-form-item label="单位名称" prop="company">
         <el-input
-          v-model="queryParams.usernum"
-          placeholder="请输入流量计品牌"
+          v-model="queryParams.company"
+          placeholder="请输入单位名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位名称" prop="company">
+
+      <el-form-item label="流量计品牌" prop="usernum">
         <el-input
-          v-model="queryParams.company"
-          placeholder="请输入单位名称"
+          v-model="queryParams.usernum"
+          placeholder="请输入流量计品牌"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -107,7 +108,7 @@
           <span v-else></span>
         </template>
       </el-table-column>
-      <el-table-column label="具体地址" align="center" prop="streetName" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="具体地址" align="center" prop="address" width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="流量计型号" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type == '1'">DN25</span>
@@ -188,7 +189,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="流量计型号" prop="type">
-              <el-select multiple v-model="form.type" placeholder="请选择流量计型号">
+              <el-select v-model="form.type" placeholder="请选择流量计型号">
                 <!--<el-option
                   v-for="dict in typeOptions"
                   :key="dict.dictValue"