|
|
@@ -104,7 +104,7 @@
|
|
|
placeholder="单位"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(item, index) in collectionData"
|
|
|
+ v-for="(item, index) in innerCollectionData"
|
|
|
:key="item.accountId + '' + index"
|
|
|
:label="item.name"
|
|
|
:value="item.bankCardNum"
|
|
|
@@ -377,11 +377,37 @@ export default {
|
|
|
dialogFormVisible: false, //账户信息弹出框状态
|
|
|
title: "新增账户信息", //账户信息弹框标题
|
|
|
expenseDialog: false, //申请单显示状态
|
|
|
- pageResult: {
|
|
|
+ pageResult: {//表格参数
|
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
|
content: [],
|
|
|
- }, //表格参数
|
|
|
+ },
|
|
|
+ formData: {
|
|
|
+ outerFlag: "0", //账户类别
|
|
|
+ accountName: "", //户名
|
|
|
+ accountQuality: "", //账户性质
|
|
|
+ bankCardNum: "", //银行卡号
|
|
|
+ bank: "", //开户行
|
|
|
+ bankName: "", //开户行名称
|
|
|
+ bankNum: "", //开户行号
|
|
|
+ certExpirationDate: "", //证书有效期
|
|
|
+ clearingProfit: "", //结算卡
|
|
|
+ dayStrokeNum: "", //单日转账笔数限制
|
|
|
+ exteriorProfit: "", //外部过账金额
|
|
|
+ fiscalProfit: "", //财税公司利润
|
|
|
+ insuranceProfit: "", //保险公司回款
|
|
|
+ otherProfit: "", //其他利润
|
|
|
+ parkProfit: "", //园区利润
|
|
|
+ priDayLines: "", //对私单日限额
|
|
|
+ priSingleLines: "", //对私单笔限额
|
|
|
+ priYearExcess: "", //对私年剩余额度
|
|
|
+ priYearLines: "", //对私年额度
|
|
|
+ pubDayLines: "", //对公单日限额
|
|
|
+ pubSingleLines: "", //对公单笔限额
|
|
|
+ pubYearExcess: "", //对公年剩余额度
|
|
|
+ pubYearLines: "", //对公年额度
|
|
|
+ tianqinProfit: "", //天勤利润
|
|
|
+ },
|
|
|
columns: [
|
|
|
// 申请列表表格头部
|
|
|
{
|
|
|
@@ -459,32 +485,6 @@ export default {
|
|
|
sortable: false,
|
|
|
},
|
|
|
],
|
|
|
- formData: {
|
|
|
- outerFlag: "0", //账户类别
|
|
|
- accountName: "", //户名
|
|
|
- accountQuality: "", //账户性质
|
|
|
- bankCardNum: "", //银行卡号
|
|
|
- bank: "", //开户行
|
|
|
- bankName: "", //开户行名称
|
|
|
- bankNum: "", //开户行号
|
|
|
- certExpirationDate: "", //证书有效期
|
|
|
- clearingProfit: "", //结算卡
|
|
|
- dayStrokeNum: "", //单日转账笔数限制
|
|
|
- exteriorProfit: "", //外部过账金额
|
|
|
- fiscalProfit: "", //财税公司利润
|
|
|
- insuranceProfit: "", //保险公司回款
|
|
|
- otherProfit: "", //其他利润
|
|
|
- parkProfit: "", //园区利润
|
|
|
- priDayLines: "", //对私单日限额
|
|
|
- priSingleLines: "", //对私单笔限额
|
|
|
- priYearExcess: "", //对私年剩余额度
|
|
|
- priYearLines: "", //对私年额度
|
|
|
- pubDayLines: "", //对公单日限额
|
|
|
- pubSingleLines: "", //对公单笔限额
|
|
|
- pubYearExcess: "", //对公年剩余额度
|
|
|
- pubYearLines: "", //对公年额度
|
|
|
- tianqinProfit: "", //天勤利润
|
|
|
- },
|
|
|
pickerOptions: {
|
|
|
//日期快捷键
|
|
|
disabledDate(time) {
|
|
|
@@ -515,23 +515,10 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
},
|
|
|
- //新增申请表单form表单
|
|
|
- tableForm: {
|
|
|
- company: "", //单位
|
|
|
- applicant: "", //申请人
|
|
|
- applySector: "", //申请部门
|
|
|
- applyTime: "", //申请日期
|
|
|
- collectionMessage: "", //收款单位信息
|
|
|
- fundFlow: "", //资金流程
|
|
|
- fundUse: "", //资金用途
|
|
|
- remark: "", //备注
|
|
|
- applyAmount: "", //申请金额
|
|
|
- bigApplyAmount: "", //大写金额
|
|
|
- payMethod: [], //支付方式
|
|
|
- },
|
|
|
payment_methodsData: [], //支付方式字典数据
|
|
|
use_fundsData: [], //备注字典数据
|
|
|
collectionData: [], //收款单位信息数据
|
|
|
+ innerCollectionData: [], //内部账户单位信息数据
|
|
|
account_qualityData: [], //账户性质字典
|
|
|
fundFlowData: [], //资金用途字典数据
|
|
|
tableRules: {
|
|
|
@@ -576,6 +563,20 @@ export default {
|
|
|
collectionMessageItem: {}, //选择收款单位整条数据
|
|
|
expendDataId: "", //修改时该条数据id
|
|
|
buttonValue: "导 出", //弹框提交按钮内容
|
|
|
+ //新增申请表单form表单
|
|
|
+ tableForm: {
|
|
|
+ company: "", //单位
|
|
|
+ applicant: "", //申请人
|
|
|
+ applySector: "", //申请部门
|
|
|
+ applyTime: "", //申请日期
|
|
|
+ collectionMessage: "", //收款单位信息
|
|
|
+ fundFlow: "", //资金流程
|
|
|
+ fundUse: "", //资金用途
|
|
|
+ remark: "", //备注
|
|
|
+ applyAmount: "", //申请金额
|
|
|
+ bigApplyAmount: "", //大写金额
|
|
|
+ payMethod: [], //支付方式
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -612,7 +613,7 @@ export default {
|
|
|
methods: {
|
|
|
//导出
|
|
|
expendDataup(idList) {
|
|
|
- if (this.expendDataId) {
|
|
|
+ if (this.expendDataId) { //编辑查看直接导出
|
|
|
let url = process.env.BASE_URL + "/upload/" + this.tableForm.uplodePath; // 3.创建一个临时的url指向blob对象
|
|
|
// 4.创建url之后可以模拟对此文件对象的一系列操作，例如：预览、下载
|
|
|
let a = document.createElement("a");
|
|
|
@@ -623,7 +624,7 @@ export default {
|
|
|
window.URL.revokeObjectURL(url);
|
|
|
this.resetForm();
|
|
|
this.findPage();
|
|
|
- } else {
|
|
|
+ } else { //新增并导出
|
|
|
this.$api.expense.excel(idList).then((response) => {
|
|
|
if (response.code == 200) {
|
|
|
response.data.forEach((data) => {
|
|
|
@@ -845,6 +846,7 @@ export default {
|
|
|
this.$api.expense.getAccountByAccountName().then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
let arr = [];
|
|
|
+ let newarr = []
|
|
|
res.data.forEach((item, index) => {
|
|
|
if (item.invAccountCardList != null) {
|
|
|
item.invAccountCardList.forEach((it) => {
|
|
|
@@ -862,8 +864,13 @@ export default {
|
|
|
item.accountName + " " + it.bankCardNum + " " + it.bank;
|
|
|
});
|
|
|
arr.push(...item.invAccountCardList);
|
|
|
+ //获取全部内部用户
|
|
|
+ if(item.outerFlag == 0){
|
|
|
+ newarr.push(...item.invAccountCardList)
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
+ this.innerCollectionData = newarr;
|
|
|
this.collectionData = arr;
|
|
|
}
|
|
|
});
|
