qiushanhe/ss-crm-manage-web
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Browse Source
This commit is contained in:
caolin
2024-07-31 21:11:55 +08:00
parent ffd15e2433 6922d1cb4c
commit 39cddaa8e0
8 changed files with 267 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/clue/payment.js
View File

@@ -37,3 +37,11 @@ export const cancelApplyPayment = async (data) => {
export const getPaymentDetail = async (params) => {
return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
}
// 撤销
export const updateApplyPayment = async (data) => {
return await request.post({
url: '/admin-api/crm/sign-pay-record/updateRecordMoney',
data
})
}

4
src/views/Basic/GeneralSet/Comp/BSClue.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-form :model="form" ref="formRef" label-width="auto">
<el-form-item v-if="getConfig('usePhoneConfig')">
<!-- <el-form-item v-if="getConfig('usePhoneConfig')">
<template #label>
<Tooltip
v-if="getConfig('usePhoneConfig').remark"
@@ -20,7 +20,7 @@
{{ item.name }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<el-form-item v-if="getConfig('showFollowConfig')">
<template #label>
<Tooltip

7
src/views/Basic/User/index.vue
View File

@@ -7,10 +7,10 @@
<el-col :span="20" :xs="24">
<!-- 搜索 -->
<el-form :model="queryParams" ref="queryFormRef" inline label-width="68px">
<el-form-item label="登录账号" prop="username">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="queryParams.username"
placeholder="请输入登录账号"
v-model="queryParams.nickname"
placeholder="请输入姓名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@@ -118,6 +118,7 @@ const queryParams = reactive({
pageNo: 1,
pageSize: 10,
username: undefined,
nickname: undefined,
mobile: undefined,
deptId: undefined
})

98
src/views/Clue/Order/Comp/DialogFeebackDetail.vue
View File

@@ -25,98 +25,18 @@
import { getPaymentDetail } from '@/api/clue/payment'
import { getFollowUserList } from '@/api/clue'
import { useAppStore } from '@/store/modules/app'
import { schoolApplySchema, mallApplySchema, auditSchema, cancelSchema } from './feedbackSchema.js'
import { dateFormatter } from '@/utils/formatTime'
const appStore = useAppStore()
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const applySchema = [
{
field: 'name',
label: '线索名称',
span: 1
},
{
field: 'phone',
label: '联系方式',
span: 1
},
{
field: 'signUserName',
label: '登记人',
span: 1
},
{
field: 'dealDate',
label: '成交日期',
dateFormat: 'YYYY-MM-DD',
span: 1
},
{
field: 'money',
label: '回款金额',
span: 1
},
{
field: 'isPayoff',
label: '是否结清',
span: 1
},
{
field: 'applyUserName',
label: '申请人',
span: 1
},
{
field: 'applyTime',
label: '申请时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
},
{
field: 'remark',
label: '备注',
span: 2,
isEditor: true
}
]
const auditSchema = [
{
field: 'stateName',
label: '审核状态',
span: 1
},
{
field: 'checkUser',
label: '审核人',
span: 1
},
{
field: 'checkTime',
label: '审核时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
},
{
field: 'checkRemark',
label: '备注',
span: 3,
isEditor: true
}
]
const cancelSchema = [
{
field: 'stateName',
label: '审核状态',
span: 1
},
{
field: 'revokeTime',
label: '撤销时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
}
]
const applySchema = computed(() => {
return appStore.getAppInfo?.instanceType == 1 ? schoolApplySchema : mallApplySchema
})
const orderInfo = ref({})
/** 打开弹窗 */

96
src/views/Clue/Order/Comp/Reback.vue
View File

