|
|
@@ -75,15 +75,15 @@
|
|
|
:columns="columns"
|
|
|
:showBatchDelete="false"
|
|
|
:showOperation="true"
|
|
|
- editButtonName="编辑"
|
|
|
button3Name="撤销"
|
|
|
button3Icon="fa fa-trash"
|
|
|
button3Background="#f56c6c"
|
|
|
@handleButton3="handleTableDelete"
|
|
|
@findPage="findPage"
|
|
|
:isshowpagination="true"
|
|
|
- @handleEdit="handleDetail"
|
|
|
></kt-common-table>
|
|
|
+ <!-- editButtonName="编辑"
|
|
|
+ @handleEdit="handleDetail" -->
|
|
|
<!-- 新增编辑弹框 -->
|
|
|
<el-dialog
|
|
|
class="dialog detailtTable"
|
|
|
@@ -285,6 +285,21 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="支付方式" prop="payMethod">
|
|
|
+ <el-select v-model="formData.payMethod" multiple placeholder="">
|
|
|
+ <el-option
|
|
|
+ v-for="item in payment_methodsData"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -299,7 +314,7 @@
|
|
|
<script>
|
|
|
import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
|
|
|
import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
|
|
|
-import CommonUtil from "@/utils/comutil.js";
|
|
|
+import { toChies } from "../../../utils/moneyTransition";
|
|
|
|
|
|
export default {
|
|
|
name: "InvoiceInformation",
|
|
|
@@ -308,6 +323,7 @@ export default {
|
|
|
// this.business("subjects"); //开票科目
|
|
|
this.business("invoice_type"); //开票类型
|
|
|
this.business("use_funds"); //备注
|
|
|
+ this.business("payment_methods"); //支付方式字典
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getAllUser();
|
|
|
@@ -317,10 +333,11 @@ export default {
|
|
|
subjectsData: [], //开票科目数据
|
|
|
invoice_typeData: [], //发票类型数据
|
|
|
use_fundsData: [], //备注数据
|
|
|
+ payment_methodsData: [], //支付方式数据
|
|
|
title: "开票新增",
|
|
|
loading: true,
|
|
|
detailDialog: false,
|
|
|
- operationWidth: 200, //操作列宽度
|
|
|
+ operationWidth: 100, //操作列宽度
|
|
|
queryFrom: {
|
|
|
//查询条件
|
|
|
},
|
|
|
@@ -331,58 +348,66 @@ export default {
|
|
|
// 列表查询条件
|
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
|
- invoiceTime:'',//开票日期
|
|
|
- invoiceBy:'',//开票方
|
|
|
- biller:'',//开票员
|
|
|
- invoiceType:'',//开票类型
|
|
|
+ invoiceTime: "", //开票日期
|
|
|
+ invoiceBy: "", //开票方
|
|
|
+ biller: "", //开票员
|
|
|
+ invoiceType: "", //开票类型
|
|
|
},
|
|
|
columns: [
|
|
|
- { prop: "biller", label: "开票员", type: "text" },
|
|
|
- { prop: "invoiceSubjects", label: "开票科目", type: "text" },
|
|
|
- { prop: "invoiceBy", label: "开票方", type: "text" },
|
|
|
- { prop: "otherUnit", label: "对方单位名称", type: "text" },
|
|
|
- { prop: "invoiceId", label: "发票号码", type: "text" },
|
|
|
- { prop: "invoiceNum", label: "发票数", type: "text" },
|
|
|
- { prop: "invoiceTime", label: "开票日期", type: "text" },
|
|
|
+ { prop: "invoiceId", label: "发票号码", type: "text", minWidth: 160 },
|
|
|
+ { prop: "invoiceNum", label: "发票数", type: "text", minWidth: 60 },
|
|
|
+ { prop: "invoiceBy", label: "开票方", type: "text", minWidth: 180 },
|
|
|
+ { prop: "otherUnit", label: "对方单位名称", type: "text", minWidth: 180 },
|
|
|
{
|
|
|
- prop: "rate",
|
|
|
- label: "税率",
|
|
|
+ prop: "invoiceTypeName",
|
|
|
+ label: "发票类型",
|
|
|
type: "text",
|
|
|
+ minWidth: 80
|
|
|
},
|
|
|
{
|
|
|
- prop: "tax",
|
|
|
- label: "税额",
|
|
|
+ prop: "invoiceMoney",
|
|
|
+ label: "开票金额",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
+ { prop: "invoiceTime", label: "开票日期", type: "text",minWidth: 100 },
|
|
|
{
|
|
|
- prop: "noHasTax",
|
|
|
- label: "不含税金额",
|
|
|
+ prop: "payoutTime",
|
|
|
+ label: "进账日期",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
+ { prop: "biller", label: "开票员", type: "text",minWidth: 70 },
|
|
|
+ { prop: "invoiceSubjects", label: "开票科目", type: "text",minWidth: 120 },
|
|
|
{
|
|
|
- prop: "invoiceTypeName",
|
|
|
- label: "发票类型",
|
|
|
+ prop: "payoutMoney",
|
|
|
+ label: "进账金额",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
{
|
|
|
- prop: "invoiceMoney",
|
|
|
- label: "开票金额",
|
|
|
+ prop: "notPayoutMoney",
|
|
|
+ label: "未进账金额",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
{
|
|
|
- prop: "payoutMoney",
|
|
|
- label: "进账金额",
|
|
|
+ prop: "rate",
|
|
|
+ label: "税率(%)",
|
|
|
type: "text",
|
|
|
+ minWidth: 70
|
|
|
},
|
|
|
{
|
|
|
- prop: "notPayoutMoney",
|
|
|
- label: "未进账金额",
|
|
|
+ prop: "tax",
|
|
|
+ label: "税额",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
{
|
|
|
- prop: "payoutTime",
|
|
|
- label: "进账日期",
|
|
|
+ prop: "noHasTax",
|
|
|
+ label: "不含税金额",
|
|
|
type: "text",
|
|
|
+ minWidth: 100
|
|
|
},
|
|
|
],
|
|
|
detailData: [],
|
|
|
@@ -397,7 +422,7 @@ export default {
|
|
|
biller: "", //开票员
|
|
|
invoiceBy: "", //开票方
|
|
|
invoiceMoney: "", //开票金额
|
|
|
- invoiceNum: "", //发票数
|
|
|
+ invoiceNum: 1, //发票数
|
|
|
invoiceSubjects: "", //开票科目
|
|
|
invoiceTime: "", //开票日期
|
|
|
invoiceType: "", //发票类型
|
|
|
@@ -407,6 +432,7 @@ export default {
|
|
|
payoutTime: "", //进账日期
|
|
|
rate: 0, //税率
|
|
|
remark: "", //备注
|
|
|
+ payMethod: [], //支付方式
|
|
|
},
|
|
|
rules: {
|
|
|
//内部表单规则
|
|
|
@@ -435,12 +461,9 @@ export default {
|
|
|
{ required: true, message: "进账金额不能为空", trigger: "blur" },
|
|
|
],
|
|
|
rate: [{ required: true, message: "税率不能为空", trigger: "blur" }],
|
|
|
- remark: [
|
|
|
- {
|
|
|
- required: true,
|
|
|
- message: "请选择备注",
|
|
|
- trigger: "change",
|
|
|
- },
|
|
|
+ remark: [{ required: true, message: "请选择备注", trigger: "change" }],
|
|
|
+ payMethod: [
|
|
|
+ { required: true, message: "请选择支付方式", trigger: "change" },
|
|
|
],
|
|
|
payoutTime: [
|
|
|
{
|
|
|
@@ -458,8 +481,36 @@ export default {
|
|
|
],
|
|
|
},
|
|
|
collectionData: [], //所以内部账户信息列表
|
|
|
+ formDataId: "", //编辑数据id
|
|
|
};
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ detailDialog(n) {
|
|
|
+ if (!n) {
|
|
|
+ this.formData = {
|
|
|
+ bankCardNum: "", //卡号
|
|
|
+ biller: "", //开票员
|
|
|
+ invoiceBy: "", //开票方
|
|
|
+ invoiceMoney: "", //开票金额
|
|
|
+ invoiceNum: 1, //发票数
|
|
|
+ invoiceSubjects: "", //开票科目
|
|
|
+ invoiceTime: "", //开票日期
|
|
|
+ invoiceType: "", //发票类型
|
|
|
+ notPayoutMoney: 0, //未进账金额
|
|
|
+ otherUnit: "", //对方单位
|
|
|
+ payoutMoney: 0, //进账金额
|
|
|
+ payoutTime: "", //进账日期
|
|
|
+ rate: 0, //税率
|
|
|
+ remark: "", //备注
|
|
|
+ payMethod: [], //支付方式
|
|
|
+ };
|
|
|
+ this.formDataId = "";
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.formData.clearValidate();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
methods: {
|
|
|
//撤销开票数据
|
|
|
handleTableDelete(index) {
|
|
|
@@ -481,10 +532,11 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
- //选择收款单位change事件
|
|
|
+ //选择开票方change事件
|
|
|
companyChange(item) {
|
|
|
this.formData.bankCardNum = item.bankCardNum;
|
|
|
this.formData.biller = item.biller;
|
|
|
+ this.formData.accountId = item.accountId;
|
|
|
},
|
|
|
//获取所有内部账户信息
|
|
|
getAllUser() {
|
|
|
@@ -540,7 +592,12 @@ export default {
|
|
|
//新增编辑开票信息
|
|
|
submitInfo() {
|
|
|
let params = JSON.parse(JSON.stringify(this.formData));
|
|
|
- params.invoiceBy = this.formData.invoiceBy.accountName;
|
|
|
+ params.invoiceBy = this.formData.invoiceBy.accountName; //开票方
|
|
|
+ params.payMethod = params.payMethod.join(","); //支付方式
|
|
|
+ params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
|
|
|
+ params.company = params.otherUnit; //单位
|
|
|
+ params.fundFlow =
|
|
|
+ params.otherUnit + "→" + this.formData.invoiceBy.nameValue; //资金流向
|
|
|
this.$refs.formData.validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.formDataId) {
|
|
|
@@ -727,7 +784,7 @@ export default {
|
|
|
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
|
|
}
|
|
|
/deep/ .el-dialog__body {
|
|
|
- height: 400px;
|
|
|
+ height: 450px;
|
|
|
/* overflow-y: auto; */
|
|
|
}
|
|
|
.addremove-box {
|
|
|
@@ -754,7 +811,7 @@ export default {
|
|
|
.detailtTable >>> .el-dialog {
|
|
|
margin-top: 10vh !important;
|
|
|
}
|
|
|
-.ktTable >>> .el-input-number--small {
|
|
|
+.frame >>> .el-input-number--small {
|
|
|
width: 100%;
|
|
|
}
|
|
|
</style>
|
haizhouwang