Skip to content

X
xichonght
Commit fa039cf5 authored by miaohaoyun's avatar miaohaoyun
Browse files
Options

Merge branch 'mhy' into 'master' 

优化用户管理、参保注销、待遇申请

See merge request !35
parents 4399d297 6ccf8037
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 78 deletions
xichongSys/src/views/Myvue/insuranceCancellationAudit.vue
View file @ fa039cf5
......@@ -3,23 +3,23 @@
<h2 class="imtil">基础信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="被终止人姓名姓名">
<el-input v-model="form.name"></el-input>
<el-input v-model="form4.name"></el-input>
</el-form-item>
<el-form-item label="出生日期">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
</el-form-item>
<el-form-item label="人员类型">
<el-input v-model="form.per_type"></el-input>
<el-input v-model="form4.per_type"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="性别">
<el-input v-model="form.sex"></el-input>
<el-input v-model="form4.sex"></el-input>
</el-form-item>
<el-form-item label="身份证号码">
<el-input v-model="form.identity_number"></el-input>
<el-input v-model="form4.identity_number"></el-input>
</el-form-item>
<el-form-item label="户籍地址">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
......@@ -29,29 +29,29 @@
<h2 class="imtil">参保注销信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="终止原因">
<el-input v-model="form.cancel_res"></el-input>
<el-input v-model="form4.cancel_res"></el-input>
</el-form-item>
<el-form-item label="死亡时间">
<el-input v-model="form.death_day"></el-input>
<el-input v-model="form4.death_day"></el-input>
</el-form-item>
<el-form-item label="停发时间">
<el-input v-model="form.stop_time"></el-input>
<el-input v-model="form4.stop_time"></el-input>
</el-form-item>
<el-form-item label="重复地区及险种">
<el-input v-model="form.repet_type"></el-input>
<el-input v-model="form4.repet_type"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="户籍迁往地区">
<el-input v-model="form.addres_new"></el-input>
<el-input v-model="form4.addres_new"></el-input>
</el-form-item>
<el-form-item label="丧葬形式">
<el-input v-model="form.bad_type"></el-input>
<el-input v-model="form4.bad_type"></el-input>
</el-form-item>
<el-form-item label="停发的追回金额">
<el-input v-model="form.reback_money"></el-input>
<el-input v-model="form4.reback_money"></el-input>
</el-form-item>
<el-form-item label="重复地区及险种的追回金额">
<el-input placeholder="该框暂无对应字段，请联系开发人员"></el-input>
......@@ -61,49 +61,49 @@
<h2 class="imtil">个人账户终止结算信息</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="个人账户余额">
<el-input v-model="form.account_balance"></el-input>
<el-input v-model="form4.account_balance"></el-input>
</el-form-item>
<el-form-item label="丧葬费">
<el-input v-model="form.bad_subsidy"></el-input>
<el-input v-model="form4.bad_subsidy"></el-input>
</el-form-item>
<el-form-item label="应抵扣重复领取其他社会保险待遇">
<el-input v-model="form.other_overApply"></el-input>
<el-input v-model="form4.other_overApply"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="一次性抚恤金">
<el-input v-model="form.once_pension"></el-input>
<el-input v-model="form4.once_pension"></el-input>
</el-form-item>
<el-form-item label="应抵扣死亡超期领取待遇">
<el-input v-model="form.death_overspend"></el-input>
<el-input v-model="form4.death_overspend"></el-input>
</el-form-item>
<el-form-item label="合计发放金额">
<el-input v-model="form.account_totle"></el-input>
<el-input v-model="form4.account_totle"></el-input>
</el-form-item>
</el-form>
</div>
<h2 class="imtil">指定受益人或法定继承人</h2>
<div class="wrap">
<!-- <div class="masks"></div>-->
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="姓名">
<el-input v-model="form.bailor_name"></el-input>
<el-input v-model="form4.bailor_name"></el-input>
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.bailor_tel"></el-input>
<el-input v-model="form4.bailor_tel"></el-input>
</el-form-item>
<el-form-item label="与终止人关系">
<el-input v-model="form.relation"></el-input>
<el-input v-model="form4.relation"></el-input>
</el-form-item>
</el-form>
<el-form ref="form" :model="form" class="form" label-width="auto">
<el-form ref="form4" :model="form4" class="form4" label-width="auto">
<el-form-item label="性别">
<el-input v-model="form.bailor_sex"></el-input>
<el-input v-model="form4.bailor_sex"></el-input>
</el-form-item>
<el-form-item label="身份证号码">
<el-input v-model="form.bailor_idNo"></el-input>
<el-input v-model="form4.bailor_idNo"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -157,7 +157,7 @@
test: "sadgsdg",
itmebs: "",
bb: false,
form: {
form4: {
account_balance: "",
account_totle: "",
addres_new: "",
......@@ -212,11 +212,11 @@
}).then(() => {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.insCan.recordId,
examineState: 1,
remark: "",
userId: 1,
// InsuredCancelEntity: this.form,
// InsuredCancelEntity: this.form4,
};
this.$api.getlist.shenhe(data).then((res) => {
let loadingInstance = Loading.service();
......@@ -230,6 +230,14 @@
});
this.$router.push({
name: "参保注销审核"
});
// 关闭当前标签
var closeAll = document.querySelectorAll(".el-icon-close");
closeAll.forEach(icon => {
if (icon.previousSibling.innerText === "参保注销审核 ") {
icon.click();
throw new Error();
}
})
} else {
this.$message({
......@@ -264,7 +272,7 @@
if (value) {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.insCan.recordId,
examineState: 2,
remark: value,
userId: 1
......@@ -332,19 +340,17 @@
}
},
created() {
this.show = this.$route.params.show;
if (this.$route.params.info) {
sessionStorage.setItem("info", this.$route.params.info);
sessionStorage.setItem("items", JSON.stringify(this.$route.params));
this.show = this.$route.params.insCan.show;
if (this.$route.params.insCan.info) {
sessionStorage.setItem("info", this.$route.params.insCan.info);
sessionStorage.setItem("items", JSON.stringify(this.$route.params.insCan));
}
this.form = JSON.parse(sessionStorage.getItem("info"));
console.log(this.form);
this.form.name = this.decrypt(this.form.name);
this.form.bailor_name = this.decrypt(this.form.bailor_name);
this.form.identity_number = this.decrypt(this.form.identity_number);
this.form.bailor_idNo = this.decrypt(this.form.bailor_idNo);
this.form4 = JSON.parse(sessionStorage.getItem("info"));
this.form4.name = this.decrypt(this.form4.name);
this.form4.bailor_name = this.decrypt(this.form4.bailor_name);
this.form4.identity_number = this.decrypt(this.form4.identity_number);
this.form4.bailor_idNo = this.decrypt(this.form4.bailor_idNo);
var obj = JSON.parse(sessionStorage.getItem("items"));
console.log(obj);
if (obj.bankpic) {
this.bb = true;
this.itmebs = "银行卡";
......@@ -364,8 +370,8 @@
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.signpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardfrontpic);
this.urls.push("http://socialsecurity.oss-cn-beijing.aliyuncs.com/" + obj.idcardbackpic);
this.form.sex = this.form.sex === 1 ? "男" : "女";
this.form.bailor_sex = this.form.bailor_sex === 1 ? "男" : "女";
this.form4.sex = this.form4.sex === 1 ? "男" : "女";
this.form4.bailor_sex = this.form4.bailor_sex === 1 ? "男" : "女";
}
}
</script>
......@@ -384,7 +390,7 @@
z-index: 200
}
.form {
.form4 {
float: left;
width: 45%;
margin-left: 20px;
......
xichongSys/src/views/Myvue/table.vue
View file @ fa039cf5
......@@ -286,24 +286,12 @@
})
}else if(d.recordtype=="待遇申请"){
sessionStorage.setItem("recordId",this.tableData[s].recordId)
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"待遇申请审核",
params:{info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
})
} else if(d.recordtype=="参保注销") {
sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"参保注销审核",
params:{
params:{
treApp: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
......@@ -313,6 +301,25 @@
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
} else if(d.recordtype=="参保注销") {
// sessionStorage.setItem("recordId",this.tableData[s].recordId)
this.$router.push({
name:"参保注销审核",
params:{
insCan: {
recordId: this.tableData[s].recordId,
info:this.tableData[s].info,
bankpic:this.tableData[s].bankpic,
idcardbackpic:this.tableData[s].idcardbackpic,
idcardfrontpic:this.tableData[s].idcardfrontpic,
signpic:this.tableData[s].signpic,
specialPhotoPic:this.tableData[s].specialPhotoPic,
bookPic:this.tableData[s].bookPic,
show:true
}
}
})
}
},
......
xichongSys/src/views/Myvue/treatmentApplicationAudit.vue
View file @ fa039cf5
......@@ -145,7 +145,7 @@
}).then(() => {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.treApp.recordId,
examineState: 1,
remark: "",
userId: 1
......@@ -196,7 +196,7 @@
if (value) {
Loading.service();
var data = {
recordId: sessionStorage.getItem("recordId"),
recordId: this.$route.params.treApp.recordId,
examineState: 2,
remark: value,
userId: 1
......@@ -220,6 +220,14 @@
message: res.message
});
}
// 关闭当前标签
var closeAll = document.querySelectorAll(".el-icon-close");
closeAll.forEach(icon => {
if (icon.previousSibling.innerText === "待遇申请审核 ") {
icon.click();
throw new Error();
}
})
}).catch((res) => {
let loadingInstance = Loading.service();
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
......@@ -264,10 +272,10 @@
}
},
created() {
this.show = this.$route.params.show;
if (this.$route.params.info) {
sessionStorage.setItem("info", this.$route.params.info);
var a = JSON.stringify(this.$route.params);
this.show = this.$route.params.treApp.show;
if (this.$route.params.treApp.info) {
sessionStorage.setItem("info", this.$route.params.treApp.info);
var a = JSON.stringify(this.$route.params.treApp);
sessionStorage.setItem("items", a);
}
this.form = JSON.parse(sessionStorage.getItem("info"));
......
xichongSys/src/views/Sys/User.vue
View file @ fa039cf5
......@@ -57,7 +57,10 @@
<el-form-item label="密码" prop="password">
<el-input v-model="dataForm.password" type="password" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="机构" prop="deptName">
<el-form-item label="身份证" prop="bangIdcard">
<el-input v-model="dataForm.bangIdcard" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="机构" prop="deptId">
<el-cascader
ref="deptTree"
v-model="dataForm.deptId"
......@@ -82,7 +85,7 @@
<el-form-item label="手机" prop="mobile">
<el-input v-model="dataForm.mobile" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="角色" prop="userRoles" v-if="!operation">
<el-form-item label="角色" prop="userRoles">
<el-select v-model="dataForm.userRoles" multiple placeholder="请选择"
style="width: 100%;">
<el-option v-for="item in roles" :key="item.id"
......@@ -90,6 +93,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="职务" prop="job">
<el-input v-model="dataForm.job" auto-complete="off"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :size="size" @click.native="dialogVisible = false" @click="cancelRules('dataForm')">{{$t('action.cancel')}}</el-button>
......@@ -134,6 +140,9 @@ export default {
],
truename: [
{ required: true, message: '请输入真实姓名', trigger: 'blur' }
],
deptId: [
{ type: 'array', required: true, message: '请选择机构', trigger: 'change'}
]
},
// 新增编辑界面数据
......@@ -142,10 +151,12 @@ export default {
name: '',
truename:'',
password: '',
bangIdcard: '',
deptId: '',
deptName: '',
email: 'test@qq.com',
mobile: '13889700023',
email: '',
mobile: '',
job: '',
status: 1,
userRoles: []
},
......@@ -189,10 +200,12 @@ export default {
id: 0,
name: '',
password: '',
deptId: 1,
bangIdcard: '',
deptId: '',
deptName: '',
email: 'test@qq.com',
mobile: '13889700023',
email: '',
mobile: '',
job: '',
status: 1,
userRoles: []
}
......@@ -287,7 +300,8 @@ export default {
this.columns = [
{prop:"id", label:"ID", minWidth:50},
{prop:"name", label:"用户名", minWidth:100},
{prop:"truename", label:"真实姓名", minWidth:80},
{prop:"truename", label:"真实姓名", minWidth:80},
{prop:"idCard", label:"身份证", minWidth:100},
{prop:"deptName", label:"机构", minWidth:100},
{prop:"roleNames", label:"角色", minWidth:80},
{prop:"job", label:"职务", minWidth:80},
......@@ -301,6 +315,7 @@ export default {
]
this.filterColumns = JSON.parse(JSON.stringify(this.columns));
       },
// 清空验证的提示信息
cancelRules: function (formName) {
this.$refs[formName].resetFields();
}
......
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 to comment