|
@@ -1,6 +1,15 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams_s" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form-item label="系统编号" prop="fCtrlcorpid">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams_s.fBillno"
|
|
|
+ placeholder="请输入系统编号"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
<el-input
|
|
|
v-model="queryParams_s.fCtrlcorpid"
|
|
@@ -10,11 +19,6 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="结算单位" prop="fCorpid">
|
|
|
- <el-select v-model="queryParams_s.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value=""/>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="对账日期" prop="fAccbilldate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
v-model="queryParams_s.fAccbilldate"
|
|
@@ -24,27 +28,35 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="状态" prop="fBillno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams_s.fBillno"
|
|
|
- placeholder="请输入选择状态"
|
|
|
+ <el-form-item label="结算单位" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams_s.fCorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ :remote-method="corpsRemoteMethod"
|
|
|
+ placeholder="请输入结算单位"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
-
|
|
|
- <el-form-item label="系统编号" prop="fBillno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams_s.fBillno"
|
|
|
- placeholder="请输入系统编号"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ <el-form-item label="状态" prop="fBillstatus">
|
|
|
+ <el-select v-model="queryParams_s.fBillstatus" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in options"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
<el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -102,20 +114,22 @@
|
|
|
<el-table-column label="序1号" type="index" width="55" align="center"/>
|
|
|
<el-table-column label="系统编号" align="center" prop="fBillno"/>
|
|
|
<el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
|
|
|
- <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="制单部门" align="center" prop="fId"/>
|
|
|
- <el-table-column label="结算单位" align="center" prop="fCorpid"/>
|
|
|
+ <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate" width="180">-->
|
|
|
+ <!-- <template slot-scope="scope">-->
|
|
|
+ <!-- <span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>-->
|
|
|
+ <!-- </template>-->
|
|
|
+ <!-- </el-table-column>-->
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fId"/>-->
|
|
|
+ <!-- <el-table-column label="结算单位" align="center" prop="fCorpid"/>-->
|
|
|
+ <el-table-column label="对账日期" align="center" prop="tMblno"/>
|
|
|
<el-table-column label="提单号" align="center" prop="tMblno"/>
|
|
|
<el-table-column label="应收合计" align="center" prop="fAmtdr"/>
|
|
|
<el-table-column label="应付合计" align="center" prop="fAmtcr"/>
|
|
|
- <el-table-column label="单据类型" align="center" prop="fBilltype"/>
|
|
|
- <el-table-column label="状态" align="center" prop="fBillstatus"/>
|
|
|
<el-table-column label="备注" align="center" prop="fRemarks"/>
|
|
|
- <el-table-column label="制单部门" align="center" prop="fDeptid"/>
|
|
|
+ <el-table-column label="状态" align="center" prop="fBillstatus"/>
|
|
|
+
|
|
|
+ <!-- <el-table-column label="单据类型" align="center" prop="fBilltype"/>-->
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fDeptid"/>-->
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -160,7 +174,7 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="结算单位" prop="fCorpid">
|
|
|
+ <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="queryParams.fCorpid"
|
|
|
filterable
|
|
@@ -179,7 +193,7 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对账日期" prop="fAccbilldate">
|
|
|
+ <el-form-item label="结算日期" label-width="78px" prop="fAccbilldate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
v-model="queryParams.fAccbilldate"
|
|
|
type="date"
|
|
@@ -208,7 +222,8 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div style="width: 100%;">
|
|
|
- <el-button type="primary" size="small" @click="innerVisible = true">确认收费</el-button>
|
|
|
+ <el-button type="warning" size="small" @click="innerVisible = true">收费</el-button>
|
|
|
+ <el-button type="primary" size="small">确认收费</el-button>
|
|
|
<el-button type="success" size="small">导出</el-button>
|
|
|
<el-button type="info" size="small">打印</el-button>
|
|
|
<el-button type="danger" size="small">删除</el-button>
|
|
@@ -247,7 +262,7 @@
|
|
|
style="display: flex;flex-wrap: wrap;"
|
|
|
>
|
|
|
<el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
-<!-- <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
|
|
|
+ <!-- <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
|
|
|
<el-select
|
|
|
v-model="queryParams.fCorpid"
|
|
|
filterable
|
|
@@ -405,6 +420,7 @@ export default {
|
|
|
return {
|
|
|
browseStatus: false,
|
|
|
fWbuOptions: [],
|
|
|
+ options:'',
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
//打开内部弹窗
|
|
@@ -530,8 +546,11 @@ export default {
|
|
|
},
|
|
|
/** 查询财务数据主列表 */
|
|
|
getList() {
|
|
|
- this.loading = true;
|
|
|
- console.log(this.queryParams_s)
|
|
|
+ this.loading = true
|
|
|
+ this.getDicts("approval_process").then((response) => {
|
|
|
+ console.log(response.data)
|
|
|
+ this.options = response.data
|
|
|
+ });
|
|
|
listCharge(this.queryParams_s).then(response => {
|
|
|
console.log(response)
|
|
|
this.chargeList = response.rows
|
|
@@ -641,6 +660,9 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
this.reset()
|
|
|
+ // this.queryParams = []
|
|
|
+ this.increase_s = []
|
|
|
+ this.resetForm('queryParams')
|
|
|
this.open = true
|
|
|
this.title = '添加财务数据主'
|
|
|
},
|
|
@@ -670,7 +692,7 @@ export default {
|
|
|
})
|
|
|
} else {
|
|
|
let formData = new window.FormData()
|
|
|
- formData.append('tFee', JSON.stringify(this.form))
|
|
|
+ formData.append('tFee', JSON.stringify(this.queryParams))
|
|
|
formData.append('tFeeDo', JSON.stringify(this.increase_s))
|
|
|
|
|
|
addCharge(formData).then(response => {
|