kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监测对象字段对完了

Browse Source
This commit is contained in:
aixianling
2022-03-25 17:43:22 +08:00
parent e6cb2bf706
commit 9e8e1788fb
4 changed files with 108 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/jianping/AppHelpedResident/AppHelpedResident.vue
View File

@@ -26,26 +26,8 @@ export default {
} }
}, },
created() { created() {
this.dict.load('residentType', "sex", "faithType", "fileStatus", this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
"legality", "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook")
"education",
"maritalStatus",
"politicsStatus",
"householdName",
"nation",
"liveReason",
"certificateType",
"job",
"militaryStatus",
"householdRelation",
"logoutReason",
"nation",
"registerStatus",
"residentTipType",
"liveCategory",
"livePeriod",
"language",
"nationality")
} }
} }
</script> </script>

88
packages/jianping/AppHelpedResident/hrAdd.vue
View File

@@ -30,47 +30,44 @@
<el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/> <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
</el-form-item> </el-form-item>
<el-form-item label="文化程度" prop="education"> <el-form-item label="文化程度" prop="education">
<ai-select v-model="form.education" :selectList="dict.getDict('education')"/> <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
</el-form-item> </el-form-item>
<el-form-item label="民族" prop="nation"> <el-form-item label="民族" prop="nation">
<ai-select v-model="form.nation" :selectList="dict.getDict('nation')"/> <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
</el-form-item> </el-form-item>
<el-form-item label="政治面貌" prop="politicsStatus"> <el-form-item label="政治面貌" prop="politicsStatus">
<ai-select v-model="form.politicsStatus" :selectList="dict.getDict('politicsStatus')"/> <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
</el-form-item> </el-form-item>
<el-form-item label="在校生状况" prop="job"> <el-form-item label="在校生状况" prop="schoolStatus">
<ai-select v-model="form.job" :selectList="dict.getDict('job')"/> <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
</el-form-item> </el-form-item>
<el-form-item label="健康状况" prop="faithType"> <el-form-item label="健康状况" prop="healthyStatus">
<ai-select v-model="form.faithType" :selectList="dict.getDict('faithType')"/> <ai-select v-model="form.healthyStatus" :selectList="dict.getDict('fpHealth')"/>
</el-form-item> </el-form-item>
<el-form-item label="务工时间(月)" prop="idNumber"> <el-form-item label="务工时间(月)" prop="workeMonths">
<el-input v-model="form.idNumber" placeholder="请输入" clearable/> <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="劳动技能" prop="maritalStatus"> <el-form-item label="劳动技能" prop="labourStatus">
<ai-select v-model="form.maritalStatus" :selectList="dict.getDict('maritalStatus')"/> <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
</el-form-item> </el-form-item>
<el-form-item label="务工区域" prop="idNumber"> <el-form-item label="务工区域" prop="workArea">
<el-input v-model="form.idNumber" placeholder="请输入" clearable maxlength="30" show-word-limit/> <el-input v-model="form.workArea" placeholder="请输入" clearable maxlength="30" show-word-limit/>
</el-form-item> </el-form-item>
<el-form-item label="是否参加大病保险" prop="militaryStatus"> <el-form-item label="是否参加大病保险" prop="seriousIllnessInsurance">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('yesOrNo')"/> <ai-select v-model="form.seriousIllnessInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否参加基本医保" prop="militaryStatus"> <el-form-item label="是否参加基本医保" prop="basicMedicalTreatment">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('yesOrNo')"/> <ai-select v-model="form.basicMedicalTreatment" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否参加基本医保" prop="militaryStatus"> <el-form-item label="享受最低生活保障" prop="subsistenceAllowance">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.subsistenceAllowance" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="享受最低生活保障" prop="militaryStatus"> <el-form-item label="是否参加养老保险" prop="endowmentInsurance">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.endowmentInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否参加养老保险" prop="militaryStatus"> <el-form-item label="是否特困供养" prop="specialPovertySupport">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.specialPovertySupport" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item>
<el-form-item label="是否特困供养" prop="militaryStatus">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
</el-form-item> </el-form-item>
</div> </div>
</template> </template>
@@ -91,27 +88,27 @@
<ai-card title="户籍信息"> <ai-card title="户籍信息">
<template slot="content"> <template slot="content">
<div flex class="half wrap"> <div flex class="half wrap">
<el-form-item label="是否户主" prop="householdName"> <el-form-item label="是否户主" prop="isHousehold">
<ai-select v-model="form.householdName" :selectList="dict.getDict('householdName')" <ai-select v-model="form.isHousehold" :selectList="dict.getDict('yesOrNo')"
@change="form.householdRelation=null"/> @change="form.householdRelation=null"/>
</el-form-item> </el-form-item>
<template v-if="form.householdName==1"> <template v-if="form.isHousehold==1">
<el-form-item label="监测对象类型" prop="militaryStatus"> <el-form-item label="监测对象类型" prop="objectType">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否危房" prop="militaryStatus"> <el-form-item label="是否危房" prop="dilapidatedHousehold">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.dilapidatedHousehold" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否饮用水安全" prop="militaryStatus"> <el-form-item label="是否饮用水安全" prop="drinkingWaterSafety">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.drinkingWaterSafety" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
<el-form-item label="是否搬迁" prop="militaryStatus"> <el-form-item label="是否搬迁" prop="move">
<ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/> <ai-select v-model="form.move" :selectList="dict.getDict('fpYesOrNo')"/>
</el-form-item> </el-form-item>
</template> </template>
<template v-if="form.householdName==0"> <template v-if="form.isHousehold==0">
<el-form-item label="与户主关系" prop="householdRelation"> <el-form-item label="与户主关系" prop="householdRelation">
<ai-select v-model="form.householdRelation" :selectList="dict.getDict('householdRelation')"/> <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
</el-form-item> </el-form-item>
<el-form-item label="户主身份证号" prop="householdIdNumber"> <el-form-item label="户主身份证号" prop="householdIdNumber">
<el-input v-model="form.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/> <el-input v-model="form.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
@@ -149,7 +146,7 @@ export default {
name: [{required: true, message: "请输入姓名"}], name: [{required: true, message: "请输入姓名"}],
sex: [{required: true, message: "请选择性别"}], sex: [{required: true, message: "请选择性别"}],
currentAreaId: [{required: true, message: "请选择户籍地"}], currentAreaId: [{required: true, message: "请选择户籍地"}],
householdName: [{required: true, message: "请选择是否户主"}], isHousehold: [{required: true, message: "请选择是否户主"}],
} }
} }
}, },
@@ -164,7 +161,7 @@ export default {
}, },
getDetail() { getDetail() {
let {id} = this.$route.query let {id} = this.$route.query
id && this.instance.post("/appportaluserenterprise/queryDetailById", null, { id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
params: {id} params: {id}
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {
@@ -174,12 +171,17 @@ export default {
}, },
handleIdNumberAutocomplete(v) { handleIdNumberAutocomplete(v) {
let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v) let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v)
this.form = {...this.form, birthday, sex} this.form = {...this.form, birthday, sex, age: this.$calcAge(v)}
}, },
submit() { submit() {
this.$refs.ruleForm.validate(v => { this.$refs.ruleForm.validate(v => {
if (v) { if (v) {
this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
if (res.code == 0) {
this.$message.success('提交成功!');
this.back()
}
})
} }
}) })
} }

