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

bug #399 #429

feature
mk 2 years ago
parent
55b7060658
commit
f2282036d4
5 changed files with 84 additions and 38 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. 66
      src/views/components/resiForm.vue
  2. 31
      src/views/components/resiInfo.vue
  3. 2
      src/views/modules/base/resi.vue
  4. 22
      src/views/modules/base/smartImport.vue
  5. 1
      src/views/modules/communityService/fuwuzhaoren/index.vue

66
src/views/components/resiForm.vue
View File

@ -176,7 +176,7 @@
<template v-for="itemj in footerInputList"> <template v-for="itemj in footerInputList">
<section v-if="item.groupId == itemj.id" class="f-flex" style="flex-wrap: wrap;"> <section v-if="item.groupId == itemj.id" class="f-flex" style="flex-wrap: wrap;">
<el-form-item v-for="(itemk,index) in itemj.children" <el-form-item v-for="(itemk,index) in itemj.children"
:key="index" label-width="100px" :key="index" label-width="105px"
:label="itemk.label" :label="itemk.label"
:class="itemk.itemType=='textarea'?'textareaDidth':''" > :class="itemk.itemType=='textarea'?'textareaDidth':''" >
<template v-if="itemk.itemType == 'radio1'" > <template v-if="itemk.itemType == 'radio1'" >
@ -697,8 +697,8 @@ export default {
itemType:"radio1", itemType:"radio1",
formName:"elderlyFlag", formName:"elderlyFlag",
opction:[ opction:[
{label:'是',value:1}, {label:'有',value:1},
{label:'否',value:0} {label:'无',value:0}
] ]
}, },
{ {
@ -786,14 +786,15 @@ export default {
itemType:"datepicker1", itemType:"datepicker1",
formName:"joinCommunityTime", formName:"joinCommunityTime",
opction:[ opction:[
]},{ ]},
label:"是否请长假", // {
itemType:"radio1", // label:"是否请长假",
formName:"longHolidayFlag", // itemType:"radio1",
opction:[ // formName:"longHolidayFlag",
{label:'是',value:1}, // opction:[
{label:'否',value:0}, // {label:'是',value:1},
]} // {label:'否',value:0},
// ]}
] ]
},{ },{
id:'ensureHouseDto', id:'ensureHouseDto',
@ -865,7 +866,7 @@ export default {
opction:[ opction:[
]},{ ]},{
label:"失业原因", label:"失业原因",
itemType:"input1", itemType:"select1",
formName:"unemploymentReason", formName:"unemploymentReason",
opction:[ opction:[
]} ,{ ]} ,{
@ -877,7 +878,7 @@ export default {
{label:'否',value:0} {label:'否',value:0}
]}, { ]}, {
label:"劳动能力就业愿望", label:"劳动能力就业愿望",
itemType:"input1", itemType:"select1",
formName:"employmentWish", formName:"employmentWish",
opction:[ opction:[
]} ]}
@ -1228,7 +1229,7 @@ export default {
{groupId:'economyDto',label:'经济情况'}, {groupId:'economyDto',label:'经济情况'},
{groupId:'resideInfoDto',label:'居住'}, {groupId:'resideInfoDto',label:'居住'},
{groupId:'familyInfoDto',label:'家庭'}, {groupId:'familyInfoDto',label:'家庭'},
{groupId:'birthRecordDTO',label:'出生人员'}, {groupId:'birthRecordDTO',label:'出生信息'},
] ]
} }
}, },
@ -1299,6 +1300,8 @@ export default {
this.getVolunteerDict() this.getVolunteerDict()
this.gethobbyDict() this.gethobbyDict()
this.getWelfareDict() this.getWelfareDict()
this.getUnemployment()
this.getCareer()
}, },
getGridList () { getGridList () {
const { user } = this.$store.state const { user } = this.$store.state
@ -1440,6 +1443,37 @@ export default {
console.log(error,'获取公益岗位字典'); console.log(error,'获取公益岗位字典');
} }
}, },
async getUnemployment(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'unemployment_cause'})
this.footerInputList.forEach(c => {
for(let i of c.children){
if(i.formName == 'unemploymentReason'){
i.opction = data.data
}
}
})
} catch (error) {
console.log(error,'获取失业原因字典');
}
},
async getCareer(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'career_goals'})
this.footerInputList.forEach(c => {
for(let i of c.children){
if(i.formName == 'employmentWish'){
i.opction = data.data
}
}
})
} catch (error) {
console.log(error,'获取就业愿望字典');
}
},
async getHouseholdDict(){ async getHouseholdDict(){
try { try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'}) const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
@ -1747,7 +1781,7 @@ export default {
} else { } else {
await this.getFamilyInfoDetailById(this.form.resiId) await this.getFamilyInfoDetailById(this.form.resiId)
} }
} else if (tab._props.label == '出生人员') { } else if (tab._props.label == '出生信息') {
if (!this.form.resiId) { if (!this.form.resiId) {
this.newForm.birthRecordDTO = this.form.birthRecordDTO this.newForm.birthRecordDTO = this.form.birthRecordDTO
} else { } else {
@ -2205,7 +2239,7 @@ export default {
} }
}) })
}, },
// 出生人员 // 出生信息
residentBirthRecord(id) { residentBirthRecord(id) {
if(this.newForm.birthRecordDTO) return if(this.newForm.birthRecordDTO) return
this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => { this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => {

31
src/views/components/resiInfo.vue
View File

@ -1118,13 +1118,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="f-flex f-bto16 f-top24"> <div class="f-flex f-bto16 f-top24">
<div class="f-labels">劳动能力就业愿望 :</div> <div class="f-labels">劳动能力就业愿望 :</div>
<span class="f-left8 f-font-color">{{ <span class="f-left8 f-font-color">{{careerText}}</span>
residentUnemployedObj
? residentUnemployedObj.employmentWish
? residentUnemployedObj.employmentWish
: "--"
: "--"
}}</span>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -1598,6 +1592,7 @@ export default {
householdArr: [], householdArr: [],
houseArr: [], houseArr: [],
unemploymentArr: [], unemploymentArr: [],
careerArr:[],
chronicArr: [], chronicArr: [],
resideArr: [], resideArr: [],
marriageArr: [], marriageArr: [],
@ -1805,6 +1800,16 @@ export default {
}); });
return text; return text;
}, },
careerText(){
let text = "--";
console.log(this.careerArr);
this.careerArr.forEach((item) => {
if (item.value == this.residentUnemployedObj.employmentWish) {
text = item.label;
}
});
return text;
},
volunteerCategoryArr() { volunteerCategoryArr() {
let arr = []; let arr = [];
if (this.residentVolunteerObj.volunteerCategory) { if (this.residentVolunteerObj.volunteerCategory) {
@ -2045,6 +2050,7 @@ export default {
this.getResidentEnsureHouse(); this.getResidentEnsureHouse();
} else if (tab._props.label == "失业") { } else if (tab._props.label == "失业") {
this.getUnemployment(); this.getUnemployment();
this.getCareer()
this.getResidentUnemployed(); this.getResidentUnemployed();
} else if (tab._props.label == "退役军人") { } else if (tab._props.label == "退役军人") {
this.getVeteranDetailById(); this.getVeteranDetailById();
@ -2526,13 +2532,22 @@ export default {
async getUnemployment() { async getUnemployment() {
try { try {
const { data } = await this.$http.post("sys/dict/data/dictlist", { const { data } = await this.$http.post("sys/dict/data/dictlist", {
dictType: "unemployment_reason", dictType: "unemployment_cause",
}); });
this.unemploymentArr = data.data; this.unemploymentArr = data.data;
} catch (error) { } catch (error) {
console.log(error, "获取失业原因字典"); console.log(error, "获取失业原因字典");
} }
}, },
async getCareer(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'career_goals'})
this.careerArr = data.data;
} catch (error) {
console.log(error,'获取就业愿望字典');
}
},
async handleTuomin(type) { async handleTuomin(type) {
const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`; const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
const { data, code, msg } = await requestPost(url); const { data, code, msg } = await requestPost(url);

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

@ -1877,7 +1877,7 @@ export default {
.dialog-h-content { .dialog-h-content {
max-height: calc(83vh - 80px); max-height: calc(83vh - 80px);
box-sizing: border-box; box-sizing: border-box;
padding: 50px 80px; padding: 50px 70px;
overflow: auto; overflow: auto;
} }
} }

22
src/views/modules/base/smartImport.vue
View File

@ -350,7 +350,6 @@ export default {
} }
return fileType && isLt1M; return fileType && isLt1M;
}, },
async uploadHttpRequest(file) { async uploadHttpRequest(file) {
this.importLoading = true; this.importLoading = true;
this.importBtnTitle = "正在上传中..."; this.importBtnTitle = "正在上传中...";
@ -364,7 +363,7 @@ export default {
if (res.data.code == 0 && res.data.msg == "success") { if (res.data.code == 0 && res.data.msg == "success") {
console.log(res.data.data); console.log(res.data.data);
const data = res.data.data; const data = res.data.data;
this.afterSuccess()
this.dataList = [ this.dataList = [
...Object.keys(data.option.exist).map((k) => { ...Object.keys(data.option.exist).map((k) => {
return { return {
@ -456,17 +455,16 @@ export default {
}, },
afterSuccess() { afterSuccess() {
this.$confirm('导入成功，是否到系统管理-导入记录中查看进度?', '提示', { this.$message({
confirmButtonText: '确定', showClose: true,
cancelButtonText: '取消', dangerouslyUseHTMLString: true,
type: 'warning', message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
center: true duration: 3000
});
let than = this
document.getElementById('clickA').addEventListener('click',function(){
than.$router.replace('/main/importRecord-index');
}) })
.then(() => {
this.$router.replace('/main/importRecord-index');
})
.catch(() => {});
this.dataList = []; this.dataList = [];
this.importOption = {}; this.importOption = {};
this.importCode = ""; this.importCode = "";

1
src/views/modules/communityService/fuwuzhaoren/index.vue
View File

@ -205,7 +205,6 @@
min-width="150" min-width="150"
label="来自" label="来自"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="serviceTimeStart" <el-table-column prop="serviceTimeStart"
align="center" align="center"

Write Preview
Loading…
Cancel
Save