Commit 0204d305 by lishengfu

update

parent 207efc7d
...@@ -62,7 +62,7 @@ export default class eduExperience extends Vue { ...@@ -62,7 +62,7 @@ export default class eduExperience extends Vue {
}; };
this.$server.EmployeeService.getEduExperience(params) this.$server.EmployeeService.getEduExperience(params)
.then(res => { .then(res => {
// console.log("edu-res=" + JSON.stringify(res)); console.log("edu-res=" + JSON.stringify(res));
this.obj = res; this.obj = res;
}) })
.catch(error => {}); .catch(error => {});
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<van-field <van-field
readonly readonly
clickable clickable
:value="value" :value="birthplaceValue"
label="出生地" label="出生地"
placeholder="请选择出生地" placeholder="请选择出生地"
@click="showBirthplace = true" @click="showBirthplace = true"
...@@ -15,22 +15,107 @@ ...@@ -15,22 +15,107 @@
<van-area :area-list="areaList" @confirm="onConfirm" @cancel="showArea = false" /> <van-area :area-list="areaList" @confirm="onConfirm" @cancel="showArea = false" />
</van-popup> </van-popup>
<!-- 民族 --> <!-- 民族 -->
<van-field
readonly
clickable
:value="nationValue"
label="民族"
placeholder="请选择"
@click="showNation = true"
/>
<van-popup v-model="showNation" position="bottom">
<van-picker
show-toolbar
:columns="columns.nation"
@confirm="onConfirm"
@cancel="showNation = false"
/>
</van-popup>
<!-- 政治面貌 -->
<van-field
readonly
clickable
:value="politicalValue"
label="政治面貌"
placeholder="请选择"
@click="showPolitical = true"
/>
<van-popup v-model="showPolitical" position="bottom">
<van-picker
show-toolbar
:columns="columns.political"
@confirm="onConfirm"
@cancel="showPolitical = false"
/>
</van-popup>
<!-- 最高学历 -->
<van-field
readonly
clickable
:value="eduValue"
label="最高学历"
placeholder="请选择"
@click="showEdu = true"
/>
<van-popup v-model="showEdu" position="bottom">
<van-picker
show-toolbar
:columns="columns.edu"
@confirm="onConfirm"
@cancel="showEdu = false"
/>
</van-popup>
<!-- 婚姻状况 -->
<van-field
readonly
clickable
:value="marryValue"
label="婚姻状况"
placeholder="请选择"
@click="showMarry = true"
/>
<van-popup v-model="showMarry" position="bottom">
<van-picker
show-toolbar
:columns="columns.marry"
@confirm="onConfirm"
@cancel="showMarry = false"
/>
</van-popup>
<!-- 生育状况 -->
<van-field
readonly
clickable
:value="maternityValue"
label="生育情况"
placeholder="请选择"
@click="showMaternity = true"
/>
<van-popup v-model="showMaternity" position="bottom">
<van-picker
show-toolbar
:columns="columns.maternity"
@confirm="onConfirm"
@cancel="showMaternity = false"
/>
</van-popup>
<!-- 档案所在地 -->
<!-- <van-field <!-- <van-field
readonly readonly
clickable clickable
:value="value" :value="maternityValue"
label="民族" label="档案所在地"
placeholder="请选择" placeholder="请选择"
@click="showNation = true" @click="showMaternity = true"
/>
<van-popup v-model="showMaternity" position="bottom">
<van-picker
show-toolbar
:columns="columns.maternity"
@confirm="onConfirm"
@cancel="showMaternity = false"
/> />
<van-popup v-model="showNation" position="bottom"> </van-popup> -->
<van-picker
show-toolbar
:columns="columns.nation"
@confirm="onConfirm"
@cancel="showNation = false"
/>
</van-popup> -->
</van-form> </van-form>
</div> </div>
</template> </template>
...@@ -52,21 +137,48 @@ import { Component } from "vue-property-decorator"; ...@@ -52,21 +137,48 @@ import { Component } from "vue-property-decorator";
export default class personInfo extends Vue { export default class personInfo extends Vue {
private obj: object = {}; private obj: object = {};
private show: boolean = false; private show: boolean = false;
private value: string = ""; private birthplaceValue: string = "";
private nationValue:string=""
private politicalValue:string=""
private eduValue:string=""
private marryValue:string=""
private maternityValue:string=""
private areaList: object = AreaList; private areaList: object = AreaList;
private showBirthplace: boolean = false; private showBirthplace: boolean = false;
private showNation: boolean = false; private showNation: boolean = false;
private showPolitical: boolean = false;
private showEdu: boolean = false;
private showMarry: boolean = false;
private showMaternity: boolean = false;
private columns: any = { private columns: any = {
nation: ["汉族", "回族", "蒙古族"], nation: ["汉族", "回族", "蒙古族"],
political: ["4", "5", "6"], political: ["群众", "共青团员", "预备党员", "中共党员", "其他"],
edu: ["7", "8", "9"], edu: [
marry: ["7", "8", "9"], "小学",
Maternity: ["7", "8", "9"] "初中",
"高中",
"大专",
"本科",
"硕士研究生",
"博士研究生",
"职高",
"中专",
"技校",
"其他"
],
marry: ["已婚", "未婚"],
maternity: ["未育", "已育一孩", "已育多孩"]
}; };
onConfirm(values: any) { onConfirm(value:any) {
this.value = values.map((item: any) => item.name).join("/"); this.maternityValue=value
this.showBirthplace = false; // this.birthplaceValue = values.map((item: any) => item.name).join("/");
// this.showBirthplace = false;
// if(item==="a"){
// // console.log(value,item)
// // this.maternityValue=value
// this.showMaternity=false
// }
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment