Skip to content

H
huaxin-rq
Commit 01197a82 authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

修改用户字段信息

parent 6109e78f
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 121 deletions
huaxin-system/src/main/java/com/zehong/system/domain/TUser.java
View file @ 01197a82
......@@ -20,6 +20,10 @@ public class TUser extends BaseEntity
/** $column.columnComment */
private Long id;
//表具编号
@Excel(name = "表具编号")
private String meternum;
/** 用户编号（表号） */
@Excel(name = "用户编号")
private String usernum;
......@@ -56,8 +60,17 @@ public class TUser extends BaseEntity
@Excel(name = "联系电话")
private String phone;
//身份证
@Excel(name = "身份证")
private String idcard;
//身份证
@Excel(name = "营业网点")
private String branch;
/** 表计类型(字典) */
@Excel(name = "表计类型",dictType = "t_meter_type")
//@Excel(name = "表计类型",dictType = "t_meter_type")
private String type;
/** 开通状态（字典表 */
......@@ -70,11 +83,11 @@ public class TUser extends BaseEntity
private Date starttime;
/** 用气设施（字典表） */
@Excel(name = "用气设施", dictType = "t_user_scene")
//@Excel(name = "用气设施", dictType = "t_user_scene")
private String device;
/** 表具类型1皮膜2超声 */
@Excel(name = "表具类型1皮膜2超声")
//@Excel(name = "表具类型1皮膜2超声")
private Integer meterType;
/** 表具厂家1金卡2秦川 */
......@@ -82,7 +95,7 @@ public class TUser extends BaseEntity
private Integer meterCompany;
/** 表具型号1 G1.5、2 G2.5、3 G4 */
@Excel(name = "表具型号1 G1.5、2 G2.5、3 G4")
//@Excel(name = "表具型号1 G1.5、2 G2.5、3 G4")
private Integer meterModel;
/** 进气方向1左2右 */
......@@ -120,6 +133,31 @@ public class TUser extends BaseEntity
//用户信息
private String userInfo;
public String getMeternum() {
return meternum;
}
public void setMeternum(String meternum) {
this.meternum = meternum;
}
public String getIdcard() {
return idcard;
}
public void setIdcard(String idcard) {
this.idcard = idcard;
}
public String getBranch() {
return branch;
}
public void setBranch(String branch) {
this.branch = branch;
}
public Integer getSelectFrom() {
return selectFrom;
}
......
huaxin-system/src/main/resources/mapper/system/TUserMapper.xml
View file @ 01197a82
......@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TUser" id="TUserResult">
<result property="id" column="id" />
<result property="usernum" column="usernum" />
<result property="meternum" column="meternum" />
<result property="city" column="city"/>
<result property="county" column="county" />
<result property="street" column="street" />
......@@ -17,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="position" column="position" />
<result property="username" column="username" />
<result property="phone" column="phone" />
<result property="idcard" column="idcard" />
<result property="branch" column="branch" />
<result property="type" column="type" />
<result property="status" column="status" />
<result property="starttime" column="starttime" />
......@@ -33,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTUserVo">
SELECT u.id, u.usernum,u.city, u.county, u.street, u.village, u.address,u.longitude,u.latitude,
SELECT u.id, u.usernum,u.city, u.county, u.street, u.village, u.address,u.longitude,u.latitude,u.meternum,u.idcard,u.branch,
u.username, u.phone, u.type, u.status, u.starttime, u.device, u.meter_type, u.meter_company,u.imgurl,u.position,u.task_Type,
u.meter_model, u.direction, u.task_id, u.remark,t.`area_name` AS countyName,
ts.`area_name` AS streetName,c.name AS villageName,IFNULL(tp.status,-1)as ajstatus
......@@ -90,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="meternum != null">meternum,</if>
<if test="usernum != null">usernum,</if>
<if test="city != null">city,</if>
<if test="county != null">county,</if>
......@@ -100,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">latitude,</if>
<if test="username != null">username,</if>
<if test="phone != null">phone,</if>
<if test="idcard != null">idcard,</if>
<if test="branch != null">branch,</if>
<if test="type != null">type,</if>
<if test="status != null">status,</if>
<if test="starttime != null">starttime,</if>
......@@ -117,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="meternum != null">#{meternum},</if>
<if test="usernum != null">#{usernum},</if>
<if test="city != null">#{city},</if>
<if test="county != null">#{county},</if>
......@@ -127,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">#{latitude},</if>
<if test="username != null">#{username},</if>
<if test="phone != null">#{phone},</if>
<if test="idcard != null">#{idcard},</if>
<if test="branch != null">#{branch},</if>
<if test="type != null">#{type},</if>
<if test="status != null">#{status},</if>
<if test="starttime != null">#{starttime},</if>
......@@ -148,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_user
<trim prefix="SET" suffixOverrides=",">
<if test="usernum != null">usernum = #{usernum},</if>
<if test="meternum != null">meternum = #{meternum},</if>
<if test="city != null">city = #{city},</if>
<if test="county != null">county = #{county},</if>
<if test="street != null">street = #{street},</if>
......@@ -157,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latitude != null">latitude = #{latitude},</if>
<if test="username != null">username = #{username},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="idcard != null">idcard = #{idcard},</if>
<if test="branch != null">branch = #{branch},</if>
<if test="type != null">`type` = #{type},</if>
<if test="status != null">status = #{status},</if>
<if test="starttime != null">starttime = #{starttime},</if>
......
huaxin-web/src/views/baseinfo/jmuser/components/DetailInfo.vue
View file @ 01197a82
......@@ -16,6 +16,19 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证">
<span>{{ detailInfo.idcard }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业网点">
<span>{{ $parent.branchFormat(this.detailInfo) }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户编号">
......@@ -23,8 +36,26 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表计类型">
<span>{{ $parent.typeFormat(this.detailInfo) }}</span>
<el-form-item label="表具厂家">
{{$parent.companyFormat(this.detailInfo)}}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="表具编号">
<span>{{ detailInfo.meternum }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表具位置">
<span v-if="detailInfo.position==1">单元屋内</span>
<span v-if="detailInfo.position==2">单元屋外</span>
<span v-if="detailInfo.position==3">院内</span>
<span v-if="detailInfo.position==4">院外</span>
<span v-if="detailInfo.position==null">-</span>
</el-form-item>
</el-col>
</el-row>
......@@ -44,14 +75,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="用气设施">
<span>{{ $parent.sheshiFormat(this.detailInfo) }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="通气日期">
......@@ -67,33 +90,16 @@
</el-row>
<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==null">-</span>
</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>
<span v-if="detailInfo.meterCompany==null">-</span>
</el-form-item>
</el-col>
</el-row>
<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==null">-</span>
</el-form-item>
</el-col>
<!--<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==null">-</span>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="进气方向">
<span v-if="detailInfo.direction==1">左</span>
......@@ -215,6 +221,7 @@
this.initMap();
});
},
initMap(){
this.$nextTick(() => {
const path = eval(this.systemSetting.map_center);
......
huaxin-web/src/views/baseinfo/jmuser/index.vue
View file @ 01197a82
......@@ -47,23 +47,23 @@
<el-select v-model="queryParams.meterCompany" placeholder="请选择表具厂家" clearable size="small">
<el-option
v-for="dict in bjcjList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="表具类型" prop="meterType">
<el-select v-model="queryParams.meterType" placeholder="请选择表具类型" clearable size="small">
<el-option
v-for="dict in bjlxList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
<!--<el-form-item label="表具类型" prop="meterType">-->
<!--<el-select v-model="queryParams.meterType" placeholder="请选择表具类型" clearable size="small">-->
<!--<el-option-->
<!--v-for="dict in bjlxList"-->
<!--:key="dict.id"-->
<!--:label="dict.name"-->
<!--:value="dict.id"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item label="表具位置" prop="position">
<el-select v-model="queryParams.position" placeholder="请选择表具位置" clearable size="small">
......@@ -135,7 +135,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="姓名" align="center" prop="username" />
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="表具编号" align="center" prop="usernum" />
<el-table-column label="用户编号" align="center" prop="usernum" />
<el-table-column label="所属区域" align="center" prop="countyName" :show-overflow-tooltip="true" width="250">
<template slot-scope="scope">
{{ scope.row.countyName }}
......@@ -153,6 +153,7 @@
</template>
</el-table-column>-->
<!--<el-table-column label="具体地址" align="center" prop="address" />-->
<!--<el-table-column label="表具编号" align="center" prop="meternum" />-->
<el-table-column label="表具位置" align="center" prop="position" :formatter="positionFormat"/>
<el-table-column label="开通状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="通气日期" align="center" prop="starttime" width="180">
......@@ -215,10 +216,53 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="身份证" prop="idcard">
<el-input v-model="form.idcard" 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="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户编号" prop="usernum">
<el-input v-model="form.usernum" placeholder="请输入用户编号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表具厂家" prop="meterCompany">
<el-select v-model="form.meterCompany" placeholder="请选择表具厂家">
<el-option
v-for="dict in bjcjList"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="表具编号" prop="usernum">
<el-input v-model="form.usernum" placeholder="请输入表具编号" />
<el-form-item label="表具编号" prop="meternum">
<el-input v-model="form.meternum" placeholder="请输入表具编号" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -341,61 +385,36 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="用气设施" prop="device">
<el-select multiple v-model="form.device" 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>
<el-col :span="12">
<el-form-item label="表具类型" prop="meterType">
<el-select v-model="form.meterType" placeholder="请选择表具类型">
<el-option
v-for="dict in bjlxList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="表具厂家" prop="meterCompany">
<el-select v-model="form.meterCompany" placeholder="请选择表具厂家">
<el-option
v-for="dict in bjcjList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12">-->
<!--<el-form-item label="表具类型" prop="meterType">-->
<!--<el-select v-model="form.meterType" placeholder="请选择表具类型">-->
<!--<el-option-->
<!--v-for="dict in bjlxList"-->
<!--:key="dict.id"-->
<!--:label="dict.name"-->
<!--:value="dict.id"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="表具型号" prop="meterModel">
<el-select v-model="form.meterModel" placeholder="请选择表具型号">
<el-option
v-for="dict in bjxhList"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12">-->
<!--<el-form-item label="表具厂家" prop="meterCompany">-->
<!--<el-select v-model="form.meterCompany" placeholder="请选择表具厂家">-->
<!--<el-option-->
<!--v-for="dict in bjcjList"-->
<!--:key="dict.id"-->
<!--:label="dict.name"-->
<!--:value="dict.id"-->
<!--/>-->
<!--</el-select>-->
<!--</el-form-item>-->
<!--</el-col>-->
<el-col :span="12">
<el-form-item label="进气方向" prop="direction">
<el-select v-model="form.direction" placeholder="请选择进气方向">
......@@ -536,7 +555,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
usernum: null,
meternum: null,
street: null,
village: null,
username: null,
......@@ -588,7 +607,7 @@
}
],
usernum: [
{ required: true, message: "表具编号不能为空", trigger: "blur" }
{ required: true, message: "用户编号不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "表计类型不能为空", trigger: "change" }
......@@ -608,6 +627,9 @@
taskType: [
{ required: true, message: "请选择安检类型", trigger: "blur" }
],
meternum: [
{ required: true, message: "表具编号不能为空", trigger: "blur" }
],
},
communitys: [],
positionOptions: [],
......@@ -620,10 +642,10 @@
this.getDicts("t_user_status").then(response => {
this.statusOptions = response.data;
});
this.getDicts("t_meter_type").then(response => {
this.typeOptions = response.data;
this.getDicts("t_meter_company").then(response => {
this.bjcjList = response.data;
});
this.getDicts("t_user_scene").then(response => {
this.getDicts("t_branch").then(response => {
this.sceneOptions = response.data;
});
this.getDicts("t_meter_position").then(response => {
......@@ -716,17 +738,15 @@
let position = this.selectDictLabel(this.positionOptions, row.position);
return position? position : "-";
},
sheshiFormat(row, column){
if(row.device==undefined){
return ""
}
var str = '';
for(var tp of row.device.split(",")){
str+= this.selectDictLabel(this.sceneOptions, tp)+"、";
}
return str.substr(0,str.length-1)
//return this.selectDictLabel(this.sceneOptions, row.status);
companyFormat(row, column) {
console.log(row)
return this.selectDictLabel(this.bjcjList, row.meterCompany);
},
branchFormat(row, column) {
console.log("branch",row)
return this.selectDictLabel(this.sceneOptions, row.branch);
},
// 取消按钮
cancel() {
this.open = false;
......@@ -743,6 +763,8 @@
address: null,
username: null,
phone: null,
idcard: null,
branch: null,
type: null,
status: "0100",
starttime: null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment