Skip to content

Commit 929fa9a

Browse files
YunaiVgitee-org
YunaiV
authored and
gitee-org
committed
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
2 parents 423ea31 + 826199d commit 929fa9a

File tree

11 files changed

+1324
-41
lines changed

11 files changed

+1324
-41
lines changed

‎src/api/crm/clue/index.ts

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
import request from '@/config/axios'
2+
3+
export interface ClueVO {
4+
id: number
5+
transformStatus: boolean
6+
followUpStatus: boolean
7+
name: string
8+
customerId: number
9+
contactNextTime: Date
10+
telephone: string
11+
mobile: string
12+
address: string
13+
ownerUserId: number
14+
contactLastTime: Date
15+
remark: string
16+
}
17+
18+
// 查询线索列表
19+
export const getCluePage = async (params) => {
20+
return await request.get({ url: `/crm/clue/page`, params })
21+
}
22+
23+
// 查询线索详情
24+
export const getClue = async (id: number) => {
25+
return await request.get({ url: `/crm/clue/get?id=` + id })
26+
}
27+
28+
// 新增线索
29+
export const createClue = async (data: ClueVO) => {
30+
return await request.post({ url: `/crm/clue/create`, data })
31+
}
32+
33+
// 修改线索
34+
export const updateClue = async (data: ClueVO) => {
35+
return await request.put({ url: `/crm/clue/update`, data })
36+
}
37+
38+
// 删除线索
39+
export const deleteClue = async (id: number) => {
40+
return await request.delete({ url: `/crm/clue/delete?id=` + id })
41+
}
42+
43+
// 导出线索 Excel
44+
export const exportClue = async (params) => {
45+
return await request.download({ url: `/crm/clue/export-excel`, params })
46+
}

‎src/api/crm/contract/index.ts

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
import request from '@/config/axios'
2+
3+
export interface ContractVO {
4+
id: number
5+
name: string
6+
customerId: number
7+
businessId: number
8+
processInstanceId: number
9+
orderDate: Date
10+
ownerUserId: number
11+
no: string
12+
startTime: Date
13+
endTime: Date
14+
price: number
15+
discountPercent: number
16+
productPrice: number
17+
roUserIds: string
18+
rwUserIds: string
19+
contactId: number
20+
signUserId: number
21+
contactLastTime: Date
22+
remark: string
23+
}
24+
25+
// 查询合同列表
26+
export const getContractPage = async (params) => {
27+
return await request.get({ url: `/crm/contract/page`, params })
28+
}
29+
30+
// 查询合同详情
31+
export const getContract = async (id: number) => {
32+
return await request.get({ url: `/crm/contract/get?id=` + id })
33+
}
34+
35+
// 新增合同
36+
export const createContract = async (data: ContractVO) => {
37+
return await request.post({ url: `/crm/contract/create`, data })
38+
}
39+
40+
// 修改合同
41+
export const updateContract = async (data: ContractVO) => {
42+
return await request.put({ url: `/crm/contract/update`, data })
43+
}
44+
45+
// 删除合同
46+
export const deleteContract = async (id: number) => {
47+
return await request.delete({ url: `/crm/contract/delete?id=` + id })
48+
}
49+
50+
// 导出合同 Excel
51+
export const exportContract = async (params) => {
52+
return await request.download({ url: `/crm/contract/export-excel`, params })
53+
}

