|
|
@@ -1,9 +1,9 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams_s" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form :model="tableFilter" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
<el-form-item label="系统编号" prop="fCtrlcorpid">
|
|
|
<el-input
|
|
|
- v-model="queryParams_s.fBillno"
|
|
|
+ v-model="tableFilter.fBillno"
|
|
|
placeholder="请输入系统编号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -12,7 +12,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="货权方" prop="fCtrlcorpid">
|
|
|
<el-input
|
|
|
- v-model="queryParams_s.fCtrlcorpid"
|
|
|
+ v-model="tableFilter.fCtrlcorpid"
|
|
|
placeholder="请输入货权方"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -21,7 +21,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="对账日期" prop="fAccbilldate">
|
|
|
<el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams_s.fAccbilldate"
|
|
|
+ v-model="tableFilter.fAccbilldate"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择账单日期"
|
|
|
@@ -30,7 +30,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="结算单位" prop="fCorpid">
|
|
|
<el-select
|
|
|
- v-model="queryParams_s.fCorpid"
|
|
|
+ v-model="tableFilter.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
@@ -47,16 +47,6 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <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>
|
|
|
@@ -85,17 +75,17 @@
|
|
|
>修改
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
- <el-button
|
|
|
- type="danger"
|
|
|
- icon="el-icon-delete"
|
|
|
- size="mini"
|
|
|
- :disabled="multiple"
|
|
|
- @click="handleDelete"
|
|
|
- v-hasPermi="['finance:charge:remove']"
|
|
|
- >删除
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
+ <!-- <el-col :span="1.5">-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- type="danger"-->
|
|
|
+ <!-- icon="el-icon-delete"-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- :disabled="multiple"-->
|
|
|
+ <!-- @click="handleDelete"-->
|
|
|
+ <!-- v-hasPermi="['finance:charge:remove']"-->
|
|
|
+ <!-- >删除-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- </el-col>-->
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="warning"
|
|
|
@@ -111,9 +101,9 @@
|
|
|
|
|
|
<el-table v-loading="loading" :data="chargeList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
- <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="序号" type="index" width="55" align="center"/>
|
|
|
+ <el-table-column label="系统编号" :show-overflow-tooltip="true" align="center" prop="fBillno"/>
|
|
|
+ <el-table-column label="货权方" :show-overflow-tooltip="true" 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>-->
|
|
|
@@ -128,7 +118,7 @@
|
|
|
<el-table-column label="备注" align="center" prop="fRemarks"/>
|
|
|
<el-table-column label="状态" align="center" prop="fBillstatus">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fBillstatus == '1'">新建</span>
|
|
|
+ <span v-if="scope.row.fBillstatus == '1'">保存</span>
|
|
|
<span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
|
|
|
<span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
|
|
|
<span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
|
|
|
@@ -136,17 +126,33 @@
|
|
|
<span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
- <!-- <el-table-column label="单据类型" align="center" prop="fBilltype"/>-->
|
|
|
- <!-- <el-table-column label="制单部门" align="center" prop="fDeptid"/>-->
|
|
|
- <el-table-column label="操作" width="100" align="center" class-name="small-padding fixed-width">
|
|
|
+ <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
+ @click="check(scope.row,0)"
|
|
|
+ v-hasPermi="['finance:contrast:edit']"
|
|
|
+ v-if="scope.row.fBillstatus == 6"
|
|
|
+ >查看</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
+ @click="check(scope.row,1)"
|
|
|
+ v-hasPermi="['finance:contrast:edit']"
|
|
|
+ v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
|
|
|
+ >审批进度</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['finance:charge:edit']"
|
|
|
+ v-if="scope.row.fBillstatus <= 3"
|
|
|
>修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
@@ -155,10 +161,28 @@
|
|
|
icon="el-icon-delete"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['finance:charge:remove']"
|
|
|
+ v-if="scope.row.fBillstatus <= 3"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- icon="el-icon-delete"-->
|
|
|
+ <!-- v-if="scope.row.fBillstatus === 6"-->
|
|
|
+ <!-- >查看-->
|
|
|
+ <!-- </el-button>-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- icon="el-icon-delete"-->
|
|
|
+ <!-- v-if="scope.row.fBillstatus > 3 && scope.row.fBillstatus < 6"-->
|
|
|
+ <!-- >查看审批流-->
|
|
|
+ <!-- </el-button>-->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <!-- <el-table-column label="单据类型" align="center" prop="fBilltype"/>-->
|
|
|
+ <!-- <el-table-column label="制单部门" align="center" prop="fDeptid"/>-->
|
|
|
+
|
|
|
</el-table>
|
|
|
|
|
|
<pagination
|
|
|
@@ -180,6 +204,7 @@
|
|
|
placeholder="请输入货权方"
|
|
|
clearable
|
|
|
size="small"
|
|
|
+ :disabled="notChange"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -192,6 +217,7 @@
|
|
|
style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
+ :disabled="notChange"
|
|
|
placeholder="请输入结算单位"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -208,6 +234,7 @@
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
placeholder="选择账单日期"
|
|
|
+ :disabled="notChange"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
@@ -227,26 +254,28 @@
|
|
|
placeholder="请输入备注"
|
|
|
clearable
|
|
|
size="small"
|
|
|
+ :disabled="notChange"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div style="width: 100%;">
|
|
|
- <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>
|
|
|
+ <el-button type="warning" size="small" @click="charGe" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">付费</el-button>
|
|
|
+ <el-button type="primary" size="small" @click="confirmCharge" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认付费</el-button>
|
|
|
+ <el-button type="success" size="small" @click="revokeCharge" v-if="queryParams.fBillstatus === '6'">撤销付费</el-button>
|
|
|
+ <el-button type="info" size="small" @click="printing" :disabled="notChange">打印</el-button>
|
|
|
+ <!-- <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>-->
|
|
|
+ <el-button type="danger" size="small" :disabled="tablefilter" v-show="queryParams.fBillstatus === '4'">撤销审批</el-button>
|
|
|
</div>
|
|
|
<el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
|
|
|
- <el-table-column type="selection" width="55" align="center"/>
|
|
|
+ <!-- <el-table-column type="selection" width="55" align="center"/> -->
|
|
|
<el-table-column label="序号" type="index" width="55" align="center"/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
- <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
|
|
|
+ <el-table-column label="存货单号" align="center" prop="fBscorpno"/>if
|
|
|
<el-table-column label="品名" align="center" prop="fProductName"/>
|
|
|
<el-table-column label="业务日期" align="center" prop="fBsdate">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{scope.row.fBsdate.slice(0,10)}}</span>
|
|
|
+ <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="费用名称" align="center" prop="fFeeName"/>
|
|
|
@@ -261,12 +290,12 @@
|
|
|
<span v-if="scope.row.fBilltype =='SJRK'">入库</span>
|
|
|
|
|
|
<span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
|
|
|
- <span v-else>{{scope.row.fBilltype}}</span>
|
|
|
+ <span v-else>{{ scope.row.fBilltype }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="金额" align="center" prop="fAmtdr"/>
|
|
|
<el-table-column label="本次金额" align="center" prop="fAmt"/>
|
|
|
<el-table-column label="备注" align="center" prop="fRemarks"/>
|
|
|
-
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -274,13 +303,17 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
@click.native.prevent="deleteRow(scope.$index, increase_s)"
|
|
|
+ :disabled="notChange"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="submitForm">保 存</el-button>
|
|
|
+ <el-button v-if="approve = false" @click="addOrUpdateHand">审批</el-button>
|
|
|
+ <el-button type="info" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
|
|
|
+ <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
+ <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
<el-dialog :close-on-click-modal="false" width="70%" :visible.sync="innerVisible" title="导入数据" append-to-body>
|
|
|
@@ -375,12 +408,14 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="importSearch">搜索</el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s">重1置</el-button>
|
|
|
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
- <el-table v-loading="loading" :data="chargeList_s" ref="chargeList" show-summary :summary-method="getSummaries" @selection-change="handleSelectionChange_s">
|
|
|
+ <el-table v-loading="loading" :data="chargeList_s" ref="chargeList" show-summary :summary-method="getSummaries"
|
|
|
+ @selection-change="handleSelectionChange_s"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
- <el-table-column label="序2号" type="index" width="55" align="center"/>
|
|
|
+ <el-table-column label="序号" type="index" width="55" align="center"/>
|
|
|
<el-table-column label="货权方" align="center" prop="fName"/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
<el-table-column label="品名" align="center" prop="fProductName"/>
|
|
|
@@ -388,9 +423,8 @@
|
|
|
<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>
|
|
|
+ <span v-else>{{ scope.row.fBilltype }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="审核日期" align="center" prop="fReviewDate"/>
|
|
|
@@ -404,11 +438,11 @@
|
|
|
clearable
|
|
|
size="small"
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- @change="imgChange1(scope.row)"
|
|
|
+ @change="imgChangeI(scope.row)"
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="备1注" align="center" prop="fRemarks">
|
|
|
+ <el-table-column label="备注" align="center" prop="fRemarks">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fRemarks"
|
|
|
@@ -425,34 +459,90 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</el-dialog>
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="printStatus"
|
|
|
+ width="80%"
|
|
|
+ :before-close="closePrinting"
|
|
|
+ >
|
|
|
+ <el-table id="print_area2" v-loading="loading" ref="table" :data="printObject" @selection-change="handleSelectionChange_s">
|
|
|
+ <!-- <el-table-column type="selection" width="55" align="center"/> -->
|
|
|
+ <el-table-column label="序号" type="index" width="55" align="center"/>
|
|
|
+ <el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
+ <el-table-column label="存货单号" align="center" prop="fBscorpno"/>
|
|
|
+ <el-table-column label="品名" align="center" prop="fProductName"/>
|
|
|
+ <el-table-column label="业务日期" align="center" prop="fBsdate">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ scope.row.fBsdate.slice(0, 10)}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="费用名称" align="center" prop="fFeeName"/>
|
|
|
+ <el-table-column label="收/付" align="center" prop="fSrcdc">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fSrcdc =='D'">收</span>
|
|
|
+ <span v-else-if="scope.row.fSrcdc =='C'">付</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="fAmtdr"/>
|
|
|
+ <el-table-column label="本次金额" align="center" prop="fAmt"/>
|
|
|
+ <el-table-column label="备注" align="center" prop="fRemarks"/>
|
|
|
+ </el-table>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="printStatus = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="printSomething">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import {
|
|
|
+ collectFee,
|
|
|
listCharge,
|
|
|
getCharge,
|
|
|
delCharge,
|
|
|
addCharge,
|
|
|
- updateCharge,
|
|
|
exportCharge,
|
|
|
search,
|
|
|
- listCorps
|
|
|
+ listCorps,
|
|
|
+ delCharge_s,
|
|
|
+ backCharge
|
|
|
} from '@/api/finance/payment'
|
|
|
import { listFees } from '@/api/basicdata/fees'
|
|
|
-import log from '@/views/monitor/job/log'
|
|
|
+import print from 'print-js'
|
|
|
+import AddOrUpdate from '@/views/viewApproval'
|
|
|
+import ApprovalComments from '@/views/startApproval'
|
|
|
+import { queryUserVal } from '@/api/warehouseBusiness/agreement'
|
|
|
|
|
|
export default {
|
|
|
name: 'Charge',
|
|
|
- components: {},
|
|
|
data() {
|
|
|
return {
|
|
|
+ Lander:'',
|
|
|
+ Operator:'',
|
|
|
+ approve:true,
|
|
|
+ addOrUpdateVisible: false,
|
|
|
+ contrastId:220,
|
|
|
+ tablefilter:false,
|
|
|
+ hide:false,
|
|
|
+ openPrint:false,
|
|
|
+ notChange:false,
|
|
|
browseStatus: true,
|
|
|
- nothing:[],
|
|
|
+ nothing: [],
|
|
|
+ //打印表
|
|
|
+ printObject: [],
|
|
|
+ printStatus: false,
|
|
|
//导入状态
|
|
|
- state_s: true ,
|
|
|
+ state_s: true,
|
|
|
fWbuOptions: [],
|
|
|
- options:'',
|
|
|
+ options: '',
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
//打开内部弹窗
|
|
|
@@ -471,7 +561,7 @@ export default {
|
|
|
// 总条数
|
|
|
total: 0,
|
|
|
//提单号暂存
|
|
|
- fMblno:'',
|
|
|
+ fMblno: '',
|
|
|
// 财务数据主表格数据
|
|
|
chargeList: [],
|
|
|
// 弹出层标题
|
|
|
@@ -489,13 +579,13 @@ export default {
|
|
|
timeExamine: '',
|
|
|
timeInterval: ''
|
|
|
},
|
|
|
- empty:[],
|
|
|
+ empty: [],
|
|
|
//导入从表传主表
|
|
|
- pass:{
|
|
|
- fAmtdr:'', //应收合计
|
|
|
- fAmtcr:'', //应付合计
|
|
|
- fMblno:'', //提单号
|
|
|
- fName:'' //货权方
|
|
|
+ pass: {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '' //货权方
|
|
|
},
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -515,7 +605,7 @@ export default {
|
|
|
fDeptid: null
|
|
|
},
|
|
|
// 主表查询参数
|
|
|
- queryParams_s: {
|
|
|
+ tableFilter: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
fBillno: null,
|
|
|
@@ -564,32 +654,197 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ components: {
|
|
|
+ AddOrUpdate,
|
|
|
+ ApprovalComments
|
|
|
+ },
|
|
|
created() {
|
|
|
this.getList()
|
|
|
+ this.register()
|
|
|
},
|
|
|
methods: {
|
|
|
+ register(){
|
|
|
+ queryUserVal().then((response)=>{
|
|
|
+ this.Lander = response.user.userName
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getDataList(){
|
|
|
+ this.addOrUpdateVisible = false
|
|
|
+ },
|
|
|
+ // 查看审批流
|
|
|
+ addOrUpdateHandle(){
|
|
|
+ this.addOrUpdateVisible = true
|
|
|
+ this.addOrUpdateVisib = false
|
|
|
+ let id = '448'
|
|
|
+ let actId = '110'
|
|
|
+ console.log(this.queryParams.fId)
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.addOrUpdate.init(this.queryParams.fId,this.contrastId)
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ // 撤销收费
|
|
|
+ revokeCharge(){
|
|
|
+ this.queryParams.fBillstatus = '1'
|
|
|
+ let formDate = new window.FormData()
|
|
|
+ formDate.append('tFee', JSON.stringify(this.queryParams))
|
|
|
+ formDate.append('tFeeDo', JSON.stringify(this.increase_s))
|
|
|
+
|
|
|
+ backCharge(formDate).then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.msgSuccess('操作成功')
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ },
|
|
|
+
|
|
|
+ // 查看按钮
|
|
|
+ check(row,res){
|
|
|
+ console.log(row.fId)
|
|
|
+ this.notChange = true
|
|
|
+ getCharge(row.fId).then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.Operator = response.data.tFee.createBy
|
|
|
+ this.increase_s = response.data.feeDoList
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.queryParams = response.data.tFee
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.fMblnoOptions = response.data.corps
|
|
|
+ this.open = true
|
|
|
+ this.title = '付费列表'
|
|
|
+ console.log(this.Lander)
|
|
|
+ console.log(this.Operator)
|
|
|
+ if (res == 1){
|
|
|
+ this.notChange = true
|
|
|
+ this.tablefilter = false
|
|
|
+ if (this.Operator == this.Lander){
|
|
|
+ this.reset()
|
|
|
+ this.pass = {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '', //货权方
|
|
|
+ fFeesName: '', //结算单位
|
|
|
+ fCorpid: '' //结算单位ID
|
|
|
+ }
|
|
|
+ const fId = row.fId || this.ids
|
|
|
+ console.log(fId)
|
|
|
+ getCharge(fId).then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.increase_s = response.data.feeDoList
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.queryParams = response.data.tFee
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.fMblnoOptions = response.data.corps
|
|
|
+ this.open = true
|
|
|
+ })
|
|
|
+ }else {
|
|
|
+ this.notChange = true
|
|
|
+ // this.$message.error('未知异常，请联系管理员')
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ this.notChange = true
|
|
|
+ this.reset()
|
|
|
+ this.pass = {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '', //货权方
|
|
|
+ fFeesName: '', //结算单位
|
|
|
+ fCorpid: '' //结算单位ID
|
|
|
+ }
|
|
|
+ const fId = row.fId || this.ids
|
|
|
+ console.log(fId)
|
|
|
+ getCharge(fId).then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.increase_s = response.data.feeDoList
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.queryParams = response.data.tFee
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ this.fMblnoOptions = response.data.corps
|
|
|
+ this.open = true
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //打印功能
|
|
|
+ printing() {
|
|
|
+ if (this.increase_s.length !== 0) {
|
|
|
+ this.printStatus = true
|
|
|
+ this.printObject = this.increase_s
|
|
|
+ } else {
|
|
|
+ this.$message.error('无数据，请检查是否有数据')
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //确认打印
|
|
|
+ printSomething() {
|
|
|
+ console.log('22222')
|
|
|
+ // 此处的style即为打印时的样式
|
|
|
+ const style ='table tr td,th { border-collapse: collapse;padding:15px;border:.5px #000 solid;text-align:center;}'
|
|
|
+ print({
|
|
|
+ printable: 'print_area2',
|
|
|
+ type: 'html',
|
|
|
+ style: style, // 亦可使用引入的外部css;
|
|
|
+ scanStyles: false
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //关闭打印弹窗
|
|
|
+ closePrinting() {
|
|
|
+ this.$confirm('确认关闭？')
|
|
|
+ .then(_ => {
|
|
|
+ this.printStatus = false
|
|
|
+ })
|
|
|
+ .catch(_ => {
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 确认收费
|
|
|
+ confirmCharge() {
|
|
|
+ console.log(this.increase_s)
|
|
|
+ this.$refs['ruless'].validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ if(this.increase_s.length){
|
|
|
+ this.queryParams.fBillstatus = '4'
|
|
|
+ let formDate = new window.FormData()
|
|
|
+ formDate.append('tFee', JSON.stringify(this.queryParams))
|
|
|
+ formDate.append('tFeeDo', JSON.stringify(this.increase_s))
|
|
|
+ collectFee(formDate).then(response => {
|
|
|
+ console.log(response)
|
|
|
+ this.open = false
|
|
|
+ this.msgSuccess('操作成功')
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
+ }else {
|
|
|
+ this.$message.error('表单为空不允许操作');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ charGe() {
|
|
|
+ this.queryParameter.fToCorpid = this.queryParams.fCorpid
|
|
|
+ this.innerVisible = true
|
|
|
+ },
|
|
|
getSummaries(param) {
|
|
|
- const { columns, data } = param;
|
|
|
- const sums = [];
|
|
|
+ const { columns, data } = param
|
|
|
+ const sums = []
|
|
|
columns.forEach((column, index) => {
|
|
|
- const values = data.map(item => Number(item[column.property]));
|
|
|
+ const values = data.map(item => Number(item[column.property]))
|
|
|
if (!values.every(value => isNaN(value))) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
- const value = Number(curr);
|
|
|
+ const value = Number(curr)
|
|
|
if (!isNaN(value)) {
|
|
|
- return prev + curr;
|
|
|
+ return prev + curr
|
|
|
} else {
|
|
|
- return prev;
|
|
|
+ return prev
|
|
|
}
|
|
|
- }, 0);
|
|
|
- sums[0] = '合计';
|
|
|
- sums[3] = '';
|
|
|
+ }, 0)
|
|
|
+ sums[0] = '合计'
|
|
|
+ sums[3] = ''
|
|
|
}
|
|
|
- });
|
|
|
- return sums;
|
|
|
+ })
|
|
|
+ return sums
|
|
|
},
|
|
|
- imgChange1(row){
|
|
|
- if (row.fAmt && Number(row.fAmt) > Number(row.fAmtdr)){
|
|
|
+ imgChangeI(row) {
|
|
|
+ if (row.fAmt && Number(row.fAmt) > Number(row.fAmtdr)) {
|
|
|
this.$set(row, 'fAmt', row.fAmtdr)
|
|
|
this.state_s = true
|
|
|
}
|
|
|
@@ -598,13 +853,16 @@ export default {
|
|
|
},
|
|
|
//确认导入
|
|
|
confirmImport() {
|
|
|
+ this.hide = true
|
|
|
console.log(this.state_s)
|
|
|
-
|
|
|
for (let item in this.selection) {
|
|
|
+ this.pass.fAmtcr = Number(this.pass.fAmtcr)
|
|
|
+ this.pass.fAmtdr = Number(this.pass.fAmtdr)
|
|
|
this.pass.fAmtcr += Number(this.selection[item].fAmt)
|
|
|
this.pass.fAmtdr += Number(this.selection[item].fAmtdr)
|
|
|
+ console.log(this.pass.fAmtcr)
|
|
|
+ console.log(this.pass.fAmtdr)
|
|
|
}
|
|
|
-
|
|
|
if (this.state_s == true) {
|
|
|
if (this.selection.length == '0') {
|
|
|
console.log('未选择')//写入提示
|
|
|
@@ -612,9 +870,6 @@ export default {
|
|
|
} else {
|
|
|
console.log(this.selection[0].fMblno)
|
|
|
for (let item in this.selection) {
|
|
|
- console.log(this.selection[item])
|
|
|
- console.log(this.selection[item].fMblno)
|
|
|
- console.log(this.selection[item].fName)
|
|
|
this.empty.push(this.selection[item].fMblno)
|
|
|
this.nothing.push(this.selection[item].fName)
|
|
|
}
|
|
|
@@ -625,22 +880,23 @@ export default {
|
|
|
this.nothing = new Set(this.nothing)
|
|
|
this.nothing = Array.from(this.nothing)
|
|
|
|
|
|
- if(this.empty.length <= 1){
|
|
|
+ if (this.empty.length <= 1) {
|
|
|
this.pass.fMblno = this.empty[0]
|
|
|
console.log(this.pass.fMblno)
|
|
|
- }else {
|
|
|
- this.pass.fMblno = this.empty[0] + "..."
|
|
|
+ } else {
|
|
|
+ this.pass.fMblno = this.empty[0] + '...'
|
|
|
console.log(this.pass.fMblno)
|
|
|
}
|
|
|
- if (this.nothing.length <= 1){
|
|
|
+ if (this.nothing.length <= 1) {
|
|
|
this.pass.fName = this.nothing[0]
|
|
|
- }else {
|
|
|
- this.pass.fName = this.nothing[0] + "..."
|
|
|
+ } else {
|
|
|
+ this.pass.fName = this.nothing[0] + '...'
|
|
|
}
|
|
|
|
|
|
- this.increase_s = this.selection
|
|
|
+ this.increase_s = this.increase_s.concat(this.selection)
|
|
|
this.queryParams.tMblno = this.pass.fMblno //提单号
|
|
|
this.queryParams.fCtrlcorpid = this.pass.fName
|
|
|
+ this.queryParams.fCorpid = this.queryParameter.fToCorpid
|
|
|
this.queryParams.fAmtcr = this.pass.fAmtcr
|
|
|
this.queryParams.fAmtdr = this.pass.fAmtdr
|
|
|
console.log(this.queryParams)
|
|
|
@@ -663,11 +919,10 @@ export default {
|
|
|
/** 查询财务数据主列表 */
|
|
|
getList() {
|
|
|
this.loading = true
|
|
|
- this.getDicts("approval_process").then((response) => {
|
|
|
- console.log(response.data)
|
|
|
+ this.getDicts('approval_process').then((response) => {
|
|
|
this.options = response.data
|
|
|
- });
|
|
|
- listCharge(this.queryParams_s).then(response => {
|
|
|
+ })
|
|
|
+ listCharge(this.tableFilter).then(response => {
|
|
|
console.log(response)
|
|
|
this.chargeList = response.rows
|
|
|
this.total = response.total
|
|
|
@@ -734,7 +989,21 @@ export default {
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
- this.resetForm('queryParams_s')
|
|
|
+ this.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
|
|
|
+ }
|
|
|
this.handleQuery()
|
|
|
},
|
|
|
//导入重置按钮
|
|
|
@@ -774,9 +1043,19 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
+ this.notChange = false
|
|
|
+ this.hide = true
|
|
|
this.reset()
|
|
|
- // this.queryParams = []
|
|
|
- this.increase_s = []
|
|
|
+ this.pass = {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '', //货权方
|
|
|
+ fFeesName: '', //结算单位
|
|
|
+ fCorpid: '' //结算单位ID
|
|
|
+ },
|
|
|
+ // this.queryParams = []
|
|
|
+ this.increase_s = []
|
|
|
this.queryParams = {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
@@ -791,26 +1070,37 @@ export default {
|
|
|
fRemarks: null,
|
|
|
fAccbilldate: null,
|
|
|
fDeptid: null
|
|
|
- },
|
|
|
- this.resetForm('queryParams')
|
|
|
+ }
|
|
|
+ this.resetForm('queryParams')
|
|
|
this.open = true
|
|
|
this.title = '添加财务数据主'
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
console.log(row)
|
|
|
+ this.hide = false
|
|
|
+ this.notChange = false
|
|
|
this.reset()
|
|
|
+ this.pass = {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '', //货权方
|
|
|
+ fFeesName: '', //结算单位
|
|
|
+ fCorpid: '' //结算单位ID
|
|
|
+ }
|
|
|
const fId = row.fId || this.ids
|
|
|
console.log(fId)
|
|
|
getCharge(fId).then(response => {
|
|
|
console.log(response)
|
|
|
+ this.Operator = response.data.tFee.createBy
|
|
|
this.increase_s = response.data.feeDoList
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.queryParams = response.data.tFee
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.fMblnoOptions = response.data.corps
|
|
|
this.open = true
|
|
|
- this.title = '修改收费列表'
|
|
|
+ this.title = '修改付费列表'
|
|
|
})
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
@@ -819,7 +1109,7 @@ export default {
|
|
|
this.$refs['ruless'].validate(valid => {
|
|
|
console.log(valid)
|
|
|
if (valid) {
|
|
|
- if(this.queryParams.fId == null){
|
|
|
+ if (this.queryParams.fId == null) {
|
|
|
console.log(this.queryParams)
|
|
|
// this.chargeList.fBillstatus = '1'
|
|
|
this.queryParams.fBillstatus = '1'
|
|
|
@@ -829,10 +1119,10 @@ export default {
|
|
|
addCharge(formData).then(response => {
|
|
|
this.msgSuccess('新增成功')
|
|
|
this.increase_s = []
|
|
|
- this.open = false
|
|
|
+ // this.open = false
|
|
|
this.getList()
|
|
|
})
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
console.log(this.queryParams)
|
|
|
// this.chargeList.fBillstatus = '1'
|
|
|
this.queryParams.fBillstatus = '1'
|
|
|
@@ -842,7 +1132,7 @@ export default {
|
|
|
addCharge(formData).then(response => {
|
|
|
this.msgSuccess('修改成功')
|
|
|
this.increase_s = []
|
|
|
- this.open = false
|
|
|
+ // this.open = false
|
|
|
this.getList()
|
|
|
})
|
|
|
}
|
|
|
@@ -852,7 +1142,33 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const fIds = row.fId || this.ids
|
|
|
- this.$confirm('是否确认删除财务数据主编号为"' + fIds + '"的数据项?', '警告', {
|
|
|
+ console.log(fIds)
|
|
|
+ let tips = ''
|
|
|
+ delCharge_s(fIds).then(data => {
|
|
|
+ console.log(data)
|
|
|
+ switch (data.msg) {
|
|
|
+ case '0': {
|
|
|
+ this.$message.error('当前数据已被其他操作员操作请刷新页面')
|
|
|
+ break
|
|
|
+ }
|
|
|
+ case '1': {
|
|
|
+ tips = '当前主表有数据从表无数据是否删除'
|
|
|
+ this.delete_S(fIds, tips)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ case '2': {
|
|
|
+ tips = '当前主表有数据从表有数据是否删除'
|
|
|
+ this.delete_S(fIds, tips)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ default:{
|
|
|
+ return this.$message.error('未知错误，无状态')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ delete_S(fIds, tips) {
|
|
|
+ this.$confirm(tips, '警告', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
@@ -878,8 +1194,19 @@ export default {
|
|
|
},
|
|
|
//清空一行
|
|
|
deleteRow(index, rows) {
|
|
|
- rows.splice(index, 1);
|
|
|
- },
|
|
|
+ this.queryParams.fAmtcr = 0
|
|
|
+ this.queryParams.fAmtdr = 0
|
|
|
+ rows.splice(index, 1)
|
|
|
+ for (let item in this.increase_s) {
|
|
|
+ console.log(this.increase_s[item])
|
|
|
+ this.queryParams.fAmtcr += this.increase_s[item].fAmt
|
|
|
+ this.queryParams.fAmtdr += this.increase_s[item].fAmtdr
|
|
|
+
|
|
|
+ }
|
|
|
+ console.log(this.queryParams.fAmtdr)
|
|
|
+ console.log(this.queryParams.fAmtcr)
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
caojunjie