增加营业网点字段

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

@@ -44,6 +44,10 @@ public class TBusiness extends BaseEntity
     @Excel(name = "所属市")
     private String cityName;
 
+    /** 营业网点 */
+    @Excel(name = "营业网点", dictType = "t_branch")
+    private String branch;
+
     /** 所属区（县） */
     @Excel(name = "所属区")
     private String countyName;
@@ -114,6 +118,14 @@ public class TBusiness extends BaseEntity
 
     private Integer selectFrom;
 
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
     public Integer getSelectFrom() {
         return selectFrom;
     }

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

@@ -54,6 +54,10 @@ public class TIndustry extends BaseEntity
     @Excel(name = "具体地址")
     private String address;
 
+    /** 营业网点 */
+    @Excel(name = "营业网点", dictType = "t_branch")
+    private String branch;
+
     /** 经度 */
     @Excel(name = "经度")
     private BigDecimal longitude;
@@ -112,6 +116,14 @@ public class TIndustry extends BaseEntity
 
     private String soutext;
 
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
     public String getSoutext() {
         return soutext;
     }

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

@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="direction"    column="direction"    />
         <result property="taskId"    column="task_id"    />
         <result property="remark"    column="remark"    />
+        <result property="branch" column="branch"/>
     </resultMap>
 
     <sql id="selectTBusinessVo">
-        select t.id, t.usernum, t.contract, t.city, t.county, t.street, t.village, t.address, t.longitude, t.latitude,
+        select t.id, t.usernum, t.contract, t.city, t.county, t.street, t.village, t.address, t.longitude, t.latitude,t.branch,
          t.company, t.username,
         t.phone, t.type, t.status, t.starttime, t.device, t.meter_type, t.meter_company, t.meter_model, t.direction,
          t.task_id, t.remark,IFNULL(tp.status,-1)as ajstatus,
@@ -109,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="direction != null">direction,</if>
             <if test="taskId != null">task_id,</if>
             <if test="remark != null">remark,</if>
+            <if test="branch !=null">branch,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="usernum != null">#{usernum},</if>
@@ -133,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="direction != null">#{direction},</if>
             <if test="taskId != null">#{taskId},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="branch !=null">#{branch},</if>
          </trim>
     </insert>
 
@@ -161,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="direction != null">direction = #{direction},</if>
             <if test="taskId != null">task_id = #{taskId},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="branch !=null">branch = #{branch},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -29,10 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="satisfy"    column="satisfy"    />
         <result property="inspectSign"    column="inspect_sign"    />
         <result property="inspectTime"    column="inspect_time"    />
+        <result property="branch"    column="branch"    />
     </resultMap>
 
     <sql id="selectTIndustryVo">
-        select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,
+        select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,
         u.longitude, u.latitude, u.company, u.username, u.phone, u.type, u.status, u.starttime,
         u.task_inspect_id, u.remark, u.create_time,t.`area_name` AS countyName,
          ts.`area_name` AS streetName,IFNULL(tp.status,-1)as ajstatus
@@ -58,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTIndustryById" parameterType="Long" resultMap="TIndustryResult">
-         select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,
+         select u.id, u.usernum, u.contract, u.city, u.county, u.street, u.village, u.address,u.branch,
         u.longitude, u.latitude, u.company, u.username, u.phone, u.type, u.status, u.starttime,
         u.task_inspect_id, u.remark, u.create_time,t.`area_name` AS countyName,
          ts.`area_name` AS streetName
@@ -89,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskInspectId!= null">task_inspect_id,</if>
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="branch !=null">branch,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="usernum != null">#{usernum},</if>
@@ -109,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskInspectId != null">#{taskInspectId},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="branch !=null"> #{branch},</if>
          </trim>
     </insert>
 
@@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskInspectId != null">task_inspect_id = #{taskInspectId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="branch !=null">branch = #{branch},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -55,7 +55,11 @@
                 <span>{{ detailInfo.phone }}</span>
               </el-form-item>
             </el-col>
-
+            <el-col :span="24">
+              <el-form-item label="营业网点">
+                <span>{{$parent.branchFormat(this.detailInfo)}}</span>
+              </el-form-item>
+            </el-col>
             <!--<el-col :span="12">
               <el-form-item label="表计类型">
                 <span>{{ $parent.typeFormatter(detailInfo) }}</span>
@@ -97,7 +101,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="表具型号">
-                <span v-if="detailInfo.meterModel">{{ $parent.meterModelFormatter(detailInfo) }}</span>
+                <span v-if="detailInfo.meterModel">{{ $parent.branchFormat(detailInfo,null) }}</span>
                 <span v-else>-</span>
               </el-form-item>
             </el-col>

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

@@ -268,6 +268,18 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="营业网点" prop="branch">
+              <el-select v-model="form.branch" placeholder="请选择营业网点">
+                <el-option
+                  v-for="dict in sceneOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!--<el-col :span="12">
             <el-form-item label="表计类型" prop="type">
               <el-select v-model="form.type" placeholder="请选择表计类型" style="width: 100%">
@@ -516,6 +528,7 @@ export default {
       total: 0,
       // 商业用户表格数据
       businessList: [],
+      sceneOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -635,6 +648,9 @@ export default {
     this.getMeterModel();
     this.getMeterCompany();
     this.getAddressInfo();
+    this.getDicts("t_branch").then(response => {
+      this.sceneOptions = response.data;
+  });
   },
   methods: {
     /** 查询商业用户列表 */
@@ -909,6 +925,9 @@ export default {
         row.status
       );
     },
+    branchFormat(row, column) {
+      return this.selectDictLabel(this.sceneOptions, row.branch);
+    },
     //详情
     handleDetail(row){
       this.$refs.detail.getDetailInfo(row.id);

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

@@ -52,6 +52,14 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="营业网点">
+                <span>{{ $parent.branchFormat(detailInfo,null) }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col :span="20">
               <el-form-item label="所属区域">

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

@@ -216,6 +216,18 @@
               <el-input v-model="form.phone" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="营业网点" prop="branch">
+              <el-select v-model="form.branch" placeholder="请选择营业网点">
+                <el-option
+                  v-for="dict in sceneOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <!-- 市区县镇 -->
         <el-row>
@@ -365,6 +377,8 @@ export default {
       open: false,
       // 用气场景字典
       typeOptions: [],
+      //营业网点
+      sceneOptions:[],
       // 开通状态字典
       statusOptions: [],
       // 查询参数
@@ -443,6 +457,9 @@ export default {
     this.getDicts("t_business_factory_meter_type").then(response => {
         this.meterCompanyOptions = response.data;
     });
+    this.getDicts("t_branch").then(response => {
+      this.sceneOptions = response.data;
+    });
   },
   methods: {
     /** 查询工业用户列表 */
@@ -645,6 +662,9 @@ export default {
           this.exportLoading = false;
         }).catch(() => {});
     },
+    branchFormat(row, column) {
+      return this.selectDictLabel(this.sceneOptions, row.branch);
+    },
     meterModelCompanyFormatter(row){
       return this.selectDictLabel(
         this.meterCompanyOptions,