71
packages/jianping/AppHelpedResident/hrDetail.vue
View File

@@ -12,19 +12,40 @@
<el-form-item label="性别" prop="sex">{{ dict.getLabel('sex', detail.sex) }}</el-form-item> <el-form-item label="性别" prop="sex">{{ dict.getLabel('sex', detail.sex) }}</el-form-item>
<el-form-item label="出生日期" prop="birthday">{{ detail.birthday }}</el-form-item> <el-form-item label="出生日期" prop="birthday">{{ detail.birthday }}</el-form-item>
<el-form-item label="年龄" prop="age">{{ detail.age }}</el-form-item> <el-form-item label="年龄" prop="age">{{ detail.age }}</el-form-item>
<el-form-item label="文化程度">{{ dict.getLabel('education', detail.education) }}</el-form-item> <el-form-item label="文化程度">{{ dict.getLabel('fpEducation', detail.education) }}</el-form-item>
<el-form-item label="民族">{{ dict.getLabel('nation', detail.nation) }}</el-form-item> <el-form-item label="民族">{{ dict.getLabel('fpNation', detail.nation) }}</el-form-item>
<el-form-item label="政治面貌">{{ dict.getLabel('politicsStatus', detail.politicsStatus) }}</el-form-item> <el-form-item label="政治面貌">{{
<el-form-item label="在校生状况">{{ dict.getLabel('education', detail.education) }}</el-form-item> dict.getLabel('fpPoliticalOutlook', detail.politicsStatus)
<el-form-item label="健康状况">{{ dict.getLabel('education', detail.education) }}</el-form-item> }}
<el-form-item label="务工时间(月)" prop="idNumber">{{ detail.education }}</el-form-item> </el-form-item>
<el-form-item label="劳动技能">{{ dict.getLabel('education', detail.education) }}</el-form-item> <el-form-item label="在校生状况">{{
<el-form-item label="务工区域" prop="idNumber">{{ detail.education }}</el-form-item> dict.getLabel('fpStudentsInSchool', detail.schoolStatus)
<el-form-item label="是否参加大病保险">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item> }}
<el-form-item label="是否参加基本医保">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item> </el-form-item>
<el-form-item label="享受最低生活保障">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item> <el-form-item label="健康状况">{{ dict.getLabel('fpHealth', detail.healthyStatus) }}</el-form-item>
<el-form-item label="是否参加养老保险">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item> <el-form-item label="务工时间(月)" prop="idNumber">{{ detail.workeMonths }}</el-form-item>
<el-form-item label="是否特困供养">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item> <el-form-item label="劳动技能">{{ dict.getLabel('fpLaborSkills', detail.labourStatus) }}</el-form-item>
<el-form-item label="务工区域" prop="idNumber">{{ detail.workArea }}</el-form-item>
<el-form-item label="是否参加大病保险">{{
dict.getLabel('fpYesOrNo', detail.seriousIllnessInsurance)
}}
</el-form-item>
<el-form-item label="是否参加基本医保">{{
dict.getLabel('fpYesOrNo', detail.basicMedicalTreatment)
}}
</el-form-item>
<el-form-item label="享受最低生活保障">{{
dict.getLabel('fpYesOrNo', detail.subsistenceAllowance)
}}
</el-form-item>
<el-form-item label="是否参加养老保险">{{
dict.getLabel('fpYesOrNo', detail.endowmentInsurance)
}}
</el-form-item>
<el-form-item label="是否特困供养">{{
dict.getLabel('fpYesOrNo', detail.specialPovertySupport)
}}
</el-form-item>
</div> </div>
<ai-avatar :instance="instance" v-model="detail.photo" :editable="false"/> <ai-avatar :instance="instance" v-model="detail.photo" :editable="false"/>
</div> </div>
@@ -39,26 +60,20 @@
<ai-card title="家庭情况"> <ai-card title="家庭情况">
<template slot="content"> <template slot="content">
<div flex class="half wrap"> <div flex class="half wrap">
<el-form-item label="是否户主" prop="householdName"> <el-form-item label="是否户主">{{ dict.getLabel('yesOrNo', detail.isHousehold) }}</el-form-item>
{{ dict.getLabel('householdName', detail.householdName) }}
</el-form-item>
<template v-if="detail.householdName==1"> <template v-if="detail.householdName==1">
<el-form-item label="监测对象类型" prop="militaryStatus"> <el-form-item label="监测对象类型">{{ dict.getLabel('fpType', detail.objectType) }}</el-form-item>
{{ dict.getLabel('householdName', detail.householdName) }} <el-form-item label="是否危房">
{{ dict.getLabel('fpYesOrNo', detail.dilapidatedHousehold) }}
</el-form-item> </el-form-item>
<el-form-item label="是否危房" prop="militaryStatus"> <el-form-item label="是否饮用水安全">
{{ dict.getLabel('yesOrNo', detail.householdName) }} {{ dict.getLabel('fpYesOrNo', detail.drinkingWaterSafety) }}
</el-form-item>
<el-form-item label="是否饮用水安全" prop="militaryStatus">
{{ dict.getLabel('yesOrNo', detail.householdName) }}
</el-form-item>
<el-form-item label="是否搬迁" prop="militaryStatus">
{{ dict.getLabel('yesOrNo', detail.householdName) }}
</el-form-item> </el-form-item>
<el-form-item label="是否搬迁">{{ dict.getLabel('fpYesOrNo', detail.move) }}</el-form-item>
</template> </template>
<template v-if="detail.householdName==0"> <template v-if="detail.householdName==0">
<el-form-item label="与户主关系"> <el-form-item label="与户主关系">
{{ dict.getLabel('householdRelation', detail.householdRelation) }} {{ dict.getLabel('fpRelationship', detail.householdRelation) }}
</el-form-item> </el-form-item>
<el-form-item label="户主身份证号">{{ detail.householdIdNumber }}</el-form-item> <el-form-item label="户主身份证号">{{ detail.householdIdNumber }}</el-form-item>
</template> </template>
@@ -90,7 +105,7 @@ export default {
}, },
getDetail() { getDetail() {
let {id} = this.$route.query let {id} = this.$route.query
id && this.instance.post("/appportaluserenterprise/queryDetailById", null, { id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
params: {id} params: {id}
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {

42
packages/jianping/AppHelpedResident/hrList.vue
View File

@@ -11,16 +11,16 @@
<ai-search-bar> <ai-search-bar>
<template #left> <template #left>
<ai-select placeholder="档案状态" v-model="search.fileStatus" <ai-select placeholder="档案状态" v-model="search.fileStatus"
:selectList="dict.getDict('fileStatus')" :selectList="dict.getDict('fpPrtpStatus')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
<ai-select placeholder="性别" v-model="search.sex" <ai-select placeholder="性别" v-model="search.sex"
:selectList="dict.getDict('sex')" :selectList="dict.getDict('sex')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
<ai-select placeholder="文化程度" v-model="search.education" <ai-select placeholder="文化程度" v-model="search.education"
:selectList="dict.getDict('education')" :selectList="dict.getDict('fpEducation')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
<ai-select placeholder="民族" v-model="search.nation" <ai-select placeholder="民族" v-model="search.nation"
:selectList="dict.getDict('nation')" :selectList="dict.getDict('fpNation')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@@ -40,10 +40,10 @@
unlink-panels unlink-panels
@change="page.current=1,getTableData()" @change="page.current=1,getTableData()"
/> />
<ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('politicsStatus')" <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
<ai-select placeholder="是否户主" v-model="search.householdName" <ai-select placeholder="是否户主" v-model="search.isHousehold"
:selectList="dict.getDict('householdName')" :selectList="dict.getDict('yesOrNo')"
@change="page.current=1,getTableData()"/> @change="page.current=1,getTableData()"/>
</template> </template>
<template #right> <template #right>
@@ -57,13 +57,13 @@
<el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button> <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button>
</template> </template>
<template #right> <template #right>
<ai-import :instance="instance" name="核酸检测信息" title="导入核酸检测信息" <ai-import :instance="instance" name="监测对象" title="导入监测对象"
suffixName="xlsx" suffixName="xlsx"
url="/app/appnucleicacidperson/downloadTemplate" url="/app/apppreventionreturntopoverty/downloadTemplate"
importUrl="/app/appnucleicacidperson/import" importUrl="/app/apppreventionreturntopoverty/import"
@onSuccess="page.current=1,search={},getTableData()"/> @onSuccess="page.current=1,search={},getTableData()"/>
<ai-download url="/app/appnucleicacidperson/export" :params="{...search,ids:ids.toString()}" <ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids:ids.toString()}"
:instance="instance" fileName="核酸检测信息导出文件"/> :instance="instance" fileName="监测对象导出文件"/>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -74,12 +74,6 @@
<ai-id mode="show" v-model="row.idNumber" :showEyes="false"/> <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column slot="fileStatus" label="档案状态" show-overflow-tooltip align="center">
<template slot-scope="scope">
<span v-if="scope.row.fileStatus==0" style="color:rgba(46,162,34,1);">正常</span>
<span v-if="scope.row.fileStatus==1" style="color:rgba(153,153,153,1);">已注销</span>
</template>
</el-table-column>
<el-table-column slot="options" label="操作" fixed="right" align="center"> <el-table-column slot="options" label="操作" fixed="right" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="text" @click="showDetail(row.id)">详情</el-button> <el-button type="text" @click="showDetail(row.id)">详情</el-button>
@@ -126,10 +120,10 @@ export default {
{label: "性别", prop: "sex", dict: 'sex', align: "center"}, {label: "性别", prop: "sex", dict: 'sex', align: "center"},
{slot: "idNumber"}, {slot: "idNumber"},
{label: "年龄", prop: "age", align: "center"}, {label: "年龄", prop: "age", align: "center"},
{label: "民族", prop: "nation", align: "center", dict: "nation"}, {label: "民族", prop: "nation", align: "center", dict: "fpNation"},
{label: "文化程度", prop: "education", align: "center", dict: "education"}, {label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},
{label: "政治面貌", prop: "politicsStatus", align: "center", dict: "politicsStatus"}, {label: "政治面貌", prop: "politicsStatus", align: "center", dict: "fpPoliticalOutlook"},
{slot: "fileStatus"}, {label: "档案状态", prop: "status", dict: "fpPrtpStatus"},
{slot: "options"} {slot: "options"}
], ],
ids: [], ids: [],
@@ -143,8 +137,8 @@ export default {
}, },
methods: { methods: {
getTableData() { getTableData() {
this.instance.post("/appportaluserenterprise/list", null, { this.instance.post("/app/apppreventionreturntopoverty/list", null, {
params: {...this.page, ...this.search, status: 1} params: {...this.page, ...this.search}
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {
this.tableData = res.data?.records this.tableData = res.data?.records
@@ -160,7 +154,7 @@ export default {
}, },
handleDelete(ids) { handleDelete(ids) {
this.$confirm("是否要删除监测对象").then(() => { this.$confirm("是否要删除监测对象").then(() => {
this.instance.post("/app/appnucleicacidperson/delete", null, { this.instance.post("/app/apppreventionreturntopoverty/delete", null, {
params: {ids: ids?.toString()} params: {ids: ids?.toString()}
}).then(res => { }).then(res => {
if (res?.code == 0) { if (res?.code == 0) {