|
|
@@ -1,42 +1,57 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <el-form-item label="业务编号(唯一格式+YYYY+YY+NNN，
|
|
|
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
|
|
|
-对账 DZ
|
|
|
-
|
|
|
-收费 SF
|
|
|
-
|
|
|
-付费 FF
|
|
|
-
|
|
|
-发票 FP" prop="fBillno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fBillno"
|
|
|
- placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
|
|
|
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
|
|
|
-对账 DZ
|
|
|
-
|
|
|
-收费 SF
|
|
|
-
|
|
|
-付费 FF
|
|
|
-
|
|
|
-发票 FP"
|
|
|
+ <el-form-item label="货权方" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="TWareHouseFees.fCorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
- <el-select v-model="queryParams.fCtrlcorpid" placeholder="请选择货权方" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
+ :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="fCorpid">
|
|
|
- <el-select v-model="queryParams.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
+
|
|
|
+
|
|
|
+ <el-form-item label="结算单位" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fCorpid"
|
|
|
+ placeholder="请选择结算单位"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="corpsRemoteMethod">
|
|
|
+ <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="tMblno">
|
|
|
+
|
|
|
+ <el-form-item label="录入人" prop="createBy">
|
|
|
+ <el-input
|
|
|
+ v-model="form.createBy"
|
|
|
+ :disabled="true"
|
|
|
+ placeholder="默认录入人"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <!-- <el-form-item label="提单号" prop="tMblno">
|
|
|
<el-input
|
|
|
v-model="queryParams.tMblno"
|
|
|
placeholder="请输入提单号"
|
|
|
@@ -44,8 +59,8 @@
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="应收合计" prop="fAmtdr">
|
|
|
+ </el-form-item>-->
|
|
|
+ <!-- <el-form-item label="应收合计" prop="fAmtdr">
|
|
|
<el-input
|
|
|
v-model="queryParams.fAmtdr"
|
|
|
placeholder="请输入应收合计"
|
|
|
@@ -53,8 +68,8 @@
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="应付合计" prop="fAmtcr">
|
|
|
+ </el-form-item> -->
|
|
|
+ <!-- <el-form-item label="应付合计" prop="fAmtcr">
|
|
|
<el-input
|
|
|
v-model="queryParams.fAmtcr"
|
|
|
placeholder="请输入应付合计"
|
|
|
@@ -62,18 +77,35 @@
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
|
|
|
- <el-select v-model="queryParams.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" clearable size="small">
|
|
|
+ </el-form-item> -->
|
|
|
+ <!-- <el-form-item label="单据类型" prop="fBilltype">
|
|
|
+ <el-select v-model="queryParams.fBilltype" placeholder="请选择单据类型" clearable size="small">
|
|
|
<el-option label="请选择字典生成" value="" />
|
|
|
</el-select>
|
|
|
+ </el-form-item> -->
|
|
|
+
|
|
|
+ <el-form-item label="对账日期">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="dateRange"
|
|
|
+ size="small"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ ></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
<el-form-item label="状态" prop="fBillstatus">
|
|
|
- <el-select v-model="queryParams.fBillstatus" placeholder="请选择状态" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
- </el-select>
|
|
|
+ <el-input label="录入已对账" value=""
|
|
|
+ v-model="queryParams.fBillstatus"
|
|
|
+ placeholder="请选择状态"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备注" prop="fRemarks">
|
|
|
+ <!-- <el-form-item label="备注" prop="fRemarks">
|
|
|
<el-input
|
|
|
v-model="queryParams.fRemarks"
|
|
|
placeholder="请输入备注"
|
|
|
@@ -81,22 +113,18 @@
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
+ </el-form-item>-->
|
|
|
+ <el-form-item label="系统编号" prop="fBillno">
|
|
|
+ <el-input placeholder="请输入"
|
|
|
+ v-model="queryParams.fBillno"
|
|
|
+ @keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams.fAccbilldate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择账单日期(审批流结束后更新)">
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="制单部门" prop="fDeptid">
|
|
|
- <el-select v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
+ <!-- <el-form-item label="制单部门" prop="fDeptid">
|
|
|
+ <el-input label="请选择字典生成" value="" v-model="queryParams.fDeptid" placeholder="请选择制单部门" clearable size="small"/>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item>
|
|
|
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ <el-button type="cyan" icon="el-icon-search" size="mini" @click="searchFee">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
@@ -104,17 +132,15 @@
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="primary"
|
|
|
- icon="el-icon-plus"
|
|
|
+ type="success"
|
|
|
size="mini"
|
|
|
- @click="handleAdd"
|
|
|
+ @click="dialogVisible = true"
|
|
|
v-hasPermi="['warehouse:fee:add']"
|
|
|
>新增</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="success"
|
|
|
- icon="el-icon-edit"
|
|
|
+ type="warning"
|
|
|
size="mini"
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
@@ -124,52 +150,51 @@
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="danger"
|
|
|
- icon="el-icon-delete"
|
|
|
size="mini"
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
- v-hasPermi="['warehouse:fee:remove']"
|
|
|
+ v-hasPermi="['finance:contrast + fId']"
|
|
|
>删除</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
+ type="info"
|
|
|
size="mini"
|
|
|
- @click="handleExport"
|
|
|
+ @click="openImportTable"
|
|
|
v-hasPermi="['warehouse:fee:export']"
|
|
|
+ >导入</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExport"
|
|
|
+ v-hasPermi="['finance:contrast:export']"
|
|
|
>导出</el-button>
|
|
|
</el-col>
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="制单部门" align="center" prop="fId" />
|
|
|
- <el-table-column label="业务编号(唯一格式+YYYY+YY+NNN，
|
|
|
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
|
|
|
-对账 DZ
|
|
|
-
|
|
|
-收费 SF
|
|
|
-
|
|
|
-付费 FF
|
|
|
-
|
|
|
-发票 FP" align="center" prop="fBillno" />
|
|
|
- <el-table-column label="货权方" align="center" prop="fCtrlcorpid" />
|
|
|
- <el-table-column label="结算单位(下拉模糊搜索)" align="center" prop="fCorpid" />
|
|
|
- <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="fAccbilldate" width="180">
|
|
|
+ <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
|
|
|
+ <el-table-column label="选择" width="55" align="center" type="selection"/>
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
|
|
|
+ <el-table-column label="行号" align="center" type="index"/>
|
|
|
+ <el-table-column label="系统编号" align="center" prop="fBillno"/>
|
|
|
+ <el-table-column label="货权方" align="center" prop="fCtrlcorpid"/>
|
|
|
+ <el-table-column label="结算单位" align="center" prop="fCorpid"/>
|
|
|
+ <el-table-column label="账单日期" align="center" prop="fAccbilldate">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.fAccbilldate, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="制单部门" align="center" prop="fDeptid" />
|
|
|
- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
+ <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="fRemarks" />
|
|
|
+ <el-table-column label="状态" align="center" prop="fBillstatus" />
|
|
|
+ <!-- <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
|
|
|
size="mini"
|
|
|
@@ -186,7 +211,7 @@
|
|
|
v-hasPermi="['warehouse:fee:remove']"
|
|
|
>删除</el-button>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
@@ -197,49 +222,279 @@
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
|
|
|
- <!-- 添加或修改财务数据主对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
- <el-form-item label="业务编号(唯一格式+YYYY+YY+NNN，
|
|
|
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
|
|
|
-对账 DZ
|
|
|
+ <!-- 对账表 -->
|
|
|
+ <el-dialog :visible.sync="dialogVisible" width="65%" append-to-body :close-on-click-modal="false">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
|
|
|
|
|
|
-收费 SF
|
|
|
+ <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fCtrlcorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ 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>
|
|
|
|
|
|
-付费 FF
|
|
|
+ <el-form-item label="结算单位" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fCorpid"
|
|
|
+ placeholder="请选择结算单位"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="corpsRemoteMethod">
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
-发票 FP" prop="fBillno">
|
|
|
- <el-input v-model="form.fBillno" placeholder="请输入业务编号(唯一格式+YYYY+YY+NNN，
|
|
|
-编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。)
|
|
|
-对账 DZ
|
|
|
|
|
|
-收费 SF
|
|
|
+ <el-form-item label="提单号" prop="tMblno">
|
|
|
+ <el-input v-model="form.tMblno" placeholder="" :disabled="true"/>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
-付费 FF
|
|
|
+ <el-form-item label="对账日期">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="value3"
|
|
|
+ size="small"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="date">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
-发票 FP" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
- <el-select v-model="form.fCtrlcorpid" placeholder="请选择货权方">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="结算单位(下拉模糊搜索)" prop="fCorpid">
|
|
|
- <el-select v-model="form.fCorpid" placeholder="请选择结算单位(下拉模糊搜索)">
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
+ <el-form-item label="单据日期">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="value4"
|
|
|
+ size="small"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="date">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="单据编号">
|
|
|
+ <el-input :disabled="true"/>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="录入人" prop="createBy">
|
|
|
+ <el-input v-model="form.createBy"/>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-row :gutter="10" class="mb8">
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="info"
|
|
|
+ size="mini"
|
|
|
+ @click="handleAdd" v-hasPermi="['warehouse:fee:add']"
|
|
|
+ >确认对账</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ >导出</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ >打印</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ size="mini"
|
|
|
+ @click="handleDelete"
|
|
|
+ v-hasPermi="['warehouse:fee:remove']"
|
|
|
+ >删除</el-button>
|
|
|
+ </el-col>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <el-table v-loading="loading" :data="DzfeeList" @selection-change="handleSelectionChange" size="mini">
|
|
|
+ <el-table-column type="selection" width="55" align="center" />
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
|
|
|
+ <el-table-column label="行号" align="center" type="index"/>
|
|
|
+ <el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
+ <el-table-column label="业务日期" align="center" prop="fBsdate"/>
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeName"/>
|
|
|
+ <el-table-column label="收/付" align="center" prop="fSrcdc"/>
|
|
|
+ <el-table-column label="金额" align="center" prop="fOldAmount"/>
|
|
|
+ <el-table-column label="业务类型" align="center" prop="fBilltype"/>
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
+ <el-button @click="cancel">取 消</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+ <!-- 添加或修改财务数据主对话框 -->
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :close-on-click-modal="false">
|
|
|
+ <el-form :model="TWareHouseFees" ref="feeListRules" :rules="feeListRules" label-width="80px" :inline="true">
|
|
|
+ <!-- <el-form-item label="业务编号" prop="fBillno">
|
|
|
+ <el-input v-model="form.fBillno" placeholder="请输入业务编号" />
|
|
|
+ </el-form-item> -->
|
|
|
+
|
|
|
+ <el-form-item class="el-form-item__label" label="货权方" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="TWareHouseFees.fCorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ :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="fToCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="TWareHouseFees.fToCorpid"
|
|
|
+ placeholder="请选择结算单位"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ :remote-method="corpsRemoteMethod">
|
|
|
+ <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="tMblno">
|
|
|
- <el-input v-model="form.tMblno" placeholder="请输入提单号" />
|
|
|
+ <el-input v-model="form.tMblno" placeholder="请模糊输入" @keyup.enter.native="handleQuery"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="收付" prop="fSrcdc">
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-select v-model="TWareHouseFees.fSrcdc">
|
|
|
+ <el-option value="是"/>
|
|
|
+ <el-option value="否"/>
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="应收合计" prop="fAmtdr">
|
|
|
+ <el-form-item label="是否对账" prop="fReconciliation">
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-select v-model="TWareHouseFees.fReconciliation">
|
|
|
+ <el-option value="是"/>
|
|
|
+ <el-option value="否"/>
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="费用名称" prop="fFeeid">
|
|
|
+ <template>
|
|
|
+ <el-select
|
|
|
+ v-model="form.fFeeid"
|
|
|
+ filterable
|
|
|
+ :disabled="browseStatus"
|
|
|
+ remote
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ :remote-method="fWRemoteMethod"
|
|
|
+ placeholder="费用名称"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fWbuOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="审核日期" prop="fReviewDate">
|
|
|
+ <el-date-picker
|
|
|
+ style="width:200px"
|
|
|
+ v-model="TWareHouseFees.fReviewDate"
|
|
|
+ type="daterange"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ :default-time="['00:00:00', '23:59:59']">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="对账日期">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="value2"
|
|
|
+ size="small"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ ></el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item>
|
|
|
+ <el-button class="btnColor" type="info" size="mini">导入</el-button>
|
|
|
+ <el-button class="btnColor" type="info" size="mini" @click="searchFee">搜索</el-button>
|
|
|
+ <el-button class="btnColor" type="info" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
|
|
|
+ <el-table-column label="选择" width="55" align="center" type="selection"/>
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
|
|
|
+ <el-table-column label="行号" align="center" type="index"/>
|
|
|
+ <el-table-column label="货权方" align="center" prop="fName"/>
|
|
|
+ <el-table-column label="结算单位" align="center" prop="fFeesName"/>
|
|
|
+ <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> -->
|
|
|
+ <el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
+ <el-table-column label="品名" align="center" prop="fProductName"/>
|
|
|
+ <el-table-column label="业务日期" align="center" prop="fBsdate"/>
|
|
|
+ <el-table-column label="业务类型" align="center" prop="fBilltype"/>
|
|
|
+ <!-- <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
|
|
|
+ <el-table-column label="审核日期" align="center" prop="fReviewDate" />
|
|
|
+ <el-table-column label="金额" align="center" prop="fOldAmount" />
|
|
|
+ <el-table-column label="本次金额" align="center" prop="fNewAmount" />
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeName" />
|
|
|
+ <el-table-column label="备注" align="center" prop="f_remarks" >
|
|
|
+ <el-input placeholder="请输入内容"></el-input>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ <!-- <el-form-item label="应收合计" prop="fAmtdr">
|
|
|
<el-input v-model="form.fAmtdr" placeholder="请输入应收合计" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="应付合计" prop="fAmtcr">
|
|
|
<el-input v-model="form.fAmtcr" placeholder="请输入应付合计" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)" prop="fBilltype">
|
|
|
- <el-select v-model="form.fBilltype" placeholder="请选择单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)">
|
|
|
+ <el-form-item label="单据类型" prop="fBilltype">
|
|
|
+ <el-select v-model="form.fBilltype" placeholder="请选择单据类型">
|
|
|
<el-option label="请选择字典生成" value="" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -251,12 +506,12 @@
|
|
|
<el-form-item label="备注" prop="fRemarks">
|
|
|
<el-input v-model="form.fRemarks" placeholder="请输入备注" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="账单日期(审批流结束后更新)" prop="fAccbilldate">
|
|
|
+ <el-form-item label="账单日期" prop="fAccbilldate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="form.fAccbilldate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择账单日期(审批流结束后更新)">
|
|
|
+ v-model="form.fAccbilldate"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择账单日期">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="删除状态" prop="delFlag">
|
|
|
@@ -266,27 +521,51 @@
|
|
|
<el-select v-model="form.fDeptid" placeholder="请选择制单部门">
|
|
|
<el-option label="请选择字典生成" value="" />
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="confirm">确 定</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listFee, getFee, delFee, addFee, updateFee, exportFee } from "@/api/finance/contrast";
|
|
|
+import { listFee, getFee, delFee, addFee, updateFee, exportFee, importFee} from "@/api/finance/contrast";
|
|
|
+import { listCorps } from '@/api/basicdata/corps'
|
|
|
+import { listFees } from '@/api/basicdata/fees'
|
|
|
|
|
|
+import moment from 'moment'
|
|
|
export default {
|
|
|
name: "Fee",
|
|
|
components: {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ // lineId:respones.Arry.index,
|
|
|
+ browseStatus:false,
|
|
|
+ value1:"",
|
|
|
+ value2:"",
|
|
|
+ value3:"",
|
|
|
+ value4:"",
|
|
|
+ dateRange:"",
|
|
|
+ TWareHouseFees :{
|
|
|
+ fCorpid:'',
|
|
|
+ fToCorpid:'',
|
|
|
+ fMblno:'',
|
|
|
+ fStatementNo:'',
|
|
|
+ fFeeid :'',
|
|
|
+ timeExamine:'',
|
|
|
+ timeInterval:'',
|
|
|
+ fSrcdc:'',
|
|
|
+ fReconciliation:''
|
|
|
+ },
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
+ fAccbilldate: '',
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
// 非单个禁用
|
|
|
@@ -299,10 +578,19 @@ export default {
|
|
|
total: 0,
|
|
|
// 财务数据主表格数据
|
|
|
feeList: [],
|
|
|
+ // 客户(客户数据)
|
|
|
+ fMblnoOptions: [],
|
|
|
+ fFeeunitidOptions: [],
|
|
|
+ fWbuOptions: [],
|
|
|
+ KHblnoOptions: [],
|
|
|
+
|
|
|
// 弹出层标题
|
|
|
title: "",
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
+ dialogVisible: false,
|
|
|
+ // 财务对账表格
|
|
|
+ DzfeeList: [],
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
@@ -322,22 +610,32 @@ export default {
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
- rules: {
|
|
|
- fCtrlcorpid: [
|
|
|
- { required: true, message: "货权方不能为空", trigger: "change" }
|
|
|
+ rules:{},
|
|
|
+ feeListRules: {
|
|
|
+ // fCtrlcorpid: [
|
|
|
+ // { required:true, message: '不能为空', trigger: 'blur'}
|
|
|
+ // ],
|
|
|
+ fSrcdc: [
|
|
|
+ { required:true,message: '不能为空', trigger:'blur' }
|
|
|
],
|
|
|
- fCorpid: [
|
|
|
- { required: true, message: "结算单位(下拉模糊搜索)不能为空", trigger: "change" }
|
|
|
+ fToCorpid: [
|
|
|
+ { required:true,message:'不能为空', trigger:'blur'}
|
|
|
],
|
|
|
- fBilltype: [
|
|
|
- { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
|
|
|
+ fReconciliation: [
|
|
|
+ { required:true,message:'不能为空', trigger:'blur'}
|
|
|
],
|
|
|
+ fReviewDate: [
|
|
|
+ { required:true,message:'不能为空', tigger:'blur'}
|
|
|
+ ],
|
|
|
+ // fBilltype: [
|
|
|
+ // { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请，发票申请 销项发票 进项发票)不能为空", trigger: "change" }
|
|
|
+ // ],
|
|
|
fBillstatus: [
|
|
|
{ required: true, message: "状态不能为空", trigger: "blur" }
|
|
|
- ],
|
|
|
- fDeptid: [
|
|
|
- { required: true, message: "制单部门不能为空", trigger: "change" }
|
|
|
- ],
|
|
|
+ ]
|
|
|
+ // fDeptid: [
|
|
|
+ // { required: true, message: "制单部门不能为空", trigger: "change" }
|
|
|
+ // ],
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
@@ -345,8 +643,24 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 导入搜索
|
|
|
+ searchFee() {
|
|
|
+ console.log(this.TWareHouseFees)
|
|
|
+ importFee(this.TWareHouseFees).then(response =>{
|
|
|
+ console.log(response)
|
|
|
+
|
|
|
+ this.feeList = response.rows
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ /** 打开导入表弹窗 */
|
|
|
+ openImportTable() {
|
|
|
+ this.$refs.import.show();
|
|
|
+ },
|
|
|
/** 查询财务数据主列表 */
|
|
|
getList() {
|
|
|
+ console.log(this)
|
|
|
this.loading = true;
|
|
|
listFee(this.queryParams).then(response => {
|
|
|
this.feeList = response.rows;
|
|
|
@@ -357,6 +671,7 @@ export default {
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false;
|
|
|
+ this.feeList = []
|
|
|
this.reset();
|
|
|
},
|
|
|
// 表单重置
|
|
|
@@ -386,11 +701,23 @@ export default {
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1;
|
|
|
this.getList();
|
|
|
+ this.searchFee()
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
this.resetForm("queryForm");
|
|
|
this.handleQuery();
|
|
|
+ this.TWareHouseFees={
|
|
|
+ fCorpid:'',
|
|
|
+ fToCorpid:'',
|
|
|
+ fMblno:'',
|
|
|
+ fStatementNo:'',
|
|
|
+ fFeeid :'',
|
|
|
+ timeExamine:'',
|
|
|
+ timeInterval:'',
|
|
|
+ fSrcdc:'',
|
|
|
+ fReconciliation:''
|
|
|
+ }
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
@@ -414,17 +741,40 @@ export default {
|
|
|
this.title = "修改财务数据主";
|
|
|
});
|
|
|
},
|
|
|
+ /** 远程模糊查询用户 */
|
|
|
+ corpsRemoteMethod(name) {
|
|
|
+ if (name == null || name === "") {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fMblnoOptions = response.rows;
|
|
|
+ this.KHblnoOptions = response.rows;
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
+ console.log(this.form)
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
if (this.form.fId != null) {
|
|
|
+ // let formDate = new window.FormData()
|
|
|
+ // formDate.append('contrast',JSON.stringify(this.form))
|
|
|
+ // formDate.append("feelitems", JSON.stringify(this.feeList))
|
|
|
+
|
|
|
updateFee(this.form).then(response => {
|
|
|
this.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
+ this.feeList = []
|
|
|
});
|
|
|
+
|
|
|
} else {
|
|
|
+ // let formDate = new window.FormData()
|
|
|
+ // formDate.append('contrast',JSON.stringify(this.form))
|
|
|
+ // formDate.append("feelitems", JSON.stringify(this.feeList))
|
|
|
+
|
|
|
addFee(this.form).then(response => {
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
@@ -434,33 +784,61 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ /* 添加财务数据主 导入*/
|
|
|
+ confirm(){
|
|
|
+ this.DzfeeList = this.feeList
|
|
|
+ },
|
|
|
+
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const fIds = row.fId || this.ids;
|
|
|
this.$confirm('是否确认删除财务数据主编号为"' + fIds + '"的数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return delFee(fIds);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.msgSuccess("删除成功");
|
|
|
- })
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function() {
|
|
|
+ return delFee(fIds);
|
|
|
+ }).then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
},
|
|
|
+ // 远程模糊查询费用名称
|
|
|
+ fWRemoteMethod(name) {
|
|
|
+ this.fWbuOptions = []
|
|
|
+ if (name == null || name === "") {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ console.log(response)
|
|
|
+ console.log("1111")
|
|
|
+ this.fWbuOptions = response.rows
|
|
|
+ console.log(this.fWbuOptions)
|
|
|
+ });
|
|
|
+ },
|
|
|
+
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|
|
|
this.$confirm('是否确认导出所有财务数据主数据项?', "警告", {
|
|
|
- confirmButtonText: "确定",
|
|
|
- cancelButtonText: "取消",
|
|
|
- type: "warning"
|
|
|
- }).then(function() {
|
|
|
- return exportFee(queryParams);
|
|
|
- }).then(response => {
|
|
|
- this.download(response.msg);
|
|
|
- })
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ }).then(function() {
|
|
|
+ return exportFee(queryParams);
|
|
|
+ }).then(response => {
|
|
|
+ this.download(response.msg);
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
</script>
|
|
|
+<style lang="scss" scoped>
|
|
|
+.btnColor{
|
|
|
+ border:1px solid #0f5dee;
|
|
|
+}
|
|
|
+.btnColor:hover{
|
|
|
+ color:#0f5dee;
|
|
|
+}
|
|
|
+</style>
|
翁玉文