diff --git a/src/components/OrgSelector/employeesDialog.vue b/src/components/OrgSelector/employeesDialog.vue index 5c18bbd..1a9a5c9 100644 --- a/src/components/OrgSelector/employeesDialog.vue +++ b/src/components/OrgSelector/employeesDialog.vue @@ -162,6 +162,8 @@ let saveDialog = () => { id: item.id, name: item.name, avatar: item.avatar, + username: item.username, + userName: item.username, })); emits('change', checkedList); //selectedList.value=[] diff --git a/src/views/finance/purchaseagent/index.vue b/src/views/finance/purchaseagent/index.vue index 7fdddad..ae923a2 100644 --- a/src/views/finance/purchaseagent/index.vue +++ b/src/views/finance/purchaseagent/index.vue @@ -35,6 +35,14 @@ 招标代理管理
+ + 代理汇总 + { } try { - await delObj(row.id); + await delObj({"id":row.id}); useMessage().success('删除成功'); getDataList(); } catch (err: any) { diff --git a/src/views/finance/purchasingrequisition/add.vue b/src/views/finance/purchasingrequisition/add.vue index 809b66d..7160b5b 100644 --- a/src/views/finance/purchasingrequisition/add.vue +++ b/src/views/finance/purchasingrequisition/add.vue @@ -272,9 +272,10 @@ - + {{ item.label }} + @@ -709,6 +710,22 @@ const isDeptPurchase = computed(() => { dataForm.budget && dataForm.budget < 50000); }); +// 学校统一采购时采购形式默认值（不由用户选择）：>=100万→政府采购('1')；5万~100万且集采=否→学校自主('2')；5万~100万且集采=政府集中采购→政府采购('1')；5万~100万且集采=学校集中采购→学校自主('2') +const schoolUnifiedPurchaseFormDefault = computed(() => { + if (isDeptPurchase.value || dataForm.budget == null) return null; + const budget = Number(dataForm.budget); + if (budget >= 1000000) return '1'; // 政府采购 + if (budget >= 50000 && budget < 1000000) { + if (dataForm.isCentralized === '0') return '2'; // 集采=否 → 学校自主采购 + if (dataForm.isCentralized === '1') return '1'; // 政府集中采购 → 政府采购 + if (dataForm.isCentralized === '2') return '2'; // 学校集中采购 → 学校自主采购 + } + return null; +}); + +// 学校统一采购时采购形式是否禁用（由规则自动选择，不由用户选择） +const schoolUnifiedPurchaseFormDisabled = computed(() => flowFieldDisabled('purchaseMode') || (schoolUnifiedPurchaseFormDefault.value != null)); + // 特殊情况字典 value：0否 1紧急 2单一 3进口 const isUrgentSpecial = computed(() => dataForm.isSpecial === '1'); @@ -785,7 +802,7 @@ const isGoodsCategory = computed(() => { const isSpecialServiceCategory = computed(() => { const category = getCategoryInfo(); if (!category) return false; - return Number(category.isMallService) === 1 ; + return Number(category.isMallService) === 1 || Number(category.isProjectService) === 1; }); // 委托采购中心方式自动判断： @@ -913,6 +930,15 @@ watch([() => dataForm.categoryCode, () => dataForm.budget, () => isDeptPurchase. } }, { immediate: true }); +// 学校统一采购：采购形式由规则默认选择，随预算与集采变化自动更新 +watch([() => schoolUnifiedPurchaseFormDefault.value, () => isDeptPurchase.value], () => { + if (isDeptPurchase.value) return; + const def = schoolUnifiedPurchaseFormDefault.value; + if (def != null && dataForm.purchaseMode !== def) { + dataForm.purchaseMode = def; + } +}, { immediate: true }); + // 下载模版 const downloadTemplate = async (type: string) => { const templateMap: Record = { diff --git a/src/views/finance/purchasingrequisition/index.vue b/src/views/finance/purchasingrequisition/index.vue index 082088b..e4f3419 100644 --- a/src/views/finance/purchasingrequisition/index.vue +++ b/src/views/finance/purchasingrequisition/index.vue @@ -76,6 +76,14 @@ 采购申请管理
+ + 采购申请汇总 + - 业务分管管理 + 业务分管部门及人员
新增 - - 导入 - + + + + + + + + +