给单据的新增和编辑界面增加审核按钮

This commit is contained in:
季圣华
2022-05-18 23:16:45 +08:00
parent fa48c8345b
commit 24ee142f55
23 changed files with 164 additions and 21 deletions

View File

@@ -32,10 +32,16 @@ export const BillListMixin = {
methods: {
myHandleAdd() {
this.$refs.modalForm.action = "add";
if(this.btnEnableList.indexOf(2)===-1) {
this.$refs.modalForm.isCanCheck = false
}
this.handleAdd();
},
myHandleCopyAdd(record) {
this.$refs.modalForm.action = "copyAdd";
if(this.btnEnableList.indexOf(2)===-1) {
this.$refs.modalForm.isCanCheck = false
}
this.$refs.modalForm.edit(record);
this.$refs.modalForm.title = "复制新增";
this.$refs.modalForm.disableSubmit = false;
@@ -43,6 +49,9 @@ export const BillListMixin = {
myHandleEdit(record) {
if(record.status === '0') {
this.$refs.modalForm.action = "edit";
if(this.btnEnableList.indexOf(2)===-1) {
this.$refs.modalForm.isCanCheck = false
}
this.handleEdit(record);
} else {
this.$message.warning("抱歉,只有未审核的单据才能编辑!")

View File

@@ -25,6 +25,8 @@ export const BillModalMixin = {
billUnitPirce: '',
scanBarCode: '',
scanStatus: true,
billStatus: '0',
isCanCheck: true,
isTenant: false,
spans: {
labelCol1: {span: 2},
@@ -710,6 +712,11 @@ export const BillModalMixin = {
stopScan() {
this.scanStatus = true
this.scanBarCode = ''
}
},
//保存并审核
handleOkAndCheck() {
this.billStatus = '1'
this.handleOk()
},
}
}

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -180,6 +184,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
@@ -227,6 +232,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -180,6 +184,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
@@ -228,6 +233,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -180,6 +184,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
@@ -227,6 +232,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -206,6 +210,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -257,6 +262,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -204,6 +208,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -255,6 +260,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -281,6 +285,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -347,6 +352,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -10,11 +10,15 @@
v-bind:prefixNo="prefixNo"
switchHelp
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -301,6 +305,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.rowCanEdit = true
this.materialTable.columns[1].type = FormTypes.popupJsh
this.changeColumnHide()
@@ -376,6 +381,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -10,11 +10,15 @@
v-bind:prefixNo="prefixNo"
switchHelp
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -226,6 +230,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.rowCanEdit = true
this.materialTable.columns[1].type = FormTypes.popupJsh
this.getSystemConfig()
@@ -280,6 +285,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -264,6 +268,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -325,6 +330,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -10,11 +10,15 @@
v-bind:prefixNo="prefixNo"
switchHelp
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -276,6 +280,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -344,6 +349,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -288,6 +292,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
this.changeFormTypes(this.materialTable.columns, 'snList', 0)
this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
@@ -360,6 +365,7 @@
billMain.id = this.model.id
}
billMain.salesMan = this.personList.value
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -10,11 +10,15 @@
v-bind:prefixNo="prefixNo"
switchHelp
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -219,6 +223,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.changeColumnHide()
if (this.action === 'add') {
this.addInit(this.prefixNo)
@@ -274,6 +279,7 @@
billMain.id = this.model.id
}
billMain.salesMan = this.personList.value
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -10,11 +10,15 @@
v-bind:prefixNo="prefixNo"
switchHelp
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
:id="prefixNo"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -305,6 +309,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
this.rowCanEdit = true
this.materialTable.columns[1].type = FormTypes.popupJsh
this.changeColumnHide()
@@ -382,6 +387,7 @@
billMain.id = this.model.id
}
billMain.salesMan = this.personList.value
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -33,11 +33,17 @@ export const FinancialListMixin = {
methods: {
myHandleAdd() {
this.$refs.modalForm.action = "add";
if(this.btnEnableList.indexOf(2)===-1) {
this.$refs.modalForm.isCanCheck = false
}
this.handleAdd();
},
myHandleEdit(record) {
if(record.status === '0') {
this.$refs.modalForm.action = "edit";
if(this.btnEnableList.indexOf(2)===-1) {
this.$refs.modalForm.isCanCheck = false
}
this.handleEdit(record);
} else {
this.$message.warning("抱歉,只有未审核的单据才能编辑!")

View File

@@ -15,6 +15,8 @@ export const FinancialModalMixin = {
organList: [],
personList: [],
accountList: [],
billStatus: '0',
isCanCheck: true,
isTenant: false,
spans: {
labelCol1: {span: 2},
@@ -244,6 +246,11 @@ export const FinancialModalMixin = {
});
typeof success === 'function' ? success(res) : ''
tab.loading = false
}
},
//保存并审核
handleOkAndCheck() {
this.billStatus = '1'
this.handleOk()
},
}
}

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -180,6 +184,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("SYF")
this.fileList = []
@@ -217,6 +222,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -191,6 +195,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("ZZ")
this.fileList = []
@@ -229,6 +234,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -204,6 +208,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("SR")
this.fileList = []
@@ -242,6 +247,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -204,6 +208,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("ZC")
this.fileList = []
@@ -243,6 +248,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -226,6 +230,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("SK")
this.fileList = []
@@ -263,6 +268,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),

View File

@@ -8,10 +8,14 @@
:keyboard="false"
:forceRender="true"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
wrapClassName="ant-modal-cust-warp"
style="top:5%;height: 100%;overflow-y: hidden">
<template slot="footer">
<a-button @click="handleCancel">取消</a-button>
<a-button v-if="isCanCheck" @click="handleOkAndCheck">保存并审核</a-button>
<a-button type="primary" @click="handleOk">保存</a-button>
</template>
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row class="form-row" :gutter="24">
@@ -229,6 +233,7 @@
methods: {
//调用完edit()方法之后会自动调用此方法
editAfter() {
this.billStatus = '0'
if (this.action === 'add') {
this.addInit("FK")
this.fileList = []
@@ -267,6 +272,7 @@
if(this.model.id){
billMain.id = this.model.id
}
billMain.status = this.billStatus
return {
info: JSON.stringify(billMain),
rows: JSON.stringify(detailArr),