Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c1f507bc
authored
Feb 23, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
CRM:完善合同的审批逻辑
parent
9acd01e7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
6 deletions
+34
-6
src/router/modules/remaining.ts
+12
-0
src/views/crm/contract/detail/ContractDetailsHeader.vue
+2
-2
src/views/crm/contract/detail/index.vue
+4
-3
src/views/crm/contract/index.vue
+16
-1
No files found.
src/router/modules/remaining.ts
View file @
c1f507bc
...
...
@@ -540,6 +540,18 @@ const remainingRouter: AppRouteRecordRaw[] = [
component
:
()
=>
import
(
'@/views/crm/contract/detail/index.vue'
)
},
{
path
:
'contract/detail'
,
name
:
'CrmContractDetail2'
,
// 特殊:用于适配 BPM 打开详情
meta
:
{
title
:
'合同详情XXX'
,
noCache
:
true
,
hidden
:
true
,
canTo
:
true
,
activeMenu
:
'/crm/contract'
},
component
:
()
=>
import
(
'@/views/crm/contract/detail/index.vue'
)
},
{
path
:
'contact/detail/:id'
,
name
:
'CrmContactDetail'
,
meta
:
{
...
...
src/views/crm/contract/detail/ContractDetailsHeader.vue
View file @
c1f507bc
...
...
@@ -24,7 +24,7 @@
{{
erpPriceInputFormatter
(
contract
.
totalPrice
)
}}
</el-descriptions-item>
<el-descriptions-item
label=
"下单时间"
>
{{
contract
.
orderDate
?
formatDate
(
contract
.
orderDate
)
:
'空'
}}
{{
formatDate
(
contract
.
orderDate
)
}}
</el-descriptions-item>
<!-- TODO 芋艿:回款金额 -->
<el-descriptions-item
label=
"回款金额(元)"
>
待实现
</el-descriptions-item>
...
...
@@ -37,7 +37,7 @@
<
script
lang=
"ts"
setup
>
import
*
as
ContractApi
from
'@/api/crm/contract'
import
{
formatDate
}
from
'@/utils/formatTime'
import
{
erpPriceInputFormatter
,
floatToFixed2
}
from
'@/utils'
import
{
erpPriceInputFormatter
}
from
'@/utils'
defineOptions
({
name
:
'ContractDetailsHeader'
})
defineProps
<
{
contract
:
ContractApi
.
ContractVO
}
>
()
...
...
src/views/crm/contract/detail/index.vue
View file @
c1f507bc
...
...
@@ -43,8 +43,8 @@
import
{
useTagsViewStore
}
from
'@/store/modules/tagsView'
import
{
OperateLogV2VO
}
from
'@/api/system/operatelog'
import
*
as
ContractApi
from
'@/api/crm/contract'
import
ContractDetailsHeader
from
'./ContractDetailsHeader.vue'
import
ContractDetailsInfo
from
'./ContractDetailsInfo.vue'
import
ContractDetailsHeader
from
'./ContractDetailsHeader.vue'
import
ContractProductList
from
'./ContractProductList.vue'
import
{
BizTypeEnum
}
from
'@/api/crm/permission'
import
{
getOperateLogPage
}
from
'@/api/crm/operateLog'
...
...
@@ -54,6 +54,7 @@ import PermissionList from '@/views/crm/permission/components/PermissionList.vue
import
FollowUpList
from
'@/views/crm/followup/index.vue'
defineOptions
({
name
:
'CrmContractDetail'
})
const
props
=
defineProps
<
{
id
?:
number
}
>
()
const
route
=
useRoute
()
const
message
=
useMessage
()
...
...
@@ -72,8 +73,8 @@ const openForm = (type: string, id?: number) => {
const
getContractData
=
async
()
=>
{
loading
.
value
=
true
try
{
await
getOperateLog
(
contractId
.
value
)
contract
.
value
=
await
ContractApi
.
getContract
(
contractId
.
value
)
await
getOperateLog
(
contractId
.
value
)
}
finally
{
loading
.
value
=
false
}
...
...
@@ -108,7 +109,7 @@ const close = () => {
/** 初始化 */
onMounted
(
async
()
=>
{
const
id
=
route
.
params
.
id
const
id
=
props
.
id
||
route
.
params
.
id
if
(
!
id
)
{
message
.
warning
(
'参数错误,合同不能为空!'
)
close
()
...
...
src/views/crm/contract/index.vue
View file @
c1f507bc
...
...
@@ -183,6 +183,7 @@
<el-table-column
fixed=
"right"
label=
"操作"
width=
"250"
>
<
template
#
default=
"scope"
>
<el-button
v-if=
"scope.row.auditStatus === 0"
v-hasPermi=
"['crm:contract:update']"
link
type=
"primary"
...
...
@@ -190,8 +191,8 @@
>
编辑
</el-button>
<!-- TODO @puhui999:可以加下判断,什么情况下,可以审批;然后加个【查看审批】按钮 -->
<el-button
v-if=
"scope.row.auditStatus === 0"
v-hasPermi=
"['crm:contract:update']"
link
type=
"primary"
...
...
@@ -200,6 +201,15 @@
提交审核
</el-button>
<el-button
v-else
link
v-hasPermi=
"['crm:contract:update']"
type=
"primary"
@
click=
"handleProcessDetail(scope.row)"
>
查看审批
</el-button>
<el-button
v-hasPermi=
"['crm:contract:query']"
link
type=
"primary"
...
...
@@ -328,6 +338,11 @@ const handleSubmit = async (row: ContractApi.ContractVO) => {
await
getList
()
}
/** 查看审批 */
const
handleProcessDetail
=
(
row
:
ContractApi
.
ContractVO
)
=>
{
push
({
name
:
'BpmProcessInstanceDetail'
,
query
:
{
id
:
row
.
processInstanceId
}
})
}
/** 打开合同详情 */
const
{
push
}
=
useRouter
()
const
openDetail
=
(
id
:
number
)
=>
{
...
...
Write
Preview
Markdown
is supported
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