|
@@ -19,15 +19,6 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="对账日期" prop="fAccbilldate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="tableFilter.fAccbilldate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择账单日期"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="结算单位" prop="fCorpid">
|
|
|
<el-select
|
|
|
v-model="tableFilter.fCorpid"
|
|
@@ -47,6 +38,19 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="对账日期" prop="fAccbilldate">
|
|
|
+ <el-date-picker
|
|
|
+ type="daterange"
|
|
|
+ size="small"
|
|
|
+ style="width: 300px"
|
|
|
+ v-model="tableFilter.fAccbilldate"
|
|
|
+ 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>
|
|
@@ -194,7 +198,7 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改财务数据主对话框 -->
|
|
|
- <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="70%" append-to-body>
|
|
|
+ <el-dialog :close-on-click-modal="false" :title="title" :show-close="Xbutton" :visible.sync="open" width="70%" append-to-body>
|
|
|
<el-form :model="queryParams" :rules="ruless" ref="ruless" :inline="true" v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
@@ -260,12 +264,12 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div style="width: 100%;">
|
|
|
- <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="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>
|
|
|
+ <el-button type="danger" size="small" :disabled="tablefilter" @click="approvalRevocation" 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"/> -->
|
|
@@ -310,11 +314,13 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-if="approve = false" @click="addOrUpdateHand">审批</el-button>
|
|
|
- <el-button type="info" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
|
|
|
+ <el-button v-if="approve === true" @click="immediateApproval">审批</el-button>
|
|
|
+ <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
+ <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
<el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
|
|
|
- <el-button @click="cancel">取 消</el-button>
|
|
|
+ <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
|
|
|
+ <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
|
|
|
</div>
|
|
|
<el-dialog :close-on-click-modal="false" width="70%" :visible.sync="innerVisible" title="导入数据" append-to-body>
|
|
|
<el-form ref="form" :model="queryParameter" :rules="rules" label-width="80px"
|
|
@@ -513,13 +519,15 @@ import {
|
|
|
search,
|
|
|
listCorps,
|
|
|
delCharge_s,
|
|
|
- backCharge
|
|
|
-} from '@/api/finance/payment'
|
|
|
+ backCharge,
|
|
|
+ revocation
|
|
|
+} from '@/api/finance/charge'
|
|
|
import { listFees } from '@/api/basicdata/fees'
|
|
|
import print from 'print-js'
|
|
|
import AddOrUpdate from '@/views/viewApproval'
|
|
|
import ApprovalComments from '@/views/startApproval'
|
|
|
import { queryUserVal } from '@/api/warehouseBusiness/agreement'
|
|
|
+import Global from '@/layout/components/global'
|
|
|
|
|
|
export default {
|
|
|
name: 'Charge',
|
|
@@ -527,7 +535,7 @@ export default {
|
|
|
return {
|
|
|
Lander:'',
|
|
|
Operator:'',
|
|
|
- approve:true,
|
|
|
+ approve:false,
|
|
|
addOrUpdateVisible: false,
|
|
|
contrastId:220,
|
|
|
tablefilter:false,
|
|
@@ -550,6 +558,7 @@ export default {
|
|
|
chargeList_s: [],
|
|
|
selection: '',
|
|
|
increase_s: [],
|
|
|
+ cancelButton:true,
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
// 非单个禁用
|
|
@@ -587,6 +596,7 @@ export default {
|
|
|
fMblno: '', //提单号
|
|
|
fName: '' //货权方
|
|
|
},
|
|
|
+ Xbutton:true,
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
fId: null,
|
|
@@ -604,6 +614,7 @@ export default {
|
|
|
fAccbilldate: null,
|
|
|
fDeptid: null
|
|
|
},
|
|
|
+ addOrUpdateVisib: false,
|
|
|
// 主表查询参数
|
|
|
tableFilter: {
|
|
|
pageNum: 1,
|
|
@@ -620,6 +631,7 @@ export default {
|
|
|
fAccbilldate: null,
|
|
|
fDeptid: null
|
|
|
},
|
|
|
+ approval:[],
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
@@ -661,13 +673,94 @@ export default {
|
|
|
created() {
|
|
|
this.getList()
|
|
|
this.register()
|
|
|
+
|
|
|
+ },
|
|
|
+ activated(){
|
|
|
+ this.adoPt()
|
|
|
},
|
|
|
methods: {
|
|
|
+ approvalRevocation(){
|
|
|
+ let data = {
|
|
|
+ id:this.queryParams.fId,
|
|
|
+ actId:this.contrastId,
|
|
|
+ billId:this.queryParams.fId
|
|
|
+ }
|
|
|
+ console.log(this.queryParams)
|
|
|
+ revocation(data).then(data =>{
|
|
|
+ console.log(data)
|
|
|
+ if (data.code === 200){
|
|
|
+ this.$message.success('撤销成功');
|
|
|
+ this.open = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ returnData(){
|
|
|
+ this.addOrUpdateVisib = false
|
|
|
+ },
|
|
|
+ adoPt(){
|
|
|
+ this.approval = this.$route.query.data
|
|
|
+ if (this.approval){
|
|
|
+ this.Xbutton = false
|
|
|
+ this.approval = JSON.parse(this.approval)
|
|
|
+ this.hide = false
|
|
|
+ this.notChange = true
|
|
|
+ this.approve = true
|
|
|
+ this.cancelButton = false
|
|
|
+ this.reset()
|
|
|
+ this.pass = {
|
|
|
+ fAmtdr: '', //应收合计
|
|
|
+ fAmtcr: '', //应付合计
|
|
|
+ fMblno: '', //提单号
|
|
|
+ fName: '', //货权方
|
|
|
+ fFeesName: '', //结算单位
|
|
|
+ fCorpid: '' //结算单位ID
|
|
|
+ }
|
|
|
+ getCharge(this.approval.billId).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 = '修改收费列表'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ homePage(){
|
|
|
+ this.open = false
|
|
|
+ let view = {
|
|
|
+ fullPath: "/finance/charge",
|
|
|
+ hash: "",
|
|
|
+ matched: Array(2),
|
|
|
+ meta: Object,
|
|
|
+ name: "Charge",
|
|
|
+ params: Object,
|
|
|
+ path: "/finance/charge",
|
|
|
+ query: Object,
|
|
|
+ title: "收费"
|
|
|
+ }
|
|
|
+ this.$router.push({ path: '/index'})
|
|
|
+ this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
|
|
|
+ if (this.isActive(view)) {
|
|
|
+ this.toLastView(visitedViews, view)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ Global.$emit("removeCache", "closeSelectedTag", view);
|
|
|
+ },
|
|
|
register(){
|
|
|
queryUserVal().then((response)=>{
|
|
|
this.Lander = response.user.userName
|
|
|
})
|
|
|
},
|
|
|
+ immediateApproval(){
|
|
|
+ this.addOrUpdateVisib = true
|
|
|
+ console.log(this.approval)
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.ApprovalComments.init(this.approval.billId,this.approval.actId)
|
|
|
+ })
|
|
|
+ },
|
|
|
getDataList(){
|
|
|
this.addOrUpdateVisible = false
|
|
|
},
|
|
@@ -689,9 +782,8 @@ export default {
|
|
|
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.open = false
|
|
|
this.msgSuccess('操作成功')
|
|
|
this.getList()
|
|
|
})
|
|
@@ -710,13 +802,14 @@ export default {
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.fMblnoOptions = response.data.corps
|
|
|
this.open = true
|
|
|
- this.title = '付费列表'
|
|
|
+ this.title = '收费列表'
|
|
|
console.log(this.Lander)
|
|
|
console.log(this.Operator)
|
|
|
+ this.tablefilter = true
|
|
|
if (res == 1){
|
|
|
this.notChange = true
|
|
|
- this.tablefilter = false
|
|
|
if (this.Operator == this.Lander){
|
|
|
+ this.tablefilter = false
|
|
|
this.reset()
|
|
|
this.pass = {
|
|
|
fAmtdr: '', //应收合计
|
|
@@ -932,6 +1025,7 @@ export default {
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false
|
|
|
+ this.approve = false
|
|
|
this.reset()
|
|
|
},
|
|
|
// 表单重置
|
|
@@ -961,6 +1055,7 @@ export default {
|
|
|
handleQuery() {
|
|
|
this.queryParams.pageNum = 1
|
|
|
this.getList()
|
|
|
+ console.log(this.tableFilter)
|
|
|
},
|
|
|
/** 导入搜索 */
|
|
|
importSearch() {
|
|
@@ -1078,6 +1173,7 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
console.log(row)
|
|
|
+ this.approve = false
|
|
|
this.hide = false
|
|
|
this.notChange = false
|
|
|
this.reset()
|
|
@@ -1100,7 +1196,7 @@ export default {
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.fMblnoOptions = response.data.corps
|
|
|
this.open = true
|
|
|
- this.title = '修改付费列表'
|
|
|
+ this.title = '修改收费列表'
|
|
|
})
|
|
|
},
|
|
|
/** 提交按钮 */
|