指标绑定选择产品时，加上工序选择框（过程检、出厂检），支持多选。出厂检验及指标维护给出厂检增加工序字段

zhangwencui

2026-06-04 df76c64ca6a49dbff88ea972a68a02ce53ffdbe3

 src/views/qualityManagement/finalInspection/index.vue

@@ -2,31 +2,45 @@
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">产品名称：</span>
        <el-input
            v-model="searchForm.productName"
        <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-input v-model="searchForm.productName"
            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" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                         placeholder="请选择" clearable @change="changeDaterange" />
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
        >搜索</el-button
        >
                  :prefix-icon="Search" />
        <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" />
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">搜索</el-button>
      </div>
      <div>
        <el-button type="primary" @click="openForm('add')">新增</el-button>
        <el-button type="primary"
                   @click="openForm('add')">新增</el-button>
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <PIMTable
          rowKey="id"
      <PIMTable rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
@@ -34,18 +48,27 @@
          @selection-change="handleSelectionChange"
          :tableLoading="tableLoading"
          @pagination="pagination"
          :total="page.total"
      ></PIMTable>
                :total="page.total"></PIMTable>
    </div>
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <InspectionFormDia ref="inspectionFormDia"
                       @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia"
             @close="handleQuery"></FormDia>
    <files-dia ref="filesDia"
               @close="handleQuery"></files-dia>
    <!-- 检验结果选择对话框 -->
    <el-dialog v-model="quickCheckVisible" title="检验" width="40%" @close="closeQuickCheck">
      <el-form :model="quickCheckForm" label-width="140px" label-position="top" ref="quickCheckRef">
    <el-dialog v-model="quickCheckVisible"
               title="检验"
               width="40%"
               @close="closeQuickCheck">
      <el-form :model="quickCheckForm"
               label-width="140px"
               label-position="top"
               ref="quickCheckRef">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="检测结果：" required>
            <el-form-item label="检测结果："
                          required>
              <el-radio-group v-model="quickCheckForm.checkResult">
                <el-radio value="合格">合格</el-radio>
                <el-radio value="不合格">不合格</el-radio>
@@ -53,42 +76,44 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检验员：" required>
              <el-select v-model="quickCheckForm.checkName" placeholder="请选择" clearable style="width: 100%">
                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
            <el-form-item label="检验员："
                          required>
              <el-select v-model="quickCheckForm.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-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="检测日期：" required>
              <el-date-picker
                v-model="quickCheckForm.checkTime"
            <el-form-item label="检测日期："
                          required>
              <el-date-picker v-model="quickCheckForm.checkTime"
                type="date"
                placeholder="请选择日期"
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                clearable
                style="width: 100%"
              />
                              style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="指标选择：">
              <el-select
                v-model="quickCheckForm.testStandardId"
              <el-select v-model="quickCheckForm.testStandardId"
                placeholder="请选择指标"
                clearable
                @change="handleTestStandardChange"
                style="width: 100%"
              >
                <el-option
                  v-for="item in testStandardOptions"
                         style="width: 100%">
                <el-option v-for="item in testStandardOptions"
                  :key="item.id"
                  :label="item.standardName || item.standardNo"
                  :value="item.id"
                />
                           :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
@@ -96,45 +121,62 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="检测单位：">
              <el-input v-model="quickCheckForm.checkCompany" placeholder="请输入" clearable style="width: 100%"/>
              <el-input v-model="quickCheckForm.checkCompany"
                        placeholder="请输入"
                        clearable
                        style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
        <!-- 检验值表格 -->
        <el-form-item label="检验值：" v-if="quickCheckTableData.length > 0">
          <PIMTable
            rowKey="id"
        <el-form-item label="检验值："
                      v-if="quickCheckTableData.length > 0">
          <PIMTable rowKey="id"
            :column="quickCheckTableColumn"
            :tableData="quickCheckTableData"
            :tableLoading="quickCheckTableLoading"
            height="200"
          >
                    height="200">
            <template #slot="{ row }">
              <el-input v-model="row.testValue" clearable placeholder="请输入检验值"/>
              <el-input v-model="row.testValue"
                        clearable
                        placeholder="请输入检验值" />
            </template>
          </PIMTable>
        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="handleQuickCheckConfirm">确认</el-button>
          <el-button type="primary"
                     @click="handleQuickCheckConfirm">确认</el-button>
          <el-button @click="closeQuickCheck">取消</el-button>
        </div>
      </template>
    </el-dialog>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
    <el-dialog v-model="dialogFormVisible"
               title="编辑检验员"
               width="30%"
                      @close="closeDia">
            <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
               <el-form-item label="检验员：" prop="checkName">
                  <el-select v-model="form.checkName" placeholder="请选择" clearable>
                     <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
      <el-form :model="form"
               label-width="140px"
               label-position="top"
               :rules="rules"
               ref="formRef">
        <el-form-item label="检验员："
                      prop="checkName">
          <el-select v-model="form.checkName"
                     placeholder="请选择"
                     clearable>
            <el-option v-for="item in userList"
                       :key="item.nickName"
                       :label="item.nickName"
                                     :value="item.nickName"/>
                  </el-select>
               </el-form-item>
            </el-form>
            <template #footer>
               <div class="dialog-footer">
                  <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
                  <el-button @click="closeDia">取消</el-button>
               </div>
            </template>
