Commit bc64c135 authored by 许珑标's avatar 许珑标

发薪详情&发薪记录增加下发状态筛选条件,删除提示名字而不是ID;

登录页面短信验证码有效期提示改为5分钟;
统计页面增加下发状态筛选条件;
parent 34e7b088
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
<el-form-item label="用工单位" prop="companyName"> <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>
<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-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -291,6 +296,7 @@ export default { ...@@ -291,6 +296,7 @@ export default {
dicts: ['pay_status', 'bx_bear_type', 'payee_acc_type'], dicts: ['pay_status', 'bx_bear_type', 'payee_acc_type'],
data() { data() {
return { return {
userNames: [],
// 用户导入参数 // 用户导入参数
upload: { upload: {
// 是否显示弹出层(用户导入) // 是否显示弹出层(用户导入)
...@@ -632,6 +638,7 @@ export default { ...@@ -632,6 +638,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.userNames = selection.map(item => item.userName)
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
...@@ -676,7 +683,8 @@ export default { ...@@ -676,7 +683,8 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids const ids = row.id || this.ids
this.$modal.confirm('是否确认删除发薪详情编号为"' + ids + '"的数据项?').then(function () { const userNames = row.userName || this.userNames
this.$modal.confirm('是否确认删除以下收薪人员:' + userNames + '?').then(function () {
return delPayOutDetail(ids) return delPayOutDetail(ids)
}).then(() => { }).then(() => {
this.getList() this.getList()
......
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
<el-form-item label="用工单位" prop="companyName"> <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>
<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-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......
...@@ -184,6 +184,7 @@ export default { ...@@ -184,6 +184,7 @@ export default {
dicts: ['pay_status'], dicts: ['pay_status'],
data() { data() {
return { return {
batchNames: [],
payForm: { payForm: {
payAccNo: null, payAccNo: null,
}, },
...@@ -331,6 +332,7 @@ export default { ...@@ -331,6 +332,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.batchNames = selection.map(item => item.batchName)
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
...@@ -373,7 +375,8 @@ export default { ...@@ -373,7 +375,8 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除发薪批次信息编号为"' + ids + '"的数据项?').then(function () { const batchNames = row.batchName || this.batchNames
this.$modal.confirm('是否确认删除以下发薪任务"' + batchNames + '?').then(function () {
return delPayOutRecord(ids); return delPayOutRecord(ids);
}).then(() => { }).then(() => {
this.getList(); this.getList();
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<img class="roundLogo" src="../assets/images/roundLogo.png" alt=""> <img class="roundLogo" src="../assets/images/roundLogo.png" alt="">
</div> </div>
<h3 style="text-align: center;">短信验证</h3> <h3 style="text-align: center;">短信验证</h3>
<p class="promptConter">数字验证码已通过短信发送至 +86 {{ mobile }},有效期 1 分钟,如未收到,请尝试重新获取。</p> <p class="promptConter">数字验证码已通过短信发送至 +86 {{ mobile }},有效期 5 分钟,如未收到,请尝试重新获取。</p>
<div class="verificationCodeConter"> <div class="verificationCodeConter">
<p class="g-remove-check-code_tip">请输入六位数验证码</p> <p class="g-remove-check-code_tip">请输入六位数验证码</p>
<div class="g-remove-check-code_content" @keyup="fnCheckCodeKeyup" @keydown="fnCheckCodeKeydown" <div class="g-remove-check-code_content" @keyup="fnCheckCodeKeyup" @keydown="fnCheckCodeKeydown"
......
This diff is collapsed.
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