elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-huji' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-huji

shibei_master
jiangyy 3 years ago
parent
3282591027 57609aec88
commit
e36faebcfd
2 changed files with 130 additions and 60 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. 129
      src/views/modules/base/huji/chusheng/cpts/edit.vue
  2. 61
      src/views/modules/base/huji/chusheng/index.vue

129
src/views/modules/base/huji/chusheng/cpts/edit.vue
View File

@ -102,6 +102,7 @@
placeholder="房号" placeholder="房号"
size="small" size="small"
clearable clearable
@change="handleChangeH"
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell-select"
> >
@ -125,10 +126,22 @@
class="item_width_1" class="item_width_1"
maxlength="50" maxlength="50"
show-word-limit show-word-limit
style="width: 200px; margin-right: 20px"
placeholder="请输入姓名 " placeholder="请输入姓名 "
v-model="fmData.name" v-model="fmData.name"
> >
</el-input> </el-input>
<el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
>享受福利</el-checkbox
>
<el-checkbox
v-model="fmData.isCheck"
true-label="1"
false-label="0"
@change="checkResiAvailable"
>补充居民信息</el-checkbox
>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -279,7 +292,7 @@
<el-form-item <el-form-item
label="户主姓名" label="户主姓名"
prop="houseHolderName" prop="householderName"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
@ -288,19 +301,20 @@
maxlength="50" maxlength="50"
show-word-limit show-word-limit
placeholder="请输入户主姓名" placeholder="请输入户主姓名"
v-model="fmData.houseHolderName" :disabled="fmData.alreadyHaveMaster"
v-model="fmData.householderName"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="与户主关系" label="与户主关系"
prop="houseHolderRelation" prop="householderRelation"
label-width="150px" label-width="150px"
style="display: block" style="display: block"
> >
<el-select <el-select
v-model.trim="fmData.houseHolderRelation" v-model.trim="fmData.householderRelation"
placeholder="与户主关系" placeholder="与户主关系"
size="small" size="small"
clearable clearable
@ -351,21 +365,17 @@
</template> </template>
<script> <script>
import { mapGetters } from "vuex";
import { Loading } from "element-ui"; // 引入Loading服务 import { Loading } from "element-ui"; // 引入Loading服务
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import formVltHelper from "dai-js/tools/formVltHelper"; import formVltHelper from "dai-js/tools/formVltHelper";
import { computedCard } from "@/utils/index"; import { computedCard } from "@/utils/index";
import { isCard, isMobile } from "@/utils/validate"; import { isCard } from "@/utils/validate";
var map;
var search;
var markers;
var infoWindowList;
let loading; // 加载动画 let loading; // 加载动画
function iniFmData() { function iniFmData() {
return { return {
id: "",
gridId: "", gridId: "",
villageId: "", villageId: "",
buildId: "", buildId: "",
@ -374,15 +384,17 @@ function iniFmData() {
name: "", name: "",
mobile: "", mobile: "",
idCard: "", idCard: "",
welfare: "", //福利0否，1是 isWelfare: "0", //福利0否，1是
isCheck: "0",
gender: "", gender: "",
birthplace: "", birthplace: "",
father: "", father: "",
mother: "", mother: "",
count: "", count: "",
reportDate: "", reportDate: "",
houseHolderName: "", householderName: "",
houseHolderRelation: "", householderRelation: "",
alreadyHaveMaster: false,
}; };
} }
@ -465,11 +477,38 @@ export default {
}, },
methods: { methods: {
async checkResiAvailable() {
const {
fmData: { idCard, isCheck },
} = this;
if (isCheck == "1" && isCard(idCard)) {
const { data, code, msg } = await requestPost(
"/epmetuser/icresiuser/checkuser",
{
idCard,
agencyId: this.$store.state.user.agencyId,
}
);
if (code === 0) {
if (!data.moveInstatus) {
this.$message({
type: "error",
message: `请联系${data.resiAgencyName}迁出该居民后操作`,
});
}
} else {
this.$message.error(msg);
}
}
},
handleBlurId() { handleBlurId() {
console.log("33333333333333333333");
const { sex, birth, age } = computedCard(this.fmData.idCard); const { sex, birth, age } = computedCard(this.fmData.idCard);
this.fmData.birthday = birth; if (birth) {
this.fmData.gender = sex == 1 ? "1" : "2"; this.fmData.birthday = birth;
this.fmData.gender = sex == 1 ? "1" : "2";
this.checkResiAvailable();
}
}, },
handleClearVillage() { handleClearVillage() {
@ -511,6 +550,10 @@ export default {
this.fmData.homeId = ""; this.fmData.homeId = "";
this.getHouseList(); this.getHouseList();
}, },
handleChangeH(val) {
console.log("val", val);
this.getHouseMaster();
},
getRelationList() { getRelationList() {
const { user } = this.$store.state; const { user } = this.$store.state;
@ -620,16 +663,29 @@ export default {
}); });
}, },
handleAddStaff() { getHouseMaster() {
this.fmData.organizationPersonnel = [ const { homeId } = this.fmData;
...this.fmData.organizationPersonnel, if (!homeId) return (this.alreadyHaveMaster = false);
{ personName: "", personPhone: "" },
]; this.$http
}, .post("/epmetuser/icresiuser/queryhousehold/" + homeId, {})
handleDelStaff(index) { .then(({ data: res }) => {
const { organizationPersonnel } = this.fmData; if (res.code !== 0) {
organizationPersonnel.splice(index, 1); return this.$message.error(res.msg);
this.fmData.organizationPersonnel = organizationPersonnel; } else {
console.log("获取户主信息成功", res.data);
const { name } = res.data;
if (name) {
this.fmData.householderName = name;
this.alreadyHaveMaster = true;
} else {
this.alreadyHaveMaster = false;
}
}
})
.catch(() => {
return this.$message.error("网络错误");
});
}, },
async initForm(type, row) { async initForm(type, row) {
@ -638,7 +694,22 @@ export default {
this.formType = type; this.formType = type;
console.log(row); console.log(row);
if (row) { if (row) {
this.fmData = { ...this.fmData, ...row }; // this.fmData = { ...this.fmData, ...row };
this.getInfo(row.id);
}
},
async getInfo(id) {
const { data, code, msg } = await requestPost(
"/epmetuser/icBirthRecord",
{
id,
}
);
if (code === 0) {
this.fmData = { ...this.fmData, ...data };
} else {
this.$message.error(msg);
} }
}, },
@ -666,9 +737,9 @@ export default {
async submit() { async submit() {
let url = ""; let url = "";
if (this.formType === "add") { if (this.formType === "add") {
url = "/epmetuser/birth/save"; url = "/epmetuser/icBirthRecord/save";
} else { } else {
url = "/epmetuser/birth/edit"; url = "/epmetuser/icBirthRecord/update";
this.fmData.orgId = this.orgId; this.fmData.orgId = this.orgId;
} }

61
src/views/modules/base/huji/chusheng/index.vue
View File

@ -9,15 +9,15 @@
> >
<el-row class="resi-row"> <el-row class="resi-row">
<el-col :span="6"> <el-col :span="6">
<div class="resi-cell"> <div class="resi-cell2">
<div class="resi-cell-label">所属网格</div> <div class="resi-cell2-label">所属网格</div>
<div class="resi-cell-value"> <div class="resi-cell2-value">
<el-select <el-select
v-model.trim="fmData.gridId" v-model.trim="fmData.gridId"
placeholder="请选择" placeholder="请选择"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell2-select"
@change="handleChangeGrid" @change="handleChangeGrid"
> >
<el-option <el-option
@ -32,15 +32,15 @@
</div> </div>
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<div class="resi-cell"> <div class="resi-cell2">
<div class="resi-cell-label">所属房屋</div> <div class="resi-cell2-label">所属房屋</div>
<div class="resi-cell-value"> <div class="resi-cell2-value">
<el-select <el-select
v-model.trim="fmData.villageId" v-model.trim="fmData.villageId"
placeholder="请选择小区" placeholder="请选择小区"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell2-select"
@clear="handleClearVillage" @clear="handleClearVillage"
@change="handleChangeV" @change="handleChangeV"
> >
@ -58,7 +58,7 @@
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell2-select"
:disabled="changeVDisabled" :disabled="changeVDisabled"
@clear="handleClearBuild" @clear="handleClearBuild"
@change="handleChangeB" @change="handleChangeB"
@ -78,7 +78,7 @@
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell2-select"
@click="handleClearDan" @click="handleClearDan"
@change="handleChangeD" @change="handleChangeD"
> >
@ -97,7 +97,7 @@
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell2-select"
> >
<el-option <el-option
v-for="item in optionsH" v-for="item in optionsH"
@ -115,7 +115,7 @@
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input <el-input
v-model="fmData.name" v-model="fmData.name"
class="resi-cell-input" class="resi-cell2-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入"
@ -126,7 +126,7 @@
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
<el-input <el-input
v-model="fmData.mobile" v-model="fmData.mobile"
class="resi-cell-input" class="resi-cell2-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入"
@ -137,7 +137,7 @@
<el-form-item label="身份证号" prop="idCard"> <el-form-item label="身份证号" prop="idCard">
<el-input <el-input
v-model="fmData.idCard" v-model="fmData.idCard"
class="resi-cell-input" class="resi-cell2-input"
size="small" size="small"
clearable clearable
placeholder="请输入" placeholder="请输入"
@ -159,12 +159,12 @@
<el-form-item label="享受福利" prop="remark"> <el-form-item label="享受福利" prop="remark">
<el-select <el-select
v-model.trim="fmData.welfare" v-model.trim="fmData.isWelfare"
placeholder="享受福利" placeholder="享受福利"
size="small" size="small"
clearable clearable
style="width: 120px" style="width: 120px"
class="resi-cell-select" class="resi-cell2-select"
> >
<el-option <el-option
v-for="item in optionsWelfare" v-for="item in optionsWelfare"
@ -303,11 +303,11 @@
<el-table-column prop="reportDate" align="center" label="申报户口日期"> <el-table-column prop="reportDate" align="center" label="申报户口日期">
</el-table-column> </el-table-column>
<el-table-column prop="houseHolderName" align="center" label="户主姓名"> <el-table-column prop="householderName" align="center" label="户主姓名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="houseHolderRelation" prop="householderRelation"
align="center" align="center"
label="与户主关系" label="与户主关系"
> >
@ -435,7 +435,7 @@ export default {
name: "", name: "",
mobile: "", mobile: "",
idCard: "", idCard: "",
welfare: "", //福利0否，1是 isWelfare: "", //福利0否，1是
birthdayStart: "", birthdayStart: "",
birthdayEnd: "", birthdayEnd: "",
birthdayTime: ["", ""], birthdayTime: ["", ""],
@ -764,8 +764,7 @@ export default {
}, },
async handleChu() { async handleChu() {
const url = const url = "/epmetuser/icBirthRecord/export";
"/heart/iccommunityselforganization/exportcommunityselforganization";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
axios({ axios({
url: window.SITE_CONFIG["apiURL"] + url, url: window.SITE_CONFIG["apiURL"] + url,
@ -834,7 +833,7 @@ export default {
}, },
async getTableData() { async getTableData() {
const url = "/epmetuser/birth/page"; const url = "/epmetuser/icBirthRecord/page";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
@ -892,12 +891,12 @@ export default {
overflow: visible; overflow: visible;
} }
.demo-form-inline .resi-cell { .demo-form-inline .resi-cell2 {
display: flex; display: flex;
align-items: center; align-items: center;
// margin-bottom: 20px; margin-bottom: 20px;
.resi-cell-label { .resi-cell2-label {
flex-shrink: 0; flex-shrink: 0;
min-width: 0; min-width: 0;
box-sizing: border-box; box-sizing: border-box;
@ -905,21 +904,21 @@ export default {
// text-align: right; // text-align: right;
// line-height: 32; // line-height: 32;
} }
.resi-cell-label1 { .resi-cell2-label1 {
width: max-content; width: max-content;
} }
.resi-cell-value-radio { .resi-cell2-value-radio {
display: flex; display: flex;
align-items: center; align-items: center;
min-height: 32px; min-height: 32px;
} }
.resi-cell-input { .resi-cell2-input {
width: 200px; width: 200px;
} }
.resi-cell--daterange { .resi-cell2--daterange {
max-width: 260px; max-width: 260px;
} }
.resi-cell-select { .resi-cell2-select {
width: 200px; width: 200px;
box-sizing: border-box; box-sizing: border-box;
margin-right: 10px; margin-right: 10px;
@ -930,7 +929,7 @@ export default {
width: 88px; width: 88px;
} }
} }
.resi-cell-select:last-child { .resi-cell2-select:last-child {
margin-right: 0; margin-right: 0;
} }
} }

Write Preview
Loading…
Cancel
Save