商业用户修改表具类型

huaxin-system/src/main/java/com/zehong/system/domain/TBusiness.java

@@ -100,8 +100,8 @@ public class TBusiness extends BaseEntity
     private String device;
 
     /** 表具类型1皮膜2超声 */
-    @Excel(name = "表具类型",readConverterExp="1=皮膜,2=超声")
-    private Integer meterType;
+    @Excel(name = "表具类型", dictType = "t_meter_type")
+    private String meterType;
 
     /** 表具厂家1金卡2秦川 */
     @Excel(name = "表具品牌",dictType = "t_business_factory_meter_type")
@@ -308,12 +308,12 @@ public class TBusiness extends BaseEntity
     {
         return device;
     }
-    public void setMeterType(Integer meterType) 
+    public void setMeterType(String meterType)
     {
         this.meterType = meterType;
     }
 
-    public Integer getMeterType() 
+    public String getMeterType()
     {
         return meterType;
     }

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

@@ -99,7 +99,7 @@
                 <!--<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>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">

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

@@ -932,7 +932,7 @@ export default {
     typeFormatter(row){
       return this.selectDictLabel(
         this.meterType,
-        row.type
+        row.meterType
       );
     },
     meterModelFormatter(row){