yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

数据权限

pull/781/head
zy 2025-05-17 17:40:48 +08:00
parent 0580b9876e
commit a3e714aad9
24 changed files with 668 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env.local
View File

@ -4,7 +4,10 @@ NODE_ENV=development
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径
VITE_BASE_URL='http://127.0.0.1:48080' # VITE_BASE_URL='http://8.130.12.151:48080'
# VITE_BASE_URL='http://lhy.free.idcfengye.com'
# VITE_BASE_URL='http://m94844f6.natappfree.cc'
VITE_BASE_URL='http://172.22.3.168:48080'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server

10
src/api/crm/business/index.ts
View File

@ -100,3 +100,13 @@ export const getBusinessPageByContact = async (params) => {
export const transferBusiness = async (data: TransferReqVO) => { export const transferBusiness = async (data: TransferReqVO) => {
return await request.put({ url: '/crm/business/transfer', data }) return await request.put({ url: '/crm/business/transfer', data })
} }
// 查询项目难度
export const getDifficult = async (params) => {
return await request.get({ url: `/crm/project-difficulty/page`, params })
}
// 查询平台
export const getTechnicalList = async (params) => {
return await request.get({ url: `/crm/technical-docking-checklist/page`, params })
}

5
src/api/crm/product/index.ts
View File

@ -50,3 +50,8 @@ export const deleteProduct = async (id: number) => {
export const exportProduct = async (params) => { export const exportProduct = async (params) => {
return await request.download({ url: `/crm/product/export-excel`, params }) return await request.download({ url: `/crm/product/export-excel`, params })
} }
// 查询产品列表
export const getInsuranceList = async () => {
return await request.get({ url: `/crm/service-fee-collection-method/get-insurance-list` })
}

5
src/api/crm/quotation/index.ts
View File

@ -85,6 +85,11 @@ export const QuotationApi = {
return await request.post({ url: `/crm/quotation/customer-confirm`, data }) return await request.post({ url: `/crm/quotation/customer-confirm`, data })
}, },
// 查询服务费收取方式
getServerMethodList: async (params: any) => {
return await request.get({ url: `/crm/service-fee-collection-method/page`, params })
},
// ==================== 子表（CRM 报价产品关联） ==================== // ==================== 子表（CRM 报价产品关联） ====================
// 获得CRM 报价产品关联列表 // 获得CRM 报价产品关联列表

3
src/components/processForm/index.ts Normal file
View File

@ -0,0 +1,3 @@
import processForm from './src/index.vue'
export { processForm }

39
src/components/processForm/src/index.vue Normal file
View File

@ -0,0 +1,39 @@
<template>
<el-form :model="model" :rules="rules" label-width="120px" v-loading="loading">
<el-row>
<!-- 动态渲染插槽内容 -->
<template v-for="(field, index) in Object.keys(fields)" :key="index">
<template v-if="!fields[field]">
<!-- 显示 -->
<slot :name="field"></slot>
</template>
</template>
</el-row>
</el-form>
</template>
<script lang="ts">
import { defineComponent, PropType } from 'vue';
export default defineComponent({
name: 'processForm',
props: {
model: {
type: Object as PropType<Record<string, any>>,
required: true,
},
rules: {
type: Object as PropType<Record<string, any>>,
required: true,
},
fields: {
type: Object as PropType<Record<string, { visible: boolean; readonly: boolean }>>,
required: true,
},
loading: {
type: Boolean,
default: false,
},
},
});
</script>

3
src/components/processTable/index.ts Normal file
View File

@ -0,0 +1,3 @@
import processTable from './src/index.vue'
export { processTable }

52
src/components/processTable/src/index.vue Normal file
View File

@ -0,0 +1,52 @@
<template>
<el-table :data="data" v-loading="loading" :stripe="stripe" :show-overflow-tooltip="showOverflowTooltip" style="width: 100%">
<!-- 插槽内容 -->
<template v-for="(slotName, index) in Object.keys(fields)" :key="index">
<template v-if="!fields[slotName]">
<slot :name="slotName" :scope="scope"></slot>
</template>
</template>
<slot name="other" :scope="scope"></slot>
</el-table>
</template>
<script lang="ts">
import { defineComponent, PropType, useSlots } from 'vue';
export default defineComponent({
name: 'AuthTable',
props: {
data: {
type: Array as PropType<any[]>,
required: true,
},
columns: {
type: Object as PropType<Record<string, { visible: boolean; label: string; width?: string }>>,
required: true,
},
loading: {
type: Boolean,
default: false,
},
stripe: {
type: Boolean,
default: true,
},
showOverflowTooltip: {
type: Boolean,
default: true,
},
fields: {
type: Object,
required: true,
},
},
setup() {
const slots = useSlots();
return {
slots,
};
},
});
</script>

4
src/plugins/formCreate/index.ts
View File

@ -64,6 +64,8 @@ import install from '@form-create/element-ui/auto-import'
//======================= 自定义组件 ======================= //======================= 自定义组件 =======================
import { UploadFile, UploadImg, UploadImgs } from '@/components/UploadFile' import { UploadFile, UploadImg, UploadImgs } from '@/components/UploadFile'
import { processForm } from '@/components/processForm'
import { processTable } from '@/components/processTable'
import { useApiSelect } from '@/components/FormCreate' import { useApiSelect } from '@/components/FormCreate'
import { Editor } from '@/components/Editor' import { Editor } from '@/components/Editor'
import DictSelect from '@/components/FormCreate/src/components/DictSelect.vue' import DictSelect from '@/components/FormCreate/src/components/DictSelect.vue'
@ -112,6 +114,8 @@ const components = [
UploadImg, UploadImg,
UploadImgs, UploadImgs,
UploadFile, UploadFile,
processForm,
processTable,
DictSelect, DictSelect,
UserSelect, UserSelect,
DeptSelect, DeptSelect,

2
src/router/modules/remaining.ts
View File

@ -894,7 +894,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
component: () => import('@/views/project/online/OnlineApplicationDetail.vue') component: () => import('@/views/project/online/OnlineApplicationDetail.vue')
}, },
{ {
path: 'briefWork/BriefWorkDetail', path: 'briefWork/BriefWorkProcess',
name: 'DayReportDetail', name: 'DayReportDetail',
meta: { meta: {
title: '日报详情', title: '日报详情',

31
src/views/crm/business/BusinessForm.vue
View File

@ -182,6 +182,30 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="项目难度" prop="projectDifficultyId">
<el-select v-model="formData.projectDifficultyId" :disabled="type" clearable placeholder="请选择项目难度">
<el-option
v-for="dict in difficultOptions"
:key="dict.id"
:label="dict.projectDifficulty"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="平台" prop="platformId">
<el-select v-model="formData.platformId" :disabled="type" clearable placeholder="请选择平台">
<el-option
v-for="dict in techOptions"
:key="dict.id"
:label="dict.name"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" :disabled="type" v-model="formData.remark" clearable :placeholder="formType ? '' : '请输入备注'" /> <el-input type="textarea" :disabled="type" v-model="formData.remark" clearable :placeholder="formType ? '' : '请输入备注'" />
@ -301,6 +325,8 @@ const formRef = ref();
const userOptions = ref<UserApi.UserVO[]>([]); const userOptions = ref<UserApi.UserVO[]>([]);
const statusTypeList = ref([]); const statusTypeList = ref([]);
const customerList = ref([]); const customerList = ref([]);
const techOptions = ref([]);
const difficultOptions = ref([]);
const deptTree = ref(); const deptTree = ref();
const props = defineProps({ const props = defineProps({
type: propTypes.number.def(undefined) type: propTypes.number.def(undefined)
@ -435,6 +461,11 @@ onMounted(async () => {
customerList.value = await CustomerApi.getSelfCustomerSimpleList(); customerList.value = await CustomerApi.getSelfCustomerSimpleList();
statusTypeList.value = await BusinessStatusApi.getBusinessStatusTypeSimpleList(); statusTypeList.value = await BusinessStatusApi.getBusinessStatusTypeSimpleList();
userOptions.value = await UserApi.getSimpleUserList(); userOptions.value = await UserApi.getSimpleUserList();
let techData = await BusinessApi.getTechnicalList({pageNo: 1, pageSize: 1000});//平台
console.log('%csrc/views/crm/business/BusinessForm.vue:468 diffData', 'color: #007acc;', techData);
techOptions.value = techData.list
let diffData = await BusinessApi.getDifficult({pageNo: 1, pageSize: 1000});//困难度
difficultOptions.value = diffData.list
deptTree.value = handleTree(await DeptApi.getSimpleDeptList()); deptTree.value = handleTree(await DeptApi.getSimpleDeptList());
}); });
</script> </script>

140
src/views/crm/capitalcost/CapitalCostForm.vue
View File

@ -1,63 +1,95 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="50%">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="140px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="项目编码" prop="projectCode"> <el-row>
<el-input v-model="formData.projectCode" placeholder="请输入项目编码" /> <el-col :span="12">
</el-form-item> <el-form-item label="项目编码" prop="projectCode">
<el-form-item label="结算账期" prop="paymentTerm"> <el-input v-model="formData.projectCode" placeholder="请输入项目编码" />
<el-select v-model="formData.paymentTerm" placeholder="请选择结算账期"> </el-form-item>
<el-option </el-col>
v-for="dict in getIntDictOptions(DICT_TYPE.PAYMENT_TERM)" <el-col :span="12">
:key="dict.value" <el-form-item label="结算账期" prop="paymentTerm">
:label="dict.label" <el-select v-model="formData.paymentTerm" placeholder="请选择结算账期">
:value="dict.value" <el-option
/> v-for="dict in getIntDictOptions(DICT_TYPE.PAYMENT_TERM)"
</el-select> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="授信方式" prop="creditMethod"> :value="dict.value"
<el-select v-model="formData.creditMethod" placeholder="请选择授信方式"> />
<el-option </el-select>
v-for="dict in getIntDictOptions(DICT_TYPE.CREDIT_METHOD)" </el-form-item>
:key="dict.value" </el-col>
:label="dict.label" <el-col :span="12">
:value="dict.value" <el-form-item label="授信方式" prop="creditMethod">
/> <el-select v-model="formData.creditMethod" placeholder="请选择授信方式">
</el-select> <el-option
</el-form-item> v-for="dict in getIntDictOptions(DICT_TYPE.CREDIT_METHOD)"
<el-form-item label="适用项目" prop="applicableProjects"> :key="dict.value"
<el-select v-model="formData.applicableProjects" placeholder="请选择适用项目"> :label="dict.label"
<el-option :value="dict.value"
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_APPLICABLE_PROJECTS)" />
:key="dict.value" </el-select>
:label="dict.label" </el-form-item>
:value="dict.value" </el-col>
/> <el-col :span="12">
</el-select> <el-form-item label="适用项目" prop="applicableProjects">
</el-form-item> <el-select v-model="formData.applicableProjects" placeholder="请选择适用项目">
<el-form-item label="计算周期" prop="creditCalcCycle"> <el-option
<el-input v-model="formData.creditCalcCycle" placeholder="请输入计算周期" /> v-for="dict in getIntDictOptions(DICT_TYPE.CRM_APPLICABLE_PROJECTS)"
</el-form-item> :key="dict.value"
<el-form-item label="出票周期" prop="ticketIssuanceCycle"> :label="dict.label"
<el-input v-model="formData.ticketIssuanceCycle" placeholder="请输入出票周期" /> :value="dict.value"
</el-form-item> />
<el-form-item label="结算周期" prop="settlementCycle"> </el-select>
<el-input v-model="formData.settlementCycle" placeholder="请输入结算周期" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="使用天数" prop="usageDays"> <el-col :span="12">
<el-input v-model="formData.usageDays" placeholder="请输入使用天数" /> <el-form-item label="计算周期" prop="creditCalcCycle">
</el-form-item> <el-input v-model="formData.creditCalcCycle" placeholder="请输入计算周期" />
<el-form-item label="年利率" prop="annualInterestRate"> </el-form-item>
<el-input v-model="formData.annualInterestRate" placeholder="请输入年利率" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="备注" prop="remark"> <el-form-item label="出票周期" prop="ticketIssuanceCycle">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.ticketIssuanceCycle" placeholder="请输入出票周期" />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结算周期" prop="settlementCycle">
<el-input v-model="formData.settlementCycle" placeholder="请输入结算周期" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="使用天数" prop="usageDays">
<el-input v-model="formData.usageDays" placeholder="请输入使用天数" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="年利率" prop="annualInterestRate">
<el-input v-model="formData.annualInterestRate" placeholder="请输入年利率" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="比例收费" prop="proportionalFee">
<el-input v-model="formData.proportionalFee" placeholder="请输入比例收费" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="授信额度计算周期" prop="creditLimitCalculationCycle">
<el-input v-model="formData.creditLimitCalculationCycle" placeholder="请输入授信额度计算周期" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" :rows="5" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -102,6 +134,8 @@ const formRules = reactive({
settlementCycle: [{ required: true, message: '结算周期不能为空', trigger: 'blur' }], settlementCycle: [{ required: true, message: '结算周期不能为空', trigger: 'blur' }],
usageDays: [{ required: true, message: '使用天数不能为空', trigger: 'blur' }], usageDays: [{ required: true, message: '使用天数不能为空', trigger: 'blur' }],
annualInterestRate: [{ required: true, message: '年利率不能为空', trigger: 'blur' }], annualInterestRate: [{ required: true, message: '年利率不能为空', trigger: 'blur' }],
proportionalFee: [{ required: true, message: '比例收费不能为空', trigger: 'blur' }],
creditLimitCalculationCycle: [{ required: true, message: '授信额度计算周期不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref

32
src/views/crm/contract-change-record/index.vue
View File

@ -74,15 +74,15 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true"> <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
<el-table-column align="center" fixed="left" label="合同名称" prop="name" width="160"> <!-- <el-table-column align="center" fixed="left" label="合同名称" prop="name" width="160">
<template #default="scope"> <template #default="scope">
<el-link :underline="false" type="primary" @click="openDetail(scope.row)"> <el-link :underline="false" type="primary" @click="openDetail(scope.row)">
{{ scope.row.name }} {{ scope.row.name }}
</el-link> </el-link>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" label="合同编号" prop="no" width="180" /> <el-table-column align="center" label="目前额度（元）" prop="creditLimit" />
<el-table-column align="center" label="客户名称" prop="customerName" width="120"> <el-table-column align="center" label="调整金额（元）" prop="changeAmount">
<!-- <template #default="scope"> <!-- <template #default="scope">
<el-link <el-link
:underline="false" :underline="false"
@ -106,9 +106,8 @@
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column
align="center" align="center"
label="合同金额（元）" label="最终额度（元）"
prop="totalPrice" prop="afterAmount"
width="140"
:formatter="erpPriceTableColumnFormatter" :formatter="erpPriceTableColumnFormatter"
/> />
<!-- <el-table-column <!-- <el-table-column
@ -120,18 +119,17 @@
/>--> />-->
<el-table-column <el-table-column
align="center" align="center"
label="合同开始时间" label="调整金额截止日期"
prop="startTime" prop="changeAmountDeadline"
width="120"
:formatter="dateFormatter2" :formatter="dateFormatter2"
/> />
<el-table-column <!-- <el-table-column
align="center" align="center"
label="合同结束时间" label="合同结束时间"
prop="endTime" prop="endTime"
width="120" width="120"
:formatter="dateFormatter2" :formatter="dateFormatter2"
/> /> -->
<!-- <el-table-column align="center" label="客户签约人" prop="signContactName" width="130"> <!-- <el-table-column align="center" label="客户签约人" prop="signContactName" width="130">
<template #default="scope"> <template #default="scope">
<el-link <el-link
@ -170,7 +168,7 @@
prop="contactLastTime" prop="contactLastTime"
width="180px" width="180px"
/>--> />-->
<el-table-column align="center" label="负责人" prop="ownerUserName" width="120" /> <!-- <el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
<el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" /> <el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
<el-table-column <el-table-column
:formatter="dateFormatter" :formatter="dateFormatter"
@ -186,13 +184,13 @@
prop="createTime" prop="createTime"
width="180px" width="180px"
/> />
<el-table-column align="center" label="创建人" prop="creatorName" width="120" /> <el-table-column align="center" label="创建人" prop="creatorName" width="120" /> -->
<el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120"> <!-- <el-table-column align="center" fixed="right" label="合同状态" prop="auditStatus" width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" /> <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column align="center" fixed="right" label="操作" width="180"> <el-table-column align="center" fixed="right" label="操作" width="120">
<template #default="scope"> <template #default="scope">
<div style="display:flex"> <div style="display:flex">
<el-button <el-button

17
src/views/crm/product/ProductForm.vue
View File

@ -71,6 +71,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="保险名称" prop="insuranceId">
<el-select v-model="formData.insuranceId" class="w-1/1" placeholder="请选择保险名称">
<el-option
v-for="dict in insuranceList"
:key="dict.id"
:label="dict.productDetail"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="产品描述" prop="description"> <el-form-item label="产品描述" prop="description">
<el-input v-model="formData.description" placeholder="请输入产品描述" type="textarea" :rows="3"/> <el-input v-model="formData.description" placeholder="请输入产品描述" type="textarea" :rows="3"/>
@ -94,6 +107,7 @@ defineOptions({ name: 'CrmProductForm' })
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const insuranceList = ref([]) // 保险列表
const dialogVisible = ref(false) // 弹窗的是否展示 const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题 const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@ -133,6 +147,9 @@ const open = async (type: string, id?: number) => {
formLoading.value = false formLoading.value = false
} }
} }
//获取保险列表
insuranceList.value = await ProductApi.getInsuranceList()
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗

18
src/views/crm/productprocurementcost/ProductProcurementCostForm.vue
View File

@ -96,6 +96,21 @@
<el-input v-model="formData.consultantManagement" placeholder="请输入顾问管理" /> <el-input v-model="formData.consultantManagement" placeholder="请输入顾问管理" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="基础服务费" prop="basicServiceFee">
<el-input v-model="formData.basicServiceFee" placeholder="请输入顾问管理" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="代订服务费" prop="bookingPaymentServiceFee">
<el-input v-model="formData.bookingPaymentServiceFee" placeholder="请输入顾问管理" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="票据分拣服务费" prop="billSortingServiceFee">
<el-input v-model="formData.billSortingServiceFee" placeholder="请输入顾问管理" />
</el-form-item>
</el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input type="textarea" :rows="5" v-model="formData.remark" placeholder="请输入备注" /> <el-input type="textarea" :rows="5" v-model="formData.remark" placeholder="请输入备注" />
@ -160,6 +175,9 @@ const formRules = reactive({
consultantOrderCost: [{ required: true, message: '顾问订单成本不能为空', trigger: 'blur' }], consultantOrderCost: [{ required: true, message: '顾问订单成本不能为空', trigger: 'blur' }],
markupCommission: [{ required: true, message: '溢价分佣不能为空', trigger: 'blur' }], markupCommission: [{ required: true, message: '溢价分佣不能为空', trigger: 'blur' }],
consultantManagement: [{ required: true, message: '顾问管理不能为空', trigger: 'blur' }], consultantManagement: [{ required: true, message: '顾问管理不能为空', trigger: 'blur' }],
basicServiceFee: [{ required: true, message: '基础服务费不能为空', trigger: 'blur' }],
bookingPaymentServiceFee: [{ required: true, message: '代订服务费不能为空', trigger: 'blur' }],
billSortingServiceFee: [{ required: true, message: '票据分拣服务费不能为空', trigger: 'blur' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref

20
src/views/crm/productprocurementcost/index.vue
View File

@ -64,7 +64,11 @@
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品名称" align="center" prop="projectId" /> <el-table-column label="产品名称" align="center" prop="projectId" width="180">
<template #default="scope">
{{getName(productList, scope.row.projectId)}}
</template>
</el-table-column>
<el-table-column label="产品编号" align="center" prop="projectCode" /> <el-table-column label="产品编号" align="center" prop="projectCode" />
<el-table-column label="产品类型" align="center" prop="projectCode" /> <el-table-column label="产品类型" align="center" prop="projectCode" />
<el-table-column label="明细类型" align="center" prop="projectCode" /> <el-table-column label="明细类型" align="center" prop="projectCode" />
@ -95,7 +99,7 @@
<el-button <el-button
link link
type="primary" type="primary"
@click="openForm('update', scope.row.projectId)" @click="openForm('update', scope.row.id)"
v-hasPermi="['crm:product-procurement-cost:update']" v-hasPermi="['crm:product-procurement-cost:update']"
> >
编辑 编辑
@ -129,6 +133,9 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { ProductProcurementCostApi, ProductProcurementCostVO } from '@/api/crm/productprocurementcost' import { ProductProcurementCostApi, ProductProcurementCostVO } from '@/api/crm/productprocurementcost'
import ProductProcurementCostForm from './ProductProcurementCostForm.vue' import ProductProcurementCostForm from './ProductProcurementCostForm.vue'
import * as ProductApi from '@/api/crm/product'
const productList = ref<ProductApi.ProductVO[]>([]) // 产品列表
/** 产品采购成本 列表 */ /** 产品采购成本 列表 */
defineOptions({ name: 'ProductProcurementCost' }) defineOptions({ name: 'ProductProcurementCost' })
@ -207,8 +214,15 @@ const handleExport = async () => {
} }
} }
const getName = (opt, val) => {
const arr = opt.filter(v => v.id == val)
return arr.length ? arr[0]['name'] : ''
}
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(async() => {
getList() getList()
productList.value = await ProductApi.getProductSimpleList()
}) })
</script> </script>

33
src/views/crm/quotation/QuotationForm.vue
View File

@ -4,7 +4,7 @@
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="110px" label-width="130px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-row> <el-row>
@ -203,7 +203,18 @@
<el-input v-model="formData.businessLicense" disabled /> <el-input v-model="formData.businessLicense" disabled />
</el-form-item> </el-form-item>
</el-col>--> </el-col>-->
<el-col :span="8">
<el-form-item label="服务费收取方式" prop="serviceFeeCollectionMethodId">
<el-select v-model="formData.serviceFeeCollectionMethodId" placeholder="请选择服务费收取方式">
<el-option
v-for="dict in serverMethodList"
:key="dict.id"
:label="dict.productDetail"
:value="dict.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -422,6 +433,7 @@ const deptTree = ref() // 部门树形结构
const deptList = ref() // 部门 const deptList = ref() // 部门
const orgList = ref([]) const orgList = ref([])
const handleType = ref('') const handleType = ref('')
const serverMethodList = ref([])
const invoiceTemplateList = ref([]) const invoiceTemplateList = ref([])
const { proxy }: any = getCurrentInstance(); const { proxy }: any = getCurrentInstance();
@ -437,6 +449,7 @@ const formData = ref({
invoiceTemplateId: undefined, invoiceTemplateId: undefined,
processInstanceId: undefined, processInstanceId: undefined,
auditStatus: undefined, auditStatus: undefined,
serviceFeeCollectionMethodId: undefined,
ownerUserId: undefined, ownerUserId: undefined,
expanderUserId: undefined, expanderUserId: undefined,
pricingUserId: undefined, pricingUserId: undefined,
@ -498,6 +511,7 @@ const formRules = reactive({
creditMethod: [{ required: true, message: '授信方式不能为空', trigger: 'change' }], creditMethod: [{ required: true, message: '授信方式不能为空', trigger: 'change' }],
creditCalcCycle: [{ required: true, message: '授信计算周期不能为空', trigger: 'change' }], creditCalcCycle: [{ required: true, message: '授信计算周期不能为空', trigger: 'change' }],
quotationTimes: [{ required: true, message: '第几次报价不能为空', trigger: 'change' }], quotationTimes: [{ required: true, message: '第几次报价不能为空', trigger: 'change' }],
serviceFeeCollectionMethodId: [{ required: true, message: '服务费收取方式不能为空', trigger: 'change' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref
@ -539,8 +553,13 @@ const setSuccess = (val) => {
const RevenueAnalysisFormRef = ref('') const RevenueAnalysisFormRef = ref('')
const newProducts = ref([]) const newProducts = ref([])
const handleClick = (val) => { const handleClick = (val) => {
console.log('%csrc/views/crm/quotation/QuotationForm.vue:556 subTabsName.value ', 'color: #007acc;', subTabsName.value );
if (subTabsName.value == 'RevenueAnalysis') return
if(!formData.value.serviceFeeCollectionMethodId) return message.warning('请选择服务费收取方式')
console.log('%csrc/views/crm/quotation/QuotationForm.vue:561 1111', 'color: #007acc;', 1111);
newProducts.value = [] newProducts.value = []
console.log('%csrc/views/crm/quotation/QuotationForm.vue:540 val', 'color: #007acc;', subTabsName.value);
formData.value.products.forEach( item => { formData.value.products.forEach( item => {
newProducts.value.push({ newProducts.value.push({
id: item.productId, id: item.productId,
@ -548,16 +567,17 @@ const handleClick = (val) => {
offlinePrice: item.offlinePrice, offlinePrice: item.offlinePrice,
productUnit: item.productUnit, productUnit: item.productUnit,
productName: item.productName, productName: item.productName,
detailType: item.detailType,
category: item.category category: item.category
}) })
}) })
let data = { let data = {
businessId: formData.value.businessId, businessId: formData.value.businessId,
creditMethod: formData.value.creditMethod, creditMethod: formData.value.creditMethod,
serviceFeeCollectionMethodId: formData.value.serviceFeeCollectionMethodId,
paymentTerm: formData.value.paymentTerm, paymentTerm: formData.value.paymentTerm,
quotationProducts: newProducts.value quotationProducts: newProducts.value
} }
console.log('%csrc/views/crm/quotation/QuotationForm.vue:551 newProducts.value', 'color: #007acc;', newProducts.value);
RevenueAnalysisFormRef.value.getData(data) RevenueAnalysisFormRef.value.getData(data)
} }
@ -654,6 +674,8 @@ const open = async (type: string) => {
try { try {
formData.value = await QuotationApi.getQuotation(type) formData.value = await QuotationApi.getQuotation(type)
formData.value.creditLimit = (formData.value.creditAmount || 0) + (formData.value.creditLimitNum || 0) formData.value.creditLimit = (formData.value.creditAmount || 0) + (formData.value.creditLimitNum || 0)
formData.value.serviceFeeCollectionMethodId = Number(formData.value.serviceFeeCollectionMethodId)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -762,6 +784,9 @@ onMounted(async () => {
businessList.value = await BusinessApi.getSelfSimpleBusinessList() businessList.value = await BusinessApi.getSelfSimpleBusinessList()
// 获得部门树 // 获得部门树
deptTree.value = handleTree(await DeptApi.getSimpleDeptList()) deptTree.value = handleTree(await DeptApi.getSimpleDeptList())
//服务费收取方式
let serverList = await QuotationApi.getServerMethodList({pageNo: 1, pageSize: 1000})
serverMethodList.value = serverList.list
const org = await ContractApi.getOrg({ const org = await ContractApi.getOrg({
pageNo: 1, pageNo: 1,
pageSize: 1000 pageSize: 1000

105
src/views/crm/quotation/components/RevenueAnalysis.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<el-table :data="formData" class="-mt-10px"> <el-table :data="formData" class="-mt-10px" v-loading="loading" :summary-method="getSummaries"
show-summary>
<el-table-column label="产品类型" align="center" min-width="150"> <el-table-column label="产品类型" align="center" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="row.category" /> <dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="row.category" />
@ -11,49 +12,51 @@
<dict-tag :type="DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE" :value="row.detailType" /> <dict-tag :type="DICT_TYPE.CRM_PRODUCT_DETAIL_TYPE" :value="row.detailType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="销售额" align="center" min-width="150"> <el-table-column label="销售额" align="center" prop="revenueAnalysisVO.salesVolume" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
{{row.revenueAnalysisVO.salesVolume}} {{row.revenueAnalysisVO.salesVolume}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单量" align="center" min-width="150"> <el-table-column label="订单量" align="center" prop="revenueAnalysisVO.totalOrderVolume" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
{{row.revenueAnalysisVO.totalOrderVolume}} {{row.revenueAnalysisVO.totalOrderVolume}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="营业收入" align="center" min-width="150"> <el-table-column label="营业收入" align="center" prop="revenueAnalysisVO.totalIncome" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
{{row.revenueAnalysisVO.totalIncome}} {{row.revenueAnalysisVO.totalIncome}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收入利率" align="center" min-width="130"> <el-table-column label="收入利率（%）" align="center" prop="revenueAnalysisVO.incomeInterestRate" min-width="130">
<template #default="{ row }"> <template #default="{ row }">
{{(row.revenueAnalysisVO.incomeInterestRate * 100).toFixed(2) + '%'}} {{(row.revenueAnalysisVO.incomeInterestRate * 100).toFixed(2) + '%'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="应扣成本" align="center" min-width="150"> <el-table-column label="应扣成本" align="center" prop="revenueAnalysisVO.deductibleCost" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
{{row.revenueAnalysisVO.deductibleCost}} {{row.revenueAnalysisVO.deductibleCost}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="利润" align="center" min-width="150"> <el-table-column label="利润" align="center" prop="revenueAnalysisVO.profit" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
{{row.revenueAnalysisVO.profit}} {{row.revenueAnalysisVO.profit}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="利润率" align="center" min-width="250"> <el-table-column label="利润率（%）" align="center" prop="revenueAnalysisVO.profitRate" min-width="250">
<template #default="{ row }"> <template #default="{ row }">
{{(row.revenueAnalysisVO.profitRate * 100).toFixed(2) + '%'}} {{(row.revenueAnalysisVO.profitRate * 100).toFixed(2) + '%'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="您的分润比例" align="center" min-width="150"> <el-table-column label="您的分润比例（%）" align="center" prop="revenueAnalysisVO.profitSharingRatio" min-width="150">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_INVOICE" :value="row.serviceInvoice" /> <!-- <dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_INVOICE" :value="row.serviceInvoice" /> -->
{{(row.revenueAnalysisVO.profitSharingRatio * 100).toFixed(2) + '%'}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="您的分润收入" align="center" min-width="250"> <el-table-column label="您的分润收入" align="center" prop="revenueAnalysisVO.profitSharingIncome" min-width="250">
<template #default="{ row }"> <template #default="{ row }">
<dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_INVOICE_ITEMS" :value="row.serviceInvoiceItem" /> <!-- <dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_INVOICE_ITEMS" :value="row.serviceInvoiceItem" /> -->
{{row.revenueAnalysisVO.profitSharingIncome}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -69,14 +72,90 @@ const props = defineProps<{
products: undefined products: undefined
}>() }>()
const loading = ref(true) // 列表的加载中
const formLoading = ref(false) // 表单的加载中 const formLoading = ref(false) // 表单的加载中
const formData = ref([]) const formData = ref([])
interface RevenueAnalysisVO {
id: string
name: string
salesVolume: number
totalOrderVolume: number
totalIncome: number
incomeInterestRate: number
deductibleCost: number
profit: number
profitRate: number
}
interface SummaryMethodProps<T = RevenueAnalysisVO> {
columns: TableColumnCtx<T>[]
data: T[]
}
interface Product {
id: number
productName: string
revenueAnalysisVO: RevenueAnalysisVO
}
const getSummaries = (param: SummaryMethodProps<Product>) => {
const { columns, data } = param
const sums: string[] = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const property = column.property
// if(property === 'evenueAnalysisVO.profitSharingIncome' || property === 'revenueAnalysisVO.profitSharingRatio') {
// }
const isNestedField = property ? property.includes('.') : ''
let values: number[] = []
if (isNestedField) {
const [parentField, childField] = property.split('.')
values = data.map((item) => {
const parentValue = item[parentField as keyof Product]
return parentValue ? Number((parentValue as any)[childField]) : NaN
})
} else {
values = data.map((item) => Number(item[property as keyof Product]))
}
if (!values.every((value) => Number.isNaN(value))) {
let total = `${values.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + value
} else {
return prev
}
}, 0)}`
// 检查是否是百分比字段
if (column.label.includes('%')) {
sums[index] = `${(total * 100).toFixed(2)}%` // 转换为百分比格式
} else {
sums[index] = `${Number(total).toFixed(2)}` // 保留两位小数
}
} else {
sums[index] = ''
}
})
return sums
}
/** 表单值 */ /** 表单值 */
const getData = async (data) => { const getData = async (data) => {
loading.value = true
try {
let list = await QuotationApi.getRevenueList(data) let list = await QuotationApi.getRevenueList(data)
console.log('%csrc/views/crm/quotation/components/RevenueAnalysis.vue:79 list.totalRevenueAnalysis', 'color: #007acc;', list.totalRevenueAnalysis);
formData.value = list.quotationProducts formData.value = list.quotationProducts
} finally {
loading.value = false
}
} }
const getName = (opt, val) => { const getName = (opt, val) => {
const arr = opt.filter(v => v.value == val) const arr = opt.filter(v => v.value == val)

169
src/views/project/briefWeekWork/BriefWorkWeekDetail.vue
View File

@ -1,79 +1,94 @@
<template> <template>
<ContentWrap> <ContentWrap>
<el-form <processForm
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
:fields="formFields"
label-width="120px" label-width="120px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-row> <template #briefStartDate>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="简报开始日期" prop="briefStartDate"> <el-form-item label="简报开始日期" prop="briefStartDate">
<el-date-picker <el-date-picker
v-model="formData.briefStartDate" v-model="formData.briefStartDate"
type="date" type="date"
disabled
value-format="YYYY-MM-DD"
placeholder="选择简报开始日期"
/>
</el-form-item>
</el-col>
</template>
<template #briefEndDate>
<el-col :span="8">
<el-form-item label="简报结束日期" prop="briefEndDate">
<el-date-picker
disabled disabled
value-format="YYYY-MM-DD" v-model="formData.briefEndDate"
placeholder="选择简报开始日期" type="date"
/> value-format="YYYY-MM-DD"
</el-form-item> placeholder="选择简报结束日期"
</el-col> />
<el-col :span="8"> </el-form-item>
<el-form-item label="简报结束日期" prop="briefEndDate"> </el-col>
<el-date-picker </template>
disabled <template #selectCustomer>
v-model="formData.briefEndDate" <el-col :span="8">
type="date" <el-form-item label="是否选择客户" prop="selectCustomer">
value-format="YYYY-MM-DD" <el-radio-group v-model="formData.selectCustomer" disabled>
placeholder="选择简报结束日期" <el-radio :label="true">是</el-radio>
/> <el-radio :label="false">否</el-radio>
</el-form-item> </el-radio-group>
</el-col> </el-form-item>
<el-col :span="8"> </el-col>
<el-form-item label="是否选择客户" prop="selectCustomer"> </template>
<el-radio-group v-model="formData.selectCustomer" disabled> <template #other>
<el-radio :label="true">是</el-radio> <el-col :span="24">
<el-radio :label="false">否</el-radio> <ContentWrap style="border: none;font-weight: 700" v-if="formData.selectCustomer">
</el-radio-group> 选择客户
</el-form-item> </ContentWrap>
</el-col> <CustomerForm ref="customerFormRef" :formFields="formFields" :userOptions="userOptions" :type="1" :dataList="formData.followUpRecords" v-if="formData.selectCustomer" />
<el-col :span="24"> <ContentWrap style="border: none;font-weight: 700" >
<ContentWrap style="border: none;font-weight: 700" v-if="formData.selectCustomer"> 选择任务
选择客户 </ContentWrap>
</ContentWrap> <TaskForm ref="taskFormRef" :formFields="formFields" :type="1" :dataList="formData.tasks" />
<CustomerForm ref="customerFormRef" :userOptions="userOptions" :type="1" :dataList="formData.followUpRecords" v-if="formData.selectCustomer" /> <!-- <ContentWrap style="border: none;font-weight: 700" >
<ContentWrap style="border: none;font-weight: 700" > 日报信息
选择任务 </ContentWrap>
</ContentWrap> <DayReportForm :reportType="1" :type="1" ref="dayReportFormRef" :time="time" /> -->
<TaskForm ref="taskFormRef" :type="1" :dataList="formData.tasks" /> </el-col>
<!-- <ContentWrap style="border: none;font-weight: 700" > </template>
日报信息 <template #workComplate>
</ContentWrap> <el-col :span="24">
<DayReportForm :reportType="1" :type="1" ref="dayReportFormRef" :time="time" /> --> <el-form-item label="本周完成工作" prop="workComplate">
</el-col> <el-input type="textarea" disabled :rows="5" v-model="formData.workComplate" placeholder="请输入本日完成工作" />
<el-col :span="24"> </el-form-item>
<el-form-item label="本周完成工作" prop="workComplate"> </el-col>
<el-input type="textarea" disabled :rows="5" v-model="formData.workComplate" placeholder="请输入本日完成工作" /> </template>
</el-form-item> <template #workPlan>
</el-col> <el-col :span="24">
<el-col :span="24"> <el-form-item label="下周工作计划" prop="workPlan">
<el-form-item label="下周工作计划" prop="workPlan"> <el-input type="textarea" disabled :rows="5" v-model="formData.workPlan" placeholder="请输入明日工作计划" />
<el-input type="textarea" disabled :rows="5" v-model="formData.workPlan" placeholder="请输入明日工作计划" /> </el-form-item>
</el-form-item> </el-col>
</el-col> </template>
<el-col :span="24"> <template #workAssistance>
<el-form-item label="工作困难及协助" prop="workAssistance"> <el-col :span="24">
<el-input type="textarea" disabled :rows="5" v-model="formData.workAssistance" placeholder="请输入工作困难及协助" /> <el-form-item label="工作困难及协助" prop="workAssistance">
</el-form-item> <el-input type="textarea" disabled :rows="5" v-model="formData.workAssistance" placeholder="请输入工作困难及协助" />
</el-col> </el-form-item>
<el-col :span="24"> </el-col>
<el-form-item label="附件" prop="attachment"> </template>
<UploadFile v-model="formData.attachment" :disabled="!!formType" :limit="1" :fileType="['doc','docx']"/> <template #attachment>
</el-form-item> <el-col :span="24">
</el-col> <el-form-item label="附件" prop="attachment">
</el-row> <UploadFile v-model="formData.attachment" :disabled="!!formType" :limit="1" :fileType="['doc','docx']"/>
</el-form> </el-form-item>
</el-col>
</template>
</processForm>
</ContentWrap> </ContentWrap>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -99,6 +114,25 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const time = ref([]) // const time = ref([]) //
const formFields = ref({ //字段显示隐藏权限控制,字段顺序就是显示的顺序
briefStartDate: false,
briefEndDate: false,
selectCustomer: false,
other: false,
workComplate: false ,
workPlan: false,
workAssistance: false,
attachment: false,
name: false,
followUpStatus: false ,
contactLastContent: false,
contactLastTime: false,
followUpUserId: false,
taskName: false,
taskLevel: false,
userId: false,
taskDescribe: false,
})
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
briefType: 2, briefType: 2,
@ -192,7 +226,6 @@ const resetForm = () => {
processInstanceId: undefined, processInstanceId: undefined,
auditStatus: undefined auditStatus: undefined
} }
formRef.value?.resetFields()
} }
const route = useRoute(); const route = useRoute();

15
src/views/project/briefWeekWork/BriefWorkWeekForm.vue
View File

@ -42,11 +42,11 @@
<ContentWrap style="border: none;font-weight: 700" v-if="formData.selectCustomer"> <ContentWrap style="border: none;font-weight: 700" v-if="formData.selectCustomer">
选择客户 选择客户
</ContentWrap> </ContentWrap>
<CustomerForm ref="customerFormRef" :userOptions="userOptions" v-if="formData.selectCustomer" /> <CustomerForm ref="customerFormRef" :formFields="formFields" :userOptions="userOptions" v-if="formData.selectCustomer" />
<ContentWrap style="border: none;font-weight: 700" > <ContentWrap style="border: none;font-weight: 700" >
选择任务 选择任务
</ContentWrap> </ContentWrap>
<TaskForm ref="taskFormRef" :dataList="formData.tasks" /> <TaskForm ref="taskFormRef" :formFields="formFields" :dataList="formData.tasks" />
<ContentWrap style="border: none;font-weight: 700" > <ContentWrap style="border: none;font-weight: 700" >
日报信息 日报信息
</ContentWrap> </ContentWrap>
@ -99,6 +99,17 @@ const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const time = ref([]) // const time = ref([]) //
const formFields = ref({ //字段显示隐藏权限控制,字段顺序就是显示的顺序
name: false,
followUpStatus: false ,
contactLastContent: false,
contactLastTime: false,
followUpUserId: false,
taskName: false,
taskLevel: false,
userId: false,
taskDescribe: false,
})
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
briefType: 2, briefType: 2,

71
src/views/project/briefWeekWork/components/selectCustomer.vue
View File

@ -1,35 +1,47 @@
<template> <template>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <AuthTable v-loading="loading" :fields="formFields" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="唯一主键" align="center" prop="id" /> --> <!-- <el-table-column label="唯一主键" align="center" prop="id" /> -->
<!-- <el-table-column label="项目ID" align="center" prop="projectId" /> --> <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
<el-table-column label="单位名称" align="center" prop="name" /> <template #name>
<el-table-column label="跟进类型" align="center" prop="followUpStatus"> <el-table-column label="单位名称" align="center" prop="name" />
<template #default="scope"> </template>
<dict-tag :type="DICT_TYPE.CRM_FOLLOW_UP_TYPE" :value="scope.row.followUpType" /> <template #followUpStatus>
</template> <el-table-column label="跟进类型" align="center" prop="followUpStatus">
</el-table-column> <template #default="scope">
<el-table-column label="跟进内容" align="center" prop="contactLastContent" /> <dict-tag :type="DICT_TYPE.CRM_FOLLOW_UP_TYPE" :value="scope.row.followUpType" />
<el-table-column label="跟进时间" align="center" prop="contactLastTime" :formatter="dateFormatter" /> </template>
<el-table-column label="跟进人" align="center" prop="followUpUserId"> </el-table-column>
<template #default="scope"> </template>
{{getName(userOptions, scope.row.followUpUserId)}} <template #contactLastContent>
</template> <el-table-column label="跟进内容" align="center" prop="contactLastContent" />
</el-table-column> </template>
<el-table-column label="操作" align="center" min-width="120px" v-if="!type"> <template #contactLastTime>
<template #default="scope"> <el-table-column label="跟进时间" align="center" prop="contactLastTime" :formatter="dateFormatter" />
<el-button </template>
link <template #followUpUserId>
type="danger" <el-table-column label="跟进人" align="center" prop="followUpUserId">
@click="handleDelete(scope.$index)" <template #default="scope">
v-hasPermi="['task:selectCustomer:delete']" {{getName(userOptions, scope.row.followUpUserId)}}
> </template>
删除 </el-table-column>
</el-button> </template>
</template> <template #other>
</el-table-column> <el-table-column label="操作" align="center" width="120px" v-if="!type">
</el-table> <template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.$index)"
v-hasPermi="['task:selectCustomer:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</template>
</AuthTable>
<el-row justify="center" class="mt-3" v-if="!type"> <el-row justify="center" class="mt-3" v-if="!type">
<el-button @click="openForm" round>+ 添加</el-button> <el-button @click="openForm" round>+ 添加</el-button>
</el-row> </el-row>
@ -72,6 +84,7 @@ const props = defineProps({
id: propTypes.number.def(undefined), id: propTypes.number.def(undefined),
type: propTypes.number.def(undefined), type: propTypes.number.def(undefined),
dataList: propTypes.object.def([]), dataList: propTypes.object.def([]),
formFields: {},
}) })
const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
const loading = ref(false) // 列表的加载中 const loading = ref(false) // 列表的加载中
@ -109,7 +122,6 @@ const getList = (val: []) => {
} }
val.forEach(item => { val.forEach(item => {
if(!list.value.some(v => v.id === item.id)) { if(!list.value.some(v => v.id === item.id)) {
console.log('%csrc/views/project/briefWeekWork/components/selectCustomer.vue:95 val', 'color: #007acc;', val);
val.forEach(item => { val.forEach(item => {
list.value.push({ list.value.push({
"name": item.name, "name": item.name,
@ -120,7 +132,6 @@ const getList = (val: []) => {
"id": item.id, "id": item.id,
}) })
}) })
console.log('%csrc/views/project/briefWeekWork/components/selectCustomer.vue:122 list.value', 'color: #007acc;', list.value);
} }
}) })
@ -151,7 +162,6 @@ const handleDelete = async (i: number) => {
// 删除的二次确认 // 删除的二次确认
await message.delConfirm() await message.delConfirm()
// 发起删除 // 发起删除
console.log('%csrc/views/task/briefWeekWork/components/selectCustomer.vue:132 i', 'color: #007acc;', i);
list.value.splice(i, 1) list.value.splice(i, 1)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// 刷新列表 // 刷新列表
@ -175,7 +185,6 @@ const handleExport = async () => {
} }
const getName = (opt, val) => { const getName = (opt, val) => {
console.log('%csrc/views/project/briefWeekWork/components/selectCustomer.vue:176 opt,val', 'color: #007acc;', props.userOptions,val);
const arr = opt.filter(v => v.id == val) const arr = opt.filter(v => v.id == val)
return arr.length ? arr[0]['nickname'] : '' return arr.length ? arr[0]['nickname'] : ''
} }

63
src/views/project/briefWeekWork/components/selectTask.vue
View File

@ -1,34 +1,44 @@
<template> <template>
<!-- 列表 --> <!-- 列表 -->
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <AuthTable v-loading="loading" :fields="formFields" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="唯一主键" align="center" prop="id" /> --> <!-- <el-table-column label="唯一主键" align="center" prop="id" /> -->
<!-- <el-table-column label="项目ID" align="center" prop="projectId" /> --> <!-- <el-table-column label="项目ID" align="center" prop="projectId" /> -->
<el-table-column label="任务标题" align="center" prop="taskName" /> <template #taskName>
<el-table-column label="任务优先级" align="center" prop="taskLevel"> <el-table-column label="任务标题" align="center" prop="taskName" />
<template #default="scope"> </template>
<dict-tag :type="DICT_TYPE.TTS_TASK_LEVEL" :value="scope.row.taskLevel" /> <template #taskLevel>
</template> <el-table-column label="任务优先级" align="center" prop="taskLevel">
</el-table-column> <template #default="scope">
<el-table-column label="任务负责人" align="center" prop="userId"> <dict-tag :type="DICT_TYPE.TTS_TASK_LEVEL" :value="scope.row.taskLevel" />
<template #default="scope"> </template>
{{getName(userOptions, scope.row.userId)}} </el-table-column>
</template> </template>
</el-table-column> <template #userId>
<el-table-column label="任务描述" align="center" prop="taskDescribe" /> <el-table-column label="任务负责人" align="center" prop="userId">
<el-table-column label="操作" align="center" min-width="120px" v-if="!type"> <template #default="scope">
<template #default="scope"> {{getName(userOptions, scope.row.userId)}}
<el-button </template>
link </el-table-column>
type="danger" </template>
@click="handleDelete(scope.$index)" <template #taskDescribe>
v-hasPermi="['task:selectTask:delete']" <el-table-column label="任务描述" align="center" prop="taskDescribe" />
> </template>
删除 <template #other>
</el-button> <el-table-column label="操作" align="center" min-width="120px" v-if="!type">
</template> <template #default="scope">
</el-table-column> <el-button
</el-table> link
type="danger"
@click="handleDelete(scope.$index)"
v-hasPermi="['task:selectTask:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</template>
</AuthTable>
<el-row justify="center" class="mt-3" v-if="!type"> <el-row justify="center" class="mt-3" v-if="!type">
<el-button @click="openForm" round>+ 添加</el-button> <el-button @click="openForm" round>+ 添加</el-button>
</el-row> </el-row>
@ -59,6 +69,7 @@ const props = defineProps({
id: propTypes.number.def(undefined), id: propTypes.number.def(undefined),
type: propTypes.number.def(undefined), type: propTypes.number.def(undefined),
dataList: propTypes.object.def([]), dataList: propTypes.object.def([]),
formFields: {},
}) })
const loading = ref(false) // 列表的加载中 const loading = ref(false) // 列表的加载中
const list = ref<ProjectBonusVO[]>([]) // 列表的数据 const list = ref<ProjectBonusVO[]>([]) // 列表的数据

60
src/views/project/briefWork/BriefWorkDetail.vue
View File

@ -1,46 +1,57 @@
<template> <template>
<ContentWrap> <ContentWrap>
<el-form <processForm
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
:fields="formFields"
label-width="120px" label-width="120px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-row>
<el-col :span="8"> <template #briefStartDate>
<el-form-item label="简报日期" prop="briefStartDate"> <el-col :span="8">
<el-date-picker <el-form-item label="简报日期" prop="briefStartDate">
disabled <el-date-picker
v-model="formData.briefStartDate" disabled
type="date" v-model="formData.briefStartDate"
value-format="YYYY-MM-DD" type="date"
placeholder="选择简报日期" value-format="YYYY-MM-DD"
/> placeholder="选择简报日期"
</el-form-item> />
</el-col> </el-form-item>
</el-col>
</template>
<template #workComplate>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="本日完成工作" prop="workComplate"> <el-form-item label="本日完成工作" prop="workComplate">
<el-input type="textarea" disabled :rows="5" v-model="formData.workComplate" placeholder="请输入本日完成工作" /> <el-input type="textarea" disabled :rows="5" v-model="formData.workComplate" placeholder="请输入本日完成工作" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</template>
<template #workPlan>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="明日工作计划" prop="workPlan"> <el-form-item label="明日工作计划" prop="workPlan">
<el-input type="textarea" disabled :rows="5" v-model="formData.workPlan" placeholder="请输入明日工作计划" /> <el-input type="textarea" disabled :rows="5" v-model="formData.workPlan" placeholder="请输入明日工作计划" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</template>
<template #workAssistance>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="工作困难及协助" prop="workAssistance"> <el-form-item label="工作困难及协助" prop="workAssistance">
<el-input type="textarea" disabled :rows="5" v-model="formData.workAssistance" placeholder="请输入工作困难及协助" /> <el-input type="textarea" disabled :rows="5" v-model="formData.workAssistance" placeholder="请输入工作困难及协助" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</template>
<template #attachment>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="attachment"> <el-form-item label="附件" prop="attachment">
<UploadFile v-model="formData.attachment" :disabled="!!formType" :limit="1" :fileType="['doc','docx']"/> <UploadFile v-model="formData.attachment" :disabled="!!formType" :limit="1" :fileType="['doc','docx']"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </template>
</el-form> </processForm>
</ContentWrap> </ContentWrap>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -61,6 +72,14 @@ const props = defineProps({
const dialogTitle = ref('') // 弹窗的标题 const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('') // 表单的类型：create - 新增；update - 修改
const authType = ref('') // 是否流程审批页面
const formFields = ref({ //字段显示隐藏权限控制
briefStartDate: false,
workComplate: false ,
workPlan: false,
workAssistance: false,
attachment: false
})
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
briefType: 1, briefType: 1,
@ -85,7 +104,7 @@ const formRef = ref() // 表单 Ref
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (id?: number) => { const open = async (id?: number) => {
resetForm() // resetForm()
// 修改时，设置数据 // 修改时，设置数据
if (id) { if (id) {
formLoading.value = true formLoading.value = true
@ -98,6 +117,10 @@ const open = async (id?: number) => {
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
const openAuth = () => {
}
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => { const submitForm = async () => {
@ -151,10 +174,15 @@ const resetForm = () => {
const route = useRoute(); const route = useRoute();
onMounted(async () => { onMounted(async () => {
formType.value = props.id || route.query.id formType.value = props.id || route.query.id
authType.value = route.query.authId
if (formType.value) await open(formType.value) if (formType.value) await open(formType.value)
if (!authType.value) await openAuth()
if (!formType.value) { if (!formType.value) {
formData.value.userId = useUserStore().getUser.id formData.value.userId = useUserStore().getUser.id

2
src/views/project/briefWork/index.vue
View File

@ -209,7 +209,7 @@ const openFormAdd = () => {
//详情 //详情
const openFormDetail = (row: Object) => { const openFormDetail = (row: Object) => {
router.push({ name: 'DayReportDetail', query: { id: row.id} }) router.push({ name: 'DayReportDetail', query: { id: row.id, authType: 1} })
} }
/** 查看审批 */ /** 查看审批 */