|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form :model="TWareHouseFees" ref="TWareHouseFees" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="货权方" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="TWareHouseFees.fCorpid"
|
|
@@ -24,7 +24,7 @@
|
|
|
|
|
|
<el-form-item label="结算单位" prop="fCorpid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
+ v-model="TWareHouseFees.fCorpid"
|
|
|
placeholder="请选择结算单位"
|
|
|
filterable
|
|
|
remote
|
|
@@ -43,7 +43,7 @@
|
|
|
|
|
|
<el-form-item label="录入人" prop="createBy">
|
|
|
<el-input
|
|
|
- v-model="form.createBy"
|
|
|
+ v-model="TWareHouseFees.createBy"
|
|
|
:disabled="true"
|
|
|
placeholder="默认录入人"
|
|
|
clearable
|
|
@@ -116,7 +116,7 @@
|
|
|
</el-form-item>-->
|
|
|
<el-form-item label="系统编号" prop="fBillno">
|
|
|
<el-input placeholder="请输入"
|
|
|
- v-model="queryParams.fBillno"
|
|
|
+ v-model="TWareHouseFees.fBillno"
|
|
|
@keyup.enter.native="handleQuery"/>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -167,7 +167,7 @@
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange" size="mini">
|
|
|
+ <el-table v-loading="loading" :data="contrastList" @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"/>
|
|
@@ -299,50 +299,47 @@
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
- size="mini"
|
|
|
- @click="innerVisible = true" v-hasPermi="['warehouse:fee:add']"
|
|
|
+ size="small"
|
|
|
+ @click="innerVisible = true"
|
|
|
>对账</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="info"
|
|
|
- size="mini"
|
|
|
- @click="innerVisible = true" v-hasPermi="['warehouse:fee:add']"
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
>确认对账</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="primary"
|
|
|
- size="mini"
|
|
|
+ type="success"
|
|
|
+ size="small"
|
|
|
>导出</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
- type="primary"
|
|
|
+ type="info"
|
|
|
icon="el-icon-download"
|
|
|
- size="mini"
|
|
|
+ size="small"
|
|
|
>打印</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 v-loading="loading" :data="DzfeeList" @selection-change="handleSelectionChange_s" 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="fDc"/>
|
|
|
<el-table-column label="金额" align="center" prop="fOldAmount"/>
|
|
|
<el-table-column label="业务类型" align="center" prop="fBilltype"/>
|
|
|
</el-table>
|
|
@@ -425,20 +422,11 @@
|
|
|
remote
|
|
|
:remote-method="fWRemoteMethod"
|
|
|
placeholder="费用名称"
|
|
|
- multiple
|
|
|
- >
|
|
|
- <!-- <el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
- :key="index.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option> -->
|
|
|
+ multiple>
|
|
|
<el-option v-for="item in fWbuOptions" :key="item.fId" :label="item.fName" :value="item.fId">
|
|
|
</el-option>
|
|
|
-
|
|
|
</el-select>
|
|
|
</template>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="审核日期" prop="timeExamine">
|
|
@@ -450,7 +438,7 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- :default-time="['00:00:00', '23:59:59']">
|
|
|
+ >
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -473,7 +461,7 @@
|
|
|
<el-button class="btnColor" type="info" size="mini" @click="resetQuery_s">重置</el-button>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange_s" size="mini">
|
|
|
+ <el-table v-loading="loading" :data="feeList" @selection-change="handleSelectionChange_s">
|
|
|
<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"/>
|
|
@@ -543,7 +531,7 @@
|
|
|
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 { queryUserVal } from '@/api/warehouseBusiness/agreement'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
|
name: "Fee",
|
|
@@ -551,7 +539,6 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- // lineId:respones.Arry.index,
|
|
|
browseStatus:false,
|
|
|
value1:"",
|
|
|
value2:"",
|
|
@@ -592,13 +579,18 @@ export default {
|
|
|
KHblnoOptions: [],
|
|
|
//打开内部弹窗
|
|
|
innerVisible: false,
|
|
|
+ selection: '',
|
|
|
// 弹出层标题
|
|
|
title: "",
|
|
|
+ // // 录入人
|
|
|
+ // createBy:response.user.userName,
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
dialogVisible: false,
|
|
|
// 财务对账表格
|
|
|
DzfeeList: [],
|
|
|
+ // 财务主页面表格
|
|
|
+ contrastList: [],
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
@@ -623,24 +615,27 @@ export default {
|
|
|
// fCtrlcorpid: [
|
|
|
// { required:true, message: '不能为空', trigger: 'blur'}
|
|
|
// ],
|
|
|
- fDc: [
|
|
|
- { required:true,message: '不能为空', trigger:'blur' }
|
|
|
- ],
|
|
|
- fToCorpid: [
|
|
|
- { required:true,message:'不能为空', trigger:'blur'}
|
|
|
- ],
|
|
|
- fReconciliation: [
|
|
|
- { required:true,message:'不能为空', trigger:'blur'}
|
|
|
- ],
|
|
|
- fReviewDate: [
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ // fDc: [
|
|
|
+ // { required:true,message: '不能为空', trigger:'blur' }
|
|
|
+ // ],
|
|
|
+ // fToCorpid: [
|
|
|
+ // { required:true,message:'不能为空', trigger:'blur'}
|
|
|
+ // ],
|
|
|
+ // fReconciliation: [
|
|
|
+ // { required:true,message:'不能为空', trigger:'blur'}
|
|
|
+ // ],
|
|
|
+ timeExamine: [
|
|
|
{ required:true,message:'不能为空', tigger:'blur'}
|
|
|
],
|
|
|
// fBilltype: [
|
|
|
// { required: true, message: "单据类型(对账单 收费 付费 付费申请 收费申请,发票申请 销项发票 进项发票)不能为空", trigger: "change" }
|
|
|
// ],
|
|
|
- fBillstatus: [
|
|
|
- { required: true, message: "状态不能为空", trigger: "blur" }
|
|
|
- ]
|
|
|
+ // fBillstatus: [
|
|
|
+ // { required: true, message: "状态不能为空", trigger: "blur" }
|
|
|
+ // ]
|
|
|
// fDeptid: [
|
|
|
// { required: true, message: "制单部门不能为空", trigger: "change" }
|
|
|
// ],
|
|
@@ -649,12 +644,21 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
+ // this.register()
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 默认录入人
|
|
|
+ // register() {
|
|
|
+ // queryUserVal().then((response)=>{
|
|
|
+ // this.contrastList.createBy = response.user.userName
|
|
|
+ // })
|
|
|
+ // },
|
|
|
// 导入搜索
|
|
|
searchFee() {
|
|
|
console.log(this.TWareHouseFees)
|
|
|
+ // this.feeList = []
|
|
|
this.$refs['feeListRules'].validate(valid => {
|
|
|
+ console.log(valid)
|
|
|
if (valid){
|
|
|
importFee(this.TWareHouseFees).then(response =>{
|
|
|
console.log(response)
|
|
@@ -777,18 +781,17 @@ export default {
|
|
|
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["feeListRules"].validate(valid => {
|
|
|
+ this.$refs["rules"].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))
|
|
|
+ let formDate = new window.FormData()
|
|
|
+ formDate.append('tFee',JSON.stringify(this.TWareHouseFees))
|
|
|
+ formDate.append("tFeeDo", JSON.stringify(this.feeList))
|
|
|
|
|
|
- updateFee(this.form).then(response => {
|
|
|
+ updateFee(formDate).then(response => {
|
|
|
this.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
- this.feeList = []
|
|
|
});
|
|
|
|
|
|
} else {
|