@@ -144,7 +186,14 @@

<script setup>
import { Search } from "@element-plus/icons-vue";
import {onMounted, ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
  import {
    onMounted,
    ref,
    reactive,
    toRefs,
    getCurrentInstance,
    nextTick,
  } from "vue";
import InspectionFormDia from "@/views/qualityManagement/finalInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/finalInspection/components/formDia.vue";
import {ElMessageBox} from "element-plus";
@@ -152,11 +201,15 @@
   downloadQualityInspect,
   qualityInspectDel,
   qualityInspectDetail,
   qualityInspectListPage, qualityInspectUpdate,
    qualityInspectListPage,
    qualityInspectUpdate,
   submitQualityInspect,
   qualityInspectExportNew
    qualityInspectExportNew,
} from "@/api/qualityManagement/rawMaterialInspection.js";
import {qualityInspectDetailByProductId, getQualityTestStandardParamByTestStandardId} from "@/api/qualityManagement/metricMaintenance.js";
  import {
    qualityInspectDetailByProductId,
    getQualityTestStandardParamByTestStandardId,
  } from "@/api/qualityManagement/metricMaintenance.js";
import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";
@@ -164,6 +217,7 @@

const data = reactive({
  searchForm: {
      process: "",
    productName: "",
    entryDate: undefined, // 录入日期
    entryDateStart: undefined,
@@ -178,12 +232,17 @@
  {
    label: "检测日期",
    prop: "checkTime",
    width: 120
      width: 120,
  },
  {
    label: "生产工单号",
    prop: "workOrderNo",
    width: 120
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 230,
  },
  {
    label: "检验员",
@@ -204,21 +263,21 @@
  {
    label: "数量",
    prop: "quantity",
    width: 100
      width: 100,
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
      width: 120,
  },
  {
    label: "检测结果",
    prop: "checkResult",
    dataType: "tag",
    formatType: (params) => {
      if (params == '不合格') {
      formatType: params => {
        if (params == "不合格") {
        return "danger";
      } else if (params == '合格') {
        } else if (params == "合格") {
        return "success";
      } else {
        return null;
@@ -228,7 +287,7 @@
   {
      label: "提交状态",
      prop: "inspectState",
      formatData: (params) => {
      formatData: params => {
         if (params) {
            return "已提交";
         } else {
@@ -246,10 +305,10 @@
      {
        name: "检验",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openQuickCheck(row);
        },
            disabled: (row) => {
          disabled: row => {
               // 已提交则禁用
               if (row.inspectState == 1) return true;
               // 如果检验员有值，只有当前登录用户能编辑
@@ -257,22 +316,22 @@
                  return row.checkName !== userStore.nickName;
               }
               return false;
            }
          },
      },
      {
        name: "附件",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openFilesFormDia(row);
        },
      },
            {
               name: "提交",
               type: "text",
               clickFun: (row) => {
          clickFun: row => {
                  submit(row.id);
               },
               disabled: (row) => {
          disabled: row => {
                  // 已提交则禁用
                  if (row.inspectState == 1) return true;
                  // 如果检验员有值，只有当前登录用户能提交
@@ -280,26 +339,26 @@
                     return row.checkName !== userStore.nickName;
                  }
                  return false;
               }
          },
            },
            {
               name: "分配检验员",
               type: "text",
               clickFun: (row) => {
          clickFun: row => {
                  if (!row.checkName) {
                     open(row)
              open(row);
                  } else {
                     proxy.$modal.msgError("检验员已存在");
                  }
               },
               disabled: (row) => {
          disabled: row => {
                  return row.inspectState == 1 || row.checkName;
               }
          },
            },
            {
               name: "下载",
               type: "text",
               clickFun: (row) => {
          clickFun: row => {
                  downLoadFile(row);
               },
            },
@@ -309,20 +368,20 @@
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const currentRow = ref(null)
  const currentRow = ref(null);
const page = reactive({
  current: 1,
  size: 100,
  total: 0
    total: 0,
});
const formDia = ref()
const filesDia = ref()
const inspectionFormDia = ref()
const { proxy } = getCurrentInstance()
const userStore = useUserStore()
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const { proxy } = getCurrentInstance();
  const userStore = useUserStore();
const userList = ref([]);
const form = ref({
   checkName: ""
    checkName: "",
});
const dialogFormVisible = ref(false);
const quickCheckVisible = ref(false);
@@ -331,7 +390,7 @@
   checkName: "",
   checkTime: "",
   testStandardId: "",
   checkCompany: ""
    checkCompany: "",
});
const quickCheckRef = ref(null);
const testStandardOptions = ref([]); // 指标选择下拉框数据
@@ -355,14 +414,14 @@
  {
    label: "检验值",
    prop: "testValue",
    dataType: 'slot',
    slot: 'slot',
      dataType: "slot",
      slot: "slot",
  },
]);
const quickCheckTableData = ref([]);
const quickCheckTableLoading = ref(false);

const changeDaterange = (value) => {
  const changeDaterange = value => {
  searchForm.value.entryDateStart = undefined;
  searchForm.value.entryDateEnd = undefined;
  if (value) {
@@ -377,7 +436,7 @@
  page.current = 1;
  getList();
};
const pagination = (obj) => {
  const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
@@ -385,44 +444,46 @@
const getList = () => {
  tableLoading.value = true;
  const params = { ...searchForm.value, ...page };
  params.entryDate = undefined
  qualityInspectListPage({...params, inspectType: 2}).then(res => {
    params.entryDate = undefined;
    qualityInspectListPage({ ...params, inspectType: 2 })
      .then(res => {
    tableLoading.value = false;
    tableData.value = res.data.records
        tableData.value = res.data.records;
    page.total = res.data.total;
  }).catch(err => {
    tableLoading.value = false;
  })
      .catch(err => {
        tableLoading.value = false;
      });
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  const handleSelectionChange = selection => {
  selectedRows.value = selection;
};

// 打开弹框
const openForm = (type, row) => {
  nextTick(() => {
    formDia.value?.openDialog(type, row)
  })
      formDia.value?.openDialog(type, row);
    });
};
// 打开新增检验弹框
const openInspectionForm = (type, row) => {
  nextTick(() => {
    inspectionFormDia.value?.openDialog(type, row)
  })
      inspectionFormDia.value?.openDialog(type, row);
    });
};
// 打开附件弹框
const openFilesFormDia = (type, row) => {
  nextTick(() => {
    filesDia.value?.openDialog(type, row)
  })
      filesDia.value?.openDialog(type, row);
    });
};

// 删除
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;
@@ -433,7 +494,7 @@
    type: "warning",
  })
      .then(() => {
        qualityInspectDel(ids).then((res) => {
        qualityInspectDel(ids).then(res => {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        });
@@ -460,6 +521,7 @@
         // 构建导出参数
         const exportData = {
            inspectType: 2,
          process: searchForm.value.process || "",
            productName: searchForm.value.productName || "",
            entryDateStart: searchForm.value.entryDateStart || "",
            entryDateEnd: searchForm.value.entryDateEnd || "",
@@ -471,19 +533,21 @@
         }

         // 调用新导出接口
         qualityInspectExportNew(exportData).then((blobData) => {
        qualityInspectExportNew(exportData)
          .then(blobData => {
            const blob = new Blob([blobData], {
               type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
              type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
            });
            const downloadUrl = window.URL.createObjectURL(blob);
            const link = document.createElement('a');
            const link = document.createElement("a");
            link.href = downloadUrl;
            link.download = '出厂检验.xlsx';
            link.download = "出厂检验.xlsx";
            document.body.appendChild(link);
            link.click();
            document.body.removeChild(link);
            window.URL.revokeObjectURL(downloadUrl);
         }).catch((error) => {
          })
          .catch(error => {
            proxy.$modal.msgError("导出失败");
         });
      })
@@ -493,13 +557,13 @@
};

// 提价
const submit = async (id) => {
   const res = await submitQualityInspect({id: id})
  const submit = async id => {
    const res = await submitQualityInspect({ id: id });
   if (res.code === 200) {
      proxy.$modal.msgSuccess("提交成功");
      getList();
   }
}
  };

// 关闭弹框
const closeDia = () => {
@@ -511,47 +575,47 @@
   if (currentRow.value) {
      const data = {
         ...form.value,
         id: currentRow.value.id
      }
        id: currentRow.value.id,
      };
      qualityInspectUpdate(data).then(res => {
         proxy.$modal.msgSuccess("提交成功");
         closeDia();
         getList();
      })
      });
   }
};

const open = async (row) => {
  const open = async row => {
   let userLists = await userListNoPage();
   // 筛选 roleIds 包含 106 的用户
   userList.value = (userLists.data || []).filter(user => {
      const roleIds = user.roleIds || [];
      return roleIds.includes(106) || roleIds.includes('106');
      return roleIds.includes(106) || roleIds.includes("106");
   });
   currentRow.value = row
   dialogFormVisible.value = true
}
    currentRow.value = row;
    dialogFormVisible.value = true;
  };

const downLoadFile = (row) => {
   downloadQualityInspect({ id: row.id }).then((blobData) => {
  const downLoadFile = row => {
    downloadQualityInspect({ id: row.id }).then(blobData => {
      const blob = new Blob([blobData], {
         type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
      })
      const downloadUrl = window.URL.createObjectURL(blob)
        type: "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
      });
      const downloadUrl = window.URL.createObjectURL(blob);

      const link = document.createElement('a')
      link.href = downloadUrl
      link.download = '出厂检验报告.docx'
      document.body.appendChild(link)
      link.click()
      const link = document.createElement("a");
      link.href = downloadUrl;
      link.download = "出厂检验报告.docx";
      document.body.appendChild(link);
      link.click();

      document.body.removeChild(link)
      window.URL.revokeObjectURL(downloadUrl)
   })
      document.body.removeChild(link);
      window.URL.revokeObjectURL(downloadUrl);
    });
};

// 打开检验结果选择对话框
const openQuickCheck = async (row) => {
  const openQuickCheck = async row => {
   // 先调用详情接口获取完整数据（包含指标和检验值）
   let detailData = row;
   try {
@@ -569,7 +633,7 @@
      const userLists = await userListNoPage();
      userList.value = (userLists.data || []).filter(user => {
         const roleIds = user.roleIds || [];
         return roleIds.includes(106) || roleIds.includes('106');
        return roleIds.includes(106) || roleIds.includes("106");
      });
   } catch (e) {
      console.error("加载检验员列表失败", e);
@@ -580,7 +644,8 @@
      try {
         const params = {
            productId: detailData.productId,
            inspectType: 2
          inspectType: 2,
          process: detailData.process || "",
         };
         const res = await qualityInspectDetailByProductId(params);
         testStandardOptions.value = res.data || [];
@@ -597,10 +662,13 @@
      checkName: detailData.checkName || userStore.nickName || "",
      checkTime: detailData.checkTime || dayjs().format("YYYY-MM-DD"),
      testStandardId: detailData.testStandardId || "",
      checkCompany: detailData.checkCompany || ""
      checkCompany: detailData.checkCompany || "",
   };
   // 如果有检验参数数据，回显到表格
   if (detailData.qualityInspectParams && detailData.qualityInspectParams.length > 0) {
    if (
      detailData.qualityInspectParams &&
      detailData.qualityInspectParams.length > 0
    ) {
      quickCheckTableData.value = detailData.qualityInspectParams;
   } else {
      quickCheckTableData.value = [];
@@ -609,18 +677,21 @@
};

// 指标选择变化处理
const handleTestStandardChange = (testStandardId) => {
  const handleTestStandardChange = testStandardId => {
  if (!testStandardId) {
    quickCheckTableData.value = [];
    return;
  }
  quickCheckTableLoading.value = true;
  getQualityTestStandardParamByTestStandardId(testStandardId).then(res => {
    getQualityTestStandardParamByTestStandardId(testStandardId)
      .then(res => {
    quickCheckTableData.value = res.data || [];
  }).catch(error => {
    console.error('获取标准参数失败:', error);
      })
      .catch(error => {
        console.error("获取标准参数失败:", error);
    quickCheckTableData.value = [];
  }).finally(() => {
      })
      .finally(() => {
    quickCheckTableLoading.value = false;
  });
};
@@ -633,7 +704,7 @@
      checkName: "",
      checkTime: "",
      testStandardId: "",
      checkCompany: ""
      checkCompany: "",
   };
   quickCheckTableData.value = [];
   testStandardOptions.value = [];
@@ -671,7 +742,7 @@
         testStandardId: testStandardIdToPass,
         checkCompany: checkCompanyToPass,
         inspectType: 2,
         qualityInspectParams: qualityInspectParamsToPass
        qualityInspectParams: qualityInspectParamsToPass,
      };
      qualityInspectUpdate(data).then(res => {
         proxy.$modal.msgSuccess("检验成功");
@@ -685,7 +756,15 @@
         currentRow.value.checkTime = checkTimeToPass;
         currentRow.value.checkCompany = checkCompanyToPass;
         currentRow.value.testStandardId = testStandardIdToPass;
         formDia.value?.openDialog("edit", currentRow.value, checkResultToPass, checkNameToPass, testStandardIdToPass, checkCompanyToPass, qualityInspectParamsToPass);
        formDia.value?.openDialog(
          "edit",
          currentRow.value,
          checkResultToPass,
          checkNameToPass,
          testStandardIdToPass,
          checkCompanyToPass,
          qualityInspectParamsToPass
        );
      });
   }
};