Merge branch 'refs/heads/dev_NEW_pro' into dev_天津_中兴实强new

gaoluyang

2026-05-25 b87f35ad442544fa3892def5c2979357eb76e4d7

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -14,6 +14,15 @@
        <span style="margin-left: 10px" class="search_title">检测日期：</span>
        <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                        placeholder="请选择" clearable @change="changeDaterange"/>
        <span style="margin-left: 10px" class="search_title">采购订单号：</span>
        <el-input
            v-model="searchForm.purchaseContractNo"
            style="width: 240px"
            placeholder="请输入采购订单号搜索"
            @change="handleQuery"
            clearable
            :prefix-icon="Search"
        />
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
        >搜索
        </el-button
@@ -83,6 +92,7 @@
  searchForm: {
    supplier: "",
    entryDate: undefined, // 录入日期
    purchaseContractNo: "",
    entryDateStart: undefined,
    entryDateEnd: undefined,
  },
@@ -124,8 +134,23 @@
    prop: "unit",
  },
  {
    label: "数量",
    label: "总数量",
    prop: "quantity",
    width: 100
  },
  {
    label: "合格数量",
    prop: "qualifiedQuantity",
    width: 100
  },
  {
    label: "不合格数量",
    prop: "unqualifiedQuantity",
    width: 100
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
  },
  {
@@ -143,7 +168,7 @@
      } else if (params === '合格') {
        return "success";
      } else {
        return null;
        return 'danger';
      }
    },
  },
@@ -182,6 +207,13 @@
            }
      },
      {
        name: "查看",
        type: "text",
        clickFun: (row) => {
          openForm("view", row);
        },
      },
      {
        name: "附件",
        type: "text",
        clickFun: (row) => {