qsh 3 months ago
parent 7df45d6703
commit b2a376cdf0
  1. 127
      src/views/Clue/Order/Comp/DialogOrderProduct.vue
  2. 118
      src/views/Clue/Order/Comp/MallOrderList.vue
  3. 82
      src/views/Clue/Pool/Comp/DialogSuccess.vue
  4. 2
      src/views/Clue/Pool/index.vue

@ -0,0 +1,127 @@
<template>
<Dialog title="成交商品" v-model="show" width="80%">
<el-table :data="orderProductList" border stripe>
<el-table-column prop="productName" label="成交产品" />
<el-table-column prop="specsName" label="产品规格" />
<el-table-column prop="signNum" label="成交数量" />
<el-table-column prop="remark" label="成交备注" />
<el-table-column label="生产状态" width="160px">
<template #default="scope">
<el-switch
v-model="scope.row.isProduced"
:active-value="true"
:inactive-value="false"
active-text="已生产"
inactive-text="待生产"
v-if="checkPermi(['clue:order:update-produce'])"
size="small"
@change="handleChangeProdoce(scope.row)"
/>
<div v-else>{{ scope.row.isProducedDesc }}</div>
</template>
</el-table-column>
<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
placement="top"
width="500px"
trigger="click"
v-if="scope.row.warehouseName && scope.row.sendRemark"
>
<template #reference>
<el-button type="primary" style="padding: 0" text>点击查看</el-button>
</template>
<div v-dompurify-html="scope.row.sendRemark"></div>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" width="100px">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
:disabled="scope.row.sendState == '已发货'"
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:send']"
@click="handleDelivery(scope.row)"
>
发货
</el-button>
<el-button
type="danger"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:remove-product']"
@click="handleRemoveProduct(scope.row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</Dialog>
</template>
<script setup>
import * as OrderApi from '@/api/clue/sign'
import { checkPermi } from '@/utils/permission'
const show = ref(false)
const orderProductList = ref([])
function open(orderId) {
try {
show.value = true
getFields()
OrderApi.getSign(orderId).then((data) => {
orderProductList.value = data.signProducts || []
})
} catch (error) {
console.log(error)
}
}
const orderSchema = ref([])
function getFields() {
getOrderFieldList().then((data) => {
const list = useCrudSchemas(data).allSchemas.detailSchema
const arr = []
list.forEach((it) => {
if (it.label.includes('日期')) {
it.dateFormat = 'YYYY-MM-DD'
}
if (it.field == 'receivedMoney') {
checkPermi(['clue:order:return-list']) && arr.push(it)
} else {
arr.push(it)
}
})
if (arr.filter((item) => item.span != 2).length % 2 != 0) {
arr.push({})
}
orderSchema.value = [
...arr,
{
field: 'remark',
label: '备注',
span: 2,
isEditor: true
}
]
})
}
defineExpose({
open
})
</script>
<style lang="scss" scoped></style>

