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-08-10 13:21:15 +08:00
parent 18bfc7d353 1be86c7699
commit 769c901954
8 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/Clue/Order/Comp/DialogFeebackAudit.vue
View File

@@ -1,7 +1,7 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
<Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
<el-table :data="followList" size="small" border class="mt-10px">
<el-table :data="followList" size="small" border class="mt-10px mb-10px">
<el-table-column prop="userName" label="跟进人" />
<el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
<el-table-column prop="signSate" label="成交状态" />

14
src/views/Clue/Order/Comp/DialogOrder.vue
View File

@@ -1,7 +1,7 @@
<template>
<Dialog title="成交详情" v-model="show" width="800px">
<el-tabs v-model="tabName">
<el-tab-pane label="线索信息" name="clueInfo">
<el-tab-pane label="线索信息" name="clueInfo" v-if="checkPermi(['clue:pool:detail'])">
<Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
</el-tab-pane>
<el-tab-pane label="成交信息" name="orderInfo">
@@ -61,7 +61,11 @@
</el-table>
</div>
</el-tab-pane>
<el-tab-pane label="回款记录" name="returnRecord">
<el-tab-pane
label="回款记录"
name="returnRecord"
v-if="checkPermi(['clue:order:return-list'])"
>
<el-table :data="returnRecordList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="money" label="回款金额" />
@@ -70,7 +74,11 @@
<el-table-column prop="stateName" label="审核状态" />
</el-table>
</el-tab-pane>
<el-tab-pane label="售后记录" name="afterSale">
<el-tab-pane
label="售后记录"
name="afterSale"
v-if="checkPermi(['clue:order:after-sale-list'])"
>
<el-table :data="aftersaleList" border stripe>
<el-table-column type="index" width="50" />
<el-table-column prop="reason" label="售后原因" />

30
src/views/Clue/Order/Comp/MallOrderList.vue
View File

@@ -72,7 +72,16 @@
<el-table-column prop="specsName" label="产品规格" width="100px" />
<el-table-column prop="signNum" label="成交数量" width="90px" />
<el-table-column prop="remark" label="成交备注" />
<el-table-column label="发货状态" prop="sendState" width="90px" />
<el-table-column label="发货状态" prop="sendState" width="90px">
<template #default="scope">
<el-tag
:type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
size="small"
>
{{ scope.row.sendState }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="发货备注" width="100px">
<template #default="scope">
<el-popover
@@ -115,17 +124,14 @@
min-width="120px"
>
<template #default="{ row }">
<el-popover
placement="top"
width="500px"
trigger="click"
v-if="item.field == 'remark' && row.remark"
>
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="row.remark"></div>
</el-popover>
<div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
<el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="row[item.field]"></div>
</el-popover>
</div>
<span v-else-if="item.form?.component == 'DatePicker'">
{{ formatDate(row[item.field]) }}
</span>

19
src/views/Clue/Order/Comp/OrderList.vue
View File

@@ -89,17 +89,14 @@
min-width="120px"
>
<template #default="{ row }">
<el-popover
placement="top"
width="500px"
trigger="click"
v-if="item.field == 'remark' && row[item.field]"
>
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="row.remark"></div>
</el-popover>
<div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
<el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="row[item.field]"></div>
</el-popover>
</div>
<span v-else-if="item.form?.component == 'DatePicker'">
{{ formatDate(row[item.field]) }}
</span>

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

@@ -209,7 +209,7 @@
<el-table-column prop="applyUserName" label="申请人" min-width="90" />
<el-table-column
prop="applyTime"
label="审核人"
label="申请时间"
min-width="120px"
:formatter="dateFormatter"
/>

3
src/views/Clue/Pool/Comp/DialogClue.vue
View File

@@ -172,6 +172,9 @@ const formSchema = computed(() => {
// it.componentProps['disabled'] = formType.value != 'create'
it.componentProps['disabled'] = true
}
// else if (it.field == 'convertPeople' && formType.value == 'update') {
// it.componentProps['disabled'] = true
// }
if (it.field == 'convertPeople') {
it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
}

4
src/views/Clue/Pool/Comp/DialogSuccess.vue
View File

@@ -11,7 +11,7 @@
labelWidth="130px"
:defaultShow="false"
/>
<el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="mt-20px">
<el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
<el-row :gutter="20">
<!-- 驾校招生模式 -->
<template v-if="appStore.getAppInfo?.instanceType == 1">
@@ -131,7 +131,7 @@
</el-form-item>
</el-col>
<el-col
:span="8"
:span="fieldItem.component == 'Editor' ? 24 : 8"
:offset="0"
v-for="fieldItem in diyFieldList"
:key="fieldItem.clueParamId"

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

@@ -22,7 +22,13 @@
<el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
修改
</el-button>
<el-button type="danger" v-hasPermi="['clue:pool:delete']" plain @click="handleRemove">
<el-button
type="danger"
v-if="info.state != '成交'"
v-hasPermi="['clue:pool:delete']"
plain
@click="handleRemove"
>
删除
</el-button>
</div>