工商业信息修改

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

@@ -75,7 +75,6 @@ public class TBusiness extends BaseEntity
     private String phone;
 
     /** 表计类型(字典) */
-    @Excel(name = "表计类型",dictType="t_meter_type")
     private String type;
 
     /** 开通状态（字典表 */
@@ -95,11 +94,11 @@ public class TBusiness extends BaseEntity
     private Integer meterType;
 
     /** 表具厂家1金卡2秦川 */
-    @Excel(name = "表具厂家",readConverterExp="1=金卡,2=秦川")
+    @Excel(name = "表具品牌",dictType = "t_business_factory_meter_type")
     private Integer meterCompany;
 
     /** 表具型号1 G1.5、2 G2.5、3 G4 */
-    @Excel(name = "表具型号",readConverterExp="1=G1.5,2=G2.5,3=G4")
+    @Excel(name = "表具型号",dictType="t_business_meter_model")
     private Integer meterModel;
 
     /** 进气方向1左2右 */

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

@@ -22,7 +22,7 @@ public class TIndustry extends BaseEntity
     private Long id;
 
     /** 用户编号 */
-    @Excel(name = "流量计品牌")
+    @Excel(name = "流量计品牌", dictType = "t_business_factory_meter_type")
     private String usernum;
 
     /** 生产品种 */

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

@@ -56,11 +56,11 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <!--<el-col :span="12">
               <el-form-item label="表计类型">
                 <span>{{ $parent.typeFormatter(detailInfo) }}</span>
               </el-form-item>
-            </el-col>
+            </el-col>-->
           </el-row>
 
           <el-row>
@@ -85,9 +85,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="表具厂家">
-                <span v-if="detailInfo.meterCompany == 1">金卡</span>
-                <span v-if="detailInfo.meterCompany == 2">秦川</span>
+              <el-form-item label="表具品牌">
+                <span v-if="detailInfo.meterModel">{{ $parent.meterModelCompanyFormatter(detailInfo) }}</span>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -95,9 +95,8 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="表具型号">
-                <span v-if="detailInfo.meterModel == 1">G1.5</span>
-                <span v-if="detailInfo.meterModel == 2">G2.5</span>
-                <span v-if="detailInfo.meterModel == 3">G4</span>
+                <span v-if="detailInfo.meterModel">{{ $parent.meterModelFormatter(detailInfo) }}</span>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">

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

@@ -121,7 +121,8 @@
       <el-table-column label="具体地址" align="center" prop="address" width="180" :show-overflow-tooltip="true"/>
       <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="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="status" :formatter="statusFormatter" :show-overflow-tooltip="true"/>
       <el-table-column label="通气日期" align="center" prop="starttime" width="180">
         <template slot-scope="scope">
@@ -328,10 +329,14 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="表具厂家" prop="meterCompany">
-              <el-select v-model="form.meterCompany" placeholder="请选择表具厂家" style="width: 100%">
-                <el-option label="金卡" :value="1" />
-                <el-option label="秦川" :value="2" />
+            <el-form-item label="表具品牌" prop="meterCompany">
+              <el-select v-model="form.meterCompany" placeholder="请选择表具品牌" style="width: 100%">
+                <el-option
+                  v-for="dict in meterCompany"
+                  :key="dict.dictValue"
+                  :value="dict.dictValue"
+                  :label="dict.dictLabel"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -339,9 +344,12 @@
           <el-col :span="12">
             <el-form-item label="表具型号" prop="meterModel">
               <el-select v-model="form.meterModel" placeholder="请选择表具型号" style="width: 100%">
-                <el-option label="G1.5" :value="1" />
-                <el-option label="G2.5" :value="2" />
-                <el-option label="G4" :value="3" />
+                <el-option
+                  v-for="dict in meterModelOptional"
+                  :key="dict.dictValue"
+                  :value="dict.dictValue"
+                  :label="dict.dictLabel"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -611,13 +619,17 @@ export default {
         steamer: 0,
         barrel: 0,
         wall: 0
-      }
+      },
+      meterModelOptional: [],
+      meterCompany: []
     };
   },
   created() {
     this.getList();
     this.getMeterType();
     this.getOpenStatus();
+    this.getMeterModel();
+    this.getMeterCompany();
     this.getAddressInfo();
   },
   methods: {
@@ -787,6 +799,16 @@ export default {
           this.openStatus = response.data;
       });
     },
+    getMeterModel(){
+      this.getDicts("t_business_meter_model").then((response) => {
+          this.meterModelOptional = response.data;
+      });
+    },
+    getMeterCompany(){
+      this.getDicts("t_business_factory_meter_type").then((response) => {
+          this.meterCompany = response.data;
+      });
+    },
     /**
      * 经纬度坐标方法
      */
@@ -864,6 +886,18 @@ export default {
         row.type
       );
     },
+    meterModelFormatter(row){
+      return this.selectDictLabel(
+        this.meterModelOptional,
+        row.meterModel
+      );
+    },
+    meterModelCompanyFormatter(row){
+      return this.selectDictLabel(
+        this.meterCompany,
+        row.meterCompany
+      );
+    },
     //开通状态
     statusFormatter(row){
       return this.selectDictLabel(

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

@@ -31,7 +31,8 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="流量计品牌">
-                <span>{{ detailInfo.usernum }}</span>
+                <span v-if="detailInfo.usernum">{{ $parent.meterModelCompanyFormatter(this.detailInfo) }}</span>
+                <span v-else>-</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">

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

@@ -176,7 +176,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="流量计品牌" prop="usernum">
-              <el-input v-model="form.usernum" placeholder="请输入流量计品牌" />
+              <el-select v-model="form.usernum" placeholder="请选择表具品牌" style="width: 100%">
+                <el-option
+                  v-for="dict in meterCompanyOptions"
+                  :key="dict.dictValue"
+                  :value="dict.dictValue"
+                  :label="dict.dictLabel"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -419,7 +426,8 @@ export default {
         /*longitude: [
           { required: true, message: "经纬度不能为空", trigger: "blur" }
         ],*/
-      }
+      },
+      meterCompanyOptions: []
     };
   },
   created() {
@@ -431,6 +439,9 @@ export default {
     this.getDicts("t_user_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.getDicts("t_business_factory_meter_type").then(response => {
+        this.meterCompanyOptions = response.data;
+    });
   },
   methods: {
     /** 查询工业用户列表 */
@@ -632,7 +643,13 @@ export default {
           this.download(response.msg);
           this.exportLoading = false;
         }).catch(() => {});
-    }
+    },
+    meterModelCompanyFormatter(row){
+      return this.selectDictLabel(
+        this.meterCompanyOptions,
+        row.usernum
+      );
+    },
   }
 };
 </script>