@ -2,46 +2,6 @@
<div>
<!-- 搜索工作栏 -->
<div>
<el-form
:model="searchForm"
ref="moreSearchRef"
inline
label-width="0"
style="display: inline"
>
<el-form-item style="margin-bottom: 10px">
<el-select
v-model="searchForm.signProduct"
placeholder="选择成交产品"
filterable
clearable
@change="searchForm.specsId = undefined"
>
<el-option
v-for="item in prodOptions"
:key="item.productId"
:label="item.productName"
:value="item.productId"
/>
</el-select>
</el-form-item>
<el-form-item style="margin-bottom: 10px">
<el-select
v-model="searchForm.specsId"
placeholder="选择规格"
filterable
clearable
:disabled="!searchForm.signProduct"
>
<el-option
v-for="item in specsOptions(searchForm.signProduct)"
:key="item.specsId"
:label="item.specsName"
:value="item.specsId"
/>
</el-select>
</el-form-item>
</el-form>
<Search
v-if="!loading"
ref="searchRef"
@ -67,8 +27,8 @@
v-if="!loading"
class="mt-10px"
v-model:tableObject="tableObject"
:tableColumns="allSchemas.tableColumns"
rowkey="signId"
:tableColumns="allSchemas.tableColumns.filter((it) => it.paramLevel == 1)"
rowkey="signOrderId"
:expandRowKeys="expendRows"
@get-list="getTableList"
@get-checked-columns="getCheckedColumns"
@ -86,21 +46,39 @@
style="width: 100%"
> -->
<el-table
:data="row.signProducts"
:data="row.childrenOrder"
row-key="id"
stripe
style="width: 90%; margin: 0 auto"
>
<el-table-column prop="" label="子订单号" />
<el-table-column prop="" label="登记人" width="120px" />
<el-table-column prop="" label="成交日期" width="120px" />
<el-table-column prop="" label="成交价" width="120px" />
<el-table-column prop="" label="支付金额" width="120px" />
<el-table-column prop="" label="已到账金额" width="120px" />
<el-table-column prop="" label="提成状态" width="120px" />
<el-table-column prop="" label="备注" />
<el-table-column label="操作" width="200px" fixed="right">
<el-table-column prop="signId" label="子订单号" />
<el-table-column prop="createUserName" label="登记人" width="120px" />
<el-table-column prop="dealDate" label="成交日期" width="120px" />
<el-table-column prop="signPrice" label="成交价" width="120px" />
<el-table-column prop="payAmount" label="支付金额" width="120px" />
<el-table-column prop="receivedMoney" label="已到账金额" width="120px" />
<el-table-column prop="isCommissioned" label="提成状态" width="120px" />
<el-table-column prop="remark" label="备注">
<template #default="scope">
<el-popover trigger="hover" placement="top">
<div v-dompurify-html="scope.row.remark"></div>
<template #reference>
<el-button type="primary" link>查看</el-button>
</template>
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" width="260px" fixed="right">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
@click="openProduct(scope.row)"
>
成交商品
</el-button>
<el-button
type="primary"
class="mr-10px"
@ -259,6 +237,7 @@
<DialogExtraFee ref="extraFeeDialog" />
<DialogDelivery ref="deliveryDialog" @success="getTableList" />
<DialogAddProduct ref="addProductDialog" @success="getTableList" />
<DialogOrderProduct ref="orderProductDialog" />
</div>
</template>
@ -266,7 +245,6 @@
import { getSimpleFieldList } from '@/api/clue/orderField'
import * as SignApi from '@/api/clue/sign'
import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
import { getSimpleProductList } from '@/api/mall/product'
import DialogOrder from './DialogOrder.vue'
import DialogFeeback from './DialogFeeback.vue'
@ -274,6 +252,7 @@ import DialogAfterSale from './DialogAfterSale.vue'
import DialogExtraFee from './DialogExtraPay.vue'
import DialogDelivery from './DialogDelivery.vue'
import DialogAddProduct from './DialogAddProduct.vue'
import DialogOrderProduct from './DialogOrderProduct.vue'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
@ -293,18 +272,6 @@ const allSchemas = ref({})
const orderDetailDialog = ref()
const searchRef = ref()
const prodOptions = ref([])
const specsOptions = computed({
get() {
return (prodId) => {
if (prodId) {
return prodOptions.value.find((it) => it.productId == prodId).productSpecList
}
return []
}
}
})
const searchForm = ref({
signProduct: undefined
@ -351,6 +318,7 @@ async function getCurdSchemas() {
loading.value = true
try {
const data = await getSimpleFieldList()
// const mainOrderFields = data.filter((it) => it.paramLevel == 1)
data.forEach((elem) => {
if (['createUser'].includes(elem.field)) {
elem.search.options = userOptions.value
@ -371,7 +339,8 @@ const showColumns = ref([])
//
function getCheckedColumns(list) {
showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
showColumns.value =
list && list.length ? list : allSchemas.value.tableColumns.filter((it) => it.paramLevel == 1)
}
//
@ -412,11 +381,6 @@ function handleAddFee(row) {
}
async function getOptions() {
//
getSimpleProductList().then((data) => {
prodOptions.value = data
})
userOptions.value = await getUserOption()
allUserOptions.value = await getAllUserList()
getCurdSchemas()
@ -426,11 +390,6 @@ const deliveryDialog = ref()
// deliveryDialog.value.open(row)
// }
// const addProductDialog = ref()
// function handleAddProduct(row) {
// addProductDialog.value.open(row.signId, prodOptions.value)
// }
const batchIds = ref([])
function handleSelectionChange(val) {
batchIds.value = val.map((it) => it.signId)
@ -487,6 +446,11 @@ function handleBatchUpdateInstall() {
}
}
const orderProductDialog = ref()
function openProduct(row) {
orderProductDialog.value.open(row.orderId)
}
// async function handleRemoveProduct(row) {
// try {
// //
@ -518,7 +482,7 @@ function handleBatchUpdateInstall() {
// }
// }
// const expendRows = ref([])
const expendRows = ref([])
// async function onDragEnd(ev) {
// try {
// expendRows.value = [ev.data.signId]

@ -3,6 +3,27 @@
<template #btn>
<el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
</template>
<div v-if="showMergeOrder">
<div style="color: red">
查询到该客户已有成交订单请选择订单进行合并不选择则生成独立订单
</div>
<el-radio-group v-model="mergeOrderId" style="width: 100%">
<el-radio
v-for="item in mergeOrderList"
:key="item.signOrderId"
:label="item.signOrderId"
:value="item.signOrderId"
style="width: 100%; margin: 15px 0"
>
<div class="flex justify-between">
<div class="mr-20px">订单编号{{ item.signOrderId }}</div>
<div class="mr-20px">登记时间{{ item.dealDate }}</div>
<div>线索来源{{ item.source }}</div>
</div>
</el-radio>
</el-radio-group>
</div>
<div v-else>
<Descriptions
:title="`线索信息-${info.name}`"
:data="info"
@ -335,7 +356,14 @@
</el-col>
</el-row>
</el-form>
<template #footer>
</div>
<template #footer v-if="showMergeOrder">
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleNext"> </el-button>
</span>
</template>
<template #footer v-else>
<span>
<el-button @click="show = false"> </el-button>
<el-button :disabled="formLoading" type="primary" @click="handleSave"> </el-button>
@ -346,7 +374,7 @@
<script setup name="DialogSuccess">
import * as ClueApi from '@/api/clue'
import { createSign, getSignProfit } from '@/api/clue/sign'
import { createSign, getSignProfit, getSignPage } from '@/api/clue/sign'
import { getDiyFieldList } from '@/api/clue/orderField'
import { getPlaceList } from '@/api/school/place'
import { getClassTypeList } from '@/api/school/class'
@ -421,23 +449,6 @@ const showSchema = computed(() => {
return [...list, ...arr]
})
// const rules = computed(() => {
// let ruleObj = {}
// props.schema.map((it) => {
// if (it.isRequired) {
// Reflect.set(ruleObj, it.field, {
// required: true,
// message: `${it.label}`,
// trigger: 'blur, change'
// })
// }
// })
// if (appStore.getAppInfo?.instanceType == 1) {
// ruleObj = { ...ruleObj, ...schoolRules }
// }
// return ruleObj
// })
const extraPayOptions = getDictOptions('other_pay_type')
async function open(id) {
@ -446,6 +457,10 @@ async function open(id) {
getDiyFields()
const data = await ClueApi.getClue(id)
info.value = { ...data, ...data.diyParams }
//
if (appStore.getAppInfo?.instanceType == 2) {
setMergeOrder(data.phone)
}
show.value = true
} catch (error) {
console.log(error)
@ -473,6 +488,35 @@ function getDiyFields() {
})
}
const showMergeOrder = ref(false)
const mergeOrderList = ref([])
const mergeOrderId = ref(undefined)
function setMergeOrder(phone) {
getSignPage({ phone, pageNo: 1, pageSize: 10 }).then((data) => {
if (data.total > 0) {
//
showMergeOrder.value = true
mergeOrderList.value = data.list
mergeOrderId.value = undefined
}
})
}
function handleNext() {
if (mergeOrderId.value) {
form.value.signOrderId = mergeOrderId.value
const order = mergeOrderList.value.find((it) => it.signOrderId == mergeOrderId.value)
if (order.orderDiyParams) {
for (const key in order.orderDiyParams) {
if (Object.prototype.hasOwnProperty.call(order.orderDiyParams, key)) {
form.value[key] = order.orderDiyParams[key]
}
}
}
}
showMergeOrder.value = false
}
async function resetForm(id) {
const data = await getConfigByConfigKey({ configKey: 'companyCollectionConfig' })
form.value = {

@ -84,7 +84,7 @@
<div v-if="item.field == 'followRecord'">
<el-button
type="primary"
text
link
style="padding: 0"
@click="handleFollow(row)"
v-if="queryType != 4"

Loading…
Cancel
Save