Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
0c1e2edd
Commit
0c1e2edd
authored
Nov 07, 2022
by
季圣华
Browse files
给全部单据的查看界面增加反审核的按钮
parent
2a1db9bb
Changes
23
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/bill/AllocationOutList.vue
View file @
0c1e2edd
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<allocation-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></allocation-out-modal>
<allocation-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></allocation-out-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/AssembleList.vue
View file @
0c1e2edd
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<assemble-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></assemble-modal>
<assemble-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></assemble-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/DisassembleList.vue
View file @
0c1e2edd
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<disassemble-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></disassemble-modal>
<disassemble-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></disassemble-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/OtherInList.vue
View file @
0c1e2edd
...
@@ -140,7 +140,7 @@
...
@@ -140,7 +140,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<other-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></other-in-modal>
<other-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></other-in-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/OtherOutList.vue
View file @
0c1e2edd
...
@@ -140,7 +140,7 @@
...
@@ -140,7 +140,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<other-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></other-out-modal>
<other-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></other-out-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/PurchaseBackList.vue
View file @
0c1e2edd
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<purchase-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-back-modal>
<purchase-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-back-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/PurchaseInList.vue
View file @
0c1e2edd
...
@@ -151,7 +151,7 @@
...
@@ -151,7 +151,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<purchase-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-in-modal>
<purchase-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-in-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/PurchaseOrderList.vue
View file @
0c1e2edd
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<purchase-order-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-order-modal>
<purchase-order-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></purchase-order-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/RetailBackList.vue
View file @
0c1e2edd
...
@@ -149,7 +149,7 @@
...
@@ -149,7 +149,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<retail-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></retail-back-modal>
<retail-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></retail-back-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/RetailOutList.vue
View file @
0c1e2edd
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<retail-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></retail-out-modal>
<retail-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></retail-out-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/SaleBackList.vue
View file @
0c1e2edd
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<sale-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-back-modal>
<sale-back-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-back-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/SaleOrderList.vue
View file @
0c1e2edd
...
@@ -137,7 +137,7 @@
...
@@ -137,7 +137,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<sale-order-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-order-modal>
<sale-order-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-order-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/SaleOutList.vue
View file @
0c1e2edd
...
@@ -152,7 +152,7 @@
...
@@ -152,7 +152,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<sale-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-out-modal>
<sale-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></sale-out-modal>
<bill-detail
ref=
"modalDetail"
></bill-detail>
<bill-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></bill-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/bill/dialog/BillDetail.vue
View file @
0c1e2edd
...
@@ -28,6 +28,8 @@
...
@@ -28,6 +28,8 @@
<a-button
v-if=
"billType === '盘点复盘'"
v-print=
"'#stockCheckReplayPrint'"
>
普通打印
</a-button>
<a-button
v-if=
"billType === '盘点复盘'"
v-print=
"'#stockCheckReplayPrint'"
>
普通打印
</a-button>
<!--导出Excel-->
<!--导出Excel-->
<a-button
v-if=
"billType === '采购订单'||billType === '销售订单'"
@
click=
"exportExcel()"
>
导出
</a-button>
<a-button
v-if=
"billType === '采购订单'||billType === '销售订单'"
@
click=
"exportExcel()"
>
导出
</a-button>
<!--反审核-->
<a-button
v-if=
"isCanBackCheck && model.status==='1'"
@
click=
"handleBackCheck()"
>
反审核
</a-button>
<a-button
key=
"back"
@
click=
"handleCancel"
>
取消
</a-button>
<a-button
key=
"back"
@
click=
"handleCancel"
>
取消
</a-button>
</
template
>
</
template
>
<a-form
:form=
"form"
>
<a-form
:form=
"form"
>
...
@@ -976,7 +978,7 @@
...
@@ -976,7 +978,7 @@
<
script
>
<
script
>
import
pick
from
'
lodash.pick
'
import
pick
from
'
lodash.pick
'
import
{
getAction
}
from
'
@/api/manage
'
import
{
getAction
,
postAction
}
from
'
@/api/manage
'
import
{
findBillDetailByNumber
,
findFinancialDetailByNumber
,
getPlatformConfigByKey
,
getCurrentSystemConfig
}
from
'
@/api/api
'
import
{
findBillDetailByNumber
,
findFinancialDetailByNumber
,
getPlatformConfigByKey
,
getCurrentSystemConfig
}
from
'
@/api/api
'
import
{
getMpListShort
,
openDownloadDialog
,
sheet2blob
}
from
"
@/utils/util
"
import
{
getMpListShort
,
openDownloadDialog
,
sheet2blob
}
from
"
@/utils/util
"
import
BillPrintIframe
from
'
./BillPrintIframe
'
import
BillPrintIframe
from
'
./BillPrintIframe
'
...
@@ -996,6 +998,7 @@
...
@@ -996,6 +998,7 @@
width
:
'
1600px
'
,
width
:
'
1600px
'
,
visible
:
false
,
visible
:
false
,
model
:
{},
model
:
{},
isCanBackCheck
:
true
,
billType
:
''
,
billType
:
''
,
billPrintFlag
:
false
,
billPrintFlag
:
false
,
fileList
:
[],
fileList
:
[],
...
@@ -1019,7 +1022,8 @@
...
@@ -1019,7 +1022,8 @@
loading
:
false
,
loading
:
false
,
dataSource
:
[],
dataSource
:
[],
url
:
{
url
:
{
detailList
:
'
/depotItem/getDetailList
'
detailList
:
'
/depotItem/getDetailList
'
,
batchSetStatusUrl
:
"
/depotHead/batchSetStatus
"
},
},
//表头
//表头
columns
:[],
columns
:[],
...
@@ -1463,6 +1467,27 @@
...
@@ -1463,6 +1467,27 @@
this
.
loading
=
false
this
.
loading
=
false
})
})
},
},
handleBackCheck
()
{
let
that
=
this
this
.
$confirm
({
title
:
"
确认操作
"
,
content
:
"
是否对该单据进行反审核?
"
,
onOk
:
function
()
{
that
.
loading
=
true
postAction
(
that
.
url
.
batchSetStatusUrl
,
{
status
:
'
0
'
,
ids
:
that
.
model
.
id
}).
then
((
res
)
=>
{
if
(
res
.
code
===
200
){
that
.
$emit
(
'
ok
'
)
that
.
loading
=
false
that
.
close
()
}
else
{
that
.
$message
.
warning
(
res
.
data
.
message
)
that
.
loading
=
false
}
}).
finally
(()
=>
{
})
}
})
},
handleCancel
()
{
handleCancel
()
{
this
.
close
()
this
.
close
()
},
},
...
...
jshERP-web/src/views/bill/mixins/BillListMixin.js
View file @
0c1e2edd
...
@@ -72,6 +72,9 @@ export const BillListMixin = {
...
@@ -72,6 +72,9 @@ export const BillListMixin = {
}
}
},
},
myHandleDetail
(
record
,
type
)
{
myHandleDetail
(
record
,
type
)
{
if
(
this
.
btnEnableList
.
indexOf
(
7
)
===-
1
)
{
this
.
$refs
.
modalDetail
.
isCanBackCheck
=
false
}
this
.
handleDetail
(
record
,
type
);
this
.
handleDetail
(
record
,
type
);
},
},
handleApprove
(
record
)
{
handleApprove
(
record
)
{
...
...
jshERP-web/src/views/financial/AdvanceInList.vue
View file @
0c1e2edd
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<advance-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></advance-in-modal>
<advance-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></advance-in-modal>
<financial-detail
ref=
"modalDetail"
></financial-detail>
<financial-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></financial-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/financial/GiroList.vue
View file @
0c1e2edd
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<giro-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></giro-modal>
<giro-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></giro-modal>
<financial-detail
ref=
"modalDetail"
></financial-detail>
<financial-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></financial-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/financial/ItemInList.vue
View file @
0c1e2edd
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<item-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></item-in-modal>
<item-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></item-in-modal>
<financial-detail
ref=
"modalDetail"
></financial-detail>
<financial-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></financial-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/financial/ItemOutList.vue
View file @
0c1e2edd
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<item-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></item-out-modal>
<item-out-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></item-out-modal>
<financial-detail
ref=
"modalDetail"
></financial-detail>
<financial-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></financial-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
jshERP-web/src/views/financial/MoneyInList.vue
View file @
0c1e2edd
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
<!-- table区域-end -->
<!-- table区域-end -->
<!-- 表单区域 -->
<!-- 表单区域 -->
<money-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></money-in-modal>
<money-in-modal
ref=
"modalForm"
@
ok=
"modalFormOk"
></money-in-modal>
<financial-detail
ref=
"modalDetail"
></financial-detail>
<financial-detail
ref=
"modalDetail"
@
ok=
"modalFormOk"
></financial-detail>
</a-card>
</a-card>
</a-col>
</a-col>
</a-row>
</a-row>
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment