Skip to content

薪
薪瑞通-前端
Commit b17f44bb authored by 谢子梦's avatar 谢子梦
Browse files
Options

文档问题优化

parent 01f06589
Show whitespace changes
Inline Side-by-side
Showing with 193 additions and 369 deletions
src/App.vue
View file @ b17f44bb
......@@ -17,3 +17,22 @@ export default {
}
}
</script>
<style lang="scss">
.el-table__body-wrapper {
background-color: #ddd;
}
.el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: rgb(197, 215, 222);
border-radius: 3px;
}
.el-table__body-wrapper::-webkit-scrollbar {
width: 8px !important;
height: 8px !important;
}
.el-table__body-wrapper {
background-color: #fff !important;
}
</style>
src/views/business/accInfo/index.vue
View file @ b17f44bb
......@@ -2,35 +2,17 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="单位名称" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入单位名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.companyName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="信用代码" prop="companyCode">
<el-input
v-model="queryParams.companyCode"
placeholder="请输入单位信用代码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.companyCode" placeholder="请输入单位信用代码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="发薪账户" prop="payAccNo">
<el-input
v-model="queryParams.payAccNo"
placeholder="请输入发薪账户"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.payAccNo" placeholder="请输入发薪账户" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="归属客户" prop="deptId">
<el-cascader
clearable
:props="cascaderProps"
v-model="queryParams.deptId"
:options="deptOptions">
<el-cascader clearable :props="cascaderProps" v-model="queryParams.deptId" :options="deptOptions">
</el-cascader>
</el-form-item>
<el-form-item>
......@@ -41,47 +23,25 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['business:accInfo:add']"
>新增</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['business:accInfo:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['business:accInfo:edit']"
>修改</el-button>
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['business:accInfo:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['business:accInfo:remove']"
>删除</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['business:accInfo:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['business:accInfo:export']"
>导出</el-button>
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:accInfo:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="accInfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="accInfoList" @selection-change="handleSelectionChange" :height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="单位名称" align="center" prop="companyName" />
<el-table-column label="信用代码" align="center" prop="companyCode" />
......@@ -91,31 +51,16 @@
<el-table-column label="归属客户" align="center" prop="deptName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:accInfo:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['business:accInfo:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:accInfo:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:accInfo:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改商户付款账户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -133,10 +78,7 @@
<el-input v-model="form.legalPhone" placeholder="请输入法人电话" />
</el-form-item>
<el-form-item label="归属客户" prop="deptId">
<el-cascader
:props="cascaderProps"
v-model="form.deptId"
:options="deptOptions">
<el-cascader :props="cascaderProps" v-model="form.deptId" :options="deptOptions">
</el-cascader>
</el-form-item>
<el-form-item label="发薪账户" prop="payAccNo">
......@@ -300,7 +242,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -342,12 +284,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商户付款账户编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除商户付款账户编号为"' + ids + '"的数据项？').then(function () {
return delAccInfo(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......
src/views/business/component/paidUsers.vue
View file @ b17f44bb
......@@ -16,14 +16,26 @@
<el-input v-model="formData.contractName" :disabled="true" placeholder="请输入所属合同"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="管理费" prop="operationCost">
<el-input-number @change="postcalculateShow = true" v-model="formData.operationCost"
placeholder="请输入请输入管理费" :precision="2" :step="1" :min="0" controls-position="right"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在岗位" prop="postName">
<el-input v-model="formData.postName" placeholder="请输入所在岗位"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="56">
<el-col :span="8">
<el-form-item label="员工姓名" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入员工姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="人员性别" prop="gender">
<!-- <el-input v-model="formData.gender" placeholder="请选择人员性别"></el-input> -->
<el-form-item label="人员性别">
<el-select v-model="formData.gender" placeholder="请选择人员性别">
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
......@@ -35,15 +47,14 @@
<el-input v-model="formData.userCode" placeholder="请输入身份证号"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="56">
<el-col :span="8">
<el-form-item label="岗位名称" prop="postName">
<el-input v-model="formData.postName" placeholder="请输入岗位名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="管理费" prop="operationCost">
<el-input-number @change="postcalculateShow = true" v-model="formData.operationCost"
placeholder="请输入请输入管理费" :precision="2" :step="1" :min="0" controls-position="right"></el-input-number>
<el-form-item label="账号类型" prop="payeeAccType">
<el-select v-model="formData.payeeAccType" placeholder="请选择账号类型" clearable>
<el-option v-for="dict in dict.type.payee_acc_type" :key="dict.value" :label="dict.label"
:value="dict.value * 1" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -52,15 +63,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账号类型" prop="payeeAccType">
<el-select v-model="formData.payeeAccType" placeholder="请选择账号类型" clearable>
<el-option v-for="dict in dict.type.payee_acc_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户行" prop="payeeAccBank">
<el-form-item label="开户行">
<el-select v-model="formData.payeeAccBank" filterable remote placeholder="请输入关键词"
:remote-method="listBanks" :loading="loading">
<el-option v-for="item in banks" :key="item.id" :label="item.bankName" :value="item.bankName">
......@@ -304,7 +307,7 @@
<div class="projectTitle">承担方式</div>
</el-col>
<el-col :span="5">
<el-radio-group v-model="formData.bearType">
<el-radio-group @change="bearChange" v-model="formData.bearType">
<el-radio :label="1">各自承担</el-radio>
<el-radio :label="2">个人全部承担</el-radio>
</el-radio-group>
......@@ -349,8 +352,7 @@
</el-form-item>
</el-col>
<el-col :span="3">
<el-button type="success" icon="el-icon-circle-plus-outline" @click="postcalculateFN"
v-if="postcalculateShow">计算
<el-button type="success" icon="el-icon-circle-plus-outline" @click="postcalculateFN">计算
</el-button>
</el-col>
</el-row>
......@@ -433,7 +435,7 @@ export default {
{ required: true, message: '收款账号不能为空', trigger: 'blur' }
],
postName: [
{ required: true, message: '岗位名称不能为空', trigger: 'blur' }
{ required: true, message: '所在岗位不能为空', trigger: 'blur' }
],
postWage: [
{ required: true, message: '岗位工资不能为空', trigger: 'blur' }
......@@ -547,6 +549,10 @@ export default {
}
},
methods: {
// 承担方式变化执行
bearChange() {
this.postcalculateFN()
},
// 计算方法
postcalculateFN() {
let obj = {
......
src/views/business/component/staffForm.vue
View file @ b17f44bb
......@@ -11,38 +11,37 @@
</div>
<div class="cardMain">
<el-row :gutter="56">
<el-col :span="8">
<el-col :span="10">
<el-form-item label="合同名称" prop="contractName">
<el-input v-model="formData.contractName" placeholder="请输入合同名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="管理费" prop="operationCost">
<el-input-number v-model="formData.operationCost" placeholder="请输入管理费" :precision="2"
:step="1" :min="0" controls-position="right"></el-input-number>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item label="合同编号" prop="contractCode">-->
<!-- <el-input v-model="formData.contractCode" placeholder="请输入合同编号"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
</el-row>
<el-row :gutter="56">
<el-col :span="10">
<el-form-item label="所在单位" prop="groupName">
<el-input v-model="formData.groupName" placeholder="请输入所在单位"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="所属部门" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入所属部门"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="10">
<el-form-item label-width="180px" label="单位编码(社会信用代码)" prop="groupCode">
<el-form-item label="单位编码">
<el-input v-model="formData.groupCode" placeholder="请输入单位编码(社会信用代码)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="56">
<el-col :span="10">
<el-form-item label="发薪主体">
<el-input placeholder="请输入发薪主题"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="管理费" prop="operationCost">
<el-input-number v-model="formData.operationCost" placeholder="请输入管理费" :precision="2"
:step="1" :min="0" controls-position="right"></el-input-number>
</el-form-item>
</el-col>
</el-row>
</div>
</el-card>
<!-- 缴纳基数 -->
......@@ -320,7 +319,7 @@ export default {
providentFundBase: 0,
providentFundCompanyRate: 0,
providentFundPersonalRate: 0,
operationCost: null,
operationCost: 0,
deptId: null,
bearType: 1,
},
......@@ -733,7 +732,7 @@ export default {
providentFundBase: 0,
providentFundCompanyRate: 0,
providentFundPersonalRate: 0,
operationCost: null,
operationCost: 0,
deptId: null,
bearType: 1,
}
......
src/views/business/outContract/index.vue
View file @ b17f44bb
......@@ -50,7 +50,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="outContractList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="outContractList" @selection-change="handleSelectionChange" height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="合同名称" align="center" prop="contractName" fixed />
<el-table-column label="合同编号" align="center" prop="contractCode" fixed />
......@@ -515,11 +515,12 @@ export default {
this.$refs["bcoForm"].validate(valid => {
if (valid) {
// console.log(this.bcoForm);
this.bcoForm.salaryMonth =this.bcoForm.salaryMonth + '-01'
this.bcoForm.salaryMonth = this.bcoForm.salaryMonth + '-01'
buildPayOutRecord(this.bcoForm).then(resp => {
if (resp.code == 200) {
this.bcoOpen = false
this.$modal.alertSuccess("操作成功,请耐心等待任务生成")
this.$modal.msgSuccess("操作成功,请耐心等待任务生成")
this.getList();
}
})
}
......
src/views/business/outPersonal/index.vue
View file @ b17f44bb
......@@ -44,7 +44,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="outPersonalList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="outPersonalList" @selection-change="handleSelectionChange" :height="640">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="所属合同" align="center" prop="contractName" fixed />
<el-table-column label="员工姓名" align="center" prop="userName" fixed />
......@@ -205,7 +205,7 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
<!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="发薪名单模板"
......
src/views/business/payOutDetail/index.vue
View file @ b17f44bb
......@@ -43,7 +43,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange" :height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工资月份" align="center" prop="salaryMonth" fixed>
<template slot-scope="scope">
......@@ -155,8 +155,7 @@
type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:payOutDetail:remove']">删除
</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)">查看回单
</el-button>
</template>
......
src/views/business/payOutDetail/list.vue
View file @ b17f44bb
......@@ -43,7 +43,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="payOutDetailList" @selection-change="handleSelectionChange" :height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工资月份" align="center" prop="salaryMonth" fixed>
<template slot-scope="scope">
......@@ -128,7 +128,7 @@
<el-table-column label="应发工资" align="center" prop="salaryPayable" />
<el-table-column label="实发金额" align="center" prop="actualPayable" />
<el-table-column label="管理费" align="center" prop="operationCost" />
<el-table-column label="考勤扣除" align="center" prop="checkWorkCost">
<el-table-column label="薪资调整" align="center" prop="checkWorkCost">
<template slot-scope="{row}">
{{ row.checkWorkCost ? row.checkWorkCost : '--' }}
</template>
......@@ -140,22 +140,18 @@
</el-table-column>
<el-table-column label="操作" align="center" width="110" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus"
size="mini" type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
<el-button v-if="scope.row.payStatus && 3 != scope.row.payStatus && 2 != scope.row.payStatus" size="mini"
type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutDetail:edit']">修改
</el-button>
<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']">考勤核对
<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']">考勤核对
</el-button>
<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)"
<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)"
v-hasPermi="['business:payOutDetail:remove']">删除
</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)">查看回单
</el-button>
</template>
......
src/views/business/payOutGroup/index.vue
View file @ b17f44bb
......@@ -2,84 +2,39 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="工资批次编号" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
placeholder="请输入工资批次编号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.batchNo" placeholder="请输入工资批次编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工资批次分组编号" prop="groupNo">
<el-input
v-model="queryParams.groupNo"
placeholder="请输入工资批次分组编号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.groupNo" placeholder="请输入工资批次分组编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="工资月份" prop="salaryMonth">
<el-date-picker clearable
v-model="queryParams.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="queryParams.salaryMonth" type="date" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资月份">
</el-date-picker>
</el-form-item>
<el-form-item label="组内总条数" prop="totalCount">
<el-input
v-model="queryParams.totalCount"
placeholder="请输入组内总条数"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.totalCount" placeholder="请输入组内总条数" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="组内总金额" prop="totalAmount">
<el-input
v-model="queryParams.totalAmount"
placeholder="请输入组内总金额"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.totalAmount" placeholder="请输入组内总金额" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="成功条数" prop="successCount">
<el-input
v-model="queryParams.successCount"
placeholder="请输入成功条数"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.successCount" placeholder="请输入成功条数" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="成功金额" prop="successAmount">
<el-input
v-model="queryParams.successAmount"
placeholder="请输入成功金额"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.successAmount" placeholder="请输入成功金额" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="失败条数" prop="failCount">
<el-input
v-model="queryParams.failCount"
placeholder="请输入失败条数"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.failCount" placeholder="请输入失败条数" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="失败金额" prop="failAmount">
<el-input
v-model="queryParams.failAmount"
placeholder="请输入失败金额"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.failAmount" placeholder="请输入失败金额" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="所属部门" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入所属部门"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.deptId" placeholder="请输入所属部门" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -89,42 +44,20 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['business:payOutGroup:add']"
>新增</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['business:payOutGroup:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['business:payOutGroup:edit']"
>修改</el-button>
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['business:payOutGroup:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['business:payOutGroup:remove']"
>删除</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['business:payOutGroup:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['business:payOutGroup:export']"
>导出</el-button>
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:payOutGroup:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -149,31 +82,16 @@
<el-table-column label="所属部门" align="center" prop="deptId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutGroup:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['business:payOutGroup:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutGroup:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:payOutGroup:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改发薪分组对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -185,10 +103,7 @@
<el-input v-model="form.groupNo" placeholder="请输入工资批次分组编号" />
</el-form-item>
<el-form-item label="工资月份" prop="salaryMonth">
<el-date-picker clearable
v-model="form.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="form.salaryMonth" type="date" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资月份">
</el-date-picker>
</el-form-item>
......@@ -357,7 +272,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -399,12 +314,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除发薪分组编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除发薪分组编号为"' + ids + '"的数据项？').then(function () {
return delPayOutGroup(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
......
src/views/business/payOutRecord/index.vue
View file @ b17f44bb
......@@ -49,7 +49,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange" :height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务名称" align="center" prop="batchName" />
<el-table-column label="合同名称" align="center" prop="contractName" />
......@@ -80,7 +80,8 @@
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-if="scope.row.payStatus && scope.row.payStatus > 0"
v-hasPermi="['business:payOutRecord:edit']">修改</el-button> -->
<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)"
<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)"
v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-money" @click="paySalary(scope.row)"
v-if="scope.row.payStatus && 1 == scope.row.payStatus"
......@@ -177,7 +178,7 @@
</template>
<script>
import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord, pay} from "@/api/business/payOutRecord";
import { listPayOutRecord, getPayOutRecord, delPayOutRecord, addPayOutRecord, updatePayOutRecord, pay } from "@/api/business/payOutRecord";
import { listPayAccInfo } from '@/api/business/payAcc'
export default {
......
src/views/business/payOutRecord/payOutRecord.vue
View file @ b17f44bb
......@@ -2,25 +2,14 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="任务名称" prop="batchName">
<el-input
v-model="queryParams.batchName"
placeholder="请输入发薪任务名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.batchName" placeholder="请输入发薪任务名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="发薪单位" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入发薪单位"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.companyName" placeholder="请输入发薪单位" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="下发状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
:value="dict.value" />
<el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
......@@ -31,89 +20,52 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['business:payOutRecord:add']"
>新增</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['business:payOutRecord:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['business:payOutRecord:edit']"
>修改</el-button>
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['business:payOutRecord:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['business:payOutRecord:remove']"
>删除</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['business:payOutRecord:export']"
>导出</el-button>
<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['business:payOutRecord:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="payOutRecordList" @selection-change="handleSelectionChange" :height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务名称" align="center" prop="batchName" />
<el-table-column label="发薪单位" align="center" prop="companyName" />
<el-table-column label="下发人数" align="center" prop="totalCount" />
<el-table-column label="总金额" align="center" prop="totalAmount" />
<el-table-column label="生成时间" align="center" prop="createTime" >
<el-table-column label="生成时间" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="下发状态" align="center" prop="payStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus"/>
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutRecord:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['business:payOutRecord:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['business:payOutRecord:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改发薪批次信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -122,10 +74,7 @@
<el-input v-model="form.batchName" placeholder="请输入发薪批/任务次名称" />
</el-form-item>
<el-form-item label="发薪完成时间" prop="payTime">
<el-date-picker clearable
v-model="form.payTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="form.payTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择发薪完成时间">
</el-date-picker>
</el-form-item>
......@@ -139,10 +88,7 @@
<el-input v-model="form.batchNo" placeholder="请输入工资批次编号" />
</el-form-item>
<el-form-item label="工资所属月份" prop="salaryMonth">
<el-date-picker clearable
v-model="form.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="form.salaryMonth" type="date" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资所属月份">
</el-date-picker>
</el-form-item>
......@@ -327,7 +273,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -369,7 +315,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项？').then(function () {
return delPayOutRecord(ids);
}).then(() => {
this.getList();
......
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