From e17463f3acd56649f84c36cc08edbff130958b23 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, 26 Feb 2023 00:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E9=80=89=E6=8B=A9=E6=9D=A5=E6=8E=A7=E5=88=B6=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=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 --- jshERP-web/src/mixins/JeecgListMixin.js | 4 ++-- jshERP-web/src/utils/util.js | 15 +++++++++++++++ jshERP-web/src/views/bill/AllocationOutList.vue | 3 ++- jshERP-web/src/views/bill/AssembleList.vue | 3 ++- jshERP-web/src/views/bill/DisassembleList.vue | 3 ++- jshERP-web/src/views/bill/OtherInList.vue | 3 ++- jshERP-web/src/views/bill/OtherOutList.vue | 3 ++- jshERP-web/src/views/bill/PurchaseBackList.vue | 3 ++- jshERP-web/src/views/bill/PurchaseInList.vue | 3 ++- jshERP-web/src/views/bill/PurchaseOrderList.vue | 3 ++- jshERP-web/src/views/bill/RetailBackList.vue | 3 ++- jshERP-web/src/views/bill/RetailOutList.vue | 3 ++- jshERP-web/src/views/bill/SaleBackList.vue | 3 ++- jshERP-web/src/views/bill/SaleOrderList.vue | 3 ++- jshERP-web/src/views/bill/SaleOutList.vue | 3 ++- jshERP-web/src/views/bill/dialog/BillDetail.vue | 11 +++++++---- jshERP-web/src/views/bill/mixins/BillListMixin.js | 13 +++++++++---- .../src/views/bill/mixins/BillModalMixin.js | 6 ++++-- jshERP-web/src/views/financial/AdvanceInList.vue | 3 ++- jshERP-web/src/views/financial/GiroList.vue | 3 ++- jshERP-web/src/views/financial/ItemInList.vue | 3 ++- jshERP-web/src/views/financial/ItemOutList.vue | 3 ++- jshERP-web/src/views/financial/MoneyInList.vue | 3 ++- jshERP-web/src/views/financial/MoneyOutList.vue | 3 ++- .../views/financial/dialog/FinancialDetail.vue | 10 +++++++--- .../views/financial/mixins/FinancialListMixin.js | 10 +++++++--- .../views/financial/mixins/FinancialModalMixin.js | 6 ++++-- jshERP-web/src/views/system/SystemConfigList.vue | 5 ++++- 28 files changed, 97 insertions(+), 40 deletions(-) diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index e1633f28..cd61026c 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -274,8 +274,8 @@ export const JeecgListMixin = { // 新增/修改 成功时，重载列表 this.loadData(); }, - handleDetail:function(record, type){ - this.$refs.modalDetail.show(record, type); + handleDetail:function(record, type, prefixNo){ + this.$refs.modalDetail.show(record, type, prefixNo); this.$refs.modalDetail.title=type+"-详情"; }, /* 导出 */ diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js index 78484f18..465e02ea 100644 --- a/jshERP-web/src/utils/util.js +++ b/jshERP-web/src/utils/util.js @@ -543,6 +543,21 @@ export function removeByVal(arrylist, val) { } } +export function getCheckFlag(multiBillType, multiLevelApprovalFlag, prefixNo) { + if(multiLevelApprovalFlag==='1') { + //开启 + if(multiBillType) { + let multiBillTypeArr = multiBillType.split(',') + return multiBillTypeArr.indexOf(prefixNo) <= -1 + } else { + return true + } + } else { + //关闭 + return true + } +} + /** * 将字符串中单个金额中的数值转为负数 * @param str diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 00fc9624..baa137fa 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -108,7 +108,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -163,6 +163,7 @@ status: "", remark: "" }, + prefixNo: 'DBCK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 831e9a0b..355bfffb 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -108,7 +108,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -163,6 +163,7 @@ status: "", remark: "" }, + prefixNo: 'ZZD', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index b8280160..c2cd5b26 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -108,7 +108,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -163,6 +163,7 @@ status: "", remark: "" }, + prefixNo: 'CXD', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 96ad99b1..ae1e7419 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -122,7 +122,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -179,6 +179,7 @@ status: "", remark: "" }, + prefixNo: 'QTRK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 0d1752a0..984374ad 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -122,7 +122,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -179,6 +179,7 @@ status: "", remark: "" }, + prefixNo: 'QTCK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index e241e00e..ae905121 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -131,7 +131,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -189,6 +189,7 @@ status: "", remark: "" }, + prefixNo: 'CGTH', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index ada8c53e..1bd566cf 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -141,7 +141,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -209,6 +209,7 @@ status: "", remark: "" }, + prefixNo: 'CGRK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 3524a832..b11a2551 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -111,7 +111,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -169,6 +169,7 @@ status: "", remark: "" }, + prefixNo: 'CGDD', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 9db55819..81306d1c 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -131,7 +131,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -189,6 +189,7 @@ status: "", remark: "" }, + prefixNo: 'LSTH', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 5f098fbd..d6ec6ed7 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -126,7 +126,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -183,6 +183,7 @@ status: "", remark: "" }, + prefixNo: 'LSCK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index a649a2a0..950d3e87 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -132,7 +132,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -189,6 +189,7 @@ status: "", remark: "" }, + prefixNo: 'XSTH', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 0a94d8a1..0319d03c 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -112,7 +112,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -175,6 +175,7 @@ status: "", remark: "" }, + prefixNo: 'XSDD', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 46b344f0..86a38660 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -142,7 +142,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -209,6 +209,7 @@ status: "", remark: "" }, + prefixNo: 'XSCK', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 6044d69c..1d2911ba 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -1012,7 +1012,7 @@ import pick from 'lodash.pick' import { getAction, postAction } from '@/api/manage' import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api' - import { getMpListShort, openDownloadDialog, sheet2blob } from "@/utils/util" + import { getMpListShort, getCheckFlag, openDownloadDialog, sheet2blob } from "@/utils/util" import BillPrintIframe from './BillPrintIframe' import WorkflowIframe from '@/components/tools/WorkflowIframe' import FinancialDetail from '../../financial/dialog/FinancialDetail' @@ -1040,7 +1040,7 @@ purchaseBySaleFlag: false, linkNumberList: [], financialBillNoList: [], - /* 原始审核是否开启 */ + /* 原始反审核是否开启 */ checkFlag: true, tableWidth: { 'width': '1500px' @@ -1457,7 +1457,9 @@ getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ this.purchaseBySaleFlag = res.data.purchaseBySaleFlag==='1'?true:false - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, @@ -1475,12 +1477,13 @@ } }) }, - show(record, type) { + show(record, type, prefixNo) { //查询单条单据信息 findBillDetailByNumber({ number: record.number }).then((res) => { if (res && res.code === 200) { let item = res.data this.billType = type + this.prefixNo = prefixNo //附件下载 this.fileList = item.fileName this.visible = true diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 606f2b43..0f67f86b 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -1,13 +1,16 @@ import Vue from 'vue' import {getAction } from '@/api/manage' import { FormTypes } from '@/utils/JEditableTableUtil' -import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, getCurrentSystemConfig} from '@/api/api' +import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, + getCurrentSystemConfig} from '@/api/api' +import { getCheckFlag } from "@/utils/util" export const BillListMixin = { data () { return { /* 原始审核是否开启 */ checkFlag: true, + prefixNo: '', supList: [], cusList: [], retailList: [], @@ -79,11 +82,11 @@ export const BillListMixin = { this.$message.warning("抱歉，只有未审核的单据才能删除！") } }, - myHandleDetail(record, type) { + myHandleDetail(record, type, prefixNo) { if(this.btnEnableList.indexOf(7)===-1) { this.$refs.modalDetail.isCanBackCheck = false } - this.handleDetail(record, type); + this.handleDetail(record, type, prefixNo); }, handleApprove(record) { this.$refs.modalForm.action = "approve"; @@ -108,7 +111,9 @@ export const BillListMixin = { initSystemConfig() { getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 75165f33..53dd55e1 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -2,7 +2,7 @@ import { FormTypes, getListData } from '@/utils/JEditableTableUtil' import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount, getPersonByNumType, getBatchNumberList, getCurrentSystemConfig} from '@/api/api' import { getAction,putAction } from '@/api/manage' -import { getMpListShort, getNowFormatDateTime } from "@/utils/util" +import { getMpListShort, getNowFormatDateTime, getCheckFlag } from "@/utils/util" import { USER_INFO } from "@/store/mutation-types" import Vue from 'vue' @@ -150,7 +150,9 @@ export const BillModalMixin = { initSystemConfig() { getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index e02938af..22c16f32 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -113,7 +113,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -172,6 +172,7 @@ remark: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'SYF', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index e0c15f46..22c1b19e 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -113,7 +113,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -172,6 +172,7 @@ remark: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'ZZ', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index a62024b3..866d70d2 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -122,7 +122,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -182,6 +182,7 @@ remark: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'SR', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index e84e48b7..adc64f42 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -122,7 +122,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -182,6 +182,7 @@ remark: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'ZC', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index 30152a98..23a0308c 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -128,7 +128,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -189,6 +189,7 @@ number: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'SK', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index 47f56e8d..8e4cdc4b 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -128,7 +128,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - 查看 + 查看 编辑 @@ -189,6 +189,7 @@ number: "", roleType: Vue.ls.get('roleType') }, + prefixNo: 'FK', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue index dec0ad0d..c3110f7f 100644 --- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue +++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue @@ -403,6 +403,7 @@ import pick from 'lodash.pick' import { getAction, postAction } from '@/api/manage' import { findFinancialDetailByNumber, getCurrentSystemConfig, getPlatformConfigByKey } from '@/api/api' + import { getCheckFlag } from "@/utils/util" import WorkflowIframe from '@/components/tools/WorkflowIframe' import JUpload from '@/components/jeecg/JUpload' export default { @@ -421,7 +422,7 @@ isCanBackCheck: true, financialType: '', fileList: [], - /* 原始审核是否开启 */ + /* 原始反审核是否开启 */ checkFlag: true, labelCol: { xs: { span: 24 }, @@ -483,12 +484,13 @@ this.width = realScreenWidth<1500?'1200px':'1550px' }, methods: { - show(record, type) { + show(record, type, prefixNo) { //查询单条财务信息 findFinancialDetailByNumber({ billNo: record.billNo }).then((res) => { if (res && res.code === 200) { let item = res.data this.financialType = type + this.prefixNo = prefixNo //附件下载 this.fileList = item.fileName this.visible = true @@ -520,7 +522,9 @@ getSystemConfig() { getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js index 6c4aa73d..5b2b5717 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js @@ -1,5 +1,6 @@ import {findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail, getUserList, getPersonByType, getAccount, getCurrentSystemConfig} from '@/api/api' +import { getCheckFlag } from "@/utils/util" import Vue from 'vue' export const FinancialListMixin = { @@ -7,6 +8,7 @@ export const FinancialListMixin = { return { /* 原始审核是否开启 */ checkFlag: true, + prefixNo: '', supList: [], cusList: [], organList: [], @@ -64,11 +66,11 @@ export const FinancialListMixin = { this.$message.warning("抱歉，只有未审核的单据才能删除！") } }, - myHandleDetail(record, type) { + myHandleDetail(record, type, prefixNo) { if(this.btnEnableList.indexOf(7)===-1) { this.$refs.modalDetail.isCanBackCheck = false } - this.handleDetail(record, type); + this.handleDetail(record, type, prefixNo); }, handleApprove(record) { this.$refs.modalForm.action = "approve"; @@ -85,7 +87,9 @@ export const FinancialListMixin = { initSystemConfig() { getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index bfb5eeaf..a7e0e54f 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -2,7 +2,7 @@ import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTabl import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount, getPersonByType,findInOutItemByParam,getCurrentSystemConfig} from '@/api/api' import { getAction,putAction } from '@/api/manage' -import { getMpListShort, getNowFormatDateTime } from "@/utils/util" +import { getCheckFlag, getNowFormatDateTime } from "@/utils/util" import { USER_INFO } from "@/store/mutation-types" import Vue from 'vue' @@ -73,7 +73,9 @@ export const FinancialModalMixin = { initSystemConfig() { getCurrentSystemConfig().then((res) => { if(res.code === 200 && res.data){ - this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true + let multiBillType = res.data.multiBillType + let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag + this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo) } }) }, diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue index 428eda3a..5f495179 100644 --- a/jshERP-web/src/views/system/SystemConfigList.vue +++ b/jshERP-web/src/views/system/SystemConfigList.vue @@ -136,6 +136,7 @@ multiLevelApprovalFlagSwitch: false, //多级审核 originalMultiLevelApprovalFlag: '0', //原始多级审核状态 multiBillTypeSelect: [], //单据类型 + originalMultiBillTypeSelect: [], //原始单据类型 isReadOnly: false, isShowApproval: false, labelCol: { @@ -246,6 +247,7 @@ } if (record.multiBillType != null && record.multiBillType != '') { this.multiBillTypeSelect = record.multiBillType.split(',') + this.originalMultiBillTypeSelect = record.multiBillType } } } else { @@ -280,7 +282,8 @@ this.init() that.$message.info('保存成功！'); //如果多级审核切换状态需要刷新浏览器 - if(this.originalMultiLevelApprovalFlag!= formData.multiLevelApprovalFlag) { + if(this.originalMultiLevelApprovalFlag!= formData.multiLevelApprovalFlag || + this.originalMultiBillTypeSelect!=formData.multiBillType) { location.reload() } }else{