Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工

云

3 天以前 c77086ad2d7949ab36dd0c4e0b59907e672dd64f

 src/views/srm/tender/detail.vue

@@ -6,20 +6,20 @@

import { Page } from '@vben/common-ui';

import { message, Modal } from 'ant-design-vue';
import { message } from 'ant-design-vue';
import { IconifyIcon } from '@vben/icons';

import {
  getTenderProject,
  getMaterialList, createMaterial, updateMaterial, deleteMaterial,
  getBidListByProject, createBid, withdrawBid,
  getBidListByProject, createBid, withdrawBid, updateBidTotal,
  getQuoteList, createQuote, updateQuote,
  createBidOpen, getBidOpen,
  getEvaluationList, createBidEvaluation, updateBidEvaluation, calculateRanking,
  createAward, deleteAward, getAward, getAwardByProject, approveAward, generatePurchaseOrder,
  confirmTenderProject,
} from '#/api/srm/tender';
import { getSupplierSimpleList } from '#/api/srm/supplier';
import { getSupplierList } from '#/api/srm/supplier';
import { getItemSimpleList } from '#/api/mdm/item';
import type { MdmItemApi } from '#/api/mdm/item';
import {
@@ -51,7 +51,7 @@
onMounted(async () => {
  const [items, suppliers] = await Promise.all([
    getItemSimpleList(),
    getSupplierSimpleList(),
    getSupplierList(),
  ]);
  mdmItemList.value = items;
  supplierList.value = suppliers;
@@ -150,6 +150,8 @@
const quoteFormVisible = ref(false);
const quoteForm = ref<SrmTenderApi.QuoteVO>({ bidId: undefined!, tenderMaterialId: undefined! });
const selectedBidId = ref<number>();
/** 投标总金额草稿：进入报价页时带出已保存总价，可自动带出报价合计后人工微调 */
const bidTotalDraft = ref<number>();

const availableMaterials = computed(() => {
  const quotedIds = new Set(
@@ -169,29 +171,11 @@
  selectedBidId.value = bidId;
  quoteLoading.value = true;
  try { quoteList.value = await getQuoteList(bidId); } finally { quoteLoading.value = false; }
  // 带出该投标已保存的投标总金额（为空则让用户录入/自动带出）
  const bid = bidList.value.find((b) => b.id === bidId);
  bidTotalDraft.value = bid?.bidTotalAmount ?? undefined;
}
async function handleSaveQuote() {
  // 校验：报价金额与投标金额一致性
  const bid = bidList.value.find((b) => b.id === quoteForm.value.bidId);
  if (bid?.bidTotalAmount != null) {
    const otherQuotesTotal = quoteList.value
      .filter((q) => q.id !== quoteForm.value.id)
      .reduce((sum, q) => sum + (q.quotePrice ?? 0), 0);
    const newTotal = otherQuotesTotal + (quoteForm.value.quotePrice ?? 0);
    if (newTotal !== bid.bidTotalAmount) {
      await new Promise<void>((resolve, reject) => {
        Modal.confirm({
          title: '金额不一致提示',
          content: `报价总金额（${newTotal.toLocaleString()}）与投标金额（${bid.bidTotalAmount!.toLocaleString()}）不一致，是否继续提交？`,
          okText: '继续提交',
          cancelText: '取消',
          onOk: () => { resolve(); },
          onCancel: () => { reject(new Error('cancel')); },
        });
      });
    }
  }

  if (quoteForm.value.id) {
    await updateQuote(quoteForm.value);
  } else {
@@ -208,6 +192,62 @@
  quoteForm.value = { ...row };
  quoteFormVisible.value = true;
}

/** 招标物料 Map：报价行按 tenderMaterialId 反查物料数量 */
const materialMap = computed(() => {
  const map = new Map<number, SrmTenderApi.TenderMaterialVO>();
  materialList.value.forEach((m) => {
    if (m.id != null) map.set(m.id, m);
  });
  return map;
});

/** 报价明细对应的招标物料数量 */
function materialQuantityOf(quote: SrmTenderApi.QuoteVO): number {
  return materialMap.value.get(quote.tenderMaterialId!)?.quantity ?? 0;
}

/** 报价行金额 = 报价单价 × 物料数量 */
function quoteAmountOf(quote: SrmTenderApi.QuoteVO): number {
  return (quote.quotePrice ?? 0) * materialQuantityOf(quote);
}

/** 选中投标下已录报价的合计金额 */
const selectedQuoteTotalAmount = computed(() =>
  quoteList.value.reduce((sum, q) => sum + quoteAmountOf(q), 0),
);

/** 维护（整单）投标总金额：可自动带出报价合计后人工微调（用于整单让利等） */
async function handleSaveBidTotal() {
  if (!selectedBidId.value) return;
  if (bidTotalDraft.value == null) {
    message.warning('请填写投标总金额');
    return;
  }
  await updateBidTotal(selectedBidId.value, bidTotalDraft.value);
  message.success('投标总金额已保存');
  loadBids();
}

/** 已保存的投标总金额 与 报价合计 的差异提示（只提示，不拦截） */
const bidTotalCompareHint = computed<{ text: string; tone: 'success' | 'warning' } | null>(() => {
  const sum = selectedQuoteTotalAmount.value;
  if (sum <= 0) {
    return null; // 尚未录报价，暂不比较
  }
  const stored = selectedBid.value?.bidTotalAmount;
  if (stored == null) {
    return { text: '该投标尚未维护总金额：可点「自动带出报价合计」填入后保存', tone: 'warning' };
  }
  const diff = Math.abs(stored - sum);
  if (diff < 0.01) {
    return { text: `投标总金额 ¥${stored.toLocaleString()} 与报价合计一致`, tone: 'success' };
  }
  return {
    text: `投标总金额 ¥${stored.toLocaleString()} 与报价合计 ¥${sum.toLocaleString()} 不一致（差额 ¥${diff.toLocaleString()}）。如需整单让利/调价，直接在投标总金额处修改并保存。`,
    tone: 'warning',
  };
});

// ========== 开标 ==========
const bidOpen = ref<any>(null);
@@ -363,6 +403,7 @@
const typeLabel = computed(() => getLabel(TENDER_TYPE_CELLTAG.labels, project.value?.tenderType));
const isDraft = computed(() => project.value?.tenderStatus === TENDER_STATUS.DRAFT);
const isPublished = computed(() => project.value?.tenderStatus === TENDER_STATUS.PUBLISHED);
const isBidding = computed(() => project.value?.tenderStatus === TENDER_STATUS.BIDDING);
const isPublishedOrBidding = computed(() => {
  const s = project.value?.tenderStatus;
  return s === TENDER_STATUS.PUBLISHED || s === TENDER_STATUS.BIDDING;
@@ -438,7 +479,7 @@
const bidColumns = [
  { title: '投标编号', dataIndex: 'bidNo', width: 140 },
  { title: '供应商', dataIndex: 'supplierName', width: 200 },
  { title: '投标金额', dataIndex: 'bidTotalAmount', width: 120 },
  { title: '投标总金额', dataIndex: 'bidTotalAmount', width: 120 },
  { title: '投标时间', dataIndex: 'bidTime', width: 160 },
  { title: '状态', dataIndex: 'bidStatus', width: 100, customRender: ({ text }: any) => BID_STATUS_MAP[text] || text },
  { title: '操作', key: 'actions', width: 240 },
@@ -446,7 +487,9 @@

const quoteColumns = [
  { title: '物料', dataIndex: 'materialName', width: 120 },
  { title: '报价价格', dataIndex: 'quotePrice', width: 100 },
  { title: '报价单价', dataIndex: 'quotePrice', width: 100 },
  { title: '数量', dataIndex: 'quantity', width: 70 },
  { title: '报价金额', dataIndex: 'quoteAmount', width: 110 },
  { title: '税率(%)', dataIndex: 'taxRate', width: 80 },
  { title: '交期(天)', dataIndex: 'deliveryCycle', width: 80 },
  { title: '付款条件', dataIndex: 'paymentTerms', width: 120 },
@@ -537,14 +580,32 @@
          </div>

          <!-- 招标说明 / 资质要求 -->
          <template v-if="project.tenderDesc || project.qualificationRequirements">
          <template
            v-if="project.tenderDesc || project.qualificationRequirements || (project.attachmentList && project.attachmentList.length)"
          >
            <a-divider class="!my-2" />
            <a-collapse :bordered="false" ghost expand-icon-position="end">
              <a-collapse-panel v-if="project.tenderDesc" key="desc" header="招标说明">
                <p class="text-gray-500 text-xs whitespace-pre-wrap">{{ project.tenderDesc }}</p>
              </a-collapse-panel>
              <a-collapse-panel v-if="project.qualificationRequirements" key="req" header="资质要求">
                <p class="text-gray-500 text-xs whitespace-pre-wrap">{{ project.qualificationRequirements }}</p>
              <a-collapse-panel
                v-if="project.qualificationRequirements || (project.attachmentList && project.attachmentList.length)"
                key="req"
                header="资质要求"
              >
                <p v-if="project.qualificationRequirements" class="text-gray-500 text-xs whitespace-pre-wrap">{{ project.qualificationRequirements }}</p>
                <div v-if="project.attachmentList && project.attachmentList.length" class="mt-2 flex flex-col gap-1">
                  <a
                    v-for="file in project.attachmentList"
                    :key="file.id"
                    :href="file.url"
                    target="_blank"
                    rel="noopener noreferrer"
                    class="text-blue-500 text-xs hover:underline"
                  >
                    {{ file.name || '附件-' + file.id }}
                  </a>
                </div>
              </a-collapse-panel>
            </a-collapse>
          </template>
@@ -594,7 +655,7 @@
              </template>
              <div class="flex items-center justify-between mb-3">
                <span class="text-xs text-gray-400">共 <b class="text-gray-600">{{ bidCount }}</b> 个投标</span>
                <a-button v-if="isPublishedOrBidding || isDraft || isPriceComparing" type="primary" size="small" @click="bidForm = { tenderProjectId: projectId, supplierId: undefined!, bidNo: '' }; bidFormVisible = true">
                <a-button v-if="isBidding || isDraft || isPriceComparing" type="primary" size="small" @click="bidForm = { tenderProjectId: projectId, supplierId: undefined!, bidNo: '' }; bidFormVisible = true">
                  <template #icon><IconifyIcon icon="ant-design:plus-outlined" /></template>
                  新增投标
                </a-button>
@@ -637,7 +698,29 @@
                  <span class="text-gray-400">供应商：<b class="text-gray-700">{{ selectedBid.supplierName }}</b></span>
                  <a-button size="small" type="link" class="ml-auto" @click="activeTab = 'bid'">切换投标</a-button>
                </div>
                <div class="text-right mb-3">
                <!-- 投标总金额（整单总价）：可与报价合计自动带出并人工调整 -->
                <div v-if="(isPublishedOrBidding || isDraft || isPriceComparing) && selectedBid?.bidStatus !== BID_STATUS.WITHDRAWN" class="flex flex-wrap items-center gap-x-3 gap-y-2 mb-2 px-3 py-2 bg-blue-50/70 rounded text-xs">
                  <span class="text-gray-600 font-medium">投标总金额</span>
                  <a-input-number v-model:value="bidTotalDraft" :min="0" :precision="2" class="!w-40" placeholder="整单总价">
                    <template #addonAfter>元</template>
                  </a-input-number>
                  <a-button size="small" type="link" :disabled="selectedQuoteTotalAmount <= 0" @click="bidTotalDraft = selectedQuoteTotalAmount">
                    自动带出报价合计 ¥{{ selectedQuoteTotalAmount.toLocaleString() }}
                  </a-button>
                  <a-button size="small" type="primary" @click="handleSaveBidTotal">保存总价</a-button>
                </div>
                <a-alert
                  v-if="bidTotalCompareHint"
                  :type="bidTotalCompareHint.tone"
                  :show-icon="true"
                  class="mb-3"
                  :message="bidTotalCompareHint.text"
                />
                <div class="flex items-center justify-between mb-3">
                  <span class="text-xs text-gray-400">
                    已报价 <b class="text-gray-600">{{ quoteList.length }}</b> / <b class="text-gray-600">{{ materialList.length }}</b> 项物料，报价合计
                    <b class="text-blue-500">{{ selectedQuoteTotalAmount.toLocaleString() }}</b> 元
                  </span>
                  <a-button v-if="(isPublishedOrBidding || isDraft || isPriceComparing) && selectedBid?.bidStatus !== BID_STATUS.WITHDRAWN" type="primary" size="small" @click="handleAddQuote">
                    <template #icon><IconifyIcon icon="ant-design:plus-outlined" /></template>
                    新增报价
@@ -647,6 +730,12 @@
                  <template #bodyCell="{ column, record }">
                    <template v-if="column.dataIndex === 'quotePrice'">
                      <span class="font-medium text-blue-600">{{ record.quotePrice?.toLocaleString() }}</span>
                    </template>
                    <template v-if="column.dataIndex === 'quantity'">
                      {{ materialQuantityOf(record) || '-' }}
                    </template>
                    <template v-if="column.dataIndex === 'quoteAmount'">
                      <span class="font-medium text-blue-600">{{ quoteAmountOf(record).toLocaleString() }}</span>
                    </template>
                    <template v-if="column.dataIndex === 'taxRate'">
                      {{ record.taxRate != null ? `${record.taxRate}%` : '-' }}
@@ -873,7 +962,9 @@
            </a-select>
          </a-form-item>
          <a-form-item label="投标总金额">
            <a-input-number v-model:value="bidForm.bidTotalAmount" :min="0" class="!w-full" placeholder="投标总金额"><template #addonAfter>元</template></a-input-number>
            <div class="text-xs text-gray-400 leading-5">
              可暂不填：报价明细录完后，在「报价管理」页按报价合计自动带出、再人工微调保存。
            </div>
          </a-form-item>
        </a-form>
      </a-modal>
@@ -888,7 +979,7 @@
          </a-form-item>
          <a-row :gutter="12">
            <a-col :span="8">
              <a-form-item label="报价价格" required><a-input-number v-model:value="quoteForm.quotePrice" :min="0" class="!w-full" placeholder="报价"><template #addonAfter>元</template></a-input-number></a-form-item>
              <a-form-item label="报价单价" required><a-input-number v-model:value="quoteForm.quotePrice" :min="0" class="!w-full" placeholder="报价"><template #addonAfter>元</template></a-input-number></a-form-item>
            </a-col>
            <a-col :span="8">
              <a-form-item label="税率(%)"><a-input-number v-model:value="quoteForm.taxRate" :min="0" :max="100" class="!w-full" placeholder="如 13" /></a-form-item>
@@ -998,4 +1089,4 @@
      </a-modal>
    </template>
  </Page>
</template>
</template>