Skip to content

Commit 6d0231d

Browse files
committed
CRM:优化合同列表界面
1 parent 3ad68c3 commit 6d0231d

File tree

2 files changed

+75
-19
lines changed

2 files changed

+75
-19
lines changed

src/views/crm/contact/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
v-for="item in customerList"
2323
:key="item.id"
2424
:label="item.name"
25-
:value="item.id"
25+
:value="item.id!"
2626
/>
2727
</el-select>
2828
</el-form-item>

src/views/crm/contract/index.vue

Lines changed: 74 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,44 +57,84 @@
5757
<!-- TODO 芋艿:各种字段要调整 -->
5858
<ContentWrap>
5959
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
60-
<el-table-column align="center" label="合同编号" prop="no" width="130" />
60+
<el-table-column align="center" fixed="left" label="合同编号" prop="no" width="130" />
6161
<el-table-column align="center" label="合同名称" prop="name" width="130" />
62-
<el-table-column align="center" label="合同状态" prop="auditStatus" width="130" />
63-
<el-table-column align="center" label="客户名称" prop="customerName" width="130" />
62+
<el-table-column align="center" label="客户名称" prop="customerName" width="120">
63+
<template #default="scope">
64+
<el-link
65+
:underline="false"
66+
type="primary"
67+
@click="openCustomerDetail(scope.row.customerId)"
68+
>
69+
{{ scope.row.customerName }}
70+
</el-link>
71+
</template>
72+
</el-table-column>
73+
<!-- TODO @puhui999:做了商机详情后,可以把这个超链接加上 -->
6474
<el-table-column align="center" label="商机名称" prop="businessName" width="130" />
65-
<el-table-column align="center" label="合同金额(元)" prop="price" width="130" />
6675
<el-table-column
67-
:formatter="dateFormatter"
6876
align="center"
6977
label="下单时间"
7078
prop="orderDate"
71-
width="180"
79+
width="120"
80+
:formatter="dateFormatter2"
7281
/>
7382
<el-table-column
74-
:formatter="dateFormatter"
7583
align="center"
76-
label="开始时间"
84+
label="合同金额"
85+
prop="price"
86+
width="130"
87+
:formatter="fenToYuanFormat"
88+
/>
89+
<el-table-column
90+
align="center"
91+
label="合同开始时间"
7792
prop="startTime"
78-
width="180"
93+
width="120"
94+
:formatter="dateFormatter2"
7995
/>
8096
<el-table-column
81-
:formatter="dateFormatter"
8297
align="center"
83-
label="结束时间"
98+
label="合同结束时间"
8499
prop="endTime"
85-
width="180"
100+
width="120"
101+
:formatter="dateFormatter2"
86102
/>
87-
<el-table-column align="center" label="客户签约人" prop="contactName" width="130" />
103+
<el-table-column align="center" label="客户签约人" prop="contactName" width="130">
104+
<template #default="scope">
105+
<el-link
106+
:underline="false"
107+
type="primary"
108+
@click="openContactDetail(scope.row.contactId)"
109+
>
110+
{{ scope.row.contactName }}
111+
</el-link>
112+
</template>
113+
</el-table-column>
88114
<el-table-column align="center" label="公司签约人" prop="signUserName" width="130" />
89115
<el-table-column align="center" label="备注" prop="remark" width="130" />
90-
<el-table-column align="center" label="审核状态" prop="auditStatus" width="130" />
116+
<!-- TODO @puhui999:后续可加 【已收款金额】、【未收款金额】 -->
117+
<el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
118+
<el-table-column align="center" label="创建人" prop="creatorName" width="120" />
91119
<el-table-column
92120
:formatter="dateFormatter"
93121
align="center"
94-
label="最后跟进时间"
95-
prop="contactLastTime"
96-
width="180"
122+
label="更新时间"
123+
prop="updateTime"
124+
width="180px"
97125
/>
126+
<el-table-column
127+
:formatter="dateFormatter"
128+
align="center"
129+
label="创建时间"
130+
prop="createTime"
131+
width="180px"
132+
/>
133+
<el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
134+
<template #default="scope">
135+
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
136+
</template>
137+
</el-table-column>
98138
<el-table-column fixed="right" label="操作" width="250">
99139
<template #default="scope">
100140
<el-button
@@ -105,6 +145,7 @@
105145
>
106146
编辑
107147
</el-button>
148+
<!-- TODO @puhui999:可以加下判断,什么情况下,可以审批; -->
108149
<el-button
109150
v-hasPermi="['crm:contract:update']"
110151
link
@@ -145,10 +186,12 @@
145186
<ContractForm ref="formRef" @success="getList" />
146187
</template>
147188
<script lang="ts" setup>
148-
import { dateFormatter } from '@/utils/formatTime'
189+
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
149190
import download from '@/utils/download'
150191
import * as ContractApi from '@/api/crm/contract'
151192
import ContractForm from './ContractForm.vue'
193+
import { fenToYuanFormat } from '@/utils/formatter'
194+
import { DICT_TYPE } from '@/utils/dict'
152195
153196
defineOptions({ name: 'CrmContract' })
154197
@@ -237,10 +280,23 @@ const handleApprove = async (row: ContractApi.ContractVO) => {
237280
message.success('提交审核成功!')
238281
await getList()
239282
}
283+
284+
/** 打开合同详情 */
240285
const { push } = useRouter()
241286
const openDetail = (id: number) => {
242287
push({ name: 'CrmContractDetail', params: { id } })
243288
}
289+
290+
/** 打开客户详情 */
291+
const openCustomerDetail = (id: number) => {
292+
push({ name: 'CrmCustomerDetail', params: { id } })
293+
}
294+
295+
/** 打开联系人详情 */
296+
const openContactDetail = (id: number) => {
297+
push({ name: 'CrmContactDetail', params: { id } })
298+
}
299+
244300
/** 初始化 **/
245301
onMounted(() => {
246302
getList()

0 commit comments

Comments
 (0)