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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

Browse Source
This commit is contained in:
yanran200730
2022-04-28 14:02:08 +08:00
parent 001fc94d95 5f8fff9943
commit b85a5a9cfb
5 changed files with 88 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,7 +192,7 @@
<ai-select v-model="form.riskType" :selectList="dict.getDict('fpRiskType')"/> <ai-select v-model="form.riskType" :selectList="dict.getDict('fpRiskType')"/>
</el-form-item> </el-form-item>
<el-form-item label="脱贫年度"> <el-form-item label="脱贫年度">
<el-date-picker v-model="form.povertyYear" type="year" placeholder="请选择"/> <ai-select v-model="form.povertyYear" :selectList="dict.getDict('fpYear')"/>
</el-form-item> </el-form-item>
<el-form-item label="因自然灾害子项"> <el-form-item label="因自然灾害子项">
<ai-select v-model="form.naturalDisasterType" :selectList="dict.getDict('fpNaturalDisaster')"/> <ai-select v-model="form.naturalDisasterType" :selectList="dict.getDict('fpNaturalDisaster')"/>
@@ -322,22 +322,22 @@ export default {
}, },
guaranteeCheckList() { guaranteeCheckList() {
return [ return [
{label: '享受农村最低生活保障', value: 0}, {label: '享受农村最低生活保障', value: '0'},
{label: '是否特困供养人员', value: 1}, {label: '是否特困供养人员', value: '1'},
{label: '分散供养五保户转集中供养（减少）', value: 2}, {label: '分散供养五保户转集中供养（减少）', value: '2'},
{label: '是否接受医疗救助', value: 3}, {label: '是否接受医疗救助', value: '3'},
{label: '是否接受其它健康扶贫', value: 4}, {label: '是否接受其它健康扶贫', value: '4'},
] ]
}, },
basicsCheckList() { basicsCheckList() {
return [ return [
{label: '城乡居民基本医疗保险', value: 0}, {label: '城乡居民基本医疗保险', value: '0'},
{label: '城镇职工基本医疗保险', value: 1}, {label: '城镇职工基本医疗保险', value: '1'},
{label: '大病保险', value: 2}, {label: '大病保险', value: '2'},
{label: '商业补充医疗保险', value: 3}, {label: '商业补充医疗保险', value: '3'},
{label: '城乡居民基本养老保险', value: 4}, {label: '城乡居民基本养老保险', value: '4'},
{label: '城镇职工基本养老保险', value: 5}, {label: '城镇职工基本养老保险', value: '5'},
{label: '享受人身意外保险补贴', value: 6}, {label: '享受人身意外保险补贴', value: '6'},
] ]
}, },
}, },
@@ -366,9 +366,6 @@ export default {
this.form.birthDate = '' this.form.birthDate = ''
this.form.sex = '' this.form.sex = ''
this.form.age = '' this.form.age = ''
this.form.nation = ''
this.form.education = ''
this.form.politicsStatus = ''
return return
} }
this.form.name = e.name this.form.name = e.name
@@ -376,9 +373,6 @@ export default {
this.form.phone = e.phone this.form.phone = e.phone
this.form.currentAreaId = e.currentAreaId this.form.currentAreaId = e.currentAreaId
this.form.currentAddress = e.currentAddress this.form.currentAddress = e.currentAddress
this.form.nation = e.nation
this.form.education = e.education
this.form.politicsStatus = e.politicsStatus
this.handleIdNumberAutocomplete(e.idNumber) this.handleIdNumberAutocomplete(e.idNumber)
this.isSelectUser = true this.isSelectUser = true
}, },
@@ -398,11 +392,12 @@ export default {
res.data.healthyStatusList = res.data.healthyStatus.split(',') res.data.healthyStatusList = res.data.healthyStatus.split(',')
} }
if(res.data.basicsCheck) { if(res.data.basicsCheck) {
res.data.basicsList = res.data.basicsCheck.split(',') res.data.basicsList = res.data.basicsCheck.split(',')
} }
if(res.data.guaranteeCheck) { if(res.data.guaranteeCheck) {
res.data.guaranteeList = res.data.guaranteeCheck.split(',') res.data.guaranteeList = res.data.guaranteeCheck.split(',')
} }
console.log(res.data)
this.form = {...res.data} this.form = {...res.data}
} }
}) })
@@ -428,6 +423,25 @@ export default {
if(this.form.guaranteeList.length) { if(this.form.guaranteeList.length) {
this.form.guaranteeCheck = this.form.basicsList.join(',') this.form.guaranteeCheck = this.form.basicsList.join(',')
} }
if([1, 2, 3].includes(2)) {
this.form.jcbxCxyiliao = '01'
}else {
this.form.jcbxCxyiliao = '02'
}
this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
this.checkInit('jcbxDabing',this.form.basicsList, '2')
this.checkInit('jcbxShangye',this.form.basicsList, '3')
this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
this.checkInit('bzcsQita',this.form.guaranteeList, '4')
this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => { this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success('提交成功!'); this.$message.success('提交成功!');
@@ -436,6 +450,13 @@ export default {
}) })
} }
}) })
},
checkInit(formName, list, value) {
if(list.includes(value)) {
this.form[formName] = '01'
}else {
this.form[formName] = '02'
}
} }
}, },
created() { created() {

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

@@ -110,7 +110,7 @@
<el-form-item label="监测对象类型" prop="objectType">{{ dict.getLabel("fpType", detail.objectType)}}</el-form-item> <el-form-item label="监测对象类型" prop="objectType">{{ dict.getLabel("fpType", detail.objectType)}}</el-form-item>
<el-form-item label="是否军烈属">{{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs)}}</el-form-item> <el-form-item label="是否军烈属">{{ dict.getLabel("fpYesOrNo", detail.militaryMartyrs)}}</el-form-item>
<el-form-item label="风险因素" prop="riskType">{{ dict.getLabel("fpRiskType", detail.riskType)}} </el-form-item> <el-form-item label="风险因素" prop="riskType">{{ dict.getLabel("fpRiskType", detail.riskType)}} </el-form-item>
<el-form-item label="脱贫年度">{{detail.povertyYear}} </el-form-item> <el-form-item label="脱贫年度">{{ dict.getLabel("fpYear", detail.povertyYear)}} </el-form-item>
<el-form-item label="因自然灾害子项">{{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType)}}</el-form-item> <el-form-item label="因自然灾害子项">{{ dict.getLabel("fpNaturalDisaster", detail.naturalDisasterType)}}</el-form-item>
<el-form-item label="是否义务阶段失学辍学">{{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool)}}</el-form-item> <el-form-item label="是否义务阶段失学辍学">{{ dict.getLabel("fpYesOrNo", detail.dropOutOfSchool)}}</el-form-item>
<el-form-item label="识别监测时间">{{ detail.createTime}}</el-form-item> <el-form-item label="识别监测时间">{{ detail.createTime}}</el-form-item>
@@ -120,10 +120,10 @@
<el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item> <el-form-item label="信息采集人联系电话">{{ detail.updateUserPhone}}</el-form-item>
</div> </div>
<el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item> <el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
<el-form-item label="备注说明">{{detail.detail}}</el-form-item> <!-- <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
<el-form-item label="图片"> <el-form-item label="图片">
<ai-uploader disabled v-model="detail.files"></ai-uploader> <ai-uploader disabled v-model="detail.files"></ai-uploader>
</el-form-item> </el-form-item> -->
</template> </template>
</ai-card> </ai-card>
<ai-card title="家庭收支情况"> <ai-card title="家庭收支情况">
@@ -482,22 +482,22 @@ export default {
}, },
guaranteeCheckList() { guaranteeCheckList() {
return [ return [
{ label: '享受农村最低生活保障', value: 0 }, {label: '享受农村最低生活保障', value: '0'},
{ label: '是否特困供养人员', value: 1 }, {label: '是否特困供养人员', value: '1'},
{ label: '分散供养五保户转集中供养（减少）', value: 2 }, {label: '分散供养五保户转集中供养（减少）', value: '2'},
{ label: '是否接受医疗救助', value: 3 }, {label: '是否接受医疗救助', value: '3'},
{ label: '是否接受其它健康扶贫', value: 4 }, {label: '是否接受其它健康扶贫', value: '4'},
] ]
}, },
basicsCheckList() { basicsCheckList() {
return [ return [
{ label: '城乡居民基本医疗保险', value: 0 }, {label: '城乡居民基本医疗保险', value: '0'},
{ label: '城镇职工基本医疗保险', value: 1 }, {label: '城镇职工基本医疗保险', value: '1'},
{ label: '大病保险', value: 2 }, {label: '大病保险', value: '2'},
{ label: '商业补充医疗保险', value: 3 }, {label: '商业补充医疗保险', value: '3'},
{ label: '城乡居民基本养老保险', value: 4 }, {label: '城乡居民基本养老保险', value: '4'},
{ label: '城镇职工基本养老保险', value: 5 }, {label: '城镇职工基本养老保险', value: '5'},
{ label: '享受人身意外保险补贴', value: 6 }, {label: '享受人身意外保险补贴', value: '6'},
] ]
}, },
}, },
@@ -537,9 +537,6 @@ export default {
this.form.age = '' this.form.age = ''
this.form.currentAreaId = '' this.form.currentAreaId = ''
this.form.currentAddress = '' this.form.currentAddress = ''
this.form.nation = ''
this.form.education = ''
this.form.politicsStatus = ''
return return
} }
this.form.name = e.name this.form.name = e.name
@@ -547,9 +544,6 @@ export default {
this.form.phone = e.phone this.form.phone = e.phone
this.form.currentAreaId = e.currentAreaId this.form.currentAreaId = e.currentAreaId
this.form.currentAddress = e.currentAddress this.form.currentAddress = e.currentAddress
this.form.nation = e.nation
this.form.education = e.education
this.form.politicsStatus = e.politicsStatus
this.handleIdNumberAutocomplete(e.idNumber) this.handleIdNumberAutocomplete(e.idNumber)
this.isSelectUser = true this.isSelectUser = true
}, },
@@ -619,6 +613,19 @@ export default {
if (this.form.guaranteeList.length) { if (this.form.guaranteeList.length) {
this.form.guaranteeCheck = this.form.basicsList.join(',') this.form.guaranteeCheck = this.form.basicsList.join(',')
} }
this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
this.checkInit('jcbxDabing',this.form.basicsList, '2')
this.checkInit('jcbxShangye',this.form.basicsList, '3')
this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
this.checkInit('bzcsQita',this.form.guaranteeList, '4')
this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => { this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.getDetail() this.getDetail()
@@ -629,6 +636,13 @@ export default {
} }
}); });
}, },
checkInit(formName, list, value) {
if(list.includes(value)) {
this.form[formName] = '01'
}else {
this.form[formName] = '02'
}
},
onClose() { onClose() {
this.isShowAdd = false; this.isShowAdd = false;
}, },

2
project/sass/apps/AppGridBlock/AppGridBlock.vue
View File

@@ -20,7 +20,7 @@ import Add from "./components/add";
export default { export default {
name: "AppGridBlock", name: "AppGridBlock",
label: "网格区块", label: "网格区块(saas)",
props: { props: {
instance: Function, instance: Function,

2
project/sass/apps/AppGridMap/AppGridMap.vue
View File

@@ -18,7 +18,7 @@ import List from "./components/list";
export default { export default {
name: "AppGridMap", name: "AppGridMap",
label: "网格地图", label: "网格地图(saas)",
props: { props: {
instance: Function, instance: Function,

18
project/sass/apps/AppGridMember/AppGridMember.vue
View File

@@ -2,12 +2,12 @@
<div class="AppGridMember"> <div class="AppGridMember">
<keep-alive :include="['List']"> <keep-alive :include="['List']">
<component <component
ref="component" ref="component"
:is="component" :is="component"
@change="onChange" @change="onChange"
:params="params" :params="params"
:instance="instance" :instance="instance"
:dict="dict" :dict="dict"
></component> ></component>
</keep-alive> </keep-alive>
</div> </div>
@@ -20,8 +20,7 @@ import Family from "./components/Family";
export default { export default {
name: "AppGridMember", name: "AppGridMember",
label: "网格管理员", label: "网格管理员(saas)",
props: { props: {
instance: Function, instance: Function,
dict: Object, dict: Object,
@@ -41,7 +40,8 @@ export default {
Family Family
}, },
mounted() {}, mounted() {
},
methods: { methods: {
onChange(data) { onChange(data) {