elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.【通讯录】增加证件号 

2.【人房】居民和组织页面删掉部分无用旧代码
feature
wxz 2 years ago
parent
b91d7e9a39
commit
3fa61f0b66
3 changed files with 75 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/views/modules/base/community/communityTable.vue
  2. 28
      src/views/modules/base/organization/organization.vue
  3. 46
      src/views/modules/base/resi.vue

50
src/views/modules/base/community/communityTable.vue
View File

@ -533,7 +533,7 @@ export default {
diyDialog: false, diyDialog: false,
conditions: [], conditions: [],
queryConditions: [], // queryConditions: [],
}; };
}, },
@ -585,33 +585,33 @@ export default {
// categoryKeys: ['house_info'], categoryKey: 'house_info', // categoryKeys: ['house_info'], categoryKey: 'house_info',
// } // }
// }); // });
this.getQueryConditions(); // this.getQueryConditions();
}, },
methods: { methods: {
async getQueryConditions() { // async getQueryConditions() {
let params = { // let params = {
formCode: "community_info", // formCode: "community_info",
customerId: this.$store.state.user.customerId, // customerId: this.$store.state.user.customerId,
}; // };
//
const { data } = await this.$http.post( // const { data } = await this.$http.post(
"/oper/customize/icform/queryItems", // "/oper/customize/icform/queryItems",
params // params
); // );
//
if (data.code === 0) { // if (data.code === 0) {
this.queryConditions = data.data.map((item) => { // this.queryConditions = data.data.map((item) => {
return { // return {
...item, // ...item,
humpName: util.capitalToHump(item.columnName), // humpName: util.capitalToHump(item.columnName),
}; // };
}); // });
console.log(this.queryConditions); // console.log(this.queryConditions);
} else { // } else {
this.$message.error(data.msg); // this.$message.error(data.msg);
} // }
}, // },
reportForm() { reportForm() {
let paramMap = { let paramMap = {

28
src/views/modules/base/organization/organization.vue
View File

@ -384,6 +384,11 @@
<el-input v-model="peoForm.mobile" <el-input v-model="peoForm.mobile"
placeholder="请输入联系电话"></el-input> placeholder="请输入联系电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号"
prop="idCard">
<el-input v-model="peoForm.idCard"
placeholder="请输入证件号"></el-input>
</el-form-item>
<!-- 性别下拉框 --> <!-- 性别下拉框 -->
<el-form-item label="性别" <el-form-item label="性别"
prop="gender"> prop="gender">
@ -466,6 +471,11 @@
<el-input v-model="peoForm.mobile" <el-input v-model="peoForm.mobile"
placeholder="请输入联系电话"></el-input> placeholder="请输入联系电话"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号"
prop="mobile">
<el-input v-model="peoForm.idCard"
placeholder="请输入证件号"></el-input>
</el-form-item>
<el-form-item label="性别" <el-form-item label="性别"
prop="gender"> prop="gender">
<el-select v-model="peoForm.gender" <el-select v-model="peoForm.gender"
@ -554,6 +564,11 @@
placeholder="联系电话" placeholder="联系电话"
:disabled="true"></el-input> :disabled="true"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号">
<el-input v-model="peoForm.idCard"
placeholder="--"
:disabled="true"></el-input>
</el-form-item>
<el-form-item label="组织/部门"> <el-form-item label="组织/部门">
<el-input v-model="peoForm.zuzhi" <el-input v-model="peoForm.zuzhi"
placeholder="组织/部门" placeholder="组织/部门"
@ -985,6 +1000,7 @@ export default {
peoForm: { peoForm: {
name: "", name: "",
mobile: "", mobile: "",
idCard: "",
gender: "", gender: "",
post: "", post: "",
duty: [], duty: [],
@ -1091,6 +1107,7 @@ export default {
rulesPeo: { rulesPeo: {
name: [{ required: true, message: "姓名必填", trigger: "blur" }], name: [{ required: true, message: "姓名必填", trigger: "blur" }],
mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }], mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }],
idCard: [{ required: true, message: "证件号必填", trigger: "blur" }],
gender: [{ required: true, message: "性别必填", trigger: "blur" }], gender: [{ required: true, message: "性别必填", trigger: "blur" }],
post: [{ required: true, message: "专兼职必填", trigger: "blur" }], post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
duty: [{ required: true, message: "职责必填", trigger: "blur" }], duty: [{ required: true, message: "职责必填", trigger: "blur" }],
@ -1400,6 +1417,7 @@ export default {
orgType: this.peoForm.orgType, orgType: this.peoForm.orgType,
name: this.peoForm.name, name: this.peoForm.name,
mobile: this.peoForm.mobile, mobile: this.peoForm.mobile,
idCard: this.peoForm.idCard,
gender: this.peoForm.gender, gender: this.peoForm.gender,
workType: this.peoForm.post, workType: this.peoForm.post,
roles: this.peoForm.duty, roles: this.peoForm.duty,
@ -1459,6 +1477,7 @@ export default {
roles: this.peoForm.duty, roles: this.peoForm.duty,
newRoles: this.peoForm.newRoles, newRoles: this.peoForm.newRoles,
agencyId: this.currentAgencyId, agencyId: this.currentAgencyId,
idCard: this.peoForm.idCard
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
@ -1530,12 +1549,14 @@ export default {
this.insertForm.contacts = ""; this.insertForm.contacts = "";
this.insertForm.code = ""; this.insertForm.code = "";
this.insertForm.mobile = ""; this.insertForm.mobile = "";
this.insertForm.idCard = "";
this.insertForm.departmentName = ""; this.insertForm.departmentName = "";
this.peoForm = { this.peoForm = {
name: "", name: "",
mobile: "", mobile: "",
gender: "", gender: "",
idCard: "",
post: "", post: "",
duty: [], duty: [],
orgType: "", orgType: "",
@ -1563,6 +1584,7 @@ export default {
peoFormRest () { peoFormRest () {
(this.peoForm.name = ""), (this.peoForm.name = ""),
(this.peoForm.mobile = ""), (this.peoForm.mobile = ""),
(this.peoForm.idCard = ""),
(this.peoForm.gender = ""), (this.peoForm.gender = ""),
(this.peoForm.post = ""), (this.peoForm.post = ""),
(this.peoForm.duty = ""); (this.peoForm.duty = "");
@ -1650,6 +1672,7 @@ export default {
// 查看弹窗 // 查看弹窗
cancelDetails () { cancelDetails () {
this.details = false; this.details = false;
this.peoFormRest();
}, },
/** 人员调动取消按钮 */ /** 人员调动取消按钮 */
cancelTransfer () { cancelTransfer () {
@ -1823,6 +1846,7 @@ export default {
this.peoForm.post = data.workType; this.peoForm.post = data.workType;
// this.peoForm.gender = data.gender === 1 ? '男' : '女' // this.peoForm.gender = data.gender === 1 ? '男' : '女'
this.peoForm.gender = data.gender; this.peoForm.gender = data.gender;
this.peoForm.idCard = data.idCard;
// 已有的权限（职责） // 已有的权限（职责）
let existedDutyArr = []; let existedDutyArr = [];
data.roleList.forEach(function (sysDuty) { data.roleList.forEach(function (sysDuty) {
@ -1865,6 +1889,7 @@ export default {
// this.peoForm.gender = data.gender === 1 ? '男' : '女' // this.peoForm.gender = data.gender === 1 ? '男' : '女'
this.peoForm.gender = data.gender; this.peoForm.gender = data.gender;
this.peoForm.post = data.workType; this.peoForm.post = data.workType;
this.peoForm.idCard = data.idCard;
// 已有的权限（职责） // 已有的权限（职责）
let existedDutyArr = []; let existedDutyArr = [];
data.roleList.forEach(function (sysDuty) { data.roleList.forEach(function (sysDuty) {
@ -1926,13 +1951,14 @@ export default {
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
debugger
if (code === 0) { if (code === 0) {
this.peoForm.name = data.name; this.peoForm.name = data.name;
this.peoForm.mobile = this.peoForm.mobile =
data.mobile.substr(0, 3) + "****" + data.mobile.substr(7); data.mobile.substr(0, 3) + "****" + data.mobile.substr(7);
this.peoForm.activeTime = data.activeTime; this.peoForm.activeTime = data.activeTime;
this.peoForm.duty = data.roles; this.peoForm.duty = data.roles;
this.peoForm.idCard = data.idCard;
this.peoForm.zuzhi = data.orgName; this.peoForm.zuzhi = data.orgName;
if (data.enableFlag === "enable") { if (data.enableFlag === "enable") {
this.peoForm.disableFlag = "已启用"; this.peoForm.disableFlag = "已启用";

46
src/views/modules/base/resi.vue
View File

@ -1593,29 +1593,29 @@ export default {
} }
}, },
async getQueryConditions() { // async getQueryConditions() {
let params = { // let params = {
formCode: "resident_base_info", // formCode: "resident_base_info",
customerId: this.$store.state.user.customerId, // customerId: this.$store.state.user.customerId,
}; // };
//
const { data } = await this.$http.post( // const { data } = await this.$http.post(
"/oper/customize/icform/queryItems", // "/oper/customize/icform/queryItems",
params // params
); // );
//
if (data.code === 0) { // if (data.code === 0) {
this.queryConditions = data.data.map((item) => { // this.queryConditions = data.data.map((item) => {
return { // return {
...item, // ...item,
humpName: util.capitalToHump(item.columnName), // humpName: util.capitalToHump(item.columnName),
}; // };
}); // });
console.log(this.queryConditions); // console.log(this.queryConditions);
} else { // } else {
this.$message.error(data.msg); // this.$message.error(data.msg);
} // }
}, // },
getrowInfo(id) { getrowInfo(id) {
let params = { let params = {

Write Preview
Loading…
Cancel
Save