purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据系统配置增加单据类型的选择来控制单据的审核按钮

Browse Source
This commit is contained in:
季圣华
2023-02-26 00:18:59 +08:00
parent 4b32add365
commit e17463f3ac
28 changed files with 97 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-web/src/views/bill/AllocationOutList.vue
View File

@@ -108,7 +108,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '调拨出库')">查看</a>
<a @click="myHandleDetail(record, '调拨出库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
status: "",
remark: ""
},
prefixNo: 'DBCK',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/AssembleList.vue
View File

@@ -108,7 +108,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '组装单')">查看</a>
<a @click="myHandleDetail(record, '组装单', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
status: "",
remark: ""
},
prefixNo: 'ZZD',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/DisassembleList.vue
View File

@@ -108,7 +108,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '拆卸单')">查看</a>
<a @click="myHandleDetail(record, '拆卸单', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
status: "",
remark: ""
},
prefixNo: 'CXD',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/OtherInList.vue
View File

@@ -122,7 +122,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '其它入库')">查看</a>
<a @click="myHandleDetail(record, '其它入库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -179,6 +179,7 @@
status: "",
remark: ""
},
prefixNo: 'QTRK',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/OtherOutList.vue
View File

@@ -122,7 +122,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '其它出库')">查看</a>
<a @click="myHandleDetail(record, '其它出库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -179,6 +179,7 @@
status: "",
remark: ""
},
prefixNo: 'QTCK',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/PurchaseBackList.vue
View File

@@ -131,7 +131,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '采购退货出库')">查看</a>
<a @click="myHandleDetail(record, '采购退货出库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
status: "",
remark: ""
},
prefixNo: 'CGTH',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/PurchaseInList.vue
View File

@@ -141,7 +141,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '采购入库')">查看</a>
<a @click="myHandleDetail(record, '采购入库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -209,6 +209,7 @@
status: "",
remark: ""
},
prefixNo: 'CGRK',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/PurchaseOrderList.vue
View File

@@ -111,7 +111,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '采购订单')">查看</a>
<a @click="myHandleDetail(record, '采购订单', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -169,6 +169,7 @@
status: "",
remark: ""
},
prefixNo: 'CGDD',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/RetailBackList.vue
View File

@@ -131,7 +131,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '零售退货入库')">查看</a>
<a @click="myHandleDetail(record, '零售退货入库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
status: "",
remark: ""
},
prefixNo: 'LSTH',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/RetailOutList.vue
View File

@@ -126,7 +126,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '零售出库')">查看</a>
<a @click="myHandleDetail(record, '零售出库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -183,6 +183,7 @@
status: "",
remark: ""
},
prefixNo: 'LSCK',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/SaleBackList.vue
View File

@@ -132,7 +132,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '销售退货入库')">查看</a>
<a @click="myHandleDetail(record, '销售退货入库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
status: "",
remark: ""
},
prefixNo: 'XSTH',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/SaleOrderList.vue
View File

@@ -112,7 +112,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '销售订单')">查看</a>
<a @click="myHandleDetail(record, '销售订单', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -175,6 +175,7 @@
status: "",
remark: ""
},
prefixNo: 'XSDD',
labelCol: {
span: 5
},

3
jshERP-web/src/views/bill/SaleOutList.vue
View File

@@ -142,7 +142,7 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="myHandleDetail(record, '销售出库')">查看</a>
<a @click="myHandleDetail(record, '销售出库', prefixNo)">查看</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -209,6 +209,7 @@
status: "",
remark: ""
},
prefixNo: 'XSCK',
labelCol: {
span: 5
},

11
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -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

13
jshERP-web/src/views/bill/mixins/BillListMixin.js
View File

@@ -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)
}
})
},

6
jshERP-web/src/views/bill/mixins/BillModalMixin.js
View File

@@ -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)
}
})
},