admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 78+16个项目验收问题全部解决

Browse Source
This commit is contained in:
严妍 2023-07-13 14:41:24 +08:00
parent 105165fc92
commit 6c63d016a3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/api/laborManagement/payoff.js
View File

@ -30,12 +30,12 @@ export function payrollRecordDetailById(data) {
// 导出人员工资pdf // 导出人员工资pdf
export function exportSalaryPdf(params) { export function exportSalaryPdf(params) {
window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/salaryPdf?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}`; window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/salaryPdf?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
} }
// 导出工资列表excel // 导出工资列表excel
export function exportSalaryExcel(params) { export function exportSalaryExcel(params) {
window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/excelProjectWages?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}`; window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/excelProjectWages?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
} }
// 导入工资列表excel // 导入工资列表excel

9
src/views/projectFront/laborManage/Payoff/index.vue
View File

@ -111,6 +111,7 @@
<el-button @click="handleExportExcel">导出 Excel</el-button> <el-button @click="handleExportExcel">导出 Excel</el-button>
<el-upload <el-upload
style="display: inline-block; margin-left: 15px" style="display: inline-block; margin-left: 15px"
ref="upload"
class="upload-demo" class="upload-demo"
name="excelFile" name="excelFile"
:action=" :action="
@ -512,7 +513,8 @@ export default {
teamId: this.queryParams.teamId, teamId: this.queryParams.teamId,
departmentId: this.queryParams.departmentId, departmentId: this.queryParams.departmentId,
payStatus:this.queryParams.payStatus, payStatus:this.queryParams.payStatus,
payMonth: this.queryParams.payMonth payMonth: this.queryParams.payMonth,
enterpriseId: this.queryParams.enterpriseId
} }
exportSalaryPdf(params) exportSalaryPdf(params)
}, },
@ -523,15 +525,18 @@ export default {
teamId: this.queryParams.teamId, teamId: this.queryParams.teamId,
departmentId: this.queryParams.departmentId, departmentId: this.queryParams.departmentId,
payStatus:this.queryParams.payStatus, payStatus:this.queryParams.payStatus,
payMonth: this.queryParams.payMonth payMonth: this.queryParams.payMonth,
enterpriseId: this.queryParams.enterpriseId
} }
// console.log('导出参数',params) // console.log('导出参数',params)
exportSalaryExcel(params) exportSalaryExcel(params)
}, },
handleUploadSuccess(res) { handleUploadSuccess(res) {
console.log('导入成功')
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message); this.$message.success(res.message);
this.getEnterpriseList() this.getEnterpriseList()
this.$refs.upload.clearFiles();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }