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

税地分支初次提交

parent 392077e6
import request from '@/utils/request'
// 查询税收分类编码--分页
export function taxCodeTableList(query) {
return request({
url: '/business/classifyCode/list',
method: 'get',
params: query
})
}
// 查询税收分类编码--全部
export function listAllTaxCode(query) {
return request({
url: '/business/classifyCode/listAll',
method: 'get',
params: query
})
}
import request from '@/utils/request'
// 查询税地单位信息列表
export function listUnitInfo(query) {
return request({
url: '/business/unitInfo/list',
method: 'get',
params: query
})
}
// 查询代发企业签约列表
export function querySignList(query) {
return request({
url: '/business/laborSign/taxUnit/list',
method: 'get',
params: query
})
}
// 查询税地单位信息所有列表
export function listAllUnitInfo(query) {
return request({
url: '/business/unitInfo/listAll',
method: 'get',
params: query
})
}
// 查询税地单位信息详细
export function getUnitInfo(id) {
return request({
url: '/business/unitInfo/getInfo/' + id,
method: 'get'
})
}
// 新增税地单位信息
export function addUnitInfo(data) {
return request({
url: '/business/unitInfo/add',
method: 'post',
data: data
})
}
// 修改税地单位信息-仅修改基础数据
export function updateUnitInfo(data) {
return request({
url: '/business/unitInfo/edit',
method: 'post',
data: data
})
}
// 修改税地单位信息-含关联数据
export function updateUnitAllInfo(data) {
return request({
url: '/business/unitInfo/editAll',
method: 'post',
data: data
})
}
// 删除税地单位信息
export function delUnitInfo(id) {
return request({
url: '/business/unitInfo/remove/' + id,
method: 'get'
})
}
// 获取税地企业可支持开票类目
export function getUnitTaxCategories(unitId) {
return request({
url: '/business/unitInfo/taxCategories/get/' + unitId,
method: 'get'
})
}
// 获取可签约的代发企业信息
export function listToSignUnit(query) {
return request({
url: '/business/unitInfo/toSign/list',
method: 'get',
params: query
})
}
......@@ -96,7 +96,7 @@ export function updateUserPwd(oldPassword, newPassword) {
return request({
url: '/system/user/profile/updatePwd',
method: 'post',
params: data
data: data
})
}
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
<div class="EDMMain">
<div class="themeMain">
<div class="head-container">
<el-input v-model="deptName" placeholder="请输入发薪主题" clearable size="small" prefix-icon="el-icon-search"
<el-input v-model="deptName" placeholder="请输入发薪主体" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px" />
</div>
<div class="head-container">
......@@ -147,7 +147,7 @@
</template>
<script>
import { listCompanyInfo } from "@/api/business/companyInfo";
import { listAllCompanyInfo, listCompanyInfo } from '@/api/business/companyInfo'
import { listOutContract, delOutContract, addOutContract, updateOutContract } from "@/api/business/outContract";
import { buildPayOutRecord } from '@/api/business/payOutRecord'
......@@ -269,10 +269,10 @@ export default {
},
/** 查询付款主体信息列表 */
getThemeList() {
listCompanyInfo({ pageNum: 1, pageSize: 999, companyName: this.deptName }).then(response => {
listAllCompanyInfo({ companyName: this.deptName }).then(response => {
let arr = []
response.rows.forEach(item => {
response.data.forEach(item => {
arr.push({
id: item.id,
label: item.companyName
......
......@@ -703,7 +703,7 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('business/payOutDetail/export', ...this.queryParams, `payOutDetail_${new Date().getTime()}.xlsx`)
this.download('business/payOutDetail/export', {...this.queryParams}, `发薪详情${new Date().getTime()}.xlsx`)
},
async checkWork(row) {
this.preForm.salaryPayDetailId = row.id
......
......@@ -96,7 +96,7 @@
</el-col>
<el-col :span="8">
<div class="buttonOperate">
<el-button type="primary" @click="goRegister">绑定发薪账户</el-button>
<el-button type="primary" @click="toSign">绑定发薪账户</el-button>
</div>
</el-col>
</el-row>
......@@ -388,6 +388,14 @@
<el-button @click="billPanel = false">关 闭</el-button>
</div>
</el-dialog>
<el-dialog title="绑定账户" :visible.sync="bindAcc.panel" width="80%">
<tax-sign-component></tax-sign-component>
<div slot="footer" class="dialog-footer">
<el-button @click="bindAcc.panel = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -398,11 +406,16 @@ import { addAccRecharge, listBill } from '@/api/business/accRecharge.js'
import { addDateRange } from '@/utils/ruoyi'
import { formatDate } from '@/utils'
import QrCodeComponent from '@/components/QrCode.vue'
import TaxSignComponent from '@/views/business/salaryAccount/taxSignComponent.vue'
export default {
name: 'SalaryAccount',
components: { QrCodeComponent, AccSelect },
components: { TaxSignComponent, QrCodeComponent, AccSelect },
data() {
return {
bindAcc: {
panel: false,
},
billPanel: false,
qrPayPanel: {
open: false,
......@@ -494,6 +507,9 @@ export default {
}
},
methods: {
toSign() {
this.bindAcc.panel = true;
},
billTypeTabClick(tab) {
// this.billQuery.capitalPurpose = tab.name === "second" ? 2 : 1 //1:服务费 2:余额
// this.getBillList();
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="true" label-width="80px">
<el-form-item label="代发企业" prop="unitName">
<el-input v-model="queryParams.unitName" placeholder="请输入企业名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="签约状态" prop="signStatus">
<el-select v-model="queryParams.signStatus" placeholder="请选择签约状态" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.tax_labor_sign_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-table v-loading="loading" :data="unitInfoList">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="代发企业" align="center" prop="unitName" fixed/>
<el-table-column label="机构代码" align="center" prop="unitCode" fixed/>
<el-table-column label="所属地址" align="center" prop="address"/>
<el-table-column label="所属行业" align="center" prop="sectorDictDataVal"/>
<el-table-column label="可开票类型" align="center" prop="invoiceTypes">
<template slot-scope="scope">
<dict-tag style="margin-top: 3px" v-for="(item, index) in scope.row.invoiceTypes.split(',')"
:options="dict.type.tax_invoice_type" :value="item"
/>
</template>
</el-table-column>
<el-table-column label="月开票额度" align="center" prop="invoiceLimit"/>
<el-table-column label="联系人" align="center" prop="legalPersonName"/>
<el-table-column label="联系电话" align="center" prop="legalPersonMobile"/>
<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"
v-if="!scope.row.signStatus"
@click="toSign(scope.row)"
v-hasPermi="['business:laborSign:add']"
>签约
</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" />
<!-- 签约申请 -->
<el-dialog title="签约申请" :visible.sync="signPanel" width="500px" append-to-body>
<el-form ref="signForm" :model="signForm" :rules="signFormRules" label-width="80px">
<el-form-item label="代发企业" prop="taxUnitName">
<el-input v-model="signForm.taxUnitName" disabled placeholder="请选择代发企业" />
</el-form-item>
<el-form-item label="签约主体" prop="inviterName">
<el-select v-model="signForm.inviterId" clearable placeholder="请选择发薪主体">
<el-option v-for="item in payerCompanyArr" :key="item.id" :label="item.companyName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitSignForm">确 定</el-button>
<el-button @click="signPanel = false">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listToSignUnit } from '@/api/business/unitInfo'
import { addLaborSign } from '@/api/business/laborSign'
import { listAllCompanyInfo } from '@/api/business/companyInfo'
export default {
name: "taxSignComponent",
dicts: ['tax_invoice_type', 'tax_labor_sign_status'],
computed: {
},
data() {
return {
payerCompanyArr: [],
signForm: {
taxUnitId: null,
taxUnitName: '',
inviterId: null,
},
signPanel: false,
// 遮罩层
loading: true,
// 总条数
total: 0,
// 商户付款账户表格数据
unitInfoList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
unitName: null,
},
signFormRules: {
inviterId: [
{ required: true, message: "签约主体不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getPayerCompanyList();
},
methods: {
getPayerCompanyList() {
listAllCompanyInfo().then(resp => {
if (200 == resp.code) {
this.payerCompanyArr = resp.data
}
})
},
/** 查询商户付款账户列表 */
getList() {
this.loading = true;
listToSignUnit(this.queryParams).then(response => {
this.unitInfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
toSign(row) {
this.$confirm(`确认发起与${row.unitName}的签约申请吗`, '操作提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.signForm.taxUnitId = row.id
this.signForm.taxUnitName = row.unitName
this.signPanel = true
}).catch(() => {});
},
submitSignForm() {
addLaborSign(this.signForm).then(resp => {
if (200 === resp.code) {
this.$modal.msgSuccess("操作成功!");
}
}).finally(() => {
this.signPanel = false
})
}
}
};
</script>
This diff is collapsed.
<template>
<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="inviterName">
<el-input
v-model="queryParams.inviterName"
placeholder="请输入合作企业名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="代发企业" prop="taxUnitName">
<el-input
v-model="queryParams.taxUnitName"
placeholder="请输入信用代码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="签约状态" prop="signStatus">
<el-select v-model="queryParams.signStatus" placeholder="请选择签约状态" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.tax_labor_sign_status" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-table v-loading="loading" :data="tableData">
<el-table-column label="签约企业" align="center">
<el-table-column label="企业名称" align="center" prop="inviterName" fixed/>
<el-table-column label="机构代码" align="center" prop="inviterCode" fixed/>
<el-table-column label="联系人" align="center" prop="inviterUserName"/>
<el-table-column label="联系电话" align="center" prop="inviterUserMobile"/>
</el-table-column>
<el-table-column label="代发企业" align="center">
<el-table-column label="企业名称" align="center" prop="taxUnitName"/>
<el-table-column label="机构代码" align="center" prop="taxUnitCode"/>
<el-table-column label="联系人" align="center" prop="taxUnitUserName"/>
<el-table-column label="联系电话" align="center" prop="taxUnitUserMobile"/>
</el-table-column>
<el-table-column label="签约状态" align="center" prop="signStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.tax_labor_sign_status" :value="scope.row.signStatus" />
</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="doAgree(scope.row)"
v-if="scope.row.signStatus && 1 === scope.row.signStatus"
v-hasPermi="['business:laborSign:add']"
>签约合约
</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['business:unitInfo: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"
/>
</div>
</template>
<script>
import { querySignList } from '@/api/business/unitInfo'
import { agreeSign } from '@/api/business/laborSign'
export default {
name: 'signList',
dicts: ['tax_labor_sign_status'],
data() {
return {
// 遮罩层
loading: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 税地单位信息表格数据
tableData: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
inviterName: null,
taxUnitName: null
}
}
},
created() {
this.getList()
},
methods: {
/** 查询税地单位信息列表 */
getList() {
this.loading = true
querySignList(this.queryParams).then(response => {
this.tableData = response.rows
this.total = response.total
this.loading = false
})
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
/** 导出按钮操作 */
handleExport() {
this.download('business/unitInfo/export', {
...this.queryParams
}, `unitInfo_${new Date().getTime()}.xlsx`)
},
doAgree(row) {
this.$confirm(`确认签订与${row.inviterName}的合约吗?`, '操作提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
agreeSign(row.id).then(resp => {
if (200 === resp.code) {
this.$modal.msgSuccess("操作成功")
this.getList()
}
})
}).catch(() => {});
}
}
}
</script>
......@@ -11,13 +11,13 @@
</el-form-item>
<el-form-item prop="password">
<el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
@keyup.enter.native="getSmsCode">
@keyup.enter.native="handleLogin">
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
<el-input v-model="loginForm.code" auto-complete="off" placeholder="数字验证码" style="width: 63%;"
@keyup.enter.native="getSmsCode">
@keyup.enter.native="handleLogin">
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
</el-input>
<div class="login-code">
......@@ -37,7 +37,7 @@
<el-checkbox v-model="loginForm.rememberMe" style="margin:12px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;">
<el-button :loading="loading" size="medium" type="primary" style="width:100%;"
@click.native.prevent="getSmsCode">
@click.native.prevent="handleLogin">
<span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span>
</el-button>
......@@ -238,7 +238,7 @@ export default {
// this.loginRules.smsCode = [{ required: true, trigger: "change", message: "请输入短信验证码" }]
// this.$refs.loginForm.validate(valid => {
// if (valid) {
this.loginForm.smsCode = code
// this.loginForm.smsCode = code
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, { expires: 30 });
......
......@@ -67,7 +67,7 @@
<el-table-column prop="actualPayable" label="实发工资(元)">
</el-table-column>
<el-table-column label="公司承担部分">
<el-table-column prop="gsbxCompanyMoney" label="工商保险(元)">
<el-table-column prop="gsbxCompanyMoney" label="工伤保险(元)">
</el-table-column>
<el-table-column prop="providentFundCompanyMoney" label="公积金(元)">
</el-table-column>
......@@ -81,7 +81,7 @@
</el-table-column>
</el-table-column>
<el-table-column label="个人承担部分">
<el-table-column prop="gsbxPersonalMoney" label="工商保险(元)">
<el-table-column prop="gsbxPersonalMoney" label="工伤保险(元)">
</el-table-column>
<el-table-column prop="providentFundPersonalMoney" label="公积金(元)">
</el-table-column>
......@@ -169,7 +169,7 @@
<el-table-column prop="actualPayable" label="实发工资(元)">
</el-table-column>
<el-table-column label="公司承担部分">
<el-table-column prop="gsbxCompanyMoney" label="工商保险(元)">
<el-table-column prop="gsbxCompanyMoney" label="工伤保险(元)">
</el-table-column>
<el-table-column prop="providentFundCompanyMoney" label="公积金(元)">
</el-table-column>
......@@ -183,7 +183,7 @@
</el-table-column>
</el-table-column>
<el-table-column label="个人承担部分">
<el-table-column prop="gsbxPersonalMoney" label="工商保险(元)">
<el-table-column prop="gsbxPersonalMoney" label="工伤保险(元)">
</el-table-column>
<el-table-column prop="providentFundPersonalMoney" label="公积金(元)">
</el-table-column>
......
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