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

sc

Browse Source
This commit is contained in:
qsh
2025-08-21 11:04:43 +08:00
parent cb2deeb142
commit 7df45d6703
8 changed files with 120 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.base
View File

@@ -4,8 +4,8 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
# VITE_BASE_URL='http://47.98.161.246:48080'
VITE_BASE_URL='http://114.215.207.150:48080'
VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.215.207.150:48080'
# 高德地图key密钥
# 1寻驾

4
src/components/DictTag/src/DictTag.vue
View File

@@ -8,7 +8,7 @@ export default defineComponent({
name: 'DictTag',
props: {
type: {
type: String as PropType<string>,
type: String,
required: true
},
value: {
@@ -42,7 +42,7 @@ export default defineComponent({
return (
<ElTag
style={dictData.value?.cssClass ? 'color: #fff' : ''}
type={dictData.value?.colorType}
type={dictData.value?.colorType || 'primary'}
color={
dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)
? dictData.value?.cssClass

2
src/components/Form/src/components/useRenderRadio.tsx
View File

@@ -13,7 +13,7 @@ export const useRenderRadio = () => {
return item?.options?.map((option) => {
const { ...other } = option
return (
<Com {...other} label={option[valueAlias || 'value']}>
<Com {...other} label={option[valueAlias || 'value']} value={option[valueAlias || 'value']}>
{option[labelAlias || 'label']}
</Com>
)

2
src/components/Search/src/Search.vue
View File

@@ -183,7 +183,7 @@ initSearch()
virtual-triggering
>
<el-checkbox-group v-model="checkedSchema" @change="changeSearch">
<el-checkbox v-for="item in schema" :key="item.id" :label="item.id">
<el-checkbox v-for="item in schema" :key="item.id" :label="item.id" :value="item.id">
{{ item.label }}
</el-checkbox>
</el-checkbox-group>

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

@@ -78,20 +78,62 @@
<el-table-column type="expand" fixed="left">
<template #default="{ row }">
<div class="p-10px flex justify-center">
<VueDraggable
<!-- <VueDraggable
target="tbody"
v-model="row.signProducts"
:animation="150"
@end="onDragEnd"
style="width: 100%"
>
> -->
<el-table
:data="row.signProducts"
row-key="id"
stripe
style="width: 80%; margin: 0 auto"
style="width: 90%; margin: 0 auto"
>
<el-table-column prop="productName" label="成交产品" width="120px" />
<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">
<template #default="scope">
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:after-sale']"
@click="sellAfter(scope.row)"
>
售后
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:return']"
@click="feeBack(scope.row)"
>
回款
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)"
>
取消登记
</el-button>
</template>
</el-table-column>
<!-- <el-table-column prop="productName" label="成交产品" width="120px" />
<el-table-column prop="specsName" label="产品规格" width="120px" />
<el-table-column prop="signNum" label="成交数量" width="90px" />
<el-table-column prop="remark" label="成交备注" width="100px" />
@@ -157,9 +199,9 @@
删除
</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</VueDraggable>
<!-- </VueDraggable> -->
</div>
</template>
</el-table-column>
@@ -184,7 +226,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" width="240px" fixed="right">
<el-table-column label="操作" width="120px" fixed="right">
<template #default="scope">
<el-button
type="primary"
@@ -196,27 +238,6 @@
>
详情
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:after-sale']"
@click="sellAfter(scope.row)"
>
售后
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-if="scope.row.isPayoff == '未结清'"
v-hasPermi="['clue:order:return']"
@click="feeBack(scope.row)"
>
回款
</el-button>
<el-button
type="primary"
class="mr-10px"
@@ -227,26 +248,6 @@
>
添加支出
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:pool:enroll']"
@click="cancelDeal(scope.row)"
>
取消登记
</el-button>
<el-button
type="primary"
class="mr-10px"
link
style="padding: 0; margin-left: 0"
v-hasPermi="['clue:order:add-product']"
@click="handleAddProduct(scope.row)"
>
添加产品
</el-button>
</template>
</el-table-column>
</SSTable>
@@ -277,8 +278,8 @@ import DialogAddProduct from './DialogAddProduct.vue'
import { removeNullField } from '@/utils'
import { formatDate } from '@/utils/formatTime'
import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
import { VueDraggable } from 'vue-draggable-plus'
import { checkPermi } from '@/utils/permission'
// import { VueDraggable } from 'vue-draggable-plus'
// import { checkPermi } from '@/utils/permission'
const userOptions = ref([])
const allUserOptions = ref([])
@@ -421,14 +422,14 @@ async function getOptions() {
getCurdSchemas()
}
const deliveryDialog = ref()
function handleDelivery(row) {
deliveryDialog.value.open(row)
}
// function handleDelivery(row) {
// deliveryDialog.value.open(row)
// }
const addProductDialog = ref()
function handleAddProduct(row) {
addProductDialog.value.open(row.signId, prodOptions.value)
}
// const addProductDialog = ref()
// function handleAddProduct(row) {
// addProductDialog.value.open(row.signId, prodOptions.value)
// }
const batchIds = ref([])
function handleSelectionChange(val) {
@@ -486,51 +487,51 @@ function handleBatchUpdateInstall() {
}
}
async function handleRemoveProduct(row) {
try {
// 修改状态的二次确认
await message.confirm(`确认要删除${row.productName}吗?`)
// 发起修改状态
await SignApi.removeOrderProduct(row.id)
message.success('删除成功')
// 刷新列表
getTableList()
} catch {}
}
// async function handleRemoveProduct(row) {
// try {
// // 修改状态的二次确认
// await message.confirm(`确认要删除${row.productName}吗?`)
// // 发起修改状态
// await SignApi.removeOrderProduct(row.id)
// message.success('删除成功')
// // 刷新列表
// getTableList()
// } catch {}
// }
async function handleChangeProdoce(row) {
try {
// 修改状态的二次确认
await message.confirm('确认要修改生产状态吗?')
// 发起修改状态
await SignApi.updateProduceStatus({
signId: row.signId,
id: row.id,
isProduced: row.isProduced
})
message.success('修改成功')
// 刷新列表
// getTableList()
} catch {
// 取消后，进行恢复按钮
row.isProduced = !row.isProduced
}
}
// async function handleChangeProdoce(row) {
// try {
// // 修改状态的二次确认
// await message.confirm('确认要修改生产状态吗?')
// // 发起修改状态
// await SignApi.updateProduceStatus({
// signId: row.signId,
// id: row.id,
// isProduced: row.isProduced
// })
// message.success('修改成功')
// // 刷新列表
// // getTableList()
// } catch {
// // 取消后，进行恢复按钮
// row.isProduced = !row.isProduced
// }
// }
const expendRows = ref([])
async function onDragEnd(ev) {
try {
expendRows.value = [ev.data.signId]
const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
await SignApi.updateProduceSort(list.map((it) => it.id))
message.success('修改成功')
// 刷新列表
getTableList()
} catch (error) {
console.log(error)
getTableList()
}
}
// const expendRows = ref([])
// async function onDragEnd(ev) {
// try {
// expendRows.value = [ev.data.signId]
// const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
// await SignApi.updateProduceSort(list.map((it) => it.id))
// message.success('修改成功')
// // 刷新列表
// getTableList()
// } catch (error) {
// console.log(error)
// getTableList()
// }
// }
</script>
<style lang="scss" scoped></style>

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

@@ -1,5 +1,5 @@
<template>
<Dialog title="成交登记" v-model="show" width="900px">
<Dialog title="成交登记" v-model="show" width="1000px">
<template #btn>
<el-button class="mr-20px" type="primary" size="small" @click="handleSave">保存</el-button>
</template>
@@ -12,7 +12,7 @@
:defaultShow="false"
/>
<el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
<el-row :gutter="20">
<el-row>
<!-- 驾校招生模式 -->
<template v-if="appStore.getAppInfo?.instanceType == 1">
<el-col :span="8" :offset="0">
@@ -95,8 +95,8 @@
<el-col :span="8" :offset="0">
<el-form-item label="是否全款">
<el-radio-group v-model="form.isPayoff">
<el-radio :label="true"> 全款 </el-radio>
<el-radio :label="false"> 非全款 </el-radio>
<el-radio :label="true" :value="true"> 全款 </el-radio>
<el-radio :label="false" :value="false"> 非全款 </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -113,8 +113,8 @@
<el-col :span="8" :offset="0">
<el-form-item label="公司收款" prop="isCompanyReceipts">
<el-radio-group v-model="form.isCompanyReceipts">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
<el-radio :label="true" :value="true">是</el-radio>
<el-radio :label="false" :value="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

2
src/views/Clue/Pool/index.vue
View File

@@ -136,7 +136,7 @@
<el-button
type="primary"
link
:disabled="scope.row.state == '成交'"
:disabled="appStore.getAppInfo?.instanceType == 1 && scope.row.state == '成交'"
@click="handleSuccess(scope.row)"
v-hasPermi="['clue:pool:enroll']"
>

1
src/views/OKR/Meeting/index.vue
View File

@@ -67,6 +67,7 @@
<el-table-column prop="meetingSubject" label="会议主题" />
<el-table-column prop="startTime" label="会议时间" width="170px" />
<el-table-column prop="meetingRoom" label="会议地点" width="140px" />
<el-table-column prop="creatorName" label="发起人" width="100px" />
<el-table-column prop="expectEndTime" label="预计结束时间" width="170px" />
<el-table-column prop="expectUserName" label="预约参会人员" />
<el-table-column prop="actualUserName" label="实际参会人员" />