Commit 43a1e013 authored by 谢子梦's avatar 谢子梦

去掉发薪管理新增、修改-日期选择修改

parent 55e1987f
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="el-icon-help" size="mini" :disabled="multiple" @click="createBatchTask" <el-button type="success" icon="el-icon-help" size="mini" :disabled="multiple" @click="createBatchTask"
v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button> v-hasPermi="['business:outContract:bco']">生成发薪任务</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"
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<el-table-column label="单位信用代码" align="center" prop="groupCode" /> <el-table-column label="单位信用代码" align="center" prop="groupCode" />
<el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110"> <el-table-column label="五险一金承担方式" align="center" prop="bearType" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType"/> <dict-tag :options="dict.type.bx_bear_type" :value="scope.row.bearType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="保险缴纳基数"> <el-table-column label="保险缴纳基数">
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<el-button size="mini" type="text" icon="el-icon-user" @click="staffManage(scope.row)" <el-button size="mini" type="text" icon="el-icon-user" @click="staffManage(scope.row)"
v-hasPermi="['business:outContract:manage']">员工管理</el-button> v-hasPermi="['business:outContract:manage']">员工管理</el-button>
<el-button type="text" icon="el-icon-s-help" size="mini" @click="createBatchTaskOne(scope.row)" <el-button type="text" icon="el-icon-s-help" size="mini" @click="createBatchTaskOne(scope.row)"
v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button> v-hasPermi="['business:outContract:bco']">生成发薪任务</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -109,9 +109,9 @@ ...@@ -109,9 +109,9 @@
<el-form-item label="合同名称" prop="contractName"> <el-form-item label="合同名称" prop="contractName">
<el-input v-model="form.contractName" placeholder="请输入合同名称" /> <el-input v-model="form.contractName" placeholder="请输入合同名称" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="合同编号" prop="contractCode">--> <!-- <el-form-item label="合同编号" prop="contractCode">-->
<!-- <el-input v-model="form.contractCode" placeholder="请输入合同编号" />--> <!-- <el-input v-model="form.contractCode" placeholder="请输入合同编号" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="单位名称" prop="groupName"> <el-form-item label="单位名称" prop="groupName">
<el-input v-model="form.groupName" placeholder="请输入单位名称" /> <el-input v-model="form.groupName" placeholder="请输入单位名称" />
</el-form-item> </el-form-item>
...@@ -195,10 +195,7 @@ ...@@ -195,10 +195,7 @@
<el-input v-model="bcoForm.taskName" placeholder="请输入任务名称" /> <el-input v-model="bcoForm.taskName" placeholder="请输入任务名称" />
</el-form-item> </el-form-item>
<el-form-item label="工资月份" prop="salaryMonth"> <el-form-item label="工资月份" prop="salaryMonth">
<el-date-picker <el-date-picker v-model="bcoForm.salaryMonth" type="month" value-format="yyyy-MM" placeholder="选择月">
v-model="bcoForm.salaryMonth"
type="month"
placeholder="选择月">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -517,7 +514,7 @@ export default { ...@@ -517,7 +514,7 @@ export default {
submitBcoForm() { submitBcoForm() {
this.$refs["bcoForm"].validate(valid => { this.$refs["bcoForm"].validate(valid => {
if (valid) { if (valid) {
console.log(this.bcoForm); // console.log(this.bcoForm);
buildPayOutRecord(this.bcoForm).then(resp => { buildPayOutRecord(this.bcoForm).then(resp => {
if (resp.code == 200) { if (resp.code == 200) {
this.bcoOpen = false this.bcoOpen = false
......
...@@ -2,25 +2,14 @@ ...@@ -2,25 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="任务名称" prop="batchName"> <el-form-item label="任务名称" prop="batchName">
<el-input <el-input v-model="queryParams.batchName" placeholder="请输入发薪任务名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.batchName"
placeholder="请输入发薪任务名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="发薪单位" prop="companyName"> <el-form-item label="发薪单位" prop="companyName">
<el-input <el-input v-model="queryParams.companyName" placeholder="请输入发薪单位" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.companyName"
placeholder="请输入发薪单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="下发状态" prop="payStatus"> <el-form-item label="下发状态" prop="payStatus">
<el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable> <el-select v-model="queryParams.payStatus" placeholder="请选择订单状态" clearable>
<el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label" :value="dict.value" />
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -30,7 +19,7 @@ ...@@ -30,7 +19,7 @@
</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 <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -48,25 +37,14 @@ ...@@ -48,25 +37,14 @@
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['business:payOutRecord:edit']" v-hasPermi="['business:payOutRecord:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
type="danger" v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['business:payOutRecord:remove']"
>删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
type="warning" v-hasPermi="['business:payOutRecord:export']">导出</el-button>
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['business:payOutRecord:export']"
>导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
...@@ -77,61 +55,36 @@ ...@@ -77,61 +55,36 @@
<el-table-column label="发薪单位" align="center" prop="companyName" /> <el-table-column label="发薪单位" align="center" prop="companyName" />
<el-table-column label="下发人数" align="center" prop="totalCount" /> <el-table-column label="下发人数" align="center" prop="totalCount" />
<el-table-column label="总金额" align="center" prop="totalAmount" /> <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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下发状态" align="center" prop="payStatus"> <el-table-column label="下发状态" align="center" prop="payStatus">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-if="scope.row.payStatus && scope.row.payStatus > 0" v-if="scope.row.payStatus && scope.row.payStatus > 0"
v-hasPermi="['business:payOutRecord:edit']" v-hasPermi="['business:payOutRecord:edit']">修改</el-button> -->
>修改</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-if="scope.row.payStatus && scope.row.payStatus > 0" v-if="scope.row.payStatus && scope.row.payStatus > 0"
v-hasPermi="['business:payOutRecord:remove']" v-hasPermi="['business:payOutRecord:remove']">删除</el-button>
>删除</el-button> <el-button size="mini" type="text" icon="el-icon-money" @click="paySalary(scope.row)"
<el-button
size="mini"
type="text"
icon="el-icon-money"
@click="paySalary(scope.row)"
v-if="scope.row.payStatus && 1 == scope.row.payStatus" v-if="scope.row.payStatus && 1 == scope.row.payStatus"
v-hasPermi="['business:payOutRecord:list']" v-hasPermi="['business:payOutRecord:list']">支付</el-button>
>支付</el-button> <el-button size="mini" type="text" icon="el-icon-s-grid" @click="batchDetails(scope.row)"
<el-button
size="mini"
type="text"
icon="el-icon-s-grid"
@click="batchDetails(scope.row)"
v-if="scope.row.payStatus && scope.row.payStatus > 0" v-if="scope.row.payStatus && scope.row.payStatus > 0"
v-hasPermi="['business:payOutRecord:list']" v-hasPermi="['business:payOutRecord:list']">发薪详情</el-button>
>发薪详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改发薪批次信息对话框 --> <!-- 添加或修改发薪批次信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
...@@ -140,10 +93,7 @@ ...@@ -140,10 +93,7 @@
<el-input v-model="form.batchName" placeholder="请输入发薪批/任务次名称" /> <el-input v-model="form.batchName" placeholder="请输入发薪批/任务次名称" />
</el-form-item> </el-form-item>
<el-form-item label="发薪完成时间" prop="payTime"> <el-form-item label="发薪完成时间" prop="payTime">
<el-date-picker clearable <el-date-picker clearable v-model="form.payTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.payTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择发薪完成时间"> placeholder="请选择发薪完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -157,10 +107,7 @@ ...@@ -157,10 +107,7 @@
<el-input v-model="form.batchNo" placeholder="请输入工资批次编号" /> <el-input v-model="form.batchNo" placeholder="请输入工资批次编号" />
</el-form-item> </el-form-item>
<el-form-item label="工资所属月份" prop="salaryMonth"> <el-form-item label="工资所属月份" prop="salaryMonth">
<el-date-picker clearable <el-date-picker clearable v-model="form.salaryMonth" type="date" value-format="yyyy-MM-dd HH:mm:ss"
v-model="form.salaryMonth"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工资所属月份"> placeholder="请选择工资所属月份">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -207,11 +154,7 @@ ...@@ -207,11 +154,7 @@
</el-form-item> </el-form-item>
<el-form-item label="付款账号" prop="payAccNo"> <el-form-item label="付款账号" prop="payAccNo">
<el-select v-model="payForm.payAccNo" placeholder="请选择"> <el-select v-model="payForm.payAccNo" placeholder="请选择">
<el-option <el-option v-for="item in payAccList" :key="item.id" :label="item.payAccNo" :value="item.payAccNo">
v-for="item in payAccList"
:key="item.id"
:label="item.payAccNo"
:value="item.payAccNo">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -390,7 +333,7 @@ export default { ...@@ -390,7 +333,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
...@@ -432,12 +375,12 @@ export default { ...@@ -432,12 +375,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项?').then(function () {
return delPayOutRecord(ids); return delPayOutRecord(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
......
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