@@ -94,9 +94,58 @@
>
<el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
<el-table-column prop="signId" label="成交单号" min-width="180px" />
<el-table-column prop="name" label="线索名称" min-width="150px" />
<el-table-column prop="phone" label="联系方式" min-width="150px" />
<el-table-column prop="money" label="回款金额" min-width="150px" />
<el-table-column prop="name" label="线索名称" width="150px" />
<el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
<el-table-column prop="money" label="回款金额" min-width="120px">
<template #default="{ row }">
<el-input-number
v-if="row.edit"
v-model="row.money"
size="small"
:min="0"
:controls="false"
style="width: 100%"
/>
<div v-else>{{ row.money }}</div>
</template>
</el-table-column>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="companyProfit"
label="公司利润"
min-width="120px"
>
<template #default="{ row }">
<el-input-number
v-if="row.edit"
v-model="row.companyProfit"
size="small"
:min="0"
:controls="false"
style="width: 100%"
/>
<div v-else>{{ row.companyProfit }}</div>
</template>
</el-table-column>
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
prop="personProfit"
label="员工利润"
min-width="120px"
>
<template #default="{ row }">
<el-input-number
v-if="row.edit"
v-model="row.personProfit"
size="small"
:min="0"
:controls="false"
style="width: 100%"
/>
<div v-else>{{ row.personProfit }}</div>
</template>
</el-table-column>
<el-table-column prop="signPrice" label="成交价" min-width="90" />
<el-table-column prop="isPayoff" label="是否结清" min-width="90" />
<el-table-column
v-if="appStore.getAppInfo?.instanceType == 1"
@@ -125,7 +174,7 @@
:formatter="dateFormatter"
/>
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
<el-table-column label="操作" width="150px" fixed="right">
<el-table-column label="操作" width="220px" fixed="right">
<template #default="{ row }">
<el-button type="primary" style="padding: 0" text @click="handleDetail(row)">
详情
@@ -140,6 +189,16 @@
>
撤销
</el-button>
<el-button
type="primary"
style="padding: 0"
text
v-if="row.state == 1"
v-hasPermi="['clue:order:update-return-money']"
@click="handleUpdate(row)"
>
<span>{{ row.edit ? '保存' : '修改金额' }}</span>
</el-button>
<el-button
type="primary"
style="padding: 0"
@@ -226,7 +285,7 @@ function handleReset() {
}
}
const totalMoney = ref(0)
const totalInfo = ref({})
const loading = ref(false)
async function getList() {
loading.value = true
@@ -234,7 +293,7 @@ async function getList() {
const data = await FeebackApi.getPaymentPage(removeNullField(searchForm.value))
tableList.value = data.list
total.value = data.total
totalMoney.value = data.totalAmount
totalInfo.value = data.totalData
} finally {
loading.value = false
}
@@ -291,7 +350,13 @@ function getSummaries(param) {
if (index === 0) {
sums[index] = '合计'
} else if (column.property == 'money') {
sums[index] = totalMoney.value
sums[index] = totalInfo.value.totalMoney
} else if (column.property == 'personProfit') {
sums[index] = totalInfo.value.totalPersonProfit
} else if (column.property == 'companyProfit') {
sums[index] = totalInfo.value.totalPersonProfit
} else if (column.property == 'signPrice') {
sums[index] = totalInfo.value.totalSignPrice
} else {
sums[index] = ''
}
@@ -300,6 +365,23 @@ function getSummaries(param) {
return sums
}
async function handleUpdate(row) {
if (row.edit) {
// 删除的二次确认
await message.confirm('是否确认修改回款金额？')
// 保存
FeebackApi.updateApplyPayment({ id: row.id, money: row.money })
.then(() => {
message.success('修改成功')
})
.finally(() => {
row.edit = false
})
} else {
row.edit = true
}
}
onMounted(() => {
getOptions()
handleSearch()

10
src/views/Clue/Order/Comp/SchoolSettle.vue
View File

@@ -239,16 +239,14 @@ const loading = ref(false)
const tableList = ref([])
const total = ref(0)
const totalNum = ref(0)
const totalAmount = ref(0)
const totalInfo = ref({})
async function getList() {
loading.value = true
try {
const data = await SettleApi.getSchoolSettlePage(removeNullField(searchForm.value))
tableList.value = data.list
total.value = data.total
totalNum.value = data.totalNum
totalAmount.value = data.totalAmount
totalInfo.value = data.totalData
} finally {
loading.value = false
}
@@ -261,9 +259,9 @@ function getSummaries(param) {
if (index === 0) {
sums[index] = '合计'
} else if (column.property == 'settlementNum') {
sums[index] = totalNum.value
sums[index] = totalInfo.value.totalNum
} else if (column.property == 'settlementMoney') {
sums[index] = totalAmount.value
sums[index] = totalInfo.value.totalAmount
} else {
sums[index] = ''
}

150
src/views/Clue/Order/Comp/feedbackSchema.js Normal file
View File

@@ -0,0 +1,150 @@
export const schoolApplySchema = [
{
field: 'name',
label: '线索名称',
span: 1
},
{
field: 'phone',
label: '联系方式',
span: 1
},
{
field: 'signUserName',
label: '登记人',
span: 1
},
{
field: 'dealDate',
label: '成交日期',
dateFormat: 'YYYY-MM-DD',
span: 1
},
{
field: 'money',
label: '回款金额',
span: 1
},
{
field: 'signPrice',
label: '成交价',
span: 1
},
{
field: 'companyProfit',
label: '公司利润',
span: 1
},
{
field: 'personProfit',
label: '员工利润',
span: 1
},
{
field: 'applyUserName',
label: '申请人',
span: 1
},
{
field: 'applyTime',
label: '申请时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
},
{
field: 'remark',
label: '备注',
span: 2,
isEditor: true
}
]
export const mallApplySchema = [
{
field: 'name',
label: '线索名称',
span: 1
},
{
field: 'phone',
label: '联系方式',
span: 1
},
{
field: 'signUserName',
label: '登记人',
span: 1
},
{
field: 'dealDate',
label: '成交日期',
dateFormat: 'YYYY-MM-DD',
span: 1
},
{
field: 'money',
label: '回款金额',
span: 1
},
{
field: 'signPrice',
label: '成交价',
span: 1
},
{
field: 'applyUserName',
label: '申请人',
span: 1
},
{
field: 'applyTime',
label: '申请时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
},
{
field: 'remark',
label: '备注',
span: 2,
isEditor: true
}
]
export const auditSchema = [
{
field: 'stateName',
label: '审核状态',
span: 1
},
{
field: 'checkUser',
label: '审核人',
span: 1
},
{
field: 'checkTime',
label: '审核时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
},
{
field: 'checkRemark',
label: '备注',
span: 3,
isEditor: true
}
]
export const cancelSchema = [
{
field: 'stateName',
label: '审核状态',
span: 1
},
{
field: 'revokeTime',
label: '撤销时间',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
span: 1
}
]

2
src/views/Clue/Pool/Comp/DrawerClue.vue
View File

@@ -16,7 +16,7 @@
<div class="flex" style="align-items: center">
<b class="mr-5px text-24px">{{ info.name }}</b>
<div class="mr-5px text-16px">{{ info.phone }}</div>
<el-tag type="success">{{ info.intentionState }}</el-tag>
<el-tag type="success">{{ info.intentionStateName }}</el-tag>
</div>
<div>
<el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">