‎src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
<template>
22
<el-drawer v-model="drawerVisible" title="子任务" size="70%">
3+
<!-- 当前任务 -->
34
<template #header>
45
<h4>【{{ baseTask.name }} 】审批人：{{ baseTask.assigneeUser?.nickname }}</h4>
5-
<el-button style="margin-left: 5px" v-if="showSubSignButton(baseTask)" type="danger" plain @click="handleSubSign(baseTask)">
6-
<Icon icon="ep:remove" />
7-
减签
6+
<el-button
7+
style="margin-left: 5px"
8+
v-if="isSubSignButtonVisible(baseTask)"
9+
type="danger"
10+
plain
11+
@click="handleSubSign(baseTask)"
12+
>
13+
<Icon icon="ep:remove" /> 减签
814
</el-button>
915
</template>
10-
<el-table :data="tableData" style="width: 100%" row-key="id" border>
16+
<!-- 子任务列表 -->
17+
<el-table :data="baseTask.children" style="width: 100%" row-key="id" border>
1118
<el-table-column prop="assigneeUser.nickname" label="审批人" />
1219
<el-table-column prop="assigneeUser.deptName" label="所在部门" />
1320
<el-table-column label="审批状态" prop="result">
@@ -32,18 +39,17 @@
3239
<el-table-column label="操作" prop="operation">
3340
<template #default="scope">
3441
<el-button
35-
v-if="showSubSignButton(scope.row)"
42+
v-if="isSubSignButtonVisible(scope.row)"
3643
type="danger"
3744
plain
3845
@click="handleSubSign(scope.row)"
3946
>
40-
<Icon icon="ep:remove" />
41-
减签
47+
<Icon icon="ep:remove" /> 减签
4248
</el-button>
4349
</template>
4450
</el-table-column>
4551
</el-table>
46-
<!-- 减签 -->
52+
<!-- 减签 -->
4753
<TaskSubSignDialogForm ref="taskSubSignDialogForm" />
4854
</el-drawer>
4955
</template>
@@ -53,12 +59,11 @@ import { DICT_TYPE } from '@/utils/dict'
5359
import { dateFormatter } from '@/utils/formatTime'
5460
import TaskSubSignDialogForm from './TaskSubSignDialogForm.vue'
5561
56-
const message = useMessage() // 消息弹窗
57-
defineOptions({ name: 'ProcessInstancechildrenList' })
62+
defineOptions({ name: 'ProcessInstanceChildrenTaskList' })
5863
64+
const message = useMessage() // 消息弹窗
5965
const drawerVisible = ref(false) // 抽屉的是否展示
6066
61-
const tableData = ref<any[]>([]) //表格数据
6267
const baseTask = ref<object>({})
6368
/** 打开弹窗 */
6469
const open = async (task: any) => {
@@ -67,30 +72,22 @@ const open = async (task: any) => {
6772
return
6873
}
6974
baseTask.value = task
70-
//设置表格数据
71-
tableData.value = task.children
72-
//展开抽屉
75+
// 展开抽屉
7376
drawerVisible.value = true
7477
}
7578
defineExpose({ open }) // 提供 openModal 方法，用于打开弹窗
7679
77-
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
78-
79-
/**
80-
* 减签
81-
*/
80+
/** 发起减签 */
8281
const taskSubSignDialogForm = ref()
8382
const handleSubSign = (item) => {
8483
taskSubSignDialogForm.value.open(item.id)
84+
// TODO @海洋：减签后，需要刷新下界面哈
8585
}
8686
87-
/**
88-
* 显示减签按钮
89-
* @param task
90-
*/
91-
const showSubSignButton = (task:any) => {
92-
if(!isEmpty(task.children)){
93-
//有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
87+
/** 是否显示减签按钮 */
88+
const isSubSignButtonVisible = (task: any) => {
89+
if (task && task.children && !isEmpty(task.children)) {
90+
// 有子任务，且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
9491
const subTask = task.children.find((item) => item.result === 1 || item.result === 9)
9592
return !isEmpty(subTask)
9693
}

‎src/views/bpm/processInstance/detail/TaskAddSignDialogForm.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</el-form-item>
2323
</el-form>
2424
<template #footer>
25-
<el-button :disabled="formLoading" type="primary" @click="submitForm('before')"
26-
>向前加签</el-button
27-
>
28-
<el-button :disabled="formLoading" type="primary" @click="submitForm('after')"
29-
>向后加签</el-button
30-
>
25+
<el-button :disabled="formLoading" type="primary" @click="submitForm('before')">
26+
向前加签
27+
</el-button>
28+
<el-button :disabled="formLoading" type="primary" @click="submitForm('after')">
29+
向后加签
30+
</el-button>
3131
<el-button @click="dialogVisible = false">取 消</el-button>
3232
</template>
3333
</Dialog>

‎src/views/bpm/processInstance/detail/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ import TaskUpdateAssigneeForm from './TaskUpdateAssigneeForm.vue'
114114
import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
115115
import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
116116
import TaskReturnDialog from './TaskReturnDialogForm.vue'
117-
import TaskDelegateForm from './taskDelegateForm.vue'
117+
import TaskDelegateForm from './TaskDelegateForm.vue'
118118
import TaskAddSignDialogForm from './TaskAddSignDialogForm.vue'
119119
import { registerComponent } from '@/utils/routerHelper'
120120
import { isEmpty } from '@/utils/is'

‎src/views/crm/clue/ClueForm.vue

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<template>
2+
<Dialog :title="dialogTitle" v-model="dialogVisible">
3+
<el-form
4+
ref="formRef"
5+
:model="formData"
6+
:rules="formRules"
7+
label-width="100px"
8+
v-loading="formLoading"
9+
>
10+
<el-form-item label="转化状态" prop="transformStatus">
11+
<el-radio-group v-model="formData.transformStatus">
12+
<el-radio
13+
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
14+
:key="dict.value"
15+
:label="dict.value"
16+
>
17+
{{ dict.label }}
18+
</el-radio>
19+
</el-radio-group>
20+
</el-form-item>
21+
<el-form-item label="跟进状态" prop="followUpStatus">
22+
<el-radio-group v-model="formData.followUpStatus">
23+
<el-radio
24+
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
25+
:key="dict.value"
26+
:label="dict.value"
27+
>
28+
{{ dict.label }}
29+
</el-radio>
30+
</el-radio-group>
31+
</el-form-item>
32+
<el-form-item label="线索名称" prop="name">
33+
<el-input v-model="formData.name" placeholder="请输入线索名称" />
34+
</el-form-item>
35+
<!-- TODO 客户选择 -->
36+
<el-form-item label="客户" prop="customerId">
37+
<el-input v-model="formData.customerId" placeholder="请选择客户" />
38+
</el-form-item>
39+
<el-form-item label="下次联系时间" prop="contactNextTime">
40+
<el-date-picker
41+
v-model="formData.contactNextTime"
42+
type="date"
43+
value-format="x"
44+
placeholder="选择下次联系时间"
45+
/>
46+
</el-form-item>
47+
<el-form-item label="电话" prop="telephone">
48+
<el-input v-model="formData.telephone" placeholder="请输入电话" />
49+
</el-form-item>
50+
<el-form-item label="手机号" prop="mobile">
51+
<el-input v-model="formData.mobile" placeholder="请输入手机号" />
52+
</el-form-item>
53+
<el-form-item label="地址" prop="address">
54+
<el-input v-model="formData.address" placeholder="请输入地址" />
55+
</el-form-item>
56+
<!-- TODO 负责人选择 -->
57+
<el-form-item label="负责人" prop="ownerUserId">
58+
<el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
59+
</el-form-item>
60+
<el-form-item label="备注" prop="remark">
61+
<el-input v-model="formData.remark" placeholder="请输入备注" />
62+
</el-form-item>
63+
</el-form>
64+
<template #footer>
65+
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
66+
<el-button @click="dialogVisible = false">取 消</el-button>
67+
</template>
68+
</Dialog>
69+
</template>
70+
<script setup lang="ts">
71+
import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
72+
import * as ClueApi from '@/api/crm/clue'
73+
74+
const { t } = useI18n() // 国际化
75+
const message = useMessage() // 消息弹窗
76+
77+
const dialogVisible = ref(false) // 弹窗的是否展示
78+
const dialogTitle = ref('') // 弹窗的标题
79+
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
80+
const formType = ref('') // 表单的类型：create - 新增；update - 修改
81+
const formData = ref({
82+
id: undefined,
83+
transformStatus: undefined,
84+
followUpStatus: undefined,
85+
name: undefined,
86+
customerId: undefined,
87+
contactNextTime: undefined,
88+
telephone: undefined,
89+
mobile: undefined,
90+
address: undefined,
91+
ownerUserId: undefined,
92+
contactLastTime: undefined,
93+
remark: undefined
94+
})
95+
const formRules = reactive({
96+
transformStatus: [{ required: true, message: '转化状态不能为空', trigger: 'blur' }],
97+
followUpStatus: [{ required: true, message: '跟进状态不能为空', trigger: 'blur' }],
98+
name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }],
99+
customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }]
100+
})
101+
const formRef = ref() // 表单 Ref
102+
103+
/** 打开弹窗 */
104+
const open = async (type: string, id?: number) => {
105+
dialogVisible.value = true
106+
dialogTitle.value = t('action.' + type)
107+
formType.value = type
108+
resetForm()
109+
// 修改时，设置数据
110+
if (id) {
111+
formLoading.value = true
112+
try {
113+
formData.value = await ClueApi.getClue(id)
114+
} finally {
115+
formLoading.value = false
116+
}
117+
}
118+
}
119+
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
120+
121+
/** 提交表单 */
122+
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
123+
const submitForm = async () => {
124+
// 校验表单
125+
if (!formRef) return
126+
const valid = await formRef.value.validate()
127+
if (!valid) return
128+
// 提交请求
129+
formLoading.value = true
130+
try {
131+
const data = formData.value as unknown as ClueApi.ClueVO
132+
if (formType.value === 'create') {
133+
await ClueApi.createClue(data)
134+
message.success(t('common.createSuccess'))
135+
} else {
136+
await ClueApi.updateClue(data)
137+
message.success(t('common.updateSuccess'))
138+
}
139+
dialogVisible.value = false
140+
// 发送操作成功的事件
141+
emit('success')
142+
} finally {
143+
formLoading.value = false
144+
}
145+
}
146+
147+
/** 重置表单 */
148+
const resetForm = () => {
149+
formData.value = {
150+
id: undefined,
151+
transformStatus: undefined,
152+
followUpStatus: undefined,
153+
name: undefined,
154+
customerId: undefined,
155+
contactNextTime: undefined,
156+
telephone: undefined,
157+
mobile: undefined,
158+
address: undefined,
159+
ownerUserId: undefined,
160+
contactLastTime: undefined,
161+
remark: undefined
162+
}
163+
formRef.value?.resetFields()
164+
}
165+
</script>

0 commit comments

Comments
 (0)