Skip to content

薪
薪瑞通-前端
Commit 34e7b088 authored by 许珑标's avatar 许珑标
Browse files
Options

发薪记录:查全部、去掉增删改功能； 

调整薪资导入：默认覆盖调整记录、更新导入模板；
发薪统计：增加统计字段；
parent aad5e249
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 46 deletions
src/views/business/payOutDetail/index.vue
View file @ 34e7b088
...@@ -247,14 +247,14 @@ ...@@ -247,14 +247,14 @@
<!-- 薪资调整导入对话框 --> <!-- 薪资调整导入对话框 -->
<el-dialog title="薪资调整导入" :visible.sync="adjustUpload.open" width="400px" append-to-body> <el-dialog title="薪资调整导入" :visible.sync="adjustUpload.open" width="400px" append-to-body>
<el-form label-width="150px"> <!-- <el-form label-width="150px">-->
<el-form-item label="是否删除原记录"> <!-- <el-form-item label="是否删除原记录">-->
<el-radio-group v-model="adjustUpload.uploadRadio"> <!-- <el-radio-group v-model="adjustUpload.uploadRadio">-->
<el-radio :label="1">是</el-radio> <!-- <el-radio :label="1">是</el-radio>-->
<el-radio :label="2">否</el-radio> <!-- <el-radio :label="2">否</el-radio>-->
</el-radio-group> <!-- </el-radio-group>-->
</el-form-item> <!-- </el-form-item>-->
</el-form> <!-- </el-form>-->
<el-upload ref="adjustUpload" :limit="1" accept=".xlsx, .xls" :headers="adjustUpload.headers" <el-upload ref="adjustUpload" :limit="1" accept=".xlsx, .xls" :headers="adjustUpload.headers"
:action="adjustUpload.url + '?cover=' + adjustUpload.uploadRadio" :disabled="adjustUpload.isUploading" :action="adjustUpload.url + '?cover=' + adjustUpload.uploadRadio" :disabled="adjustUpload.isUploading"
:on-progress="handleFileUploadProgressAdjust" :on-success="handleFileSuccessAdjust" :auto-upload="false" drag> :on-progress="handleFileUploadProgressAdjust" :on-success="handleFileSuccessAdjust" :auto-upload="false" drag>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="薪资调整导入模板" <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="薪资调整导入模板"
href="/导入薪资调整模板.xlsx" target="_blank">下载模板</a> href="/薪资调整导入模板.xlsx" target="_blank">下载模板</a>
</div> </div>
</el-upload> </el-upload>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -314,7 +314,7 @@ export default { ...@@ -314,7 +314,7 @@ export default {
// 是否禁用上传 // 是否禁用上传
isUploading: false, isUploading: false,
// 是否更新已经存在的用户数据 // 是否更新已经存在的用户数据
uploadRadio: 2, uploadRadio: 1,
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
......
src/views/business/payOutDetail/list.vue
View file @ 34e7b088
...@@ -20,21 +20,21 @@ ...@@ -20,21 +20,21 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" <!-- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"-->
v-hasPermi="['business:payOutDetail:add']">新增 <!-- v-hasPermi="['business:payOutDetail:add']">新增-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" <!-- <el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"-->
v-hasPermi="['business:payOutDetail:edit']">修改 <!-- v-hasPermi="['business:payOutDetail:edit']">修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" <!-- <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"-->
v-hasPermi="['business:payOutDetail:remove']">删除 <!-- v-hasPermi="['business:payOutDetail:remove']">删除-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:payOutDetail:export']">导出 v-hasPermi="['business:payOutDetail:export']">导出
...@@ -145,13 +145,13 @@ ...@@ -145,13 +145,13 @@
<!-- type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"--> <!-- type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['business:payOutDetail:edit']">修改--> <!-- v-hasPermi="['business:payOutDetail:edit']">修改-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button v-if="scope.row.payStatus && 1 == scope.row.payStatus" size="mini" type="text" icon="el-icon-edit" <!-- <el-button v-if="scope.row.payStatus && 1 == scope.row.payStatus" size="mini" type="text" icon="el-icon-edit"-->
@click="checkWork(scope.row)" v-hasPermi="['business:payOutDetail:edit']">调整薪资 <!-- @click="checkWork(scope.row)" v-hasPermi="['business:payOutDetail:edit']">调整薪资-->
</el-button> <!-- </el-button>-->
<el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini" <!-- <el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini"-->
type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" <!-- type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"-->
v-hasPermi="['business:payOutDetail:remove']">删除 <!-- v-hasPermi="['business:payOutDetail:remove']">删除-->
</el-button> <!-- </el-button>-->
<el-button v-if="scope.row.payStatus && 3 == scope.row.payStatus" size="mini" type="text" icon="el-icon-info" <el-button v-if="scope.row.payStatus && 3 == scope.row.payStatus" size="mini" type="text" icon="el-icon-info"
@click="eviView(scope.row)">查看回单 @click="eviView(scope.row)">查看回单
</el-button> </el-button>
...@@ -280,7 +280,7 @@ export default { ...@@ -280,7 +280,7 @@ export default {
batchNo: null, batchNo: null,
companyName: null, companyName: null,
companyCode: null, companyCode: null,
payStatus: 3, payStatus: null,
userName: null, userName: null,
userCode: null userCode: null
}, },
......
src/views/statistics/index.vue
View file @ 34e7b088
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<el-form :model="paramsMonth" label-width="80px" label-position="left"> <el-form :model="paramsMonth" label-width="80px" label-position="left">
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发薪主体"> <el-form-item label="合同名称">
<el-input v-model="paramsMonth.payerAccName" placeholder="请输入发薪主体"></el-input> <el-input v-model="paramsMonth.contractName" placeholder="请输入合同名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{{ statisticsMothTime(row.timeVal) }} {{ statisticsMothTime(row.timeVal) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payerAccName" label="发薪主体"> <el-table-column prop="contractName" label="合同名称">
</el-table-column> </el-table-column>
<el-table-column prop="companyName" label="单位名称"> <el-table-column prop="companyName" label="单位名称">
</el-table-column> </el-table-column>
...@@ -65,6 +65,20 @@ ...@@ -65,6 +65,20 @@
<el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)"> <el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="个人承担部分">
<el-table-column prop="gsbxPersonalMoney" label="工商保险(元)">
</el-table-column>
<el-table-column prop="providentFundPersonalMoney" label="公积金(元)">
</el-table-column>
<el-table-column prop="sybxPersonalMoney" label="失业保险(元)">
</el-table-column>
<el-table-column prop="syubxPersonalMoney" label="生育保险(元)">
</el-table-column>
<el-table-column prop="ylbxPersonalMoney" label="养老保险(元)">
</el-table-column>
<el-table-column prop="ysbxPersonalMoney" label="医疗保险(元)">
</el-table-column>
</el-table-column>
</el-table> </el-table>
<div style="text-align: end;margin-top:6px;"> <div style="text-align: end;margin-top:6px;">
<el-pagination @size-change="handleSizeChangeMonth" @current-change="handleCurrentChangeMonth" <el-pagination @size-change="handleSizeChangeMonth" @current-change="handleCurrentChangeMonth"
...@@ -79,8 +93,8 @@ ...@@ -79,8 +93,8 @@
<el-form :model="paramsYear" label-width="80px" label-position="left"> <el-form :model="paramsYear" label-width="80px" label-position="left">
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发薪主体"> <el-form-item label="合同名称">
<el-input v-model="paramsYear.payerAccName" placeholder="请输入发薪主体"></el-input> <el-input v-model="paramsYear.contractName" placeholder="请输入合同名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -117,7 +131,7 @@ ...@@ -117,7 +131,7 @@
{{ statisticsYearTime(row.timeVal) }} {{ statisticsYearTime(row.timeVal) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="payerAccName" label="发薪主体"> <el-table-column prop="contractName" label="合同名称">
</el-table-column> </el-table-column>
<el-table-column prop="companyName" label="单位名称"> <el-table-column prop="companyName" label="单位名称">
</el-table-column> </el-table-column>
...@@ -137,6 +151,20 @@ ...@@ -137,6 +151,20 @@
<el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)"> <el-table-column prop="ysbxCompanyMoney" label="医疗保险(元)">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="个人承担部分">
<el-table-column prop="gsbxPersonalMoney" label="工商保险(元)">
</el-table-column>
<el-table-column prop="providentFundPersonalMoney" label="公积金(元)">
</el-table-column>
<el-table-column prop="sybxPersonalMoney" label="失业保险(元)">
</el-table-column>
<el-table-column prop="syubxPersonalMoney" label="生育保险(元)">
</el-table-column>
<el-table-column prop="ylbxPersonalMoney" label="养老保险(元)">
</el-table-column>
<el-table-column prop="ysbxPersonalMoney" label="医疗保险(元)">
</el-table-column>
</el-table-column>
</el-table> </el-table>
<div style="text-align: end;margin-top:6px;"> <div style="text-align: end;margin-top:6px;">
<el-pagination @size-change="handleSizeChangeYear" @current-change="handleCurrentChangeYear" <el-pagination @size-change="handleSizeChangeYear" @current-change="handleCurrentChangeYear"
...@@ -162,7 +190,7 @@ export default { ...@@ -162,7 +190,7 @@ export default {
timeUnit: 'MONTH', timeUnit: 'MONTH',
timeVal: null, timeVal: null,
companyName: null, companyName: null,
payerAccName: null contractName: null
}, },
totalMonth: 0, totalMonth: 0,
statisticsMothList: [], statisticsMothList: [],
...@@ -174,7 +202,7 @@ export default { ...@@ -174,7 +202,7 @@ export default {
timeUnit: 'YEAR', timeUnit: 'YEAR',
timeVal: null, timeVal: null,
companyName: null, companyName: null,
payerAccName: null contractName: null
}, },
totalYear: 0, totalYear: 0,
statisticsYearList: [], statisticsYearList: [],
...@@ -247,7 +275,7 @@ export default { ...@@ -247,7 +275,7 @@ export default {
}, 0); }, 0);
// sums[index] += ' 元'; // sums[index] += ' 元';
} else { } else {
sums[index] = 'N/A'; sums[index] = '';
} }
}); });
let arrAY = [] let arrAY = []
...@@ -292,7 +320,7 @@ export default { ...@@ -292,7 +320,7 @@ export default {
}, 0); }, 0);
// sums[index] += ' 元'; // sums[index] += ' 元';
} else { } else {
sums[index] = 'N/A'; sums[index] = '';
} }
}); });
let arrAY = [] let arrAY = []
...@@ -316,7 +344,7 @@ export default { ...@@ -316,7 +344,7 @@ export default {
timeUnit: 'YEAR', timeUnit: 'YEAR',
timeVal: String(new Date().getFullYear()), timeVal: String(new Date().getFullYear()),
companyName: null, companyName: null,
payerAccName: null, contractName: null,
} }
this.getStatisticsListYear() this.getStatisticsListYear()
}, },
...@@ -328,7 +356,7 @@ export default { ...@@ -328,7 +356,7 @@ export default {
timeUnit: 'MONTH', timeUnit: 'MONTH',
timeVal: String(new Date().getFullYear()) + '-' + String(new Date().getMonth() + 1).padStart(2, '0'), timeVal: String(new Date().getFullYear()) + '-' + String(new Date().getMonth() + 1).padStart(2, '0'),
companyName: null, companyName: null,
payerAccName: null, contractName: null,
} }
this.getStatisticsListMonth() this.getStatisticsListMonth()
}, },
...@@ -398,4 +426,4 @@ export default { ...@@ -398,4 +426,4 @@ export default {
} }
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>
\ No newline at end of file
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