Skip to content

薪
薪瑞通-前端
Commit becb3977 authored by wanghf's avatar wanghf
Browse files
Options

Merge remote-tracking branch '云效/test' into feat/test-seal-rayin

parents 0b1ba4c8 7769d9f4
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 74 deletions
src/api/login.js
View file @ becb3977
......@@ -10,7 +10,7 @@ export function login(username, password, code, smsCode, uuid) {
uuid
}
return request({
url: '/loginBySmsCode',
url: '/login',
headers: {
isToken: false
},
......
src/assets/styles/sidebar.scss
View file @ becb3977
......@@ -26,6 +26,7 @@
overflow: hidden;
-webkit-box-shadow: 2px 0 6px rgba(205, 206, 208, 0.35);
box-shadow: 2px 0 6px rgba(205, 206, 208, 0.35);
padding-bottom: 2%;
// reset element-ui css
.horizontal-collapse-transition {
......@@ -70,7 +71,8 @@
width: 100% !important;
}
.el-menu-item, .el-submenu__title {
.el-menu-item,
.el-submenu__title {
overflow: hidden !important;
text-overflow: ellipsis !important;
white-space: nowrap !important;
......@@ -90,11 +92,11 @@
}
}
& .theme-dark .is-active > .el-submenu__title {
& .theme-dark .is-active>.el-submenu__title {
color: $base-menu-color-active !important;
}
& .nest-menu .el-submenu > .el-submenu__title,
& .nest-menu .el-submenu>.el-submenu__title,
& .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important;
height: 45px;
......@@ -110,7 +112,7 @@
}
// 暗色风格
& .theme-dark .nest-menu .el-submenu > .el-submenu__title,
& .theme-dark .nest-menu .el-submenu>.el-submenu__title,
& .theme-dark .el-submenu .el-menu-item {
background-color: $base-sub-menu-background !important;
......@@ -149,7 +151,7 @@
.el-submenu {
overflow: hidden;
& > .el-submenu__title {
&>.el-submenu__title {
padding: 0 !important;
.svg-icon {
......@@ -160,8 +162,8 @@
.el-menu--collapse {
.el-submenu {
& > .el-submenu__title {
& > span {
&>.el-submenu__title {
&>span {
height: 0;
width: 0;
overflow: hidden;
......@@ -208,13 +210,13 @@
// when menu collapsed
.el-menu--vertical {
& > .el-menu {
&>.el-menu {
.svg-icon {
margin-right: 16px;
}
}
.nest-menu .el-submenu > .el-submenu__title,
.nest-menu .el-submenu>.el-submenu__title,
.el-menu-item {
&:hover {
// you can use $subMenuHover
......@@ -223,7 +225,7 @@
}
// the scroll bar appears when the subMenu is too long
> .el-menu--popup {
>.el-menu--popup {
max-height: 100vh;
overflow-y: auto;
......
src/views/business/invoiceApply/index.vue
View file @ becb3977
......@@ -881,8 +881,8 @@ export default {
},
onlineInvoice(row) {
let taxpayerQuery = {
// companyType: 2,
// companyId: row.taxCompanyId
companyType: 2,
companyId: row.taxCompanyId
}
listAllLoginUser(taxpayerQuery).then(resp => {
if (200 === resp.code) {
......@@ -898,20 +898,20 @@ export default {
}
},
onlineGen() {
this.$prompt('请输入返回值', '操作提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(({ value }) => {
let testData = {
code: value
}
this.invoicingAfter(testData)
})
// onlineInvoicing(this.onlineInvoiceForm).then(resp => {
// if (200 === resp.code) {
// this.invoicingAfter(resp.data)
// this.$prompt('请输入返回值', '操作提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// }).then(({ value }) => {
// let testData = {
// code: value
// }
// this.invoicingAfter(testData)
// })
onlineInvoicing(this.onlineInvoiceForm).then(resp => {
if (200 === resp.code) {
this.invoicingAfter(resp.data)
}
})
},
invoicingAfter(data) {
let code = data.code
......@@ -930,14 +930,8 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
}).then(({ value }) => {
// todo 重新发起
this.onlineInvoiceForm.smsCode = value
// this.onlineGen()
this.$message({
type: 'success',
message: '你输入的短信验证码是: ' + value
});
console.log('一键开票请求参数：', this.onlineInvoiceForm)
this.onlineGen()
})
} else if (code == 500) {
this.$modal.msgError(data.msg)
......
src/views/business/invoiceApply/ready.vue
View file @ becb3977
......@@ -572,7 +572,6 @@ export default {
},
//更新视图方法
changeItemForceupdate() {
console.log('执行立刻', this.formApply.items);
this.$forceUpdate()
},
//获取企业信息数据
......@@ -636,8 +635,6 @@ export default {
this.batchNos = selection.map(item => item.batchNo)
this.single = selection.length !== 1
this.multiple = !selection.length
console.log(this.ids);
console.log(this.batchNos);
},
/** 导出按钮操作 */
handleExport() {
......@@ -733,7 +730,6 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(this.formApply)
addApplyInvoice(this.formApply).then(response => {
this.loading = false;
if (response.code == 200) {
......@@ -759,16 +755,35 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.openApply = true;
//ids转字符串，逗号隔开
this.formApply.batchPayIds = ids;
this.formApply.batchPayOrderIds = ids.join(',');
const selectItemList = this.payOrderList.filter(item => ids.includes(item.id));
const payAccNoSet = new Set(selectItemList.map(item => item.payerAccNo));
if (payAccNoSet.size > 1) {
this.$modal.msgWarning("您所选的数据不是同一个付款账户，无法进行合并开票操作")
return;
}
let sumSuccessAmount = 0;
selectItemList.forEach(item => {
sumSuccessAmount += Number(item.successAmount);
});
getSellerInvoiceInfo([...payAccNoSet][0]).then(resp => {
if (200 === resp.code) {
this.formApply.taxCompanyId = resp.data.taxUnitId
this.formApply.taxCompanyInvoice.companyId = resp.data.taxUnitId
this.formApply.taxCompanyInvoice.invoiceTitle = resp.data.taxUnitName
this.formApply.taxCompanyInvoice.companyName = resp.data.taxUnitName
this.formApply.taxCompanyInvoice.taxRegistrationNumber = resp.data.taxUnitCode
this.formApply.applyCompanyId = resp.data.inviterId
this.formApply.applyCompanyInvoice.companyId = resp.data.inviterId
this.formApply.applyCompanyInvoice.companyName = resp.data.inviterName
this.formApply.applyCompanyInvoice.invoiceTitle = resp.data.inviterName
this.formApply.applyCompanyInvoice.taxRegistrationNumber = resp.data.inviterCode
}
})
this.formApply.totalAmountTax = Number.parseFloat(sumSuccessAmount).toFixed(2);
this.openApply = true;
})
},
addItemClick() {
......@@ -794,7 +809,6 @@ export default {
classify.taxAmount = ''
classify.freeType = ''
this.formApply.items.push(classify)
console.log('表格数据', this.formApply);
this.taxCategoryPanel.open = false
// this.$forceUpdate()
......
src/views/business/payOrder/index.vue
View file @ becb3977
......@@ -59,6 +59,13 @@
<dict-tag :options="dict.type.pay_status" :value="scope.row.payStatus" />
</template>
</el-table-column>
<el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="数据来源" align="center" prop="dataSource" width="180">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.dataSource && 2 === scope.row.dataSource">接口</el-tag>
<el-tag v-if="scope.row.dataSource && 1 === scope.row.dataSource">平台</el-tag>
</template>
</el-table-column>
<el-table-column label="详情预览" align="center">
<template slot-scope="scope">
<p style="margin: 0px;padding: 0px;">批次总笔数：{{ scope.row.totalCount }}</p>
......@@ -76,8 +83,7 @@
<span>{{ parseTime(scope.row.transactionTime) }}</span>
</template>
</el-table-column>
<el-table-column label="支付类型" align="center" prop="payTitle" />
<el-table-column label="支付备注" align="center" prop="payRemark" />
<!-- <el-table-column label="支付备注" align="center" prop="payRemark" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.payStatus && scope.row.payStatus === 1" size="mini" type="text" icon="el-icon-money" @click="doPay(scope.row)">确认支付</el-button>
......
src/views/business/salaryAccount/index.vue
View file @ becb3977
......@@ -282,7 +282,33 @@
<el-col :span="12">
<div class="ownRechargeMain">
<img class="ownRechargeImage" src="@/assets/images/xianxia.png" alt="">
<el-button class="ownRechargeButton" @click="offlineRecharge">线下充值</el-button>
<el-button class="ownRechargeButton" @click="offlineRecharge(true)">线下充值</el-button>
</div>
</el-col>
</el-row>
</el-dialog>
<!-- 第三方发薪账号充值 -->
<el-dialog title="第三方发薪账户充值" :visible.sync="rechargeCoursePanelDialog" width="42%" center>
<el-row :gutter="64">
<el-col :span="12">
<p style="text-align: center;">通过与账本同主体的企业支付宝进行充值，可在手机端和电脑端充值</p>
</el-col>
<el-col :span="12">
<p style="text-align: center;">通过银行系统进行打款充值</p>
</el-col>
</el-row>
<el-row :gutter="64">
<el-col :span="12">
<div class="ownRechargeMain">
<img class="ownRechargeImage" src="@/assets/images/zfb.png" alt="">
<el-button class="ownRechargeButton"
@click="rechargeCoursePanelDialog = false; aliQRCodeRechargeOpen = true">直属账户充值</el-button>
</div>
</el-col>
<el-col :span="12">
<div class="ownRechargeMain">
<img class="ownRechargeImage" src="@/assets/images/xianxia.png" alt="">
<el-button class="ownRechargeButton" @click="offlineRecharge(false)">线下账户充值</el-button>
</div>
</el-col>
</el-row>
......@@ -291,9 +317,15 @@
<el-dialog title="汇款充值" :visible.sync="rechargeCoursePanel" width="50%">
<h2 style="font-weight: bold;font-size: 22px;margin-top: -15px;color: #1a1a1a">什么是汇款充值</h2>
<el-row>
<el-col :span="24">
<el-col :span="24" v-if="offlineRechargeStatic">
商户可通过银行转账方式完成对应支付宝专属收款账户的充值。支付宝会为商户的每个支付宝账户提供独立的"专属收款账户"，商户从任一同名银行账户向其对应的"专属收款账户"转账，即可完成充值。
</el-col>
<el-col :span="24" v-else>
代发企业为商户开设支付宝安全发专属账本，商户可使用开设“安全发专属账本”时备案的银行账户（切记一定要使用备案的银行账户转账，否则系统将无法自动划转至专属账本）将需下发资金转入至代发企业招行专户，招行专户收到款后，将在30分钟内由系统自动将钱转入至“支付宝安全发专属账本”，具体转账路径如下图所示：
<div style="text-align: center;">
<img style="width:80%;margin-top: 10px;" src="@/assets/images/stepRecharge.png" alt="">
</div>
</el-col>
</el-row>
<el-row style="margin-top: 15px;">
<el-col :span="24">
......@@ -310,18 +342,21 @@
<el-timeline-item>
<span style="font-weight: bold;font-size: 18px">登录你的网上银行</span>
<span style="color: gray;font-size: 14px">(支持任意银行)</span>
<div style="font-size: 14px;margin-top: 5px">必须使用本公司同名的银行账户进行汇款转账，首次使用建议小金额转入测试</div>
<div v-if="offlineRechargeStatic" style="font-size: 14px;margin-top: 5px">
必须使用本公司同名的银行账户进行汇款转账，首次使用建议小金额转入测试
</div>
<div v-else style="font-size: 14px;margin-top: 5px">必须使用开设“支付宝安全发专属账本”时备案的银行账户进行汇款转账，首次使用建议小额转入测试。</div>
</el-timeline-item>
<el-timeline-item>
<span style="font-weight: bold;font-size: 18px">转账时填写以下专属账户</span>
<div style="font-size: 14px;margin-top: 5px">请注意收款账户支行选择：
<div v-if="offlineRechargeStatic" style="font-size: 14px;margin-top: 5px">请注意收款账户支行选择：
<span style="color: red">支付宝-备付金账户</span>
<span>、开户地选择：</span>
<span style="color: red">上海市-上海市</span>
<span>，否则支付宝无法收到资金</span>
</div>
<el-descriptions title="你的企业备付金余额账户" :column="1" :border="true" style="margin-top: 15px"
:label-style="accDetail.label_style" :contentStyle="accDetail.content_style">
<el-descriptions :title="offlineRechargeStatic ? '你的企业备付金余额账户' : ''" :column="1" :border="true"
style="margin-top: 15px" :label-style="accDetail.label_style" :contentStyle="accDetail.content_style">
<el-descriptions-item label="账号">{{ offlineRechargeData.cardNo }}</el-descriptions-item>
<el-descriptions-item label="户名">{{ offlineRechargeData.bankAccName
}}</el-descriptions-item>
......@@ -542,6 +577,7 @@ export default {
// 线下充值
rechargeCoursePanel: false,
offlineRechargeData: {},
offlineRechargeStatic: false,
// 充值记录相关参数
billQuery: {
pageNum: 1,
......@@ -556,7 +592,9 @@ export default {
billTotal: 0,
userInfoName: null,
accountCollection: [],
loading: false
loading: false,
// 第三方发薪账号余额、服务费充值选择弹窗
rechargeCoursePanelDialog: false,
}
},
created() {
......@@ -616,8 +654,11 @@ export default {
})
},
// 选择线下充值方法
offlineRecharge() {
offlineRecharge(isBol) {
this.offlineRechargeStatic = isBol
if (isBol) {
this.ownAliQRCodeRechargeOpen = false
this.$modal.loading('...加载中')
getAccAliInfo(this.aliQRCodeRechargeForm.payeeAccNo).then(resp => {
if (200 === resp.code) {
......@@ -630,6 +671,18 @@ export default {
}).finally(() => {
this.$modal.closeLoading()
})
} else {
this.rechargeCoursePanel = false
this.offlineRechargeData = {
cardNo: '515901720410008',
bankAccName: '盐城美好生活专业清洁服务有限公司',
cardBank: '招商银行',
cardBranch: '盐城市青年路支行',
cardLocation: '江苏-盐城市',
cardDeposit: '308311000033'
}
this.rechargeCoursePanel = true
}
},
// 点击服务分充值方法-自有
ownServiceChargeRecharge(val) {
......@@ -652,14 +705,16 @@ export default {
this.aliQRCodeRechargeForm.rechargeType = 2
this.aliQRCodeRechargeForm.payeeAccNo = val.payAccNo
this.aliQRCodeRechargeForm.bindType = val.bindType
this.aliQRCodeRechargeOpen = true
this.rechargeCoursePanelDialog = true
// this.aliQRCodeRechargeOpen = true
},
// 点击服务费充值方法-第三方
serviceChargeRecharge(val) {
this.aliQRCodeRechargeForm.rechargeType = 1
this.aliQRCodeRechargeForm.payeeAccNo = val.payAccNo
this.aliQRCodeRechargeForm.bindType = val.bindType
this.aliQRCodeRechargeOpen = true
this.rechargeCoursePanelDialog = true
// this.aliQRCodeRechargeOpen = true
},
// 确认支付按钮
getAliPayUrl() {
......
src/views/business/taxUser/index.vue
View file @ becb3977
......@@ -293,7 +293,6 @@ export default {
this.title = "添加办税人信息";
},
getAllUnit() {
console.log(this.unitList)
if (!this.unitList || this.unitList.length < 1) {
listAllUnitInfo().then(resp => {
if (200 === resp.code) {
......
src/views/login.vue
View file @ becb3977
......@@ -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>
......@@ -236,7 +236,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 });
......
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