Commit 4296a7bd by lishengfu

Merge branch 'master' of gitlab.corp.qinqinxiaobao.com:frontend_vue/qqxb-self-service

parents a130c21e 0ca92150
...@@ -2,36 +2,36 @@ ...@@ -2,36 +2,36 @@
* 员工相关接口 * 员工相关接口
*/ */
export interface EmployeeInterface { export interface EmployeeInterface {
getUserInfo(params: any): Promise<any>; getUserInfo(params: any): Promise<any>;
getCityList(params: any): Promise<any>; // 获取城市列表 getCityList(params: any): Promise<any>; // 获取城市列表
getDispatchList(params: any): Promise<any>; //根据身份证获取用户所属派遣公司列表 getDispatchList(params: any): Promise<any>; //根据身份证获取用户所属派遣公司列表
getDispatchInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的信息(劳务派遣首页数据) getDispatchInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的信息(劳务派遣首页数据)
getWorkInfoList(params: any): Promise<any>; //获取工作信息列表 getWorkInfoList(params: any): Promise<any>; //获取工作信息列表
getWorkInfoDetail(params: any): Promise<any>; //获取工作信息详情 getWorkInfoDetail(params: any): Promise<any>; //获取工作信息详情
updateWorkInfo(params: any): Promise<any>; //修改工作信息 updateWorkInfo(params: any): Promise<any>; //修改工作信息
addWorkInfo(params: any): Promise<any>; //新增工作信息 addWorkInfo(params: any): Promise<any>; //新增工作信息
deleteWorkInfo(params: any): Promise<any>; //新增工作信息 deleteWorkInfo(params: any): Promise<any>; //新增工作信息
getPersonInfo(params: any): Promise<any>; //获取个人信息 getPersonInfo(params: any): Promise<any>; //获取个人信息
savePersonInfo(params: any): Promise<any>; //保存个人信息 savePersonInfo(params: any): Promise<any>; //保存个人信息
getContactInfo(params: any): Promise<any>; //获取联系信息 getContactInfo(params: any): Promise<any>; //获取联系信息
saveContactInfo(params: any): Promise<any>; //保存联系信息 saveContactInfo(params: any): Promise<any>; //保存联系信息
getSocialInfo(params: any): Promise<any>; //获取社保信息 getSocialInfo(params: any): Promise<any>; //获取社保信息
saveSocialInfo(params: any): Promise<any>; //保存社保信息 saveSocialInfo(params: any): Promise<any>; //保存社保信息
getWageCardInfo(params: any): Promise<any>; //获取工资卡信息 getWageCardInfo(params: any): Promise<any>; //获取工资卡信息
saveWageCardInfo(params: any): Promise<any>; //保存工资卡信息 saveWageCardInfo(params: any): Promise<any>; //保存工资卡信息
getEduExperience(params: any): Promise<any>; //获取教育经历 getEduExperience(params: any): Promise<any>; //获取教育经历
getEduExperienceDetial(params: any): Promise<any>; //获取教育信息详情 getEduExperienceDetial(params: any): Promise<any>; //获取教育信息详情
addEduExperience(params: any): Promise<any>; //新增教育信息 addEduExperience(params: any): Promise<any>; //新增教育信息
updateEduExperience(params: any): Promise<any>; //修改教育信息 updateEduExperience(params: any): Promise<any>; //修改教育信息
deleteEduExperience(params: any): Promise<any>; //删除教育信息 deleteEduExperience(params: any): Promise<any>; //删除教育信息
getTechnologyExperience(params: any): Promise<any>; //获取技术特长 getTechnologyExperience(params: any): Promise<any>; //获取技术特长
updateTechnologyExperience(params: any): Promise<any>; //修改技术特长 updateTechnologyExperience(params: any): Promise<any>; //修改技术特长
getSalaryInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的工资条信息 getSalaryInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的工资条信息
getFiles(params:any):Promise<any>;// 获取文件 getSalaryInfoDetail(params: any): Promise<any>; //通过ID拿到派遣员工的工资条详细信息
setFiles(params:any):Promise<any>;// 设置文件 getFiles(params: any): Promise<any>; // 获取文件
delFiles(params:any):Promise<any>;// 删除文件 setFiles(params: any): Promise<any>; // 设置文件
putFiles(params:any):Promise<any>;// 提交文件 delFiles(params: any): Promise<any>; // 删除文件
putFiles(params: any): Promise<any>; // 提交文件
getAgileWorker(params: any): Promise<any>; //灵活用工 getAgileWorker(params: any): Promise<any>; //灵活用工
} }
...@@ -280,6 +280,16 @@ class EmployeeService implements EmployeeInterface { ...@@ -280,6 +280,16 @@ class EmployeeService implements EmployeeInterface {
/** /**
* *
* 通过id获取工资条详细
* @param params
*/
public getSalaryInfoDetail(params: any): Promise<any> {
let url = `${urls.employeeUrl}/api/user/employee/salary/${params.id}/detail`;
return request.get(url, {}, this.header, false);
}
/**
*
* 获取文件 * 获取文件
* @param params * @param params
*/ */
......
...@@ -42,7 +42,11 @@ ...@@ -42,7 +42,11 @@
v-for="(itemD, indexD) in itemM.list" v-for="(itemD, indexD) in itemM.list"
:key="indexD" :key="indexD"
> >
<a href class="detail"> <a
href="javascript:void(0)"
class="detail"
@click="toDetail_click(itemD.id)"
>
<span class="font2">工资 | {{ itemD.abbrName }}</span> <span class="font2">工资 | {{ itemD.abbrName }}</span>
<span></span> <span></span>
<span class="font2">{{ <span class="font2">{{
...@@ -85,14 +89,18 @@ export default class PaySlips extends Vue { ...@@ -85,14 +89,18 @@ export default class PaySlips extends Vue {
"2029" "2029"
]; ];
private toDetail_click(id: any) {
this.$router.push({ name: "PaySlipsMonth", query: { id: id } });
}
private getSalaryInfo(): void { private getSalaryInfo(): void {
let params = { let params = {
spId: this.$route.query.sp_id, spId: this.$route.query.sp_id,
idNo: "330881199511043934" //localStorage.getItem("id_no") idNo: localStorage.getItem("id_no")
}; };
this.$server.EmployeeService.getSalaryInfo(params) this.$server.EmployeeService.getSalaryInfo(params)
.then(res => { .then(res => {
console.log("res=" + JSON.stringify(res) + "工资条信息"); // console.log("res=" + JSON.stringify(res) + "工资条信息");
this.data = res; this.data = res;
this.changeData(); this.changeData();
console.log("obj=", JSON.stringify(this.obj)); console.log("obj=", JSON.stringify(this.obj));
...@@ -289,6 +297,9 @@ export default class PaySlips extends Vue { ...@@ -289,6 +297,9 @@ export default class PaySlips extends Vue {
</script> </script>
<style lang="less"> <style lang="less">
#main-content {
width: 90%;
}
.pay-item-box2 { .pay-item-box2 {
width: 100%; width: 100%;
} }
......
...@@ -4,22 +4,21 @@ ...@@ -4,22 +4,21 @@
<div class="slips-mid-top"> <div class="slips-mid-top">
<p>实发工资(元)</p> <p>实发工资(元)</p>
<h3> <h3>
current_real_wage <span>{{ Number(obj[0].currentRealWage).toFixed(2) }}</span>
<span>.00</span>
</h3> </h3>
</div> </div>
<div class="slips-mid-bottom"> <div class="slips-mid-bottom">
<p> <p>
<label>收入来源</label> <label>收入来源</label>
<span>abbr_name</span> <span>{{ obj[0].abbrName }}</span>
</p> </p>
<p> <p>
<label>保存账户</label> <label>保存账户</label>
<span>bank_no</span> <span>{{ obj[0].bankNo }}</span>
</p> </p>
<p> <p>
<label>发放时间</label> <label>发放时间</label>
<span>pay_time</span> <span>{{ obj[0].payTime }}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -29,44 +28,135 @@ ...@@ -29,44 +28,135 @@
<div class="pay-detail-box"> <div class="pay-detail-box">
<p> <p>
<label>本次收入</label> <label>本次收入</label>
<!-- <span>current_real_wage - current_base_old_insurance - current_base_health_insurance - current_unemployment_insurance - current_fund - current_tax_deduction</span> --> <span>{{
<span>1000.00</span> Number(obj[0].currentRealWage) -
Number(obj[0].currentBaseOldInsurance) -
Number(obj[0].currentBaseHealthInsurance) -
Number(obj[0].currentUnemploymentInsurance) -
Number(obj[0].currentFund) -
Number(obj[0].currentTaxDeduction)
}}</span>
</p> </p>
<p> <p>
<label>养老保险</label> <label>养老保险</label>
<span>current_base_old_insurance</span> <span class="green"
>-{{ Number(obj[0].currentBaseOldInsurance).toFixed(2) }}</span
>
</p> </p>
<p> <p>
<label>医疗保险</label> <label>医疗保险</label>
<span>current_base_health_insurance</span> <span class="green"
>-{{ Number(obj[0].currentBaseHealthInsurance).toFixed(2) }}</span
>
</p> </p>
<p> <p>
<label>失业保险</label> <label>失业保险</label>
<span>current_unemployment_insurance</span> <span class="green"
>-{{ Number(obj[0].currentUnemploymentInsurance).toFixed(2) }}</span
>
</p> </p>
<p> <p>
<label>住房公积金</label> <label>住房公积金</label>
<span>current_fund</span> <span class="green"
>-{{ Number(obj[0].currentFund).toFixed(2) }}</span
>
</p> </p>
<p> <p>
<label>代扣个税</label> <label>代扣个税</label>
<span>current_tax_deduction</span> <span class="green"
>-{{ Number(obj[0].currentTaxDeduction).toFixed(2) }}</span
>
</p> </p>
<p class="wages"> <p class="wages">
<label>实发工资</label> <label>实发工资</label>
<span>current_real_wage</span> <span>-{{ Number(obj[0].currentRealWage).toFixed(2) }}</span>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script lang="ts">
import "../assets/css/labor.css"; import "../assets/css/labor.css";
export default {}; import Vue from "vue";
import { Component } from "vue-property-decorator";
@Component({})
export default class PaySlipsMonth extends Vue {
private obj: any = [
{
no: "",
abbrName: "",
currentRealWage: 0,
currentBaseOldInsurance: 0,
cardType: "",
bankNo: "",
currentFund: 0,
payTime: "",
currentIncome: 0,
currentUnemploymentInsurance: 0,
cardNo: "",
currentBaseHealthInsurance: 0,
name: "",
bankName: "",
bankOpen: "",
currentTaxDeduction: 0
}
];
private id: any = "";
private getSalaryInfo(): void {
let params = {
id: this.id
};
this.$server.EmployeeService.getSalaryInfoDetail(params)
.then(res => {
// console.log("res=" + JSON.stringify(res) + "工资条信息");
this.obj = res;
console.log("obj=", JSON.stringify(this.obj));
})
.catch(error => {});
}
init() {
this.id = this.$route.query.id;
this.getSalaryInfo();
// this.obj = {
// rescode: 0,
// data: [
// {
// no: "GZ20200608160345451651972",
// abbrName: "1022服务商Q",
// currentRealWage: 500000,
// current_base_old_insurance: 10000,
// card_type: "居民身份证",
// bank_no: "6214833401590859",
// current_fund: 3000,
// pay_time: "2020-06-08",
// current_income: 650000,
// current_unemployment_insurance: 2000,
// card_no: "330881199511043934",
// current_base_health_insurance: 5000,
// name: "李鹏飞",
// bank_name: "招商银行",
// bank_open: "招商银行中华北大街支行",
// current_tax_deduction: 5000
// }
// ]
// };
}
created() {
console.log("this.id=", this.id);
this.init();
}
}
</script> </script>
<style lang="less"> <style lang="less">
.green {
color: #70b603 !important;
}
</style> </style>
\ No newline at end of file
...@@ -83,9 +83,12 @@ export default class SelectIdentity extends Vue { ...@@ -83,9 +83,12 @@ export default class SelectIdentity extends Vue {
await this.$server.EmployeeService.getUserInfo({}) await this.$server.EmployeeService.getUserInfo({})
.then(res => { .then(res => {
if (res.data && res.data.uthStatus && res.data.uthStatus > 0) { if (res.data && res.data.uthStatus && res.data.uthStatus > 0) {
console.log(res);
this.id_no = res.data.personalIdCardNo; this.id_no = res.data.personalIdCardNo;
localStorage.setItem("id_no", res.data.personalIdCardNo); localStorage.setItem("id_no", res.data.personalIdCardNo);
localStorage.setItem("name", res.data.personalName); localStorage.setItem("name", res.data.personalName);
localStorage.setItem("sex", res.data.sex);
localStorage.setItem("birthday", res.data.birthday); localStorage.setItem("birthday", res.data.birthday);
} else { } else {
//TODO: 跳转到实名认证 //TODO: 跳转到实名认证
......
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