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

Compare commits

base: qiushanhe:18bfc7d353e740571dfdd93610810c082647b96d
Branches Tags
qiushanhe:dev-cjl
qiushanhe:dev-cl
qiushanhe:dev-report
qiushanhe:main
qiushanhe:salary
..
compare: qiushanhe:fb6b341242106a838dc6f72f3e7a7903dcc87c2d
Branches Tags
qiushanhe:dev-cjl
qiushanhe:dev-cl
qiushanhe:dev-report
qiushanhe:main
qiushanhe:salary

No commits in common. '18bfc7d353e740571dfdd93610810c082647b96d' and 'fb6b341242106a838dc6f72f3e7a7903dcc87c2d' have entirely different histories.
18bfc7d353 ... fb6b341242

6 changed files with 41 additions and 184 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 61
      src/views/Clue/Order/Comp/AfterSales.vue
  2. 35
      src/views/Clue/Order/Comp/DialogFeebackAudit.vue
  3. 8
      src/views/Clue/Order/Comp/MallSettle.vue
  4. 77
      src/views/Clue/Order/Comp/Reback.vue
  5. 8
      src/views/Clue/Order/Comp/SchoolSettle.vue
  6. 18
      src/views/Clue/Order/index.vue

61
src/views/Clue/Order/Comp/AfterSales.vue
Unescape View File

@ -8,7 +8,7 @@
<el-input v-model="searchForm.name" placeholder="线索名称" clearable />
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
<el-select v-model="searchForm.state" placeholder="审核状态" clearable>
<el-option label="待审核" :value="1" />
<el-option label="已撤销" :value="2" />
<el-option label="已通过" :value="3" />
@ -16,13 +16,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signUser"
placeholder="登记人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
<el-option
v-for="item in userOptions"
:key="item.id"
@ -40,17 +34,10 @@
range-separator="-"
start-placeholder="成交日期"
end-placeholder="成交日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.applyUser"
placeholder="申请人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
<el-option
v-for="item in userOptions"
:key="item.id"
@ -68,31 +55,12 @@
range-separator="-"
start-placeholder="申请日期"
end-placeholder="申请日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="searchForm.checkTime"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="审核日期"
end-placeholder="审核日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
查询
</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:after-sale-reset']">
重置
</el-button>
<el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
批量审核
</el-button>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
<el-button @click="batchAudit">批量审核</el-button>
</el-form-item>
</el-form>
@ -126,23 +94,10 @@
min-width="120px"
:formatter="dateFormatter"
/>
<el-table-column prop="checkUser" label="审核人" min-width="90" />
<el-table-column
prop="checkTime"
label="审核时间"
min-width="120px"
:formatter="dateFormatter"
/>
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
<el-table-column label="操作" width="150px" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
style="padding: 0"
text
v-hasPermi="['clue:order:after-sale-detail']"
@click="handleDetail(row.id)"
>
<el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
详情
</el-button>
<el-button
@ -207,7 +162,6 @@ const searchForm = ref({
dealUser: undefined,
createDate: [],
createUser: undefined,
checkTime: [],
pageNo: 1,
pageSize: 20
})
@ -231,7 +185,6 @@ function handleReset() {
dealUser: undefined,
createDate: [],
createUser: undefined,
checkTime: [],
pageNo: 1,
pageSize: 20
}

35
src/views/Clue/Order/Comp/DialogFeebackAudit.vue
Unescape View File

