Skip to content

Z
zh-baseversion-project
Commit d769384f authored by zhangjianqian's avatar zhangjianqian
Browse files
Options

改字，查询等

parent 56f07ae5
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 19 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TEmployedPeopleInfo.java
View file @ d769384f
...@@ -63,6 +63,16 @@ public class TEmployedPeopleInfo extends BaseEntity ...@@ -63,6 +63,16 @@ public class TEmployedPeopleInfo extends BaseEntity
/** 头像地址 */ /** 头像地址 */
private String avatarAddress; private String avatarAddress;
private String searchKeyword;
public String getSearchKeyword() {
return searchKeyword;
}
public void setSearchKeyword(String searchKeyword) {
this.searchKeyword = searchKeyword;
}
public String getAvatarAddress() { public String getAvatarAddress() {
return avatarAddress; return avatarAddress;
} }
......
zh-baseversion-system/src/main/resources/mapper/system/TEmployedPeopleInfoMapper.xml
View file @ d769384f
...@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select employed_people_id, employed_people_name,avatar_address, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type,people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info select employed_people_id, employed_people_name,avatar_address, id_card, certificate_num, beyond_enterprise_name, beyond_enterprise_id, register_examination_type,people_occupation, issue_date, certificate_change, create_by, create_time, update_by, update_time, is_del, remarks from t_employed_people_info
<where> <where>
1=1 and is_del='0' 1=1 and is_del='0'
<if test="searchKeyword!=null and searchKeyword!=''"> and (employed_people_name like concat('%', #{searchKeyword}, '%') or id_card like concat('%', #{searchKeyword}, '%'))</if>
<if test=" beyondEnterpriseId !='-2' and beyondEnterpriseId != null and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if> <if test=" beyondEnterpriseId !='-2' and beyondEnterpriseId != null and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
<if test="employedPeopleName != null and employedPeopleName != ''"> and employed_people_name like concat('%', #{employedPeopleName}, '%')</if> <if test="employedPeopleName != null and employedPeopleName != ''"> and employed_people_name like concat('%', #{employedPeopleName}, '%')</if>
<if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if> <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
......
zh-baseversion-web/src/views/regulation/station/index.vue
View file @ d769384f
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
<el-form-item label="场站名称" prop="siteStationName" label-width="70px"> <el-form-item label="厂站名称" prop="siteStationName" label-width="70px">
<el-input <el-input
v-model="queryParams.siteStationName" v-model="queryParams.siteStationName"
placeholder="请输入场站名称" placeholder="请输入厂站名称"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
<el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="场站类型" align="center" prop="siteStationType" > <el-table-column label="厂站类型" align="center" prop="siteStationType" >
<span slot-scope="scope" v-if="scope.row.siteStationType">{{scope.row.siteStationType}}</span> <span slot-scope="scope" v-if="scope.row.siteStationType">{{scope.row.siteStationType}}</span>
<span v-else>-</span> <span v-else>-</span>
</el-table-column> </el-table-column>
<el-table-column label="场站名称" align="center" prop="siteStationName" > <el-table-column label="厂站名称" align="center" prop="siteStationName" >
<span slot-scope="scope" v-if="scope.row.siteStationName">{{scope.row.siteStationName}}</span> <span slot-scope="scope" v-if="scope.row.siteStationName">{{scope.row.siteStationName}}</span>
<span v-else>-</span> <span v-else>-</span>
</el-table-column> </el-table-column>
...@@ -150,14 +150,14 @@ ...@@ -150,14 +150,14 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改场站信息对话框 --> <!-- 添加或修改厂站信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<el-form-item label="场站类型" prop="siteStationType"> <el-form-item label="厂站类型" prop="siteStationType">
<el-select v-model="form.siteStationType" placeholder="请选择场站类型" style="width: 100%"> <el-select v-model="form.siteStationType" placeholder="请选择厂站类型" style="width: 100%">
<el-option v-for="dict in siteStationTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" /> <el-option v-for="dict in siteStationTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -223,8 +223,8 @@ ...@@ -223,8 +223,8 @@
<el-row> <el-row>
<el-col :span="23"> <el-col :span="23">
<el-form-item label="场站名称" prop="siteStationName"> <el-form-item label="厂站名称" prop="siteStationName">
<el-input v-model="form.siteStationName" placeholder="请输入场站名称" /> <el-input v-model="form.siteStationName" placeholder="请输入厂站名称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -493,13 +493,13 @@ export default { ...@@ -493,13 +493,13 @@ export default {
showSearch: true, showSearch: true,
// 总条数 // 总条数
total: 0, total: 0,
// 场站信息表格数据 // 厂站信息表格数据
stationList: [], stationList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 场站类型：1.加气站 2.门站 3.调压站 4.储备站 5.气化站 6.灌装站 // 厂站类型：1.加气站 2.门站 3.调压站 4.储备站 5.气化站 6.灌装站
siteStationTypeOptions: [], siteStationTypeOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
...@@ -522,10 +522,10 @@ export default { ...@@ -522,10 +522,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
siteStationType: [ siteStationType: [
{ required: true, message: "请输入场站类型", trigger: "blur" }, { required: true, message: "请输入厂站类型", trigger: "blur" },
], ],
siteStationName: [ siteStationName: [
{ required: true, message: "请输入场站名称", trigger: "blur" }, { required: true, message: "请输入厂站名称", trigger: "blur" },
], ],
buildDate: [ buildDate: [
{ required: true, message: "请选择建设年代", trigger: "blur" }, { required: true, message: "请选择建设年代", trigger: "blur" },
...@@ -562,7 +562,7 @@ export default { ...@@ -562,7 +562,7 @@ export default {
this.fileList = []; this.fileList = [];
}, },
/** 查询场站信息列表 */ /** 查询厂站信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listStation(this.queryParams).then(response => { listStation(this.queryParams).then(response => {
...@@ -571,7 +571,7 @@ export default { ...@@ -571,7 +571,7 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
// 场站类型：1.加气站 2.门站 3.调压站 4.储备站 5.气化站 6.灌装转 字典翻译 // 厂站类型：1.加气站 2.门站 3.调压站 4.储备站 5.气化站 6.灌装转 字典翻译
siteStationTypeFormat(row, column) { siteStationTypeFormat(row, column) {
return this.selectDictLabel(this.siteStationTypeOptions, row.siteStationType); return this.selectDictLabel(this.siteStationTypeOptions, row.siteStationType);
}, },
...@@ -639,7 +639,7 @@ export default { ...@@ -639,7 +639,7 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加场站信息"; this.title = "添加厂站信息";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -670,7 +670,7 @@ export default { ...@@ -670,7 +670,7 @@ export default {
url: this.form.pictureAddress, url: this.form.pictureAddress,
}); });
} }
this.title = "修改场站信息"; this.title = "修改厂站信息";
this.devicePos = [response.data.longitude, response.data.latitude]; this.devicePos = [response.data.longitude, response.data.latitude];
}); });
...@@ -700,7 +700,7 @@ export default { ...@@ -700,7 +700,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const siteStationIds = row.siteStationId || this.ids; const siteStationIds = row.siteStationId || this.ids;
this.$confirm('是否确认删除场站名称为"' + row.beyondEnterpriseName + '"的数据项?', "警告", { this.$confirm('是否确认删除厂站名称为"' + row.beyondEnterpriseName + '"的数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
...@@ -714,7 +714,7 @@ export default { ...@@ -714,7 +714,7 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有场站信息数据项?', "警告", { this.$confirm('是否确认导出所有厂站信息数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
......
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