yinq
/
hwbm-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.1.8 报价单模块前后端联动优化，包括客户名称按客户ID下拉检索、编辑页客户名称必填且联系人非必填、付款方式改为固定下拉文本、报价日期默认当天、补充质保期字段及列表展示

Browse Source
dev
yinq 3 weeks ago
parent d1ff671dcb
commit 753889fd37
3 changed files with 175 additions and 458 deletions
Show Stats Download Patch File Download Diff File

40
src/api/oa/crm/crmQuoteInfo/types.ts
Unescape Escape View File

@ -69,6 +69,11 @@ export interface CrmQuoteInfoVO {
*/
deliveryPeriod: number;
/**
* 质保期
*/
warrantyPeriod: number;
/**
* 交付/交货方式
*/
@ -114,6 +119,11 @@ export interface CrmQuoteInfoVO {
*/
totalIncludingTax: number;
/**
* 客户ID
*/
customerId: string | number;
/**
* 客户方联系人ID
*/
@ -272,6 +282,11 @@ export interface CrmQuoteInfoForm extends BaseEntity {
*/
deliveryPeriod?: number;
/**
* 质保期
*/
warrantyPeriod?: number;
/**
* 交付/交货方式
*/
@ -317,6 +332,16 @@ export interface CrmQuoteInfoForm extends BaseEntity {
*/
totalIncludingTax?: number;
/**
* 客户ID
*/
customerId?: string | number;
/**
* 客户名称
*/
customerName?: string;
/**
* 客户方联系人ID
*/
@ -480,6 +505,11 @@ export interface CrmQuoteInfoQuery extends PageQuery {
*/
deliveryPeriod?: number;
/**
* 质保期
*/
warrantyPeriod?: number;
/**
* 交付/交货方式
*/
@ -525,6 +555,16 @@ export interface CrmQuoteInfoQuery extends PageQuery {
*/
totalIncludingTax?: number;
/**
* 客户ID
*/
customerId?: string | number;
/**
* 客户名称
*/
customerName?: string;
/**
* 客户方联系人ID
*/

78
src/views/oa/crm/crmQuoteInfo/edit.vue
Unescape Escape View File

@ -101,6 +101,11 @@
<el-input-number v-model="form.deliveryPeriod" :min="0" :precision="0" :disabled="isView" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="质保期" prop="warrantyPeriod">
<el-input-number v-model="form.warrantyPeriod" :min="0" :precision="0" :disabled="isView" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="交货方式" prop="deliveryMethod">
<el-input v-model="form.deliveryMethod" placeholder="请输入交货方式" :disabled="isView" />
@ -109,7 +114,7 @@
<el-col :span="12">
<el-form-item label="付款方式" prop="paymentMethod">
<el-select v-model="form.paymentMethod" placeholder="请选择付款方式" :disabled="isView">
<el-option v-for="dict in payment_method" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-option v-for="item in paymentMethodOptions" :key="item" :label="item" :value="item" />
</el-select>
</el-form-item>
</el-col>
@ -176,7 +181,7 @@
<el-option
v-for="c in customerContactList"
:key="c.contactId"
:label="c.contactName + ' - ' + (c.phoneNumber || '')"
:label="c.contactName"
:value="c.contactId"
/>
</el-select>
@ -211,13 +216,6 @@
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
<!-- 原附件上传块已迁移到“附件”分区，保留以便后续恢复 -->
<el-col :span="12" v-if="false">
<el-form-item label="附件上传">
<el-button type="primary" plain icon="Upload" @click="handleFile">上传附件</el-button>
<div style="margin-top: 8px; color: #999">支持格式：.rar .zip .doc .docx .pdf，单个文件不超过20MB</div>
</el-form-item>
</el-col>
</el-row>
<!-- 报价物料编辑对话框 -->
<el-dialog :title="materialDialog.title" v-model="materialDialog.visible" width="800px" append-to-body>
@ -343,19 +341,27 @@
<!-- 对齐合同编辑页：单卡片内分区展示 -->
<el-divider content-position="left">客户方信息</el-divider>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="客户名称" prop="customerId">
<el-select v-model="form.customerId" filterable placeholder="请选择客户名称" @change="onCustomerChanged" :disabled="isView">
<el-option v-for="c in customerList" :key="c.customerId" :label="c.customerName" :value="c.customerId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户联系人" prop="customerContactId">
<el-select
v-model="form.customerContactId"
filterable
clearable
placeholder="请选择客户联系人"
@change="onCustomerContactChanged"
:disabled="isView"
>
<el-option
v-for="c in customerContactList"
v-for="c in filteredCustomerContactList"
:key="c.contactId"
:label="c.contactName + ' - ' + (c.phoneNumber || '')"
:label="c.contactName"
:value="c.contactId"
/>
</el-select>
@ -488,6 +494,7 @@ import { addCrmQuoteInfo, getCrmQuoteInfo, quoteSubmitAndFlowStart, updateCrmQuo
import { CrmQuoteInfoForm } from '@/api/oa/crm/crmQuoteInfo/types';
import type { CrmQuoteMaterialForm } from '@/api/oa/crm/crmQuoteMaterial/types';
import { getCrmCustomerContactList } from '@/api/oa/crm/customerContact';
import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
import { getCrmSupplierInfoList } from '@/api/oa/crm/crmSupplierInfo';
import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
import { getBasePrintTemplateList } from '@/api/oa/base/printTemplate';
@ -498,8 +505,8 @@ import SubmitVerify from '@/components/Process/submitVerify.vue';
import { FlowCodeEnum } from '@/enums/OAEnum';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { business_direction, currency_type, quote_category, contract_type, material_flag, wf_business_status, payment_method } = toRefs<any>(
proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'contract_type', 'material_flag', 'wf_business_status', 'payment_method')
const { business_direction, currency_type, quote_category, contract_type, material_flag, wf_business_status } = toRefs<any>(
proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'contract_type', 'material_flag', 'wf_business_status')
);
const router = useRouter();
@ -530,11 +537,14 @@ const form = reactive<CrmQuoteInfoForm>({
validFrom: undefined,
validTo: undefined,
deliveryPeriod: undefined,
warrantyPeriod: undefined,
deliveryMethod: undefined,
paymentMethod: undefined,
currencyType: undefined,
taxIncludedInfo: undefined,
taxRate: undefined,
customerId: undefined,
customerName: undefined,
customerContactId: undefined,
customerContactName: undefined,
customerContactPhone: undefined,
@ -550,14 +560,27 @@ const form = reactive<CrmQuoteInfoForm>({
const rules = {
quoteName: [{ required: true, message: '报价单名称不能为空', trigger: 'blur' }],
customerContactId: [{ required: true, message: '请选择客户联系人', trigger: 'change' }]
customerId: [{ required: true, message: '请选择客户名称', trigger: 'change' }]
};
// 下拉数据
const customerList = ref<any[]>([]);
const customerContactList = ref<any[]>([]);
const supplierList = ref<any[]>([]);
const printTemplateList = ref<any[]>([]);
const DEFAULT_SUPPLIER_ID = 1;
const filteredCustomerContactList = computed(() => {
if (!form.customerId) {
return customerContactList.value;
}
return customerContactList.value.filter((item: any) => String(item.customerId) === String(form.customerId));
});
const paymentMethodOptions = ['电汇', '银行承兑（6个月内）', '电汇/银行承兑（6个月内）', '商业承兑'];
const setQuoteDateToday = () => {
const d = new Date();
form.quoteDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')} 00:00:00`;
};
// 单位下拉数据
const unitInfoList = ref<any[]>([]);
@ -849,10 +872,26 @@ const onIncludingPriceChange = (row: any, val: number) => {
// 选中联系人后，自动带出姓名、电话、邮箱（可编辑，不影响再次选择）
const onCustomerContactChanged = (id: any) => {
const c = customerContactList.value.find((x: any) => x.contactId === id);
if (c?.customerId) {
form.customerId = c.customerId;
form.customerName = c.customerName || form.customerName;
}
form.customerContactName = c?.contactName || '';
form.customerContactPhone = c?.phoneNumber || '';
form.customerContactEmail = c?.email || '';
};
const onCustomerChanged = (customerId: any) => {
const customer = customerList.value.find((item: any) => String(item.customerId) === String(customerId));
form.customerName = customer?.customerName || '';
const currentContact = customerContactList.value.find((item: any) => item.contactId === form.customerContactId);
if (currentContact && String(currentContact.customerId) === String(customerId)) {
return;
}
form.customerContactId = undefined;
form.customerContactName = '';
form.customerContactPhone = '';
form.customerContactEmail = '';
};
// 供应商选择变化处理
const onSupplierChanged = (supplierId: any) => {
const supplier = supplierList.value.find((x: any) => x.supplierId === supplierId);
@ -1000,6 +1039,8 @@ onMounted(async () => {
routeParams.value = { ...route.query };
// 下拉数据初始化
const customerRes = await getCrmCustomerInfoList({});
customerList.value = customerRes.data || [];
const contactRes = await getCrmCustomerContactList({});
customerContactList.value = contactRes.data || [];
// 加载供应商列表（计划内供应商）
@ -1016,9 +1057,15 @@ onMounted(async () => {
form.quoteId = id as any;
const res = await getCrmQuoteInfo(id as any);
Object.assign(form, res.data);
console.log('crmQuoteInfo/edit.vue数据加载成功，ossId：', form.ossId); // 添加调试日志
// 编辑模式：已存在编号则禁用生成
isCodeGenerated.value = !!form.quoteCode;
if (!form.customerId && form.customerContactId) {
const currentContact = customerContactList.value.find((item: any) => item.contactId === form.customerContactId);
if (currentContact?.customerId) {
form.customerId = currentContact.customerId;
form.customerName = currentContact.customerName || form.customerName;
}
}
// 根据已有联系人ID回填姓名、电话、邮箱（若后端已返回则保持）
if (!form.customerContactPhone || !form.customerContactEmail || !form.customerContactName) {
onCustomerContactChanged(form.customerContactId);
@ -1057,6 +1104,7 @@ onMounted(async () => {
}
// 新增模式：如已有编号则禁用生成按钮
if (!id) {
setQuoteDateToday();
applyDefaultSupplier();
isCodeGenerated.value = !!form.quoteCode;
}

515
src/views/oa/crm/crmQuoteInfo/index.vue
Unescape Escape View File

@ -10,131 +10,11 @@
<el-form-item label="报价单名称" prop="quoteName">
<el-input v-model="queryParams.quoteName" placeholder="请输入报价单名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="报价轮次" prop="quoteRound">
<el-input v-model="queryParams.quoteRound" placeholder="请输入报价轮次" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="报价大类" prop="quoteCategory">
<el-select v-model="queryParams.quoteCategory" placeholder="请选择报价大类" clearable >
<el-option v-for="dict in quote_category" :key="dict.value" :label="dict.label" :value="dict.value"/>
<el-form-item label="客户名称" prop="customerId">
<el-select v-model="queryParams.customerId" placeholder="请选择客户名称" clearable filterable style="width: 220px">
<el-option v-for="item in customerList" :key="item.customerId" :label="item.customerName" :value="item.customerId" />
</el-select>
</el-form-item>
<el-form-item label="报价类型" prop="quoteType">
<el-select v-model="queryParams.quoteType" placeholder="请选择报价类型" clearable >
<el-option v-for="dict in contract_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="业务方向" prop="businessDirection">
<el-select v-model="queryParams.businessDirection" placeholder="请选择业务方向" clearable >
<el-option v-for="dict in business_direction" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>-->
<!-- <el-form-item label="部门" prop="quoteDeptId">
<el-input v-model="queryParams.quoteDeptId" placeholder="请输入部门" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="报价日期" prop="quoteDate">
<el-date-picker clearable
v-model="queryParams.quoteDate"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择报价日期"
/>
</el-form-item>
<el-form-item label="报价有效期起" prop="validFrom">
<el-date-picker clearable
v-model="queryParams.validFrom"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择报价有效期起"
/>
</el-form-item>
<el-form-item label="报价有效期" prop="validDays">
<el-input v-model="queryParams.validDays" placeholder="请输入报价有效期" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="报价有效期止" prop="validTo">
<el-date-picker clearable
v-model="queryParams.validTo"
type="date"
value-format="YYYY-MM-DD"
placeholder="请选择报价有效期止"
/>
</el-form-item>
<el-form-item label="交货期" prop="deliveryPeriod">
<el-input v-model="queryParams.deliveryPeriod" placeholder="请输入交货期" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="交付/交货方式" prop="deliveryMethod">
<el-input v-model="queryParams.deliveryMethod" placeholder="请输入交付/交货方式" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<!-- <el-form-item label="付款方式" prop="paymentMethod">
<el-select v-model="queryParams.paymentMethod" placeholder="请选择付款方式" clearable>
<el-option v-for="dict in payment_method" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="币种" prop="currencyType">
<el-select v-model="queryParams.currencyType" placeholder="请选择币种" clearable >
<el-option v-for="dict in currency_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="含税信息" prop="taxIncludedInfo">
<el-input v-model="queryParams.taxIncludedInfo" placeholder="请输入含税信息" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="税率(默认按明细可覆盖)" prop="taxRate">
<el-input v-model="queryParams.taxRate" placeholder="请输入税率(默认按明细可覆盖)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="总报价" prop="totalPrice">
<el-input v-model="queryParams.totalPrice" placeholder="请输入总报价" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="未税总价" prop="totalBeforeTax">
<el-input v-model="queryParams.totalBeforeTax" placeholder="请输入未税总价" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="税额" prop="totalTax">
<el-input v-model="queryParams.totalTax" placeholder="请输入税额" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="含税总价" prop="totalIncludingTax">
<el-input v-model="queryParams.totalIncludingTax" placeholder="请输入含税总价" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户方联系人ID" prop="customerContactId">
<el-input v-model="queryParams.customerContactId" placeholder="请输入客户方联系人ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户方联系人" prop="customerContactName">
<el-input v-model="queryParams.customerContactName" placeholder="请输入客户方联系人" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户方联系电话" prop="customerContactPhone">
<el-input v-model="queryParams.customerContactPhone" placeholder="请输入客户方联系电话" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="客户方电子邮箱" prop="customerContactEmail">
<el-input v-model="queryParams.customerContactEmail" placeholder="请输入客户方电子邮箱" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供货方ID" prop="supplierContactId">
<el-input v-model="queryParams.supplierContactId" placeholder="请输入供货方ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供货方联系人" prop="supplierContactName">
<el-input v-model="queryParams.supplierContactName" placeholder="请输入供货方联系人" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供货方联系电话" prop="supplierContactPhone">
<el-input v-model="queryParams.supplierContactPhone" placeholder="请输入供货方联系电话" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="供货方电子邮箱" prop="supplierContactEmail">
<el-input v-model="queryParams.supplierContactEmail" placeholder="请输入供货方电子邮箱" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="项目ID(可选)" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入项目ID(可选)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="打印模板ID(可选)" prop="templateId">
<el-input v-model="queryParams.templateId" placeholder="请输入打印模板ID(可选)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="附件ID" prop="ossId">
<el-input v-model="queryParams.ossId" placeholder="请输入附件ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="报价单状态" prop="quoteStatus">
<el-select v-model="queryParams.quoteStatus" placeholder="请选择报价单状态" clearable >
<el-option v-for="dict in quote_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="流程状态" prop="flowStatus">
<el-select v-model="queryParams.flowStatus" placeholder="请选择流程状态" clearable >
<el-option v-for="dict in flow_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -160,9 +40,6 @@
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['oa/crm:crmQuoteInfo:export']">导出</el-button>-->
<!-- </el-col>-->
<el-col :span="1.8">
<el-button
type="primary"
@ -199,101 +76,94 @@
<dict-tag :options="business_direction" :value="scope.row.businessDirection" />
</template>
</el-table-column>
<el-table-column label="部门" align="center" prop="deptName" width="120" v-if="columns[7].visible" show-overflow-tooltip />
<el-table-column label="客户名称" align="center" prop="customerName" width="180" v-if="columns[23].visible" show-overflow-tooltip />
<el-table-column label="报价日期" align="center" prop="quoteDate" width="180" v-if="columns[8].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.quoteDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.quoteDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" prop="customerName" width="180" v-if="columns[22].visible" show-overflow-tooltip />
<!-- 按当前报价单页面要求暂时隐藏“报价有效期起”，仅保留后端字段兼容历史数据 -->
<!--
<el-table-column label="报价有效期起" align="center" prop="validFrom" width="180" v-if="columns[9].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.validFrom, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
-->
<el-table-column label="报价有效期" align="center" prop="validDays" width="100" v-if="columns[10].visible" />
<el-table-column label="报价有效期止" align="center" prop="validTo" width="180" v-if="columns[11].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.validTo, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.validTo, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交货期" align="center" prop="deliveryPeriod" width="100" v-if="columns[12].visible" />
<el-table-column label="交付/交货方式" align="center" prop="deliveryMethod" width="140" v-if="columns[13].visible" show-overflow-tooltip />
<el-table-column label="付款方式" align="center" prop="paymentMethod" width="120" v-if="columns[14].visible">
<el-table-column label="质保期" align="center" prop="warrantyPeriod" width="100" v-if="columns[13].visible" />
<el-table-column label="交付/交货方式" align="center" prop="deliveryMethod" width="140" v-if="columns[14].visible" show-overflow-tooltip />
<el-table-column label="付款方式" align="center" prop="paymentMethod" width="120" v-if="columns[15].visible">
<template #default="scope">
<dict-tag :options="payment_method" :value="scope.row.paymentMethod" />
<span>{{ scope.row.paymentMethod || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="币种" align="center" prop="currencyType" width="80" v-if="columns[15].visible">
<el-table-column label="币种" align="center" prop="currencyType" width="80" v-if="columns[16].visible">
<template #default="scope">
<dict-tag :options="currency_type" :value="scope.row.currencyType" />
</template>
</el-table-column>
<el-table-column label="含税信息" align="center" prop="taxIncludedInfo" width="100" v-if="columns[16].visible" show-overflow-tooltip />
<el-table-column label="税率(默认按明细可覆盖)" align="center" prop="taxRate" width="180" v-if="columns[17].visible" />
<el-table-column label="总报价" align="center" prop="totalPrice" width="130" v-if="columns[18].visible" />
<el-table-column label="未税总价" align="center" prop="totalBeforeTax" width="130" v-if="columns[19].visible" />
<el-table-column label="税额" align="center" prop="totalTax" width="130" v-if="columns[20].visible" />
<el-table-column label="含税总价" align="center" prop="totalIncludingTax" width="130" v-if="columns[21].visible" />
<el-table-column label="含税信息" align="center" prop="taxIncludedInfo" width="100" v-if="columns[17].visible" show-overflow-tooltip />
<el-table-column label="税率" align="center" prop="taxRate" width="180" v-if="columns[18].visible" />
<el-table-column label="总报价" align="center" prop="totalPrice" width="130" v-if="columns[19].visible" />
<el-table-column label="未税总价" align="center" prop="totalBeforeTax" width="130" v-if="columns[20].visible" />
<el-table-column label="税额" align="center" prop="totalTax" width="130" v-if="columns[21].visible" />
<el-table-column label="含税总价" align="center" prop="totalIncludingTax" width="130" v-if="columns[22].visible" />
<el-table-column
label="客户方联系人"
align="center"
prop="customerContactName"
width="130"
v-if="columns[23].visible"
v-if="columns[24].visible"
show-overflow-tooltip
/>
<el-table-column label="客户方联系电话" align="center" prop="customerContactPhone" width="140" v-if="columns[24].visible" />
<el-table-column label="客户方联系电话" align="center" prop="customerContactPhone" width="140" v-if="columns[25].visible" />
<el-table-column
label="客户方电子邮箱"
align="center"
prop="customerContactEmail"
width="180"
v-if="columns[25].visible"
v-if="columns[26].visible"
show-overflow-tooltip
/>
<el-table-column label="供应商名称" align="center" prop="supplierName" width="180" v-if="columns[26].visible" show-overflow-tooltip />
<el-table-column label="供应商名称" align="center" prop="supplierName" width="180" v-if="columns[27].visible" show-overflow-tooltip />
<el-table-column
label="供货方联系人"
align="center"
prop="supplierContactName"
width="130"
v-if="columns[27].visible"
v-if="columns[28].visible"
show-overflow-tooltip
/>
<el-table-column label="供货方联系电话" align="center" prop="supplierContactPhone" width="140" v-if="columns[28].visible" />
<el-table-column label="供货方联系电话" align="center" prop="supplierContactPhone" width="140" v-if="columns[29].visible" />
<el-table-column
label="供货方电子邮箱"
align="center"
prop="supplierContactEmail"
width="180"
v-if="columns[29].visible"
v-if="columns[30].visible"
show-overflow-tooltip
/>
<el-table-column label="项目ID(可选)" align="center" prop="projectId" width="120" v-if="columns[30].visible" />
<el-table-column label="打印模板ID(可选)" align="center" prop="templateId" width="140" v-if="columns[31].visible" />
<el-table-column label="附件ID" align="center" prop="ossId" width="120" v-if="columns[32].visible" />
<el-table-column label="报价单状态" align="center" prop="quoteStatus" width="120" v-if="columns[33].visible">
<el-table-column label="部门" align="center" prop="deptName" width="120" v-if="columns[7].visible" show-overflow-tooltip />
<el-table-column label="项目ID(可选)" align="center" prop="projectId" width="120" v-if="columns[31].visible" />
<el-table-column label="打印模板ID(可选)" align="center" prop="templateId" width="140" v-if="columns[32].visible" />
<el-table-column label="附件ID" align="center" prop="ossId" width="120" v-if="columns[33].visible" />
<el-table-column label="报价单状态" align="center" prop="quoteStatus" width="120" v-if="columns[34].visible">
<template #default="scope">
<dict-tag :options="quote_status" :value="scope.row.quoteStatus" />
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="flowStatus" width="120" v-if="columns[34].visible">
<el-table-column label="流程状态" align="center" prop="flowStatus" width="120" v-if="columns[35].visible">
<template #default="scope">
<dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="200" v-if="columns[35].visible" show-overflow-tooltip />
<el-table-column label="创建人" align="center" prop="createName" width="100" v-if="columns[36].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[37].visible">
<el-table-column label="备注" align="center" prop="remark" width="200" v-if="columns[36].visible" show-overflow-tooltip />
<el-table-column label="创建人" align="center" prop="createName" width="100" v-if="columns[37].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[38].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" width="100" class-name="small-padding fixed-width">
<template #default="scope">
<!-- 修改：仅草稿或退回状态可编辑（与 projectInfo 保持一致，使用 flowStatus 判断） -->
<el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
@ -303,23 +173,6 @@
<el-tooltip content="查看详情" placement="top" v-if="scope.row.flowStatus && scope.row.flowStatus !== 'draft'">
<el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
</el-tooltip>
<!-- &lt;!&ndash; 审批记录：非草稿状态可查看 &ndash;&gt;-->
<!-- <el-tooltip content="审批记录" placement="top" v-if="scope.row.flowStatus && scope.row.flowStatus !== 'draft'">-->
<!-- <el-button link type="warning" icon="Tickets" @click="handleApprovalRecord(scope.row)"></el-button>-->
<!-- </el-tooltip>-->
<!-- 删除：仅草稿状态可删除 -->
<el-tooltip content="删除" placement="top" v-if="!scope.row.flowStatus || scope.row.flowStatus === 'draft'">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa/crm:crmQuoteInfo:remove']"></el-button>
</el-tooltip>
<!-- <el-tooltip content="报价明细" placement="top">-->
<!-- <el-button-->
<!-- link-->
<!-- type="warning"-->
<!-- icon="Tickets"-->
<!-- @click="handleDetail(scope.row)"-->
<!-- v-hasPermi="['oa/crm:crmQuoteMaterial:list']"-->
<!-- ></el-button>-->
<!-- </el-tooltip>-->
<!-- 参考合同信息 contractView：仅当已绑定模板时显示预览/导出入口，避免无模板时反复告警 -->
<el-tooltip content="PDF导出" placement="top" v-if="scope.row.templateId != null">
<el-button
@ -336,185 +189,6 @@
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改报价单信息对话框 -->
<!-- <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="crmQuoteInfoFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="报价单号" prop="quoteCode">
<el-input v-model="form.quoteCode" placeholder="请输入报价单号" />
</el-form-item>
<el-form-item label="报价单名称" prop="quoteName">
<el-input v-model="form.quoteName" placeholder="请输入报价单名称" />
</el-form-item>
<el-form-item label="报价轮次" prop="quoteRound">
<el-input v-model="form.quoteRound" placeholder="请输入报价轮次" />
</el-form-item>
<el-form-item label="报价大类" prop="quoteCategory">
<el-radio-group v-model="form.quoteCategory">
<el-radio
v-for="dict in quote_category"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="报价类型" prop="quoteType">
<el-select v-model="form.quoteType" placeholder="请选择报价类型">
<el-option
v-for="dict in contract_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="业务方向" prop="businessDirection">
<el-select v-model="form.businessDirection" placeholder="请选择业务方向">
<el-option
v-for="dict in business_direction"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门" prop="quoteDeptId">
<el-input v-model="form.quoteDeptId" placeholder="请输入部门" />
</el-form-item>
<el-form-item label="报价日期" prop="quoteDate">
<el-date-picker clearable
v-model="form.quoteDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择报价日期">
</el-date-picker>
</el-form-item>
<el-form-item label="报价有效期起" prop="validFrom">
<el-date-picker clearable
v-model="form.validFrom"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择报价有效期起">
</el-date-picker>
</el-form-item>
<el-form-item label="报价有效期" prop="validDays">
<el-input v-model="form.validDays" placeholder="请输入报价有效期" />
</el-form-item>
<el-form-item label="报价有效期止" prop="validTo">
<el-date-picker clearable
v-model="form.validTo"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择报价有效期止">
</el-date-picker>
</el-form-item>
<el-form-item label="交货期" prop="deliveryPeriod">
<el-input v-model="form.deliveryPeriod" placeholder="请输入交货期" />
</el-form-item>
<el-form-item label="交付/交货方式" prop="deliveryMethod">
<el-input v-model="form.deliveryMethod" placeholder="请输入交付/交货方式" />
</el-form-item>
<el-form-item label="付款方式" prop="paymentMethod">
<el-select v-model="form.paymentMethod" placeholder="请选择付款方式">
<el-option
v-for="dict in payment_method"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="币种" prop="currencyType">
<el-select v-model="form.currencyType" placeholder="请选择币种">
<el-option
v-for="dict in currency_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="含税信息" prop="taxIncludedInfo">
<el-input v-model="form.taxIncludedInfo" placeholder="请输入含税信息" />
</el-form-item>
<el-form-item label="税率(默认按明细可覆盖)" prop="taxRate">
<el-input v-model="form.taxRate" placeholder="请输入税率(默认按明细可覆盖)" />
</el-form-item>
<el-form-item label="总报价" prop="totalPrice">
<el-input v-model="form.totalPrice" placeholder="请输入总报价" />
</el-form-item>
<el-form-item label="未税总价" prop="totalBeforeTax">
<el-input v-model="form.totalBeforeTax" placeholder="请输入未税总价" />
</el-form-item>
<el-form-item label="税额" prop="totalTax">
<el-input v-model="form.totalTax" placeholder="请输入税额" />
</el-form-item>
<el-form-item label="含税总价" prop="totalIncludingTax">
<el-input v-model="form.totalIncludingTax" placeholder="请输入含税总价" />
</el-form-item>
<el-form-item label="客户方联系人ID" prop="customerContactId">
<el-input v-model="form.customerContactId" placeholder="请输入客户方联系人ID" />
</el-form-item>
<el-form-item label="客户方联系人" prop="customerContactName">
<el-input v-model="form.customerContactName" placeholder="请输入客户方联系人" />
</el-form-item>
<el-form-item label="客户方联系电话" prop="customerContactPhone">
<el-input v-model="form.customerContactPhone" placeholder="请输入客户方联系电话" />
</el-form-item>
<el-form-item label="客户方电子邮箱" prop="customerContactEmail">
<el-input v-model="form.customerContactEmail" placeholder="请输入客户方电子邮箱" />
</el-form-item>
<el-form-item label="供货方ID" prop="supplierContactId">
<el-input v-model="form.supplierContactId" placeholder="请输入供货方ID" />
</el-form-item>
<el-form-item label="供货方联系人" prop="supplierContactName">
<el-input v-model="form.supplierContactName" placeholder="请输入供货方联系人" />
</el-form-item>
<el-form-item label="供货方联系电话" prop="supplierContactPhone">
<el-input v-model="form.supplierContactPhone" placeholder="请输入供货方联系电话" />
</el-form-item>
<el-form-item label="供货方电子邮箱" prop="supplierContactEmail">
<el-input v-model="form.supplierContactEmail" placeholder="请输入供货方电子邮箱" />
</el-form-item>
<el-form-item label="项目ID(可选)" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目ID(可选)" />
</el-form-item>
<el-form-item label="打印模板ID(可选)" prop="templateId">
<el-input v-model="form.templateId" placeholder="请输入打印模板ID(可选)" />
</el-form-item>
<el-form-item label="附件ID" prop="ossId">
<el-input v-model="form.ossId" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="报价单状态" prop="quoteStatus">
<el-select v-model="form.quoteStatus" placeholder="请选择报价单状态">
<el-option
v-for="dict in quote_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="流程状态" prop="flowStatus">
<el-select v-model="form.flowStatus" placeholder="请选择流程状态">
<el-option
v-for="dict in flow_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>-->
<!-- 审批记录 -->
<ApprovalRecord ref="approvalRecordRef" />
</div>
@ -522,20 +196,20 @@
<script setup name="CrmQuoteInfo" lang="ts">
import { useRoute, useRouter } from 'vue-router';
import { addCrmQuoteInfo, delCrmQuoteInfo, listCrmQuoteInfo, updateCrmQuoteInfo } from '@/api/oa/crm/crmQuoteInfo';
import { delCrmQuoteInfo, listCrmQuoteInfo } from '@/api/oa/crm/crmQuoteInfo';
import { CrmQuoteInfoForm, CrmQuoteInfoQuery, CrmQuoteInfoVO } from '@/api/oa/crm/crmQuoteInfo/types';
import { getCrmCustomerContactList } from '@/api/oa/crm/customerContact';
import { getCrmCustomerInfoList } from '@/api/oa/crm/customerInfo';
import ApprovalRecord from '@/components/Process/approvalRecord.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const router = useRouter();
const route = useRoute();
const { business_direction, currency_type, quote_category, payment_method, quote_status, wf_business_status, contract_type } = toRefs<any>(
proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'payment_method', 'quote_status', 'wf_business_status', 'contract_type')
const { business_direction, currency_type, quote_category, quote_status, wf_business_status, contract_type } = toRefs<any>(
proxy?.useDict('business_direction', 'currency_type', 'quote_category', 'quote_status', 'wf_business_status', 'contract_type')
);
const crmQuoteInfoList = ref<CrmQuoteInfoVO[]>([]);
const buttonLoading = ref(false);
const customerList = ref<any[]>([]);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
@ -544,14 +218,8 @@ const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const crmQuoteInfoFormRef = ref<ElFormInstance>();
const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `序号`, visible: false },
@ -567,31 +235,32 @@ const columns = ref<FieldOption[]>([
{ key: 10, label: `报价有效期`, visible: false },
{ key: 11, label: `报价有效期止`, visible: true },
{ key: 12, label: `交货期`, visible: false },
{ key: 13, label: `交付/交货方式`, visible: false },
{ key: 14, label: `付款方式`, visible: false },
{ key: 15, label: `币种`, visible: false },
{ key: 16, label: `含税信息`, visible: false },
{ key: 17, label: `税率(默认按明细可覆盖)`, visible: false },
{ key: 18, label: `总报价`, visible: true },
{ key: 19, label: `未税总价`, visible: false },
{ key: 20, label: `税额`, visible: false },
{ key: 21, label: `含税总价`, visible: true },
{ key: 22, label: `客户名称`, visible: true },
{ key: 23, label: `客户方联系人`, visible: false },
{ key: 24, label: `客户方联系电话`, visible: false },
{ key: 25, label: `客户方电子邮箱`, visible: false },
{ key: 26, label: `供应商名称`, visible: false },
{ key: 27, label: `供货方联系人`, visible: false },
{ key: 28, label: `供货方联系电话`, visible: false },
{ key: 29, label: `供货方电子邮箱`, visible: false },
{ key: 30, label: `项目ID(可选)`, visible: false },
{ key: 31, label: `打印模板ID(可选)`, visible: false },
{ key: 32, label: `附件ID`, visible: false },
{ key: 33, label: `报价单状态`, visible: true },
{ key: 34, label: `流程状态`, visible: true },
{ key: 35, label: `备注`, visible: true },
{ key: 36, label: `创建人`, visible: true },
{ key: 37, label: `创建时间`, visible: true }
{ key: 13, label: `质保期`, visible: false },
{ key: 14, label: `交付/交货方式`, visible: false },
{ key: 15, label: `付款方式`, visible: false },
{ key: 16, label: `币种`, visible: false },
{ key: 17, label: `含税信息`, visible: false },
{ key: 18, label: `税率`, visible: false },
{ key: 19, label: `总报价`, visible: true },
{ key: 20, label: `未税总价`, visible: false },
{ key: 21, label: `税额`, visible: false },
{ key: 22, label: `含税总价`, visible: true },
{ key: 23, label: `客户名称`, visible: true },
{ key: 24, label: `客户方联系人`, visible: false },
{ key: 25, label: `客户方联系电话`, visible: false },
{ key: 26, label: `客户方电子邮箱`, visible: false },
{ key: 27, label: `供应商名称`, visible: false },
{ key: 28, label: `供货方联系人`, visible: false },
{ key: 29, label: `供货方联系电话`, visible: false },
{ key: 30, label: `供货方电子邮箱`, visible: false },
{ key: 31, label: `项目ID(可选)`, visible: false },
{ key: 32, label: `打印模板ID(可选)`, visible: false },
{ key: 33, label: `附件ID`, visible: false },
{ key: 34, label: `报价单状态`, visible: true },
{ key: 35, label: `流程状态`, visible: true },
{ key: 36, label: `备注`, visible: true },
{ key: 37, label: `创建人`, visible: true },
{ key: 38, label: `创建时间`, visible: true }
// 预留：删除标志、创建部门、更新人、更新时间等
]);
@ -609,6 +278,7 @@ const initFormData: CrmQuoteInfoForm = {
validDays: undefined,
validTo: undefined,
deliveryPeriod: undefined,
warrantyPeriod: undefined,
deliveryMethod: undefined,
paymentMethod: undefined,
currencyType: undefined,
@ -651,6 +321,7 @@ const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
validDays: undefined,
validTo: undefined,
deliveryPeriod: undefined,
warrantyPeriod: undefined,
deliveryMethod: undefined,
paymentMethod: undefined,
currencyType: undefined,
@ -660,6 +331,7 @@ const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
totalBeforeTax: undefined,
totalTax: undefined,
totalIncludingTax: undefined,
customerId: undefined,
customerContactId: undefined,
customerContactName: undefined,
customerContactPhone: undefined,
@ -681,7 +353,7 @@ const data = reactive<PageData<CrmQuoteInfoForm, CrmQuoteInfoQuery>>({
}
});
const { queryParams, form, rules } = toRefs(data);
const { queryParams } = toRefs(data);
/** 查询报价单信息列表 */
const getList = async () => {
@ -692,18 +364,6 @@ const getList = async () => {
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
crmQuoteInfoFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
@ -752,23 +412,6 @@ const handleView = (row?: CrmQuoteInfoVO) => {
});
};
/** 提交按钮 */
const submitForm = () => {
crmQuoteInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.quoteId) {
await updateCrmQuoteInfo(form.value).finally(() => (buttonLoading.value = false));
} else {
await addCrmQuoteInfo(form.value).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: CrmQuoteInfoVO) => {
const _quoteIds = row?.quoteId || ids.value;
@ -778,17 +421,6 @@ const handleDelete = async (row?: CrmQuoteInfoVO) => {
await getList();
};
/** 导出按钮操作（Excel导出-已停用） */
/*const handleExport = () => {
proxy?.download(
'oa/crm/crmQuoteInfo/export',
{
...queryParams.value
},
`crmQuoteInfo_${new Date().getTime()}.xlsx`
);
};*/
/** 审批记录按钮操作 */
const handleApprovalRecord = (row: CrmQuoteInfoVO) => {
approvalRecordRef.value?.init(row.quoteId as any);
@ -811,13 +443,10 @@ const handleExportTemplate = (row?: CrmQuoteInfoVO) => {
});
};
const crmCustomerContactList = ref([]);
const getCustomerContactList = async () => {
const res = await getCrmCustomerContactList(null);
crmCustomerContactList.value = res.data;
};
onMounted(() => {
getCustomerContactList();
getCrmCustomerInfoList({}).then((res) => {
customerList.value = res.data || [];
});
getList();
});
</script>

Write Preview
Loading…
Cancel
Save