diff --git a/src/utils/dict.ts b/src/utils/dict.ts index e514ff2b7..fd0d7f0b4 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -226,9 +226,10 @@ export enum DICT_TYPE { CRM_COMPLAINT_METHOD = "crm_complaint_method", // 投诉方式 CRM_COMPLAINT_LEVEL = "crm_complaint_level", // 投诉级别 TECH_SUPPORT = "tech_support", // 是否 - + // 商机账期 PAYMENT_TERM = "payment_term", // 投诉级别 + CREDIT_CALC_CYCLE = "credit_calc_cycle",//授信计算周期 // ========== ERP - 企业资源计划模块 ========== diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue index 6143c69e9..3f792a93b 100644 --- a/src/views/crm/business/BusinessForm.vue +++ b/src/views/crm/business/BusinessForm.vue @@ -4,7 +4,7 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="120px" + label-width="140px" v-loading="formLoading" > @@ -37,7 +37,7 @@ clearable :disabled="formType || type" - placeholder="请选择需求提交人" + :placeholder="formType ? '' : '请选择需求提交人'" class="w-1/1" > @@ -109,7 +109,7 @@ type="date" :disabled="type" value-format="x" - placeholder="选择预计成交日期" + :placeholder="type ? '' : '请选择预计成交日期'" class="!w-1/1" /> @@ -161,12 +161,12 @@ :value="dict.value" /> --> - + - + @@ -184,7 +184,7 @@ - + diff --git a/src/views/crm/contract/ContractForm.vue b/src/views/crm/contract/ContractForm.vue index 4bea45f1a..eec0c29cd 100644 --- a/src/views/crm/contract/ContractForm.vue +++ b/src/views/crm/contract/ContractForm.vue @@ -43,7 +43,7 @@ - + - + - + - + - + - + @@ -146,7 +146,7 @@ @@ -155,7 +155,7 @@ @@ -170,7 +170,7 @@ - + --> - + - + - + @@ -207,12 +207,12 @@ - + - + @@ -222,7 +222,7 @@ - + @@ -232,7 +232,7 @@ - + - + - + - + - + @@ -275,7 +275,7 @@ @@ -284,7 +284,7 @@ @@ -298,7 +298,7 @@ :props="defaultProps" check-strictly node-key="id" - placeholder="归属部门" + placeholder="" /> diff --git a/src/views/crm/contract/detail/ContractDetail.vue b/src/views/crm/contract/detail/ContractDetail.vue index 60d3d8806..100deb43a 100644 --- a/src/views/crm/contract/detail/ContractDetail.vue +++ b/src/views/crm/contract/detail/ContractDetail.vue @@ -13,12 +13,12 @@ - + - + @@ -26,7 +26,7 @@ @@ -44,7 +44,7 @@ - + - + - + - + - + - + @@ -149,7 +150,7 @@ @@ -158,7 +159,7 @@ @@ -173,7 +174,7 @@ - + --> - + - + - + @@ -210,12 +211,12 @@ - + - + @@ -225,7 +226,7 @@ - + @@ -235,7 +236,7 @@ - + - + - + - + - + @@ -278,7 +279,7 @@ @@ -287,7 +288,7 @@ @@ -301,7 +302,7 @@ :props="defaultProps" check-strictly node-key="id" - placeholder="归属部门" + placeholder="" /> @@ -325,7 +326,7 @@ disabled type="date" value-format="x" - placeholder="选择合同签订日期" + placeholder="" style="width: 100%" /> @@ -337,19 +338,19 @@ type="date" disabled value-format="x" - placeholder="选择合同结束时间" + placeholder="" style="width: 100%" /> - + - + - + - + - + - + - - + + diff --git a/src/views/crm/customer-complaints/index.vue b/src/views/crm/customer-complaints/index.vue index 188449226..389b54d28 100644 --- a/src/views/crm/customer-complaints/index.vue +++ b/src/views/crm/customer-complaints/index.vue @@ -67,7 +67,7 @@ /> - + - + --> - + - + @@ -229,7 +229,7 @@ {{ customer.developerName }} {{ customer.clueDeveloperName }} {{ customer.assistName }} - {{ customer.industryId }} + {{ getName(getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY),customer.industryId) }} {{ customer.maintainerName }} {{ customer.contractorName }} {{ customer.creditNo }} @@ -79,9 +79,7 @@ const { customer } = defineProps<{ const activeNames = ref(['basicInfo', 'systemInfo']) // 展示的折叠面板 const getName = (opt, val) => { - console.log('%csrc/views/crm/customer/detail/CustomerDetailsInfo.vue:79 opt, val', 'color: #007acc;', opt, val); const arr = opt.filter(v => v.value == val) - console.log('%csrc/views/crm/customer/detail/CustomerDetailsInfo.vue:81 arr', 'color: #007acc;', arr); return arr.length ? arr[0]['label'] : '' } diff --git a/src/views/crm/customer/detail/returnvisitrecord/index.vue b/src/views/crm/customer/detail/returnvisitrecord/index.vue index de5b9c91f..9d07e283e 100644 --- a/src/views/crm/customer/detail/returnvisitrecord/index.vue +++ b/src/views/crm/customer/detail/returnvisitrecord/index.vue @@ -14,8 +14,13 @@ - - + + + + + + + --> - + + + {{getName(userOptions, scope.row.creator)}} + + - + + + {{getName(userOptions, scope.row.updater)}} + + import { dateFormatter } from '@/utils/formatTime' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' +import * as UserApi from '@/api/system/user' import download from '@/utils/download' import { ReturnVisitRecordApi, ReturnVisitRecordVO } from '@/api/crm/customer/returnvisitrecord' import ReturnVisitRecordForm from './ReturnVisitRecordForm.vue' @@ -95,6 +109,7 @@ const props = defineProps<{ }>() const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +const userOptions = ref([]) // 用户列表 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 @@ -205,9 +220,15 @@ const previewFile = (fileUrls) => { break; } }; +const getName = (opt, val) => { + const arr = opt.filter(v => v.id == val) + return arr.length ? arr[0]['nickname'] : '' +} /** 初始化 **/ -onMounted(() => { +onMounted(async() => { getList() + // 获得用户列表 + userOptions.value = await UserApi.getSimpleUserList() }) \ No newline at end of file diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue index bad06b5da..2658adbf4 100644 --- a/src/views/crm/customer/index.vue +++ b/src/views/crm/customer/index.vue @@ -20,7 +20,7 @@ @keyup.enter="handleQuery" /> - + - + - + diff --git a/src/views/crm/filetemplate/FileTemplateForm.vue b/src/views/crm/filetemplate/FileTemplateForm.vue index d1d8137d5..e5c3f0cf2 100644 --- a/src/views/crm/filetemplate/FileTemplateForm.vue +++ b/src/views/crm/filetemplate/FileTemplateForm.vue @@ -1,5 +1,5 @@ - + - + - + diff --git a/src/views/crm/quotation/QuotationDetail.vue b/src/views/crm/quotation/QuotationDetail.vue index 109b66070..8bd879645 100644 --- a/src/views/crm/quotation/QuotationDetail.vue +++ b/src/views/crm/quotation/QuotationDetail.vue @@ -12,7 +12,7 @@ - + - + @@ -32,22 +32,22 @@ - + - + - + - + - + - + @@ -220,7 +220,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/views/crm/quotation/index.vue b/src/views/crm/quotation/index.vue index 83cb13d90..c28ae8c70 100644 --- a/src/views/crm/quotation/index.vue +++ b/src/views/crm/quotation/index.vue @@ -42,7 +42,7 @@ @@ -110,35 +110,37 @@ - {{ scope.row.ownerUserName }} - + --> + {{getName(userOptions, scope.row.creator)}} + - + - + - + - + - + - + - + { } }) } +const getName = (opt, val) => { + const arr = opt.filter(v => v.id == val) + return arr.length ? arr[0]['nickname'] : '' +} /** 导出按钮操作 */ const handleExport = async () => { try {