diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index 84ffca46..0e6879e0 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -23,18 +23,18 @@ 与户主关系
- +
-
+
选择人员
- + 请选择 {{ userList[0].name }} @@ -42,7 +42,7 @@
-
+
@@ -184,210 +184,214 @@
-
- - -
-
-
-
- - 在校生状况 -
-
- -
-
-
-
- -
-
-
-
- * - 个人健康状况(可多选) -
-
-
-
{{ e.dictName }}
+ + +
+
+
+
+ + 在校生状况 +
+
+
-
- - -
-
-
-
- - 残疾类别 -
-
- -
-
-
-
-
-
- * - 残疾证办理年度 -
-
- -
-
-
-
- - -
-
-
-
- * - 基础保险(可多选) -
-
-
-
{{ e.dictName }}
+ +
+
+
+
+ * + 个人健康状况(可多选) +
+
+
+
{{ e.dictName }}
+
-
- -
-
-
-
- * - 保障措施(可多选) + +
+
+
+
+ + 残疾类别 +
+
+ +
-
-
-
{{ e.dictName }}
+
+
+
+
+ * + 残疾证办理年度 +
+
+
-
-
-
-
-
- * - 劳动技能 -
-
- + +
+
+
+
+ * + 基础保险(可多选) +
+
+
+
{{ e.dictName }}
+
+
-
-
-
- * - 是否会讲普通话 -
-
-
-
+ + +
+
+
+
+ * + 保障措施(可多选) +
+
+
+
{{ e.dictName }}
+
+
-
-
-
-
-
- * - 就业渠道 + + +
+
+
+
+ * + 劳动技能 +
+
+ +
-
- +
+
+
+
+ * + 是否会讲普通话 +
+
+
+
+
-
-
-
- * - 务工企业名称 + + +
+
+
+
+ * + 就业渠道 +
+
+ +
-
- +
+
+
+
+ * + 务工企业名称 +
+
+ +
+
+
+
+
+
+ * + 务工时间/月 +
+
+ +
+
+
+
+
+
+ * + 公益性岗位 +
+
+ +
+
+
+
+
+
+ * + 公益性岗位(月数) +
+
+ +
-
-
-
- * - 务工时间/月 -
-
- + + +
+
+
+
+ * + 是否国外务工 +
+
+
+
+
-
-
-
-
- * - 公益性岗位 -
-
- -
-
-
-
-
-
- * - 公益性岗位(月数) -
-
- -
-
-
-
- -
-
-
-
- * - 是否国外务工 -
-
-
-
-
-
-
-
-
-
- * - 务工所在地 -
-
- +
+
+
+ * + 务工所在地 +
+
+ +
-
+
@@ -524,6 +528,17 @@ export default { photo: '', riskType: '', detail: '', + disabilityType: '', // 残疾类型 + disabilityCertificateYear: '', + basicsCheck: '', // 基础保险 + guaranteeCheck: '', // 保障措施 + mandarin: '', + employmentChannels: '', + migrantEnterprises: '', + publicWelfarePosts: '', + publicWelfarePostsMonths: '', + foreignWorkers: '', + foreignWorkersAddress: '', }, $areaId: '', isEdit: false, @@ -534,7 +549,26 @@ export default { flag: false, helthList: [], namelist:[], - sickList: '', + basicsCheckList: [ + {dictName: '城乡居民基本医疗保险', checked: false}, + {dictName: '城镇职工基本医疗保险',checked: false}, + {dictName: '大病保险',checked: false}, + {dictName: '商业补充医疗保险',checked: false}, + {dictName: '城乡居民基本养老保险',checked: false}, + {dictName: '城镇职工基本养老保险',checked: false}, + {dictName: '享受人身意外保险补贴',checked: false}, + ], + basicsList: [], + guaranteeCheckList: [ + {dictName: '享受农村最低生活保障', checked: false}, + {dictName: '是否特困供养人员', checked: false}, + {dictName: '分散供养五保户转集中供养(减少)', checked: false}, + {dictName: '是否接受医疗救助', checked: false}, + {dictName: '是否接受其它健康扶贫', checked: false}, + ], + guaranteeList: [], + + } }, computed: { @@ -555,7 +589,7 @@ export default { onLoad(query) { this.isGirdUser() this.$dict.load(['fpType','fpRiskType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth', - 'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => { + 'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth','fpDisabilityType','fpYear','fpYesOrNo','fpEmploymentChannels']).then(() => { this.$dict.getDict('fpHealth').map((item) =>{ this.helthList.push({ @@ -597,19 +631,7 @@ export default { }) }, - checkboxChange(e) { - console.log(e); - var arr = [] - this.helthList.map((v)=>{ - console.log(v); - if(v.checked == true){ - console.log(0,v); - } - }) - }, - userClick(row, i) { - // console.log(0,row); if (!this.helthList[i].checked) { this.helthList[i].checked = true // 确定 this.namelist.push({ dictValue: row.dictValue, dictName: row.dictName }) // 赋值 @@ -624,7 +646,16 @@ export default { }) } - this.sickList = this.namelist.map(v=>v.dictValue).join(',') + this.form.healthyStatus = this.namelist.map(v=>v.dictValue).join(',') + }, + + // 医疗保险 + basicsCheck(row, i) { + this.basicsCheckList[i].checked = !this.basicsCheckList[i].checked + }, + // 保障措施 + guaranteeCheck(row, i) { + this.guaranteeCheckList[i].checked = !this.guaranteeCheckList[i].checked }, nextStep() { @@ -658,10 +689,49 @@ export default { this.current = 1 }, + checkInit(formName, list, index) { + if(list[index].checked) { + this.form[formName] = '01' + }else { + this.form[formName] = '02' + } + }, + submit() { if(!this.form.riskType) { return this.$u.toast('请选择风险因素') } + + this.basicsCheckList.map((item, index) => { + console.log(item.checked,index); + if (item.checked) { + this.basicsList.push(index) + } + }) + + this.form.basicsCheck = this.basicsList.join(',') + + this.guaranteeCheckList.map((item, index) => { + if (item.checked) { + this.guaranteeList.push(index) + } + }) + this.form.guaranteeCheck = this.guaranteeList.join(',') + + this.checkInit('jcbxCxyiliao',this.basicsCheckList, 0) + this.checkInit('jcbxCzyiliao',this.basicsCheckList, 1) + this.checkInit('jcbxDabing',this.basicsCheckList, 2) + this.checkInit('jcbxShangye',this.basicsCheckList, 3) + this.checkInit('jcbxCxyanglao',this.basicsCheckList, 4) + this.checkInit('jcbxCzyanglao',this.basicsCheckList, 5) + this.checkInit('jcbxRenshenyiwai',this.basicsCheckList, 6) + + this.checkInit('bzcsNongcundibao',this.guaranteeCheckList, 0) + this.checkInit('bzcsTekungongyang',this.guaranteeCheckList, 1) + this.checkInit('bzcsWubaohu',this.guaranteeCheckList, 2) + this.checkInit('bzcsYiliaojiuzhu',this.guaranteeCheckList, 3) + this.checkInit('bzcsQita',this.guaranteeCheckList, 4) + this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', { ...this.form, @@ -675,6 +745,7 @@ export default { }).catch((err) => { this.$u.toast(err) }) + // console.log(this.form); }, onAreaChange(e) { diff --git a/src/apps/AppMonitoringObject/List.vue b/src/apps/AppMonitoringObject/List.vue index fe000450..e1251550 100644 --- a/src/apps/AppMonitoringObject/List.vue +++ b/src/apps/AppMonitoringObject/List.vue @@ -10,8 +10,8 @@ {{ areaName }} 请选择 -
--> -
+
+
-->