Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inv...

huminmin

2026-06-01 a563ea879ef5fb6897e76d2df661e465dce2ab9b

Merge branch 'dev_新疆_大罗素马铃薯new' of http://114.132.189.42:9002/r/product-inventory-management into dev_新疆_大罗素马铃薯new

 src/views/index.vue

@@ -419,6 +419,8 @@
  monthSaleHaveMoney: 0,
  monthSaleMoney: 0,
  todayInventoryNum: 0,
  lastMonthSaleMoney: 0,
  lastMonthPurchaseMoney: 0,
});

const qualityStatisticsObject = ref({
@@ -701,15 +703,29 @@
  });
});

// è®¡ç®—环比增长率
const calculateGrowthRate = (current, last) => {
  const currentVal = parseFloat(current) || 0;
  const lastVal = parseFloat(last) || 0;
  if (lastVal === 0) return currentVal > 0 ? 100 : 0;
  return ((currentVal - lastVal) / lastVal * 100).toFixed(1);
};

const dashboardCards = computed(() => [
  {
    key: "sales",
    title: "销售数据",
    desc: "本月销售额(元)",
    value: formatNumber(businessInfo.value.monthSaleMoney),
    subLabel: "未开票金额",
    subValue: formatNumber(businessInfo.value.monthSaleHaveMoney),
    trend: `占比 ${ratioText(businessInfo.value.monthSaleHaveMoney, businessInfo.value.monthSaleMoney)}`,
    subLabel: "上月销售",
    subValue: formatNumber(businessInfo.value.lastMonthSaleMoney),
    trend: (() => {
      const rate = calculateGrowthRate(businessInfo.value.monthSaleMoney, businessInfo.value.lastMonthSaleMoney);
      const num = parseFloat(rate);
      if (num > 0) return `环比 â†‘ ${rate}%`;
      if (num < 0) return `环比 â†“ ${Math.abs(num)}%`;
      return "环比持平";
    })(),
    icon: DataLine,
    visible: visibleModules.value.sales,
  },
@@ -718,12 +734,15 @@
    title: "采购数据",
    desc: "本月采购额(元)",
    value: formatNumber(businessInfo.value.monthPurchaseMoney),
    subLabel: "待付款金额",
    subValue: formatNumber(businessInfo.value.monthPurchaseHaveMoney),
    trend: `占比 ${ratioText(
        businessInfo.value.monthPurchaseHaveMoney,
        businessInfo.value.monthPurchaseMoney
    )}`,
    subLabel: "上月采购",
    subValue: formatNumber(businessInfo.value.lastMonthPurchaseMoney),
    trend: (() => {
      const rate = calculateGrowthRate(businessInfo.value.monthPurchaseMoney, businessInfo.value.lastMonthPurchaseMoney);
      const num = parseFloat(rate);
      if (num > 0) return `环比 â†‘ ${rate}%`;
      if (num < 0) return `环比 â†“ ${Math.abs(num)}%`;
      return "环比持平";
    })(),
    icon: ShoppingCartFull,
    visible: visibleModules.value.procurement,
  },

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -1,154 +1,149 @@
<template>
  <div>
    <div class="search_form"
         style="margin-bottom: 10px">
      <el-form ref="searchFormRef"
               :model="searchForm"
               class="demo-form-inline">
    <div class="search_form" style="margin-bottom: 10px">
      <el-form ref="searchFormRef" :model="searchForm" class="demo-form-inline">
        <el-row :gutter="20">
          <el-col :span="4">
            <el-form-item label="出库日期"
                          prop="timeStr">
              <el-date-picker v-model="searchForm.timeStr"
            <el-form-item label="出库日期" prop="timeStr">
              <el-date-picker
                v-model="searchForm.timeStr"
                              type="date"
                              placeholder="请选择日期"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="产品大类"
                          prop="productName">
              <el-input v-model="searchForm.productName"
            <el-form-item label="产品大类" prop="productName">
              <el-input
                v-model="searchForm.productName"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="规格型号"
                          prop="model">
              <el-input v-model="searchForm.model"
            <el-form-item label="规格型号" prop="model">
              <el-input
                v-model="searchForm.model"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="批号"
                          prop="batchNo">
              <el-input v-model="searchForm.batchNo"
            <el-form-item label="批号" prop="batchNo">
              <el-input
                v-model="searchForm.batchNo"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="来源"
                          prop="recordType">
              <el-select v-model="searchForm.recordType"
            <el-form-item label="来源" prop="recordType">
              <el-select
                v-model="searchForm.recordType"
                         style="width: 240px"
                         placeholder="请选择"
                         clearable>
                <el-option v-for="item in stockRecordTypeOptions"
                clearable
              >
                <el-option
                  v-for="item in stockRecordTypeOptions"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value" />
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <!-- æŒ‰é’® -->
          <el-col :span="4">
            <el-form-item>
              <el-button type="primary"
                         @click="getList">
                æœç´¢
              </el-button>
              <el-button @click="resetSearch">
                é‡ç½®
              </el-button>
              <el-button type="primary" @click="getList"> æœç´¢ </el-button>
              <el-button @click="resetSearch"> é‡ç½® </el-button>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
    </div>
    <div class="actions">
      <el-button type="primary"
                 @click="handleBatchApprove">审批</el-button>
      <el-button type="primary" @click="handleBatchApprove">审批</el-button>
      <el-button @click="handleOut">导出</el-button>
      <el-button type="danger"
                 plain
                 @click="handleDelete">删除</el-button>
      <el-button type="primary"
                 plain
                 @click="handlePrint">打印</el-button>
      <el-button type="danger" plain @click="handleDelete">删除</el-button>
      <el-button type="primary" plain @click="handlePrint">打印</el-button>
    </div>
    <div class="table_list">
      <el-table :data="tableData"
      <el-table
        :data="tableData"
                border
                v-loading="tableLoading"
                @selection-change="handleSelectionChange"
                :expand-row-keys="expandedRowKeys"
                :row-key="(row) => row.id"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
        <el-table-column align="center"
                         type="selection"
                         width="55" />
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60" />
        <el-table-column label="出库批次"
        height="calc(100vh - 18.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="出库批次"
                         prop="outboundBatches"
                         min-width="100"
                         show-overflow-tooltip />
        <el-table-column label="出库日期"
                         prop="createTime"
                         show-overflow-tooltip />
        <el-table-column label="产品大类"
          show-overflow-tooltip
        />
        <el-table-column
          label="出库日期"
          prop="updateTime"
          show-overflow-tooltip
        />
        <el-table-column
          label="产品大类"
                         prop="productName"
                         show-overflow-tooltip />
        <el-table-column label="规格型号"
                         prop="model"
                         show-overflow-tooltip />
        <el-table-column label="批号"
                         prop="batchNo"
                         show-overflow-tooltip />
        <el-table-column label="单位"
                         prop="unit"
                         show-overflow-tooltip />
        <el-table-column label="出库数量"
          show-overflow-tooltip
        />
        <el-table-column label="规格型号" prop="model" show-overflow-tooltip />
        <el-table-column label="批号" prop="batchNo" show-overflow-tooltip />
        <el-table-column label="单位" prop="unit" show-overflow-tooltip />
        <el-table-column
          label="出库数量"
                         prop="stockOutNum"
                         show-overflow-tooltip />
        <el-table-column label="出库人"
                         prop="createBy"
                         show-overflow-tooltip />
        <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          show-overflow-tooltip
        />
        <el-table-column label="出库人" prop="createBy" show-overflow-tooltip />
        <el-table-column label="来源" prop="recordType" show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column label="审批状态"
        <el-table-column
          label="审批状态"
                         prop="approvalStatus"
                         show-overflow-tooltip>
          show-overflow-tooltip
        >
          <template #default="scope">
            <el-tag :type="getApprovalStatusTagType(scope.row.approvalStatus)"
                    size="small">
            <el-tag
              :type="getApprovalStatusTagType(scope.row.approvalStatus)"
              size="small"
            >
              {{ getApprovalStatusLabel(scope.row.approvalStatus) }}
            </el-tag>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0"
      <pagination
        v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange" />
        @pagination="paginationChange"
      />
    </div>
  </div>
</template>
@@ -216,7 +211,7 @@
    getList();
  };

  const paginationChange = obj => {
const paginationChange = (obj) => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
@@ -228,10 +223,10 @@
      ...page,
      topParentProductId: props.topParentProductId,
    })
      .then(res => {
    .then((res) => {
        tableLoading.value = false;
        tableData.value = res.data.records;
        tableData.value.map(item => {
      tableData.value.map((item) => {
          item.children = [];
        });
        total.value = res.data.total;
@@ -241,9 +236,9 @@
      });
  };

  const getRecordType = recordType => {
const getRecordType = (recordType) => {
    return (
      stockRecordTypeOptions.value.find(item => item.value === recordType)
    stockRecordTypeOptions.value.find((item) => item.value === recordType)
        ?.label || ""
    );
  };
@@ -261,7 +256,7 @@
    REJECTED: "驳回",
  };

  const getApprovalStatusLabel = status => {
const getApprovalStatusLabel = (status) => {
    if (status === null || status === undefined || status === "") {
      return "待审批";
    }
@@ -269,7 +264,7 @@
  };

  // é€šè¿‡/驳回固定色；其余（含待审批、空值、未映射但文案为待审批）统一用 warning é¢„警色
  const getApprovalStatusTagType = status => {
const getApprovalStatusTagType = (status) => {
    if (
      status === 1 ||
      status === "1" ||
@@ -290,20 +285,20 @@
  // èŽ·å–来源类型选项
  const fetchStockRecordTypeOptions = () => {
    if (props.type === "0") {
      findAllQualifiedStockOutRecordTypeOptions().then(res => {
    findAllQualifiedStockOutRecordTypeOptions().then((res) => {
        stockRecordTypeOptions.value = res.data;
      });
      return;
    }
    findAllUnQualifiedStockOutRecordTypeOptions().then(res => {
  findAllUnQualifiedStockOutRecordTypeOptions().then((res) => {
      stockRecordTypeOptions.value = res.data;
    });
  };

  // è¡¨æ ¼é€‰æ‹©æ•°æ®
  const handleSelectionChange = selection => {
const handleSelectionChange = (selection) => {
    // è¿‡æ»¤æŽ‰å­æ•°æ®
    selectedRows.value = selection.filter(item => item.id);
  selectedRows.value = selection.filter((item) => item.id);
    console.log("selection", selectedRows.value);
  };
  const expandedRowKeys = ref([]);
@@ -313,7 +308,7 @@
      proxy.$modal.msgWarning("请选择数据");
      return;
    }
    const ids = selectedRows.value.map(item => item.id);
  const ids = selectedRows.value.map((item) => item.id);
    ElMessageBox.confirm("请选择审批结果", "审批", {
      confirmButtonText: "通过",
      cancelButtonText: "驳回",
@@ -330,7 +325,7 @@
            proxy.$modal.msgError("审批通过失败");
          });
      })
      .catch(action => {
    .catch((action) => {
        if (action === "cancel") {
          batchApproveStockOutRecords({ ids, approvalStatus: 2 })
            .then(() => {
@@ -369,7 +364,7 @@
  const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
      ids = selectedRows.value.map(item => item.id);
    ids = selectedRows.value.map((item) => item.id);
    } else {
      proxy.$modal.msgWarning("请选择数据");
      return;
@@ -380,7 +375,7 @@
      type: "warning",
    })
      .then(() => {
        delPendingStockOut(ids).then(res => {
      delPendingStockOut(ids).then((res) => {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        });
@@ -659,7 +654,7 @@
  };

  // æ ¼å¼åŒ–日期
  const formatDate = dateString => {
const formatDate = (dateString) => {
    if (!dateString) return getCurrentDate();
    const date = new Date(dateString);
    const year = date.getFullYear();
@@ -669,7 +664,7 @@
  };

  // æ ¼å¼åŒ–日期时间
  const formatDateTime = date => {
const formatDateTime = (date) => {
    const year = date.getFullYear();
    const month = String(date.getMonth() + 1).padStart(2, "0");
    const day = String(date.getDate()).padStart(2, "0");

 src/views/officeProcessAutomation/ApproveManage/approve-list/approveListConstants.js

@@ -474,13 +474,14 @@
}

/** ç»„装审批提交 DTO */
export function buildApproveInstanceDto(row, uiResult, comment, warehouse) {
export function buildApproveInstanceDto(row, uiResult, comment, warehouse, extraData = {}) {
  const opinion = (comment || "").trim();
  return {
    id: row?.id,
    approveAction: mapApproveActionToApi(uiResult),
    approveComment: opinion || (uiResult === "approved" ? "同意" : ""),
    warehouse: warehouse || row?.warehouse || "",
    ...extraData,
  };
}


 src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue

@@ -3,32 +3,44 @@
  <div class="approve-detail-panel">
    <div class="detail-block">
      <div class="detail-block-title">基本信息</div>
      <el-descriptions :column="2"
                       border>
        <el-descriptions-item label="业务单号">{{ row.bizId || row.id || "—" }}</el-descriptions-item>
      <el-descriptions :column="2" border>
        <el-descriptions-item label="业务单号">{{
          row.bizId || row.id || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="审批状态">
          <el-tag :type="approvalStatusTagType(row.approvalStatus)"
          <el-tag
            :type="approvalStatusTagType(row.approvalStatus)"
                  size="small"
                  effect="plain">
            effect="plain"
          >
            {{ approvalStatusLabel(row.approvalStatus) }}
          </el-tag>
        </el-descriptions-item>
        <el-descriptions-item label="审批类型">
          <span class="approve-type-cell"
                :style="approvalTypeStyle(row.approvalType)">
          <span
            class="approve-type-cell"
            :style="approvalTypeStyle(row.approvalType)"
          >
            {{ approvalTypeLabel(row.approvalType) }}
          </span>
        </el-descriptions-item>
        <el-descriptions-item label="申请人编号">{{ row.applicantNo || "—" }}</el-descriptions-item>
        <el-descriptions-item label="申请人名称">{{ row.applicantName || "—" }}</el-descriptions-item>
        <el-descriptions-item label="申请摘要">{{ row.summary || "—" }}</el-descriptions-item>
        <el-descriptions-item v-if="row.rejectReason"
        <el-descriptions-item label="申请人编号">{{
          row.applicantNo || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="申请人名称">{{
          row.applicantName || "—"
        }}</el-descriptions-item>
        <el-descriptions-item label="申请摘要">{{
          row.summary || "—"
        }}</el-descriptions-item>
        <el-descriptions-item
          v-if="row.rejectReason"
                              label="驳回原因"
                              :span="2">
          :span="2"
        >
          <span class="reject-text">{{ row.rejectReason }}</span>
        </el-descriptions-item>
        <el-descriptions-item label="创建时间"
                              :span="2">
        <el-descriptions-item label="创建时间" :span="2">
          {{ formatDisplayTime(row.createTime) }}
        </el-descriptions-item>
      </el-descriptions>
@@ -36,36 +48,81 @@
    <div class="detail-block">
      <div class="detail-block-title">填报内容</div>
      <!-- é»˜è®¤è¡¨å•å±•ç¤º -->
      <FormPayloadFields v-if="!isSpecialApprovalType"
      <FormPayloadFields
        v-if="!isSpecialApprovalType"
                         :fields="formResolved.fields"
                         :form-payload="formResolved.formPayload"
                         readonly />
        readonly
      />
      
      <!-- å‘货审批详情 -->
      <template v-else-if="row.businessType === 7">
        <div v-if="detailData.shippingInfo" class="shipment-detail">
          <el-divider content-position="left">发货详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="销售订单">{{ detailData.shippingInfo.salesContractNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货订单号">{{ detailData.shippingInfo.shippingNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{ detailData.shippingInfo.customerName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货类型">{{ detailData.shippingInfo.type || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货日期">{{ detailData.shippingInfo.shippingDateDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="审核状态">{{ detailData.shippingInfo.status || "--" }}</el-descriptions-item>
            <el-descriptions-item label="发货车牌号">{{ detailData.shippingInfo.shippingCarNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="快递公司">{{ detailData.shippingInfo.expressCompany || "--" }}</el-descriptions-item>
            <el-descriptions-item label="快递单号" :span="2">{{ detailData.shippingInfo.expressNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="销售订单">{{
              detailData.shippingInfo.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="出库批号">{{
              detailData.shippingInfo.outboundBatches || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{
              detailData.shippingInfo.customerName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货类型">{{
              detailData.shippingInfo.type || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货日期">{{
              detailData.shippingInfo.shippingDateDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="审核状态">{{
              detailData.shippingInfo.status || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="发货车牌号">{{
              detailData.shippingInfo.shippingCarNumber || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="快递公司">{{
              detailData.shippingInfo.expressCompany || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="快递单号" :span="2">{{
              detailData.shippingInfo.expressNumber || "--"
            }}</el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.shippingProductDetailDtoList.length" style="margin-top: 20px;">
          <div
            v-if="detailData.shippingProductDetailDtoList.length"
            style="margin-top: 20px"
          >
            <h4>产品明细</h4>
            <el-table :data="detailData.shippingProductDetailDtoList"
            <el-table
              :data="detailData.shippingProductDetailDtoList"
                      border
                      size="small"
                      style="width: 100%">
              <el-table-column label="批号" prop="batchNo" min-width="160" show-overflow-tooltip />
              <el-table-column label="产品名称" prop="productName" min-width="160" show-overflow-tooltip />
              <el-table-column label="规格型号" prop="specificationModel" min-width="160" show-overflow-tooltip />
              <el-table-column label="发货数量" prop="deliveryQuantity" min-width="120" align="center" />
              style="width: 100%"
            >
              <el-table-column
                label="批号"
                prop="batchNo"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="产品名称"
                prop="productName"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="规格型号"
                prop="specificationModel"
                min-width="160"
                show-overflow-tooltip
              />
              <el-table-column
                label="发货数量"
                prop="deliveryQuantity"
                min-width="120"
                align="center"
              />
            </el-table>
          </div>
        </div>
@@ -76,33 +133,53 @@
        <div v-if="detailData" class="procurement-detail">
          <el-divider content-position="left">采购详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="采购合同号">{{ detailData.purchaseContractNumber || "--" }}</el-descriptions-item>
            <el-descriptions-item label="供应商名称">{{ detailData.supplierName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="项目名称">{{ detailData.projectName || "--" }}</el-descriptions-item>
            <el-descriptions-item label="销售合同号">{{ detailData.salesContractNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="签订日期">{{ detailData.executionDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="录入日期">{{ detailData.entryDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{ detailData.paymentMethod || "--" }}</el-descriptions-item>
            <el-descriptions-item label="采购合同号">{{
              detailData.purchaseContractNumber || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="供应商名称">{{
              detailData.supplierName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="项目名称">{{
              detailData.projectName || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="销售合同号">{{
              detailData.salesContractNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="签订日期">{{
              detailData.executionDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="录入日期">{{
              detailData.entryDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{
              detailData.paymentMethod || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="合同金额" :span="2">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold">
                Â¥{{ Number(detailData.contractAmount ?? 0).toFixed(2) }}
              </span>
            </el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.productData.length" style="margin-top: 20px;">
          <div v-if="detailData.productData.length" style="margin-top: 20px">
            <h4>产品明细</h4>
            <el-table :data="detailData.productData"
                      border
                      style="width: 100%">
            <el-table :data="detailData.productData" border style="width: 100%">
              <el-table-column prop="productCategory" label="产品名称" />
              <el-table-column prop="specificationModel" label="规格型号" />
              <el-table-column prop="unit" label="单位" />
              <el-table-column prop="quantity" label="数量" />
              <el-table-column prop="taxInclusiveUnitPrice" label="含税单价">
                <template #default="scope">Â¥{{ Number(scope.row.taxInclusiveUnitPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >Â¥{{
                    Number(scope.row.taxInclusiveUnitPrice ?? 0).toFixed(2)
                  }}</template
                >
              </el-table-column>
              <el-table-column prop="taxInclusiveTotalPrice" label="含税总价">
                <template #default="scope">Â¥{{ Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >Â¥{{
                    Number(scope.row.taxInclusiveTotalPrice ?? 0).toFixed(2)
                  }}</template
                >
              </el-table-column>
            </el-table>
          </div>
@@ -114,63 +191,83 @@
        <div v-if="detailData" class="quotation-detail">
          <el-divider content-position="left">报价详情</el-divider>
          <el-descriptions :column="2" border>
            <el-descriptions-item label="报价单号">{{ detailData.quotationNo || "--" }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{ detailData.customer || "--" }}</el-descriptions-item>
            <el-descriptions-item label="业务员">{{ detailData.salesperson || "--" }}</el-descriptions-item>
            <el-descriptions-item label="报价日期">{{ detailData.quotationDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="有效期至">{{ detailData.validDate || "--" }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{ detailData.paymentMethod || "--" }}</el-descriptions-item>
            <el-descriptions-item label="报价单号">{{
              detailData.quotationNo || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="客户名称">{{
              detailData.customer || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="业务员">{{
              detailData.salesperson || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="报价日期">{{
              detailData.quotationDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="有效期至">{{
              detailData.validDate || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="付款方式">{{
              detailData.paymentMethod || "--"
            }}</el-descriptions-item>
            <el-descriptions-item label="报价总额" :span="2">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
              <span style="font-size: 18px; color: #e6a23c; font-weight: bold">
                Â¥{{ Number(detailData.totalAmount ?? 0).toFixed(2) }}
              </span>
            </el-descriptions-item>
          </el-descriptions>
          <div v-if="detailData.products?.length" style="margin-top: 20px;">
          <div v-if="detailData.products?.length" style="margin-top: 20px">
            <h4>产品明细</h4>
            <el-table :data="detailData.products"
                      border
                      style="width: 100%">
            <el-table :data="detailData.products" border style="width: 100%">
              <el-table-column prop="product" label="产品名称" />
              <el-table-column prop="specification" label="规格型号" />
              <el-table-column prop="unit" label="单位" />
              <el-table-column prop="unitPrice" label="单价">
                <template #default="scope">Â¥{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template>
                <template #default="scope"
                  >Â¥{{ Number(scope.row.unitPrice ?? 0).toFixed(2) }}</template
                >
              </el-table-column>
            </el-table>
          </div>
          <div v-if="detailData.remark" style="margin-top: 20px;">
          <div v-if="detailData.remark" style="margin-top: 20px">
            <h4>备注</h4>
            <p>{{ detailData.remark }}</p>
          </div>
        </div>
      </template>
    </div>
    <div v-if="attachmentList.length"
         class="detail-block">
    <div v-if="attachmentList.length" class="detail-block">
      <div class="detail-block-title">附件列表</div>
      <div class="attachment-list">
        <div v-for="file in attachmentList"
        <div
          v-for="file in attachmentList"
             :key="file.id"
             class="attachment-item">
          class="attachment-item"
        >
          <el-icon class="file-icon">
            <Paperclip />
          </el-icon>
          <span class="file-name"
                :title="file.name || file.originalFilename">
          <span class="file-name" :title="file.name || file.originalFilename">
            {{ file.name || file.originalFilename }}
          </span>
          <div class="file-actions">
            <el-link v-if="file.previewURL || file.url"
            <el-link
              v-if="file.previewURL || file.url"
                     type="primary"
                     :underline="false"
                     @click="openFile(file.previewURL || file.url)">预览</el-link>
            <el-divider v-if="(file.previewURL || file.url) && file.downloadURL"
                        direction="vertical" />
            <el-link v-if="file.downloadURL"
              @click="openFile(file.previewURL || file.url)"
              >预览</el-link
            >
            <el-divider
              v-if="(file.previewURL || file.url) && file.downloadURL"
              direction="vertical"
            />
            <el-link
              v-if="file.downloadURL"
                     type="primary"
                     :underline="false"
                     @click="openFile(file.downloadURL)">下载</el-link>
              @click="openFile(file.downloadURL)"
              >下载</el-link
            >
          </div>
        </div>
      </div>
@@ -197,7 +294,6 @@
  });

  const formResolved = computed(() => resolveInstanceFormFields(props.row));


  // æ˜¯å¦ä¸ºç‰¹æ®Šå®¡æ‰¹ç±»åž‹ï¼ˆé‡‡è´­ã€å‘货、报价）
  const isSpecialApprovalType = computed(() => {

 src/views/officeProcessAutomation/ApproveManage/approve-list/useApproveList.js

@@ -665,8 +665,13 @@
    if (approveSubmitting.value) return { ok: false };
    approveSubmitting.value = true;
    try {
      // å‘货审批时传递出库批号
      const extraData = {};
      if (Number(row.businessType) === 7 && detailData.value?.shippingInfo?.outboundBatches) {
        extraData.outboundBatches = detailData.value.shippingInfo.outboundBatches;
      }
      await approveApprovalInstance(
        buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse)
        buildApproveInstanceDto(row, result, approveOpinion.value, approveDialog.warehouse, extraData)
      );
      approveDialog.visible = false;
      await fetchApprovalList();

 src/views/qualityManagement/finalInspection/components/formDia.vue

@@ -190,7 +190,7 @@
import {userListNoPage} from "@/api/system/user.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {ledgerListNoPage} from "@/api/salesManagement/salesLedger.js";
import {ledgerListNoPage, productList} from "@/api/salesManagement/salesLedger.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])

@@ -216,18 +216,18 @@
    salesContractNo: "",
  },
  rules: {
    checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
    process: [{ required: true, message: "请输入", trigger: "blur" }],
    checkTime: [{ required: false, message: "请输入", trigger: "blur" }],
    process: [{ required: false, message: "请输入", trigger: "blur" }],
    checkName: [{ required: false, message: "请输入", trigger: "blur" }],
    productId: [{ required: true, message: "请输入", trigger: "blur" }],
    productModelId: [{ required: true, message: "请选择", trigger: "change" }],
    testStandardId: [{ required: false, message: "请选择指标", trigger: "change" }],
    unit: [{ required: false, message: "请输入", trigger: "blur" }],
    quantity: [{ required: true, message: "请输入", trigger: "blur" }],
    qualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
    unqualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
    quantity: [{ required: false, message: "请输入", trigger: "blur" }],
    qualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
    unqualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: true, message: "请输入", trigger: "change" }],
    checkResult: [{ required: false, message: "请输入", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);
@@ -296,6 +296,30 @@
  form.value = {}
  testStandardOptions.value = [];
  tableData.value = [];

  // æ–°å¢žæ¨¡å¼ä¸‹ï¼Œé»˜è®¤è®¾ç½®äº§å“åç§°ä¸º"马铃薯雪花粉"(id=320)
  if (operationType.value === 'add') {
    const defaultProductId = 320;
    form.value.productId = defaultProductId;
    currentProductId.value = defaultProductId;
    form.value.productName = '马铃薯雪花粉';
    // åŠ è½½è§„格型号列表
    try {
      const modelRes = await modelList({ id: defaultProductId });
      modelOptions.value = modelRes || [];
      // é»˜è®¤é€‰ä¸­ç¬¬ä¸€ä¸ªè§„格型号
      if (modelOptions.value.length > 0) {
        const firstModel = modelOptions.value[0];
        form.value.productModelId = firstModel.id;
        form.value.model = firstModel.model || '';
        form.value.unit = firstModel.unit || '';
      }
      // åŠ è½½æŒ‡æ ‡é€‰é¡¹
      getList();
    } catch (e) {
      console.error('加载默认产品规格型号失败', e);
    }
  }

  if (operationType.value === 'edit' || operationType.value === 'view') {
    // å…ˆä¿å­˜ testStandardId，避免被清空
@@ -387,12 +411,25 @@
}

// é”€å”®è®¢å•é€‰æ‹©å˜åŒ–处理
const handleSalesLedgerChange = (value) => {
const handleSalesLedgerChange = async (value) => {
  const selectedItem = salesLedgerOptions.value.find(item => item.id == value);
  if (selectedItem) {
    form.value.salesContractNo = selectedItem.salesContractNo || '';
    // æ ¹æ®é”€å”®è®¢å•ID查询产品信息，只赋值数量
    try {
      const res = await productList({ salesLedgerId: value, type: 1 });
      const productData = res.data && res.data.length > 0 ? res.data[0] : null;
      if (productData) {
        // åªè‡ªåŠ¨å¸¦å…¥æ•°é‡
        form.value.quantity = productData.quantity || 0;
      }
    } catch (e) {
      console.error('查询销售订单产品信息失败', e);
      proxy.$modal.msgError('查询销售订单产品信息失败');
    }
  } else {
    form.value.salesContractNo = '';
    form.value.quantity = undefined;
  }
}


 src/views/qualityManagement/finalInspection/components/quickCheckDia.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,327 @@
<template>
  <div>
    <el-dialog
      v-model="dialogVisible"
      title="快速检验"
      width="70%"
      @close="closeDialog"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
              <el-select v-model="form.checkResult" placeholder="请选择检测结果" style="width: 100%" @change="handleCheckResultChange">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="部分合格" value="部分合格" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select v-model="form.testStandardId" placeholder="请选择指标" style="width: 100%" @change="handleTestStandardChange">
                <el-option
                  v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <template v-if="form.checkResult">
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="数量：" prop="quantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入数量" clearable :precision="2" @change="handleQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测单位：" prop="checkCompany">
                <el-input v-model="form.checkCompany" placeholder="请输入检测单位" clearable/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="合格数量：" prop="qualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="请输入合格数量" clearable :precision="2" @change="handleQualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="不合格数量：" prop="unqualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="请输入不合格数量" clearable :precision="2" @change="handleUnqualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="检验员：" prop="checkName">
                <el-select v-model="form.checkName" placeholder="请选择检验员" clearable style="width: 100%">
                  <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测日期：" prop="checkTime">
                <el-date-picker
                  v-model="form.checkTime"
                  type="date"
                  placeholder="请选择检测日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                />
              </el-form-item>
            </el-col>
          </el-row>
        </template>
      </el-form>
      <PIMTable
        rowKey="id"
        :column="tableColumn"
        :tableData="tableData"
        :tableLoading="tableLoading"
        height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDialog">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
import { ref, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
import { userListNoPage } from "@/api/system/user.js";
import { batchQuickInspect } from "@/api/qualityManagement/rawMaterialInspection.js";
import { qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId } from "@/api/qualityManagement/metricMaintenance.js";

const { proxy } = getCurrentInstance();
const emit = defineEmits(['close', 'success']);

const dialogVisible = ref(false);
const userList = ref([]);
const selectedIds = ref([]);
const selectedRows = ref([]);
const testStandardOptions = ref([]);
const inspectType = ref(2); // å‡ºåŽ‚检验类型

const data = reactive({
  form: {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  },
  rules: {
    checkResult: [{ required: true, message: "请选择检测结果", trigger: "change" }],
    testStandardId: [{ required: true, message: "请选择指标", trigger: "change" }],
    quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
    qualifiedQuantity: [{ required: true, message: "请输入合格数量", trigger: "blur" }],
    unqualifiedQuantity: [{ required: true, message: "请输入不合格数量", trigger: "blur" }],
    checkCompany: [{ required: true, message: "请输入检测单位", trigger: "blur" }],
    checkName: [{ required: true, message: "请选择检验员", trigger: "change" }],
    checkTime: [{ required: true, message: "请选择检测日期", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);

const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
]);
const tableData = ref([]);
const tableLoading = ref(false);

// æ‰“开弹框
const openDialog = async (ids, rows) => {
  selectedIds.value = ids;
  selectedRows.value = rows;
  dialogVisible.value = true;
  
  // åŠ è½½ç”¨æˆ·åˆ—表
  const userListsRes = await userListNoPage();
  userList.value = userListsRes.data;
  
  // åŠ è½½æŒ‡æ ‡é€‰é¡¹ï¼ˆæ ¹æ®ç¬¬ä¸€ä¸ªé€‰ä¸­è¡Œçš„产品ID）
  if (rows && rows.length > 0 && rows[0].productId) {
    const params = {
      productId: rows[0].productId,
      inspectType: 2
    };
    const res = await qualityInspectDetailByProductId(params);
    testStandardOptions.value = res.data || [];
  } else {
    testStandardOptions.value = [];
  }
  
  // é‡ç½®è¡¨å•
  form.value = {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  };
  tableData.value = [];
  
  await nextTick();
  proxy.$refs.formRef?.clearValidate();
};

// æŒ‡æ ‡é€‰æ‹©å˜åŒ–处理
const handleTestStandardChange = async (testStandardId) => {
  if (!testStandardId) {
    tableData.value = [];
    return;
  }
  tableLoading.value = true;
  try {
    const res = await getQualityTestStandardParamByTestStandardId(testStandardId);
    tableData.value = (res.data || []).map(item => ({
      ...item,
      id: null,
      testValue: ''
    }));
  } catch (error) {
    console.error('获取标准参数失败:', error);
    tableData.value = [];
  } finally {
    tableLoading.value = false;
  }
};

// æ£€æµ‹ç»“果变化处理
const handleCheckResultChange = (value) => {
  if (value === '合格') {
    // åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ç­‰äºŽæ•°é‡ï¼Œä¸åˆæ ¼æ•°é‡ä¸º0
    form.value.qualifiedQuantity = form.value.quantity || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (value === '不合格') {
    // ä¸åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ä¸º0，不合格数量等于数量
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = form.value.quantity || 0;
  }
};

// æ•°é‡å˜åŒ–处理
const handleQuantityChange = (value) => {
  if (form.value.checkResult === '合格') {
    form.value.qualifiedQuantity = value || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (form.value.checkResult === '不合格') {
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = value || 0;
  }
};

// åˆæ ¼æ•°é‡å˜åŒ–处理
const handleQualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("合格数量不能大于总数量");
    form.value.qualifiedQuantity = quantity;
    form.value.unqualifiedQuantity = 0;
  } else {
    form.value.unqualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// ä¸åˆæ ¼æ•°é‡å˜åŒ–处理
const handleUnqualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("不合格数量不能大于总数量");
    form.value.unqualifiedQuantity = quantity;
    form.value.qualifiedQuantity = 0;
  } else {
    form.value.qualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// æ ¹æ®åˆæ ¼/不合格数量更新检测结果
const updateCheckResult = () => {
  const qualified = form.value.qualifiedQuantity || 0;
  const unqualified = form.value.unqualifiedQuantity || 0;
  const quantity = form.value.quantity || 0;
  
  if (qualified === quantity && unqualified === 0) {
    form.value.checkResult = '合格';
  } else if (unqualified === quantity && qualified === 0) {
    form.value.checkResult = '不合格';
  } else if (qualified > 0 && unqualified > 0) {
    form.value.checkResult = '部分合格';
  }
};

// æäº¤è¡¨å•
const submitForm = () => {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
      const data = {
        ids: selectedIds.value,
        inspectType: inspectType.value,
        ...form.value,
        paramList: tableData.value
      };
      batchQuickInspect(data).then(res => {
        proxy.$modal.msgSuccess(res.msg || "快速检验完成");
        emit('success');
        closeDialog();
      });
    }
  });
};

// å…³é—­å¼¹æ¡†
const closeDialog = () => {
  dialogVisible.value = false;
  emit('close');
};

defineExpose({
  openDialog,
});
</script>

<style scoped>
</style>

 src/views/qualityManagement/finalInspection/index.vue

@@ -69,6 +69,9 @@
             @close="handleQuery"></FormDia>
    <files-dia ref="filesDia"
               @close="handleQuery"></files-dia>
    <QuickCheckDia ref="quickCheckDia"
                   @close="handleQuery"
                   @success="getList"></QuickCheckDia>
    <el-dialog v-model="dialogFormVisible"
               title="编辑检验员"
               width="30%"
@@ -115,6 +118,7 @@
  } from "vue";
  import InspectionFormDia from "@/views/qualityManagement/finalInspection/components/inspectionFormDia.vue";
  import FormDia from "@/views/qualityManagement/finalInspection/components/formDia.vue";
  import QuickCheckDia from "@/views/qualityManagement/finalInspection/components/quickCheckDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    downloadQualityInspect,
@@ -122,7 +126,6 @@
    qualityInspectListPage,
    qualityInspectUpdate,
    submitQualityInspect,
    batchQuickInspect,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
  import dayjs from "dayjs";
@@ -322,6 +325,7 @@
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const quickCheckDia = ref();
  const { proxy } = getCurrentInstance();
  const userStore = useUserStore();
  const userList = ref([]);
@@ -402,32 +406,8 @@
      return;
    }

    const totalCount = selectedRows.value.length;
    const submittedCount = totalCount - unSubmittedRows.length;

    let confirmMessage = `已选择 ${totalCount} æ¡æ£€éªŒå•`;
    if (submittedCount > 0) {
      confirmMessage += `（其中 ${submittedCount} æ¡å·²æäº¤ï¼Œå°†è‡ªåŠ¨è·³è¿‡ï¼‰`;
    }
    confirmMessage += `\n\n确认后将自动：\n· æ£€éªŒç»“果设为"合格"\n· åˆæ ¼æ•°é‡è®¾ä¸ºæ€»æ•°\n· ä¸åˆæ ¼æ•°é‡è®¾ä¸º 0\n· æäº¤å¹¶å…¥åº“`;

    ElMessageBox.confirm(confirmMessage, "快速检验", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
      dangerouslyUseHTMLString: false,
    })
      .then(() => {
        // è°ƒç”¨æ‰¹é‡å¿«é€Ÿæ£€éªŒæŽ¥å£
        const ids = unSubmittedRows.map(item => item.id);
        batchQuickInspect(ids).then(res => {
          proxy.$modal.msgSuccess(res.msg || "快速检验完成");
          getList();
        });
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
    quickCheckDia.value?.openDialog(ids, unSubmittedRows);
  };

  // æ‰“开新增检验弹框

 src/views/qualityManagement/metricBinding/index.vue

@@ -141,8 +141,8 @@
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="closeBindingDialog">取消</el-button>
          <el-button type="primary" @click="submitBinding">确定</el-button>
          <el-button @click="closeBindingDialog">取消</el-button>
        </span>
      </template>
    </el-dialog>
@@ -215,18 +215,6 @@
    formatData: (val) => {
      const map = { 0: '原材料检验', 1: '过程检验', 2: '出厂检验' }
      return map[val] || val
    }
  },
  {
    label: '工序',
    prop: 'processId',
    align: 'center',
    dataType: 'tag',
    formatData: (val) => {
      const target = processOptions.value.find(
        (item) => String(item.value) === String(val)
      )
      return target?.label || val
    }
  },
  {

 src/views/qualityManagement/metricMaintenance/StandardFormDialog.vue

@@ -27,16 +27,6 @@
          <el-option label="出厂检验" value="2" />
        </el-select>
      </el-form-item>
      <el-form-item label="工序" prop="processId">
        <el-select v-model="form.processId" placeholder="请选择工序" style="width: 100%">
          <el-option
            v-for="item in processOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="状态" prop="state">
        <el-select v-model="form.state" placeholder="请选择状态" style="width: 100%">
          <el-option label="草稿" value="0" />

 src/views/qualityManagement/metricMaintenance/index.vue

@@ -310,18 +310,6 @@
    }
  },
  {
    label: '工序',
    prop: 'processId',
    align: 'center',
    dataType: 'tag',
    formatData: (val) => {
      const target = processOptions.value.find(
        (item) => String(item.value) === String(val)
      )
      return target?.label || val
    }
  },
  {
    label: '状态',
    prop: 'state',
    headerSlot: 'stateHeader',

 src/views/qualityManagement/processInspection/components/formDia.vue

@@ -11,17 +11,18 @@
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="工序："
                          prop="process">
              <el-select v-model="form.process"
                         placeholder="请选择工序"
            <el-form-item label="采购合同号："
                          prop="purchaseContractNo">
              <el-select v-model="form.purchaseContractNo"
                         placeholder="请选择"
                         clearable
                         :disabled="isViewMode || processQuantityDisabled"
                         filterable
                         :disabled="isViewMode"
                         style="width: 100%">
                <el-option v-for="item in processList"
                           :key="item.name"
                           :label="item.name"
                           :value="item.name" />
                <el-option v-for="item in purchaseContractList"
                           :key="item.id"
                           :label="item.purchaseContractNumber + ' - ' + item.supplierName"
                           :value="item.purchaseContractNumber" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -216,7 +217,7 @@
    getCurrentInstance,
    nextTick,
  } from "vue";
  import { getOptions } from "@/api/procurementManagement/procurementLedger.js";
  import { getOptions, purchaseListPage } from "@/api/procurementManagement/procurementLedger.js";
  import { modelList, productTreeList } from "@/api/basicData/product.js";
  import {
    qualityInspectAdd,
@@ -228,7 +229,7 @@
  } from "@/api/qualityManagement/metricMaintenance.js";
  import { userListNoPage } from "@/api/system/user.js";
  import { qualityInspectParamInfo } from "@/api/qualityManagement/qualityInspectParam.js";
  import { list } from "@/api/productionManagement/productionProcess";

  import qualified from "@/views/inventoryManagement/stockManagement/Qualified.vue";
  const { proxy } = getCurrentInstance();
  const emit = defineEmits(["close"]);
@@ -238,7 +239,6 @@
  const data = reactive({
    form: {
      checkTime: "",
      process: "",
      checkName: "",
      productName: "",
      productId: "",
@@ -251,20 +251,21 @@
      unqualifiedQuantity: "",
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
    },
    rules: {
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
      process: [{ required: true, message: "请选择工序", trigger: "change" }],
      checkTime: [{ required: false, message: "请输入", trigger: "blur" }],
      checkName: [{ required: false, message: "请输入", trigger: "blur" }],
      productId: [{ required: true, message: "请输入", trigger: "blur" }],
      productModelId: [{ required: true, message: "请选择", trigger: "change" }],
      testStandardId: [{ required: false, message: "请选择指标", trigger: "change" }],
      unit: [{ required: false, message: "请输入", trigger: "blur" }],
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      qualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
      unqualifiedQuantity: [{ required: true, message: "请输入", trigger: "blur" }],
      quantity: [{ required: false, message: "请输入", trigger: "blur" }],
      qualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
      unqualifiedQuantity: [{ required: false, message: "请输入", trigger: "blur" }],
      checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
      checkResult: [{ required: true, message: "请输入", trigger: "change" }],
      purchaseContractNo: [{ required: false, message: "请选择", trigger: "change" }],
      checkResult: [{ required: false, message: "请输入", trigger: "change" }],
    },
  });
  const userList = ref([]);
@@ -276,9 +277,10 @@
    const v = form.value || {};
    return !!(v.productMainId != null || v.purchaseLedgerId != null);
  });
  const processList = ref([]); // å·¥åºä¸‹æ‹‰åˆ—表（工序名称 name）

  const supplierList = ref([]);
  const productOptions = ref([]);
  const purchaseContractList = ref([]); // é‡‡è´­åˆåŒå·åˆ—表
  const tableColumn = ref([
    {
      label: "指标",
@@ -315,20 +317,19 @@
    getOptions().then(res => {
      supplierList.value = res.data;
    });
    // åŠ è½½å·¥åºä¸‹æ‹‰åˆ—表
    try {
      const res = await list({ size: -1, current: -1 });
      processList.value = res.data.records || [];
    } catch (e) {
      console.error("加载工序列表失败", e);
      processList.value = [];
    }
    let userLists = await userListNoPage();
    userList.value = userLists.data;
    // å…ˆé‡ç½®è¡¨å•æ•°æ®ï¼ˆä¿æŒå­—段完整，避免弹窗首次渲染时触发必填红框“闪一下”）
    // åŠ è½½é‡‡è´­åˆåŒå·åˆ—表
    try {
      const contractRes = await purchaseListPage({ pageNum: -1, pageSize: -1 });
      purchaseContractList.value = contractRes.data?.records || [];
    } catch (e) {
      console.error("加载采购合同号失败", e);
      purchaseContractList.value = [];
    }
    // å…ˆé‡ç½®è¡¨å•æ•°æ®ï¼ˆä¿æŒå­—段完整，避免弹窗首次渲染时触发必填红框"闪一下"）
    form.value = {
      checkTime: "",
      process: "",
      checkName: "",
      productName: "",
      productId: "",
@@ -339,6 +340,7 @@
      quantity: "",
      checkCompany: "",
      checkResult: "",
      purchaseContractNo: "",
    };
    testStandardOptions.value = [];
    tableData.value = [];
@@ -370,7 +372,6 @@
        let params = {
          productId: currentProductId.value,
          inspectType: 1,
          process: form.value.process || "",
        };
        qualityInspectDetailByProductId(params).then(res => {
          testStandardOptions.value = res.data || [];
@@ -518,9 +519,16 @@
          return;
        }

        // æ ¹æ®é‡‡è´­åˆåŒå·æŸ¥æ‰¾å¯¹åº”çš„ purchaseLedgerId
        const selectedContract = purchaseContractList.value.find(
          item => item.purchaseContractNumber === form.value.purchaseContractNo
        );
        const purchaseLedgerId = selectedContract ? selectedContract.id : null;

        const data = {
          ...form.value,
          process: processName, // ä¿ç•™ process å­—段以兼容后端
          purchaseLedgerId: purchaseLedgerId, // æäº¤ purchaseLedgerId
          qualityInspectParams: tableData.value,
        };
        if (operationType.value === "add") {

 src/views/qualityManagement/processInspection/components/quickCheckDia.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,327 @@
<template>
  <div>
    <el-dialog
      v-model="dialogVisible"
      title="快速检验"
      width="70%"
      @close="closeDialog"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
              <el-select v-model="form.checkResult" placeholder="请选择检测结果" style="width: 100%" @change="handleCheckResultChange">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="部分合格" value="部分合格" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select v-model="form.testStandardId" placeholder="请选择指标" style="width: 100%" @change="handleTestStandardChange">
                <el-option
                  v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <template v-if="form.checkResult">
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="数量：" prop="quantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入数量" clearable :precision="2" @change="handleQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测单位：" prop="checkCompany">
                <el-input v-model="form.checkCompany" placeholder="请输入检测单位" clearable/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="合格数量：" prop="qualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="请输入合格数量" clearable :precision="2" @change="handleQualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="不合格数量：" prop="unqualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="请输入不合格数量" clearable :precision="2" @change="handleUnqualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="检验员：" prop="checkName">
                <el-select v-model="form.checkName" placeholder="请选择检验员" clearable style="width: 100%">
                  <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测日期：" prop="checkTime">
                <el-date-picker
                  v-model="form.checkTime"
                  type="date"
                  placeholder="请选择检测日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                />
              </el-form-item>
            </el-col>
          </el-row>
        </template>
      </el-form>
      <PIMTable
        rowKey="id"
        :column="tableColumn"
        :tableData="tableData"
        :tableLoading="tableLoading"
        height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDialog">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
import { ref, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
import { userListNoPage } from "@/api/system/user.js";
import { batchQuickInspect } from "@/api/qualityManagement/rawMaterialInspection.js";
import { qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId } from "@/api/qualityManagement/metricMaintenance.js";

const { proxy } = getCurrentInstance();
const emit = defineEmits(['close', 'success']);

const dialogVisible = ref(false);
const userList = ref([]);
const selectedIds = ref([]);
const selectedRows = ref([]);
const testStandardOptions = ref([]);
const inspectType = ref(1); // è¿‡ç¨‹æ£€éªŒç±»åž‹

const data = reactive({
  form: {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  },
  rules: {
    checkResult: [{ required: true, message: "请选择检测结果", trigger: "change" }],
    testStandardId: [{ required: true, message: "请选择指标", trigger: "change" }],
    quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
    qualifiedQuantity: [{ required: true, message: "请输入合格数量", trigger: "blur" }],
    unqualifiedQuantity: [{ required: true, message: "请输入不合格数量", trigger: "blur" }],
    checkCompany: [{ required: true, message: "请输入检测单位", trigger: "blur" }],
    checkName: [{ required: true, message: "请选择检验员", trigger: "change" }],
    checkTime: [{ required: true, message: "请选择检测日期", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);

const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
]);
const tableData = ref([]);
const tableLoading = ref(false);

// æ‰“开弹框
const openDialog = async (ids, rows) => {
  selectedIds.value = ids;
  selectedRows.value = rows;
  dialogVisible.value = true;
  
  // åŠ è½½ç”¨æˆ·åˆ—表
  const userListsRes = await userListNoPage();
  userList.value = userListsRes.data;
  
  // åŠ è½½æŒ‡æ ‡é€‰é¡¹ï¼ˆæ ¹æ®ç¬¬ä¸€ä¸ªé€‰ä¸­è¡Œçš„产品ID）
  if (rows && rows.length > 0 && rows[0].productId) {
    const params = {
      productId: rows[0].productId,
      inspectType: 1
    };
    const res = await qualityInspectDetailByProductId(params);
    testStandardOptions.value = res.data || [];
  } else {
    testStandardOptions.value = [];
  }
  
  // é‡ç½®è¡¨å•
  form.value = {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  };
  tableData.value = [];
  
  await nextTick();
  proxy.$refs.formRef?.clearValidate();
};

// æŒ‡æ ‡é€‰æ‹©å˜åŒ–处理
const handleTestStandardChange = async (testStandardId) => {
  if (!testStandardId) {
    tableData.value = [];
    return;
  }
  tableLoading.value = true;
  try {
    const res = await getQualityTestStandardParamByTestStandardId(testStandardId);
    tableData.value = (res.data || []).map(item => ({
      ...item,
      id: null,
      testValue: ''
    }));
  } catch (error) {
    console.error('获取标准参数失败:', error);
    tableData.value = [];
  } finally {
    tableLoading.value = false;
  }
};

// æ£€æµ‹ç»“果变化处理
const handleCheckResultChange = (value) => {
  if (value === '合格') {
    // åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ç­‰äºŽæ•°é‡ï¼Œä¸åˆæ ¼æ•°é‡ä¸º0
    form.value.qualifiedQuantity = form.value.quantity || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (value === '不合格') {
    // ä¸åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ä¸º0，不合格数量等于数量
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = form.value.quantity || 0;
  }
};

// æ•°é‡å˜åŒ–处理
const handleQuantityChange = (value) => {
  if (form.value.checkResult === '合格') {
    form.value.qualifiedQuantity = value || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (form.value.checkResult === '不合格') {
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = value || 0;
  }
};

// åˆæ ¼æ•°é‡å˜åŒ–处理
const handleQualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("合格数量不能大于总数量");
    form.value.qualifiedQuantity = quantity;
    form.value.unqualifiedQuantity = 0;
  } else {
    form.value.unqualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// ä¸åˆæ ¼æ•°é‡å˜åŒ–处理
const handleUnqualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("不合格数量不能大于总数量");
    form.value.unqualifiedQuantity = quantity;
    form.value.qualifiedQuantity = 0;
  } else {
    form.value.qualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// æ ¹æ®åˆæ ¼/不合格数量更新检测结果
const updateCheckResult = () => {
  const qualified = form.value.qualifiedQuantity || 0;
  const unqualified = form.value.unqualifiedQuantity || 0;
  const quantity = form.value.quantity || 0;
  
  if (qualified === quantity && unqualified === 0) {
    form.value.checkResult = '合格';
  } else if (unqualified === quantity && qualified === 0) {
    form.value.checkResult = '不合格';
  } else if (qualified > 0 && unqualified > 0) {
    form.value.checkResult = '部分合格';
  }
};

// æäº¤è¡¨å•
const submitForm = () => {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
      const data = {
        ids: selectedIds.value,
        inspectType: inspectType.value,
        ...form.value,
        paramList: tableData.value
      };
      batchQuickInspect(data).then(res => {
        proxy.$modal.msgSuccess(res.msg || "快速检验完成");
        emit('success');
        closeDialog();
      });
    }
  });
};

// å…³é—­å¼¹æ¡†
const closeDialog = () => {
  dialogVisible.value = false;
  emit('close');
};

defineExpose({
  openDialog,
});
</script>

<style scoped>
</style>

 src/views/qualityManagement/processInspection/index.vue

@@ -2,13 +2,6 @@
  <div class="app-container">
    <div class="search_form mb20">
      <div>
        <span class="search_title">工序：</span>
        <el-input v-model="searchForm.process"
                  style="width: 240px"
                  placeholder="请输入工序搜索"
                  @change="handleQuery"
                  clearable
                  :prefix-icon="Search" />
        <span style="margin-left: 10px"
              class="search_title">检测日期：</span>
        <el-date-picker v-model="searchForm.entryDate"
@@ -18,14 +11,6 @@
                        placeholder="请选择"
                        clearable
                        @change="changeDaterange" />
        <span style="margin-left: 10px"
              class="search_title">生产工单号：</span>
        <el-input v-model="searchForm.workOrderNo"
                  style="width: 240px"
                  placeholder="请输入生产工单号搜索"
                  @change="handleQuery"
                  clearable
                  :prefix-icon="Search" />
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索</el-button>
@@ -54,6 +39,9 @@
             @close="handleQuery"></FormDia>
    <files-dia ref="filesDia"
               @close="handleQuery"></files-dia>
    <QuickCheckDia ref="quickCheckDia"
                   @close="handleQuery"
                   @success="getList"></QuickCheckDia>
    <el-dialog v-model="dialogFormVisible"
               title="编辑检验员"
               width="30%"
@@ -100,6 +88,7 @@
  } from "vue";
  import InspectionFormDia from "@/views/qualityManagement/processInspection/components/inspectionFormDia.vue";
  import FormDia from "@/views/qualityManagement/processInspection/components/formDia.vue";
  import QuickCheckDia from "@/views/qualityManagement/processInspection/components/quickCheckDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    downloadQualityInspect,
@@ -107,7 +96,6 @@
    qualityInspectListPage,
    qualityInspectUpdate,
    submitQualityInspect,
    batchQuickInspect,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import FilesDia from "@/views/qualityManagement/processInspection/components/filesDia.vue";
  import dayjs from "dayjs";
@@ -116,7 +104,6 @@

  const data = reactive({
    searchForm: {
      process: "",
      entryDate: undefined, // å½•å…¥æ—¥æœŸ
      workOrderNo: "",
      entryDateStart: undefined,
@@ -135,13 +122,13 @@
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 230,
    },
    {
      label: "检验员",
      prop: "checkName",
    },
    {
      label: "采购合同号",
      prop: "purchaseContractNo",
            width: 150,
    },
    {
      label: "产品名称",
@@ -311,6 +298,7 @@
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const quickCheckDia = ref();
  const { proxy } = getCurrentInstance();
  const userStore = useUserStore();
  const changeDaterange = value => {
@@ -385,32 +373,8 @@
      return;
    }

    const totalCount = selectedRows.value.length;
    const submittedCount = totalCount - unSubmittedRows.length;

    let confirmMessage = `已选择 ${totalCount} æ¡æ£€éªŒå•`;
    if (submittedCount > 0) {
      confirmMessage += `（其中 ${submittedCount} æ¡å·²æäº¤ï¼Œå°†è‡ªåŠ¨è·³è¿‡ï¼‰`;
    }
    confirmMessage += `\n\n确认后将自动：\n· æ£€éªŒç»“果设为"合格"\n· åˆæ ¼æ•°é‡è®¾ä¸ºæ€»æ•°\n· ä¸åˆæ ¼æ•°é‡è®¾ä¸º 0\n· æäº¤å¹¶å…¥åº“`;

    ElMessageBox.confirm(confirmMessage, "快速检验", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
      dangerouslyUseHTMLString: false,
    })
      .then(() => {
        // è°ƒç”¨æ‰¹é‡å¿«é€Ÿæ£€éªŒæŽ¥å£
        const ids = unSubmittedRows.map(item => item.id);
        batchQuickInspect(ids).then(res => {
          proxy.$modal.msgSuccess(res.msg || "快速检验完成");
          getList();
        });
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
    quickCheckDia.value?.openDialog(ids, unSubmittedRows);
  };

  // æ‰“开新增检验弹框

 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue

@@ -197,18 +197,18 @@
    checkResult: "",
  },
  rules: {
    checkTime: [{required: true, message: "请输入", trigger: "blur"},],
    checkTime: [{required: false, message: "请输入", trigger: "blur"},],
    supplier: [{required: true, message: "请输入", trigger: "blur"}],
    checkName: [{required: false, message: "请输入", trigger: "blur"}],
    productId: [{required: true, message: "请输入", trigger: "blur"}],
    productModelId: [{required: true, message: "请选择产品型号", trigger: "change"}],
    testStandardId: [{required: false, message: "请选择指标", trigger: "change"}],
    unit: [{required: false, message: "请输入", trigger: "blur"}],
    quantity: [{required: true, message: "请输入", trigger: "blur"}],
    qualifiedQuantity: [{required: true, message: "请输入", trigger: "blur"}],
    unqualifiedQuantity: [{required: true, message: "请输入", trigger: "blur"}],
    quantity: [{required: false, message: "请输入", trigger: "blur"}],
    qualifiedQuantity: [{required: false, message: "请输入", trigger: "blur"}],
    unqualifiedQuantity: [{required: false, message: "请输入", trigger: "blur"}],
    checkCompany: [{required: false, message: "请输入", trigger: "blur"}],
    checkResult: [{required: true, message: "请选择检测结果", trigger: "change"}],
    checkResult: [{required: false, message: "请选择检测结果", trigger: "change"}],
  },
});
const tableColumn = ref([

 src/views/qualityManagement/rawMaterialInspection/components/quickCheckDia.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,327 @@
<template>
  <div>
    <el-dialog
      v-model="dialogVisible"
      title="快速检验"
      width="70%"
      @close="closeDialog"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
              <el-select v-model="form.checkResult" placeholder="请选择检测结果" style="width: 100%" @change="handleCheckResultChange">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="部分合格" value="部分合格" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：" prop="testStandardId">
              <el-select v-model="form.testStandardId" placeholder="请选择指标" style="width: 100%" @change="handleTestStandardChange">
                <el-option
                  v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <template v-if="form.checkResult">
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="数量：" prop="quantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入数量" clearable :precision="2" @change="handleQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测单位：" prop="checkCompany">
                <el-input v-model="form.checkCompany" placeholder="请输入检测单位" clearable/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="合格数量：" prop="qualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.qualifiedQuantity" placeholder="请输入合格数量" clearable :precision="2" @change="handleQualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="不合格数量：" prop="unqualifiedQuantity">
                <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.unqualifiedQuantity" placeholder="请输入不合格数量" clearable :precision="2" @change="handleUnqualifiedQuantityChange"/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="30">
            <el-col :span="12">
              <el-form-item label="检验员：" prop="checkName">
                <el-select v-model="form.checkName" placeholder="请选择检验员" clearable style="width: 100%">
                  <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="检测日期：" prop="checkTime">
                <el-date-picker
                  v-model="form.checkTime"
                  type="date"
                  placeholder="请选择检测日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                />
              </el-form-item>
            </el-col>
          </el-row>
        </template>
      </el-form>
      <PIMTable
        rowKey="id"
        :column="tableColumn"
        :tableData="tableData"
        :tableLoading="tableLoading"
        height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDialog">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
import { ref, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
import { userListNoPage } from "@/api/system/user.js";
import { batchQuickInspect } from "@/api/qualityManagement/rawMaterialInspection.js";
import { qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId } from "@/api/qualityManagement/metricMaintenance.js";

const { proxy } = getCurrentInstance();
const emit = defineEmits(['close', 'success']);

const dialogVisible = ref(false);
const userList = ref([]);
const selectedIds = ref([]);
const selectedRows = ref([]);
const testStandardOptions = ref([]);
const inspectType = ref(0); // åŽŸææ–™æ£€éªŒç±»åž‹

const data = reactive({
  form: {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  },
  rules: {
    checkResult: [{ required: true, message: "请选择检测结果", trigger: "change" }],
    testStandardId: [{ required: true, message: "请选择指标", trigger: "change" }],
    quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
    qualifiedQuantity: [{ required: true, message: "请输入合格数量", trigger: "blur" }],
    unqualifiedQuantity: [{ required: true, message: "请输入不合格数量", trigger: "blur" }],
    checkCompany: [{ required: true, message: "请输入检测单位", trigger: "blur" }],
    checkName: [{ required: true, message: "请选择检验员", trigger: "change" }],
    checkTime: [{ required: true, message: "请选择检测日期", trigger: "change" }],
  },
});
const { form, rules } = toRefs(data);

const tableColumn = ref([
  {
    label: "指标",
    prop: "parameterItem",
  },
  {
    label: "单位",
    prop: "unit",
  },
  {
    label: "标准值",
    prop: "standardValue",
  },
  {
    label: "内控值",
    prop: "controlValue",
  },
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
  },
]);
const tableData = ref([]);
const tableLoading = ref(false);

// æ‰“开弹框
const openDialog = async (ids, rows) => {
  selectedIds.value = ids;
  selectedRows.value = rows;
  dialogVisible.value = true;
  
  // åŠ è½½ç”¨æˆ·åˆ—表
  const userListsRes = await userListNoPage();
  userList.value = userListsRes.data;
  
  // åŠ è½½æŒ‡æ ‡é€‰é¡¹ï¼ˆæ ¹æ®ç¬¬ä¸€ä¸ªé€‰ä¸­è¡Œçš„产品ID）
  if (rows && rows.length > 0 && rows[0].productId) {
    const params = {
      productId: rows[0].productId,
      inspectType: 0
    };
    const res = await qualityInspectDetailByProductId(params);
    testStandardOptions.value = res.data || [];
  } else {
    testStandardOptions.value = [];
  }
  
  // é‡ç½®è¡¨å•
  form.value = {
    checkResult: '',
    testStandardId: '',
    quantity: undefined,
    qualifiedQuantity: undefined,
    unqualifiedQuantity: undefined,
    checkCompany: '',
    checkName: '',
    checkTime: '',
  };
  tableData.value = [];
  
  await nextTick();
  proxy.$refs.formRef?.clearValidate();
};

// æŒ‡æ ‡é€‰æ‹©å˜åŒ–处理
const handleTestStandardChange = async (testStandardId) => {
  if (!testStandardId) {
    tableData.value = [];
    return;
  }
  tableLoading.value = true;
  try {
    const res = await getQualityTestStandardParamByTestStandardId(testStandardId);
    tableData.value = (res.data || []).map(item => ({
      ...item,
      id: null,
      testValue: ''
    }));
  } catch (error) {
    console.error('获取标准参数失败:', error);
    tableData.value = [];
  } finally {
    tableLoading.value = false;
  }
};

// æ£€æµ‹ç»“果变化处理
const handleCheckResultChange = (value) => {
  if (value === '合格') {
    // åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ç­‰äºŽæ•°é‡ï¼Œä¸åˆæ ¼æ•°é‡ä¸º0
    form.value.qualifiedQuantity = form.value.quantity || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (value === '不合格') {
    // ä¸åˆæ ¼æ—¶ï¼Œåˆæ ¼æ•°é‡ä¸º0，不合格数量等于数量
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = form.value.quantity || 0;
  }
};

// æ•°é‡å˜åŒ–处理
const handleQuantityChange = (value) => {
  if (form.value.checkResult === '合格') {
    form.value.qualifiedQuantity = value || 0;
    form.value.unqualifiedQuantity = 0;
  } else if (form.value.checkResult === '不合格') {
    form.value.qualifiedQuantity = 0;
    form.value.unqualifiedQuantity = value || 0;
  }
};

// åˆæ ¼æ•°é‡å˜åŒ–处理
const handleQualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("合格数量不能大于总数量");
    form.value.qualifiedQuantity = quantity;
    form.value.unqualifiedQuantity = 0;
  } else {
    form.value.unqualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// ä¸åˆæ ¼æ•°é‡å˜åŒ–处理
const handleUnqualifiedQuantityChange = (value) => {
  const quantity = form.value.quantity || 0;
  if (value > quantity) {
    proxy.$modal.msgWarning("不合格数量不能大于总数量");
    form.value.unqualifiedQuantity = quantity;
    form.value.qualifiedQuantity = 0;
  } else {
    form.value.qualifiedQuantity = Number((quantity - value).toFixed(2));
  }
  updateCheckResult();
};

// æ ¹æ®åˆæ ¼/不合格数量更新检测结果
const updateCheckResult = () => {
  const qualified = form.value.qualifiedQuantity || 0;
  const unqualified = form.value.unqualifiedQuantity || 0;
  const quantity = form.value.quantity || 0;
  
  if (qualified === quantity && unqualified === 0) {
    form.value.checkResult = '合格';
  } else if (unqualified === quantity && qualified === 0) {
    form.value.checkResult = '不合格';
  } else if (qualified > 0 && unqualified > 0) {
    form.value.checkResult = '部分合格';
  }
};

// æäº¤è¡¨å•
const submitForm = () => {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
      const data = {
        ids: selectedIds.value,
        inspectType: inspectType.value,
        ...form.value,
        paramList: tableData.value
      };
      batchQuickInspect(data).then(res => {
        proxy.$modal.msgSuccess(res.msg || "快速检验完成");
        emit('success');
        closeDialog();
      });
    }
  });
};

// å…³é—­å¼¹æ¡†
const closeDialog = () => {
  dialogVisible.value = false;
  emit('close');
};

defineExpose({
  openDialog,
});
</script>

<style scoped>
</style>

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -55,6 +55,9 @@
             @close="handleQuery"></FormDia>
    <files-dia ref="filesDia"
               @close="handleQuery"></files-dia>
    <QuickCheckDia ref="quickCheckDia"
                   @close="handleQuery"
                   @success="getList"></QuickCheckDia>
    <el-dialog v-model="dialogFormVisible"
               title="编辑检验员"
               width="30%"
@@ -101,6 +104,7 @@
  } from "vue";
  import InspectionFormDia from "@/views/qualityManagement/rawMaterialInspection/components/inspectionFormDia.vue";
  import FormDia from "@/views/qualityManagement/rawMaterialInspection/components/formDia.vue";
  import QuickCheckDia from "@/views/qualityManagement/rawMaterialInspection/components/quickCheckDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    downloadQualityInspect,
@@ -108,7 +112,6 @@
    qualityInspectListPage,
    qualityInspectUpdate,
    submitQualityInspect,
    batchQuickInspect,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import FilesDia from "@/views/qualityManagement/rawMaterialInspection/components/filesDia.vue";
  import dayjs from "dayjs";
@@ -322,6 +325,7 @@
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const quickCheckDia = ref();
  const { proxy } = getCurrentInstance();
  const userStore = useUserStore();
  const changeDaterange = value => {
@@ -396,33 +400,8 @@
      return;
    }

    const totalCount = selectedRows.value.length;
    const unSubmittedCount = unSubmittedRows.length;
    const submittedCount = totalCount - unSubmittedCount;

    let confirmMessage = `已选择 ${totalCount} æ¡æ£€éªŒå•`;
    if (submittedCount > 0) {
      confirmMessage += `（其中 ${submittedCount} æ¡å·²æäº¤ï¼Œå°†è‡ªåŠ¨è·³è¿‡ï¼‰`;
    }
    confirmMessage += `\n\n确认后将自动：\n· æ£€éªŒç»“果设为"合格"\n· åˆæ ¼æ•°é‡è®¾ä¸ºæ€»æ•°\n· ä¸åˆæ ¼æ•°é‡è®¾ä¸º 0\n· æäº¤å¹¶å…¥åº“`;

    ElMessageBox.confirm(confirmMessage, "快速检验", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
      dangerouslyUseHTMLString: false,
    })
      .then(() => {
        // è°ƒç”¨æ‰¹é‡å¿«é€Ÿæ£€éªŒæŽ¥å£
        const ids = unSubmittedRows.map(item => item.id);
        batchQuickInspect(ids).then(res => {
          proxy.$modal.msgSuccess(res.msg || "快速检验完成");
          getList();
        });
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
      });
    quickCheckDia.value?.openDialog(ids, unSubmittedRows);
  };
  // æ‰“开附件弹框
  const openFilesFormDia = (type, row) => {

 src/views/salesManagement/salesLedger/index.vue

@@ -1083,6 +1083,15 @@
              />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="deliveryForm.type === '货车'">
            <el-form-item label="出库批号：" prop="outboundBatches">
              <el-input
                v-model="deliveryForm.outboundBatches"
                placeholder="请输入出库批号"
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-else>
            <el-form-item label="快递公司：" prop="expressCompany">
              <el-input
@@ -1421,6 +1430,7 @@
    expressCompany: "",
    expressNumber: "",
    type: "货车", // è´§è½¦, å¿«é€’
    outboundBatches: "",
  },
  deliveryRules: {
    shippingCarNumber: [
@@ -2880,6 +2890,7 @@
    type: "货车",
    batchNo: [],
    batchNoList,
    outboundBatches: "",
  };
  deliveryFileList.value = [];
  deliveryFormVisible.value = true;
@@ -2923,6 +2934,10 @@
          deliveryForm.value.type === "货车"
            ? deliveryForm.value.shippingCarNumber
            : "",
        outboundBatches:
          deliveryForm.value.type === "货车"
            ? deliveryForm.value.outboundBatches
            : "",
        expressCompany:
          deliveryForm.value.type === "快递"
            ? deliveryForm.value.expressCompany

 src/views/systemArchitecture/index.vue

@@ -107,6 +107,7 @@
        </div>
      </section>

      <!-- ç”Ÿäº§æ¨¡å—已隐藏
      <section class="section-card section-card--bottom">
        <article class="module-title module-title--produce">
          <div class="module-title__icon">
@@ -132,6 +133,7 @@
          </template>
        </div>
      </section>
      -->

      <section class="section-card section-card--bottom">
        <article class="module-title module-title--store">