|
|
@@ -8,7 +8,9 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
|
- <el-form-item label="系统编号" prop="fCtrlcorpid">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="系统编号" prop="fBillno">
|
|
|
<el-input
|
|
|
v-model="tableFilter.fBillno"
|
|
|
placeholder="请输入系统编号"
|
|
|
@@ -18,7 +20,9 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
<el-input
|
|
|
v-model="tableFilter.fCtrlcorpid"
|
|
|
placeholder="请输入货权方"
|
|
|
@@ -28,7 +32,9 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="结算单位" prop="fCorpid">
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="结算单位" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="tableFilter.fCorpid"
|
|
|
filterable
|
|
|
@@ -48,31 +54,69 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="收费日期" prop="timeInterval">
|
|
|
- <el-date-picker
|
|
|
- type="daterange"
|
|
|
- size="small"
|
|
|
- style="width: 240px"
|
|
|
- v-model="tableFilter.timeInterval"
|
|
|
- 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>
|
|
|
- <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
|
|
|
- >
|
|
|
- </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="状态" prop="fBillstatus">
|
|
|
+ <el-input
|
|
|
+ v-model="tableFilter.fBillstatus"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-collapse-transition>
|
|
|
+ <div v-show="show">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="实收合计" prop="fAmtcr">
|
|
|
+ <el-input
|
|
|
+ v-model="tableFilter.firstMoney"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ style="width: 100px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ <el-input
|
|
|
+ v-model="tableFilter.lastMoney"
|
|
|
+ placeholder="请输入金额"
|
|
|
+ clearable
|
|
|
+ style="width: 100px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="备注" prop="fRemarks">
|
|
|
+ <el-input
|
|
|
+ v-model="tableFilter.fRemarks"
|
|
|
+ placeholder="请输入提单号"
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="收费日期" prop="timeInterval">
|
|
|
+ <el-date-picker
|
|
|
+ type="daterange"
|
|
|
+ size="small"
|
|
|
+ style="width: 240px"
|
|
|
+ v-model="tableFilter.timeInterval"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
+ </el-collapse-transition>
|
|
|
</el-form>
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
@@ -92,7 +136,7 @@
|
|
|
size="mini"
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
- v-hasPermi="['financial:invoiceApplyFor:edit']"
|
|
|
+ v-hasPermi="['finance:invoiceApplyFor:query']"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -118,6 +162,32 @@
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
<div class="tabSetting">
|
|
|
+ <div style="margin-right: 20px">
|
|
|
+ <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
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-show="show"
|
|
|
+ @click="show = !show"
|
|
|
+ icon="el-icon-arrow-up"
|
|
|
+ size="mini"
|
|
|
+ >展开</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-show="!show"
|
|
|
+ @click="show = !show"
|
|
|
+ icon="el-icon-arrow-down"
|
|
|
+ size="mini"
|
|
|
+ >展开</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
<right-toolbar
|
|
|
:showSearch.sync="showSearch"
|
|
|
@queryTable="getList"
|
|
|
@@ -244,7 +314,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-view"
|
|
|
@click="check(scope.row, 0)"
|
|
|
- v-hasPermi="['financial:invoiceApplyFor:edit']"
|
|
|
+ v-hasPermi="['finance:invoiceApplyFor:query']"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
@@ -252,7 +322,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-view"
|
|
|
@click="check(scope.row, 1)"
|
|
|
- v-hasPermi="['financial:invoiceApplyFor:edit']"
|
|
|
+ v-hasPermi="['finance:invoiceApplyFor:query']"
|
|
|
v-if="
|
|
|
scope.row.fBillstatus == '提交审核' ||
|
|
|
scope.row.fBillstatus == '审核中'
|
|
|
@@ -264,7 +334,7 @@
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
- v-hasPermi="['financial:invoiceApplyFor:edit']"
|
|
|
+ v-hasPermi="['finance:invoiceApplyFor:query']"
|
|
|
v-if="
|
|
|
scope.row.fBillstatus == '保存' ||
|
|
|
scope.row.fBillstatus == '暂存' ||
|
|
|
@@ -508,10 +578,10 @@
|
|
|
@click="addOrUpdateHandle"
|
|
|
>查看审批流</el-button
|
|
|
>
|
|
|
- <el-button type="primary" @click="submitForm" size="mini" :disabled="notChange"
|
|
|
+ <el-button type="success" @click="submitForm" size="mini" :disabled="notChange"
|
|
|
>保 存</el-button
|
|
|
>
|
|
|
- <el-button @click="addPage" size="mini">新 增</el-button>
|
|
|
+ <el-button @click="addPage" type="primary" size="mini">新 增</el-button>
|
|
|
</div>
|
|
|
<div style="margin: 0 12px">
|
|
|
<el-button
|
|
|
@@ -658,8 +728,10 @@
|
|
|
v-loading="loading"
|
|
|
:data="increase_s"
|
|
|
@selection-change="handleSelectionChange_s"
|
|
|
+ show-summary
|
|
|
+ :summary-method="listTotal"
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55" align="center"/>
|
|
|
+ <el-table-column type="selection" width="60" align="center"/>
|
|
|
<el-table-column label="序号" type="index" align="center" />
|
|
|
<el-table-column
|
|
|
v-for="(item, index) in getRowList2"
|
|
|
@@ -721,6 +793,8 @@
|
|
|
v-loading="loading"
|
|
|
:data="invoiceList"
|
|
|
@selection-change="handleSelectionChange_s"
|
|
|
+ show-summary
|
|
|
+ :summary-method="listTotal"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
<el-table-column label="序号" type="index" align="center" />
|
|
|
@@ -1048,6 +1122,7 @@
|
|
|
show-summary
|
|
|
:summary-method="getSum"
|
|
|
@selection-change="handleSelectionChange_s"
|
|
|
+ show-overflow-tooltip
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column
|
|
|
@@ -1056,30 +1131,30 @@
|
|
|
width="55"
|
|
|
align="center"
|
|
|
/>
|
|
|
- <el-table-column label="货权方" align="center" prop="fName" />
|
|
|
+ <el-table-column label="货权方" align="center" prop="fName" width="200px"/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
<el-table-column label="船名" align="center" prop="boatName" />
|
|
|
<el-table-column label="航次" align="center" prop="voyageName" />
|
|
|
- <el-table-column label="品名" align="center" prop="fProductName" />
|
|
|
- <el-table-column label="业务日期" align="center">
|
|
|
- <template slot-scope="scope" v-if="scope.row.fBsdate">
|
|
|
- <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="业务类型" align="center" prop="fBilltype">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
|
|
|
- <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
|
|
|
- <span v-else>{{ scope.row.fBilltype }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- label="作业类型"
|
|
|
- align="center"
|
|
|
- prop="fBusinessType"
|
|
|
- />
|
|
|
- <el-table-column label="审核日期" align="center" prop="fReviewDate" />
|
|
|
- <el-table-column label="费用名称" align="center" prop="fFeeName" />
|
|
|
+<!-- <el-table-column label="品名" align="center" prop="fProductName" />-->
|
|
|
+<!-- <el-table-column label="业务日期" align="center">-->
|
|
|
+<!-- <template slot-scope="scope" v-if="scope.row.fBsdate">-->
|
|
|
+<!-- <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column label="业务类型" align="center" prop="fBilltype">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>-->
|
|
|
+<!-- <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>-->
|
|
|
+<!-- <span v-else>{{ scope.row.fBilltype }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column-->
|
|
|
+<!-- label="作业类型"-->
|
|
|
+<!-- align="center"-->
|
|
|
+<!-- prop="fBusinessType"-->
|
|
|
+<!-- />-->
|
|
|
+ <el-table-column label="审核日期" align="center" prop="fReviewDate" width="100px"/>
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeName" width="100px"/>
|
|
|
<el-table-column label="金额" align="center" prop="fAmtdr" />
|
|
|
<el-table-column
|
|
|
label="本次金额"
|
|
|
@@ -1098,7 +1173,7 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="备注" align="center" prop="fRemarks">
|
|
|
+ <el-table-column label="备注" align="center" prop="fRemarks" width="200px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fRemarks"
|
|
|
@@ -1196,6 +1271,7 @@ export default {
|
|
|
name: "Charge",
|
|
|
data() {
|
|
|
return {
|
|
|
+ show:false,
|
|
|
portOptions:[],
|
|
|
unitOptions:[],
|
|
|
fDNameOptions: [],
|
|
|
@@ -1347,7 +1423,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "6",
|
|
|
- label: "fSrcdc",
|
|
|
+ label: "fSrcdcName",
|
|
|
name: "收/付",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
@@ -1610,7 +1686,7 @@ export default {
|
|
|
fCorpid: null,
|
|
|
tMblno: null,
|
|
|
fAmtdr: null,
|
|
|
- fAmtcr: null,
|
|
|
+ fAmtcr: [],
|
|
|
fBilltype: null,
|
|
|
fBillstatus: null,
|
|
|
fRemarks: null,
|
|
|
@@ -1626,17 +1702,13 @@ export default {
|
|
|
tableFilter: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- fBillno: null,
|
|
|
- fCtrlcorpid: null,
|
|
|
- fCorpid: null,
|
|
|
- tMblno: null,
|
|
|
- fAmtdr: null,
|
|
|
- fAmtcr: null,
|
|
|
- fBilltype: null,
|
|
|
- fBillstatus: null,
|
|
|
- fRemarks: null,
|
|
|
- fAccbilldate: null,
|
|
|
- fDeptid: null,
|
|
|
+ fBillno:null,
|
|
|
+ fCtrlcorpid:null,
|
|
|
+ fCorpid:null,
|
|
|
+ fBillstatus:null,
|
|
|
+ fAmtcr:[],
|
|
|
+ fRemarks:null,
|
|
|
+ timeInterval:null
|
|
|
},
|
|
|
approval: [],
|
|
|
// 表单参数
|
|
|
@@ -1759,7 +1831,6 @@ export default {
|
|
|
},
|
|
|
//sheet切换
|
|
|
handleSelect(key, keyPath) {
|
|
|
- console.log(typeof(key))
|
|
|
if(key === '1') {
|
|
|
this.feeInfo = true
|
|
|
}else{
|
|
|
@@ -2033,7 +2104,11 @@ export default {
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
sums[index] = "合计";
|
|
|
- } else if (index === 12 || index === 13) {
|
|
|
+ } else if (column.label == '应收合计' || column.label == '实收合计' ||
|
|
|
+ column.label == '金额' || column.label == '本次金额' ||
|
|
|
+ column.label == '金额（含税）' || column.label == '合计金额（元）' ||
|
|
|
+ column.label == '税额' || column.label == '数量'
|
|
|
+ ) {
|
|
|
const values = data.map((item) => Number(item[column.property]));
|
|
|
if (!values.every((value) => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -2461,11 +2536,14 @@ export default {
|
|
|
fName:this.queryParams.fCorpidName
|
|
|
})
|
|
|
this.invoiceList = response.data.tFeeInvoiceList
|
|
|
+ this.$set(this.invoiceList,'fSbu',parseInt(this.invoiceList.fSbu))
|
|
|
this.mainTable = true
|
|
|
this.title = "收费列表";
|
|
|
this.tablefilter = true;
|
|
|
if (res == 1) {
|
|
|
this.notChange = true;
|
|
|
+ console.log(this.Operator)
|
|
|
+ console.log(this.Lander)
|
|
|
if (this.Operator == this.Lander) {
|
|
|
this.tablefilter = false;
|
|
|
this.reset();
|
|
|
@@ -2493,6 +2571,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ this.feeInfo = true
|
|
|
this.increase_s = response.data.feeDoList;
|
|
|
this.fWbuOptions = response.data.feesList;
|
|
|
this.queryParams = response.data.tFee;
|
|
|
@@ -2501,6 +2580,9 @@ export default {
|
|
|
fName:this.queryParams.fCorpidName
|
|
|
})
|
|
|
this.invoiceList = response.data.tFeeInvoiceList
|
|
|
+ for(let item in this.invoiceList){
|
|
|
+ this.$set(this.invoiceList[item],'fSbu',this.invoiceList[item].fSbu + '')
|
|
|
+ }
|
|
|
this.mainTable = true
|
|
|
});
|
|
|
} else {
|
|
|
@@ -2534,6 +2616,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ this.feeInfo = true
|
|
|
this.increase_s = response.data.feeDoList;
|
|
|
this.fWbuOptions = response.data.feesList;
|
|
|
this.queryParams = response.data.tFee;
|
|
|
@@ -2542,6 +2625,9 @@ export default {
|
|
|
fName:this.queryParams.fCorpidName
|
|
|
})
|
|
|
this.invoiceList = response.data.tFeeInvoiceList
|
|
|
+ for(let item in this.invoiceList){
|
|
|
+ this.$set(this.invoiceList[item],'fSbu',this.invoiceList[item].fSbu + '')
|
|
|
+ }
|
|
|
this.mainTable = true
|
|
|
});
|
|
|
}
|
|
|
@@ -2606,25 +2692,14 @@ export default {
|
|
|
addcheck(formDate).then(response=>{
|
|
|
this.msgSuccess("操作成功");
|
|
|
this.getList();
|
|
|
- this.queryParams = {
|
|
|
- fId: null,
|
|
|
- pageNum: 1,
|
|
|
- pageSize: 10,
|
|
|
- fCtrlcorpid:null,
|
|
|
- fCorpid:null,
|
|
|
- fAccbilldate:null,
|
|
|
- fBillno:null,
|
|
|
- chargingMethod:null,
|
|
|
- bank:null,
|
|
|
- invoiceNo:null,
|
|
|
- waterBillNo:null,
|
|
|
- fRemarks:null,
|
|
|
- fSystemType:null,
|
|
|
+ this.notChange = true;
|
|
|
+ this.doNot = true
|
|
|
+ this.queryParams.fBillstatus = '4'
|
|
|
+ console.log(this.Operator)
|
|
|
+ console.log(this.Lander)
|
|
|
+ if (this.Operator == this.Lander) {
|
|
|
+ this.tablefilter = false;
|
|
|
}
|
|
|
- this.invoiceList = []
|
|
|
- this.increase_s = []
|
|
|
- this.doNot = false
|
|
|
- this.queryParams.fBillstatus = 1
|
|
|
})
|
|
|
}
|
|
|
} else {
|
|
|
@@ -2870,6 +2945,8 @@ export default {
|
|
|
this.loading = false;
|
|
|
});
|
|
|
}else if(Cookies.get("sysType") == 3){
|
|
|
+ // this.tableFilter.fAmtcr[0] = this.tableFilter.firstMoney
|
|
|
+ // this.tableFilter.fAmtcr[1] = this.tableFilter.lastMoney
|
|
|
listInvoice(this.tableFilter).then(response=>{
|
|
|
console.log(response);
|
|
|
response.rows.map((e) => {
|
|
|
@@ -3121,6 +3198,7 @@ export default {
|
|
|
waterBillNo: null,
|
|
|
fSystemType: Cookies.get("sysType"),
|
|
|
};
|
|
|
+ this.feeInfo = true
|
|
|
this.resetForm("queryParams");
|
|
|
this.mainTable = true;
|
|
|
this.title = "添加财务数据主";
|
|
|
@@ -3219,11 +3297,14 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ this.feeInfo = true
|
|
|
this.increase_s = response.data.feeDoList;
|
|
|
this.fWbuOptions = response.data.feesList;
|
|
|
this.queryParams = response.data.tFee;
|
|
|
this.invoiceList = response.data.tFeeInvoiceList
|
|
|
- console.log(this.queryParams)
|
|
|
+ for(let item in this.invoiceList){
|
|
|
+ this.$set(this.invoiceList[item],'fSbu',this.invoiceList[item].fSbu + '')
|
|
|
+ }
|
|
|
this.fMblnoOptions.push({
|
|
|
fId:this.queryParams.fCorpid,
|
|
|
fName:this.queryParams.fCorpidName
|
qukaidi