@ -6,39 +6,16 @@
<el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
<el-table-column prop="signSate" label="成交状态" />
</el-table>
<el-form
ref="formRef"
v-loading="formLoading"
:model="formData"
:rules="ruels"
label-width="80px"
>
<el-row :gutter="20">
<el-col :span="12" :offset="0">
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="状态" prop="state">
<el-radio-group v-model="formData.state">
<el-radio :label="3"> 通过 </el-radio>
<el-radio :label="4"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12" :offset="0">
<el-form-item label="审核日期" prop="checkTime">
<el-date-picker
v-model="formData.checkTime"
type="date"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="选择日期"
/>
</el-form-item>
</el-col>
<el-col :span="24" :offset="0">
<el-form-item label="备注" prop="remark">
<Editor v-model:modelValue="formData.remark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@ -49,8 +26,8 @@
<script name="DialogFeebackAudit" setup>
import { getFollowUserList } from '@/api/clue'
import { auditPayment } from '@/api/clue/payment'
import { dateFormatter, formatDate } from '@/utils/formatTime'
import {} from '@/utils/formatTime'
import { dateFormatter } from '@/utils/formatTime'
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
@ -112,11 +89,6 @@ const formData = ref({
state: 3,
remark: ''
})
const ruels = {
checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
}
const formRef = ref() // 表单 Ref
const orderInfo = ref({})
@ -157,7 +129,6 @@ const resetForm = (signId) => {
formData.value = {
payId: signId,
state: 3,
checkTime: formatDate(new Date()),
remark: ''
}
formRef.value?.resetFields()

8
src/views/Clue/Order/Comp/MallSettle.vue
Unescape View File

@ -87,11 +87,9 @@
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
<el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
批量结算
</el-button>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
<el-button @click="batchSettle">批量结算</el-button>
</el-form-item>
</el-form>

77
src/views/Clue/Order/Comp/Reback.vue
Unescape View File

@ -8,7 +8,7 @@
<el-input v-model="searchForm.name" placeholder="线索名称" clearable />
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
<el-select v-model="searchForm.state" placeholder="审核状态" clearable>
<el-option label="待审核" :value="1" />
<el-option label="已撤销" :value="2" />
<el-option label="已通过" :value="3" />
@ -16,13 +16,7 @@
</el-select>
</el-form-item>
<el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
<el-select
v-model="searchForm.receiver"
placeholder="接待人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.receiver" placeholder="接待人" clearable filterable>
<el-option
v-for="item in allUserOptions"
:key="item.id"
@ -32,13 +26,7 @@
</el-select>
</el-form-item>
<el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
<el-select
v-model="searchForm.convertPeople"
placeholder="转化人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.convertPeople" placeholder="转化人" clearable filterable>
<el-option
v-for="item in allUserOptions"
:key="item.id"
@ -48,13 +36,7 @@
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.signUser"
placeholder="登记人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
<el-option
v-for="item in userOptions"
:key="item.id"
@ -72,17 +54,10 @@
range-separator="-"
start-placeholder="成交日期"
end-placeholder="成交日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.applyUser"
placeholder="申请人"
clearable
filterable
style="width: 120px"
>
<el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
<el-option
v-for="item in userOptions"
:key="item.id"
@ -100,27 +75,12 @@
range-separator="-"
start-placeholder="申请日期"
end-placeholder="申请日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="searchForm.checkTime"
type="daterange"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
range-separator="-"
start-placeholder="审核日期"
end-placeholder="审核日期"
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
<el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
批量审核
</el-button>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
<el-button @click="batchAudit">批量审核</el-button>
</el-form-item>
</el-form>
@ -209,27 +169,14 @@
<el-table-column prop="applyUserName" label="申请人" min-width="90" />
<el-table-column
prop="applyTime"
label="审核人"
min-width="120px"
:formatter="dateFormatter"
/>
<el-table-column prop="checkUser" label="审核人" min-width="90" />
<el-table-column
prop="checkTime"
label="审核时间"
label="申请时间"
min-width="120px"
:formatter="dateFormatter"
/>
<el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
<el-table-column label="操作" width="220px" fixed="right">
<template #default="{ row }">
<el-button
type="primary"
style="padding: 0"
text
v-hasPermi="['clue:order:return-detail']"
@click="handleDetail(row)"
>
<el-button type="primary" style="padding: 0" text @click="handleDetail(row)">
详情
</el-button>
<el-button
@ -307,7 +254,6 @@ const searchForm = ref({
signUser: undefined,
applyTime: [],
applyUser: undefined,
checkTime: [],
pageNo: 1,
pageSize: 20
})
@ -334,7 +280,6 @@ function handleReset() {
signUser: undefined,
applyTime: [],
applyUser: undefined,
checkTime: [],
pageNo: 1,
pageSize: 20
}
@ -409,7 +354,7 @@ function getSummaries(param) {
} else if (column.property == 'personProfit') {
sums[index] = totalInfo.value.totalPersonProfit
} else if (column.property == 'companyProfit') {
sums[index] = totalInfo.value.totalCompanyProfit
sums[index] = totalInfo.value.totalPersonProfit
} else if (column.property == 'signPrice') {
sums[index] = totalInfo.value.totalSignPrice
} else {

8
src/views/Clue/Order/Comp/SchoolSettle.vue
Unescape View File

@ -93,11 +93,9 @@
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
<el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
<el-button @click="batchSettle" v-hasPermi="['clue:order:settle-settle-batch-audit']">
批量结算
</el-button>
<el-button @click="handleSearch">查询</el-button>
<el-button @click="handleReset">重置</el-button>
<el-button @click="batchSettle">批量结算</el-button>
</el-form-item>
</el-form>

18
src/views/Clue/Order/index.vue
Unescape View File

@ -1,29 +1,21 @@
<template>
<el-tabs v-model="tabName">
<el-tab-pane label="成交列表" name="list" v-if="checkPermi(['clue:order:order-list'])">
<el-tab-pane label="成交列表" name="list">
<template v-if="tabName == 'list'">
<OrderList v-if="appStore.getAppInfo?.instanceType == 1" />
<MallOrderList v-else-if="appStore.getAppInfo?.instanceType == 2" />
</template>
</el-tab-pane>
<el-tab-pane label="回款申请" name="commission" v-if="checkPermi(['clue:order:return-list'])">
<el-tab-pane label="回款申请" name="commission">
<Reback v-if="tabName == 'commission'" />
</el-tab-pane>
<el-tab-pane
label="售后申请"
name="aftersale"
v-if="checkPermi(['clue:order:after-sale-list'])"
>
<el-tab-pane label="售后申请" name="aftersale">
<AfterSales v-if="tabName == 'aftersale'" />
</el-tab-pane>
<el-tab-pane
label="发货列表"
name="delivery"
v-if="appStore.getAppInfo?.instanceType == 2 && checkPermi(['clue:order:delivery-list'])"
>
<el-tab-pane label="发货列表" name="delivery" v-if="appStore.getAppInfo?.instanceType == 2">
<Delivery v-if="tabName == 'delivery'" />
</el-tab-pane>
<el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
<el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle'])">
<Settle v-if="tabName == 'settle'" />
</el-tab-pane>
</el-tabs>

Write Preview
Loading…
Cancel
Save