From 60b332ca942c6ae652e9ca61f9d319eff5353321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 13 Nov 2022 15:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8A=A5=E8=A1=A8=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=95=8C=E9=9D=A2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=8F=8D=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/AllocationDetail.vue | 3 ++- .../src/views/report/CustomerAccount.vue | 19 +------------------ jshERP-web/src/views/report/InDetail.vue | 3 ++- jshERP-web/src/views/report/OutDetail.vue | 3 ++- jshERP-web/src/views/report/VendorAccount.vue | 19 +------------------ .../views/report/modules/AccountInOutList.vue | 2 ++ .../views/report/modules/DebtAccountList.vue | 1 + .../report/modules/MaterialInOutList.vue | 1 + 8 files changed, 12 insertions(+), 39 deletions(-) diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue index 8c550e4e..eeb56f0c 100644 --- a/jshERP-web/src/views/report/AllocationDetail.vue +++ b/jshERP-web/src/views/report/AllocationDetail.vue @@ -241,7 +241,8 @@ myHandleDetail(record) { findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { - this.handleDetail(res.data, record.newType); + this.$refs.modalDetail.isCanBackCheck = false + this.handleDetail(res.data, record.newType) } }) }, diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index 8138ddad..52064635 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -91,7 +91,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util" import { getAction } from '@/api/manage' - import {findBySelectCus, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api' + import {findBySelectCus} from '@/api/api' import JEllipsis from '@/components/jeecg/JEllipsis' import moment from 'moment' export default { @@ -179,23 +179,6 @@ this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]; }, - myHandleDetail(record) { - if(record.type === '收入' || record.type === '支出' || record.type === '收款') { - findFinancialDetailByNumber({ billNo: record.number }).then((res) => { - if (res && res.code === 200) { - this.$refs.modalFinancialDetail.show(res.data, record.type); - this.$refs.modalFinancialDetail.title="详情"; - } - }) - } else { - findBillDetailByNumber({ number: record.number }).then((res) => { - if (res && res.code === 200) { - this.$refs.modalBillDetail.show(res.data, record.type); - this.$refs.modalBillDetail.title="详情"; - } - }) - } - }, loadData(arg) { //加载数据 若传入参数1则加载第一页的内容 if (arg === 1) { diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue index 0b81ffcf..48bcbc67 100644 --- a/jshERP-web/src/views/report/InDetail.vue +++ b/jshERP-web/src/views/report/InDetail.vue @@ -234,7 +234,8 @@ myHandleDetail(record) { findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { - this.handleDetail(res.data, record.newType); + this.$refs.modalDetail.isCanBackCheck = false + this.handleDetail(res.data, record.newType) } }) }, diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue index aa9fcde1..21bb4945 100644 --- a/jshERP-web/src/views/report/OutDetail.vue +++ b/jshERP-web/src/views/report/OutDetail.vue @@ -234,7 +234,8 @@ myHandleDetail(record) { findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { - this.handleDetail(res.data, record.newType); + this.$refs.modalDetail.isCanBackCheck = false + this.handleDetail(res.data, record.newType) } }) }, diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index 8f31de06..cd87315f 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -91,7 +91,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util" import { getAction } from '@/api/manage' - import {findBySelectSup, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api' + import {findBySelectSup} from '@/api/api' import JEllipsis from '@/components/jeecg/JEllipsis' import moment from 'moment' export default { @@ -179,23 +179,6 @@ this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]; }, - myHandleDetail(record) { - if(record.type === '收入' || record.type === '支出' || record.type === '付款') { - findFinancialDetailByNumber({ billNo: record.number }).then((res) => { - if (res && res.code === 200) { - this.$refs.modalFinancialDetail.show(res.data, record.type); - this.$refs.modalFinancialDetail.title="详情"; - } - }) - } else { - findBillDetailByNumber({ number: record.number }).then((res) => { - if (res && res.code === 200) { - this.$refs.modalBillDetail.show(res.data, record.type); - this.$refs.modalBillDetail.title="详情"; - } - }) - } - }, loadData(arg) { //加载数据 若传入参数1则加载第一页的内容 if (arg === 1) { diff --git a/jshERP-web/src/views/report/modules/AccountInOutList.vue b/jshERP-web/src/views/report/modules/AccountInOutList.vue index bdf3c983..fde2442d 100644 --- a/jshERP-web/src/views/report/modules/AccountInOutList.vue +++ b/jshERP-web/src/views/report/modules/AccountInOutList.vue @@ -146,6 +146,7 @@ if(record.fromType === 'bill') { findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { + this.$refs.billDetail.isCanBackCheck = false that.$refs.billDetail.show(res.data, record.type); that.$refs.billDetail.title="详情"; } @@ -153,6 +154,7 @@ } else if(record.fromType === 'financial') { findFinancialDetailByNumber({ billNo: record.number }).then((res) => { if (res && res.code === 200) { + this.$refs.financialDetail.isCanBackCheck = false that.$refs.financialDetail.show(res.data, record.type); that.$refs.financialDetail.title="详情"; } diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue index bc048944..ddf56463 100644 --- a/jshERP-web/src/views/report/modules/DebtAccountList.vue +++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue @@ -158,6 +158,7 @@ if (res && res.code === 200) { let type = res.data.depotHeadType type = type.replace('其它','') + this.$refs.modalDetail.isCanBackCheck = false this.handleDetail(res.data, type) } }) diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue index 6dcc6761..1beaa680 100644 --- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue +++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue @@ -119,6 +119,7 @@ this.toFromType = record.fromType findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { + this.$refs.billDetail.isCanBackCheck = false that.$refs.billDetail.show(res.data, record.type); that.$refs.billDetail.title="详情"; }