Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_pro_山西_晋和园

gongchunyi

2026-05-28 19f2e3bdbe04e7ea79c6a0bdc8c7318d4837b189

 src/views/qualityManagement/finalInspection/index.vue

@@ -1,33 +1,71 @@
<template>
  <div class="app-container">
    <div class="search_form mb20">
      <div>
        <span class="search_title">产品名称：</span>
        <el-input
            v-model="searchForm.productName"
      <el-form ref="searchFormRef"
               :model="searchForm"
               class="demo-form-inline">
        <el-row :gutter="20">
          <el-col :span="4">
            <el-form-item label="产品名称"
                          prop="productName">
              <el-input v-model="searchForm.productName"
            style="width: 240px"
            placeholder="请输入产品名称搜索"
            @change="handleQuery"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="检测日期"
                          prop="entryDate">
              <el-date-picker v-model="searchForm.entryDate"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              type="daterange"
                              placeholder="请选择"
            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
        >
      </div>
      <div>
        <el-button type="primary" @click="openForm('add')">新增</el-button>
                              @change="changeDaterange" />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="销售单号"
                          prop="salesContractNo">
              <el-input v-model="searchForm.salesContractNo"
                        style="width: 240px"
                        placeholder="请输入销售单号搜索"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="生产工单号"
                          prop="workOrderNo">
              <el-input v-model="searchForm.workOrderNo"
                        style="width: 240px"
                        placeholder="请输入生产工单号搜索"
                        clearable />
            </el-form-item>
          </el-col>
          <!-- 按钮 -->
          <el-col :span="4">
            <el-form-item>
              <el-button type="primary"
                         @click="getList">
                搜索
              </el-button>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div class="actions">
        <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"
@@ -35,25 +73,39 @@
          @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>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
    <InspectionFormDia ref="inspectionFormDia"
                       @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia"
             @close="handleQuery"></FormDia>
    <files-dia ref="filesDia"
               @close="handleQuery"></files-dia>
    <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>
@@ -63,15 +115,23 @@

<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";
import {
  downloadQualityInspect,
  qualityInspectDel,
  qualityInspectListPage, qualityInspectUpdate,
  submitQualityInspect
    qualityInspectListPage,
    qualityInspectUpdate,
    submitQualityInspect,
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
import dayjs from "dayjs";
@@ -81,6 +141,8 @@
const data = reactive({
  searchForm: {
    productName: "",
      salesContractNo: "",
      workOrderNo: "",
    entryDate: undefined, // 录入日期
    entryDateStart: undefined,
    entryDateEnd: undefined,
@@ -94,17 +156,17 @@
  {
    label: "检测日期",
    prop: "checkTime",
    width: 120
      width: 120,
  },
  {
    label: "销售单号",
    prop: "salesContractNo",
    width: 120
      width: 120,
  },
  {
    label: "生产工单号",
    prop: "workOrderNo",
    width: 120
      width: 120,
  },
  {
    label: "检验员",
@@ -125,61 +187,62 @@
  {
    label: "总数量",
    prop: "quantity",
    width: 100
      width: 100,
  },
  {
    label: "合格数量",
    prop: "qualifiedQuantity",
    width: 100
      width: 100,
  },
  {
    label: "不合格数量",
    prop: "unqualifiedQuantity",
    width: 100
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
      width: 100,
  },
  {
    label: "合格率",
    prop: "passRate",
    width: 100,
    dataType: "tag",
    formatData: (params) => {
      if (params == null || params === '') return '—';
      const n = Number(params);
      if (Number.isNaN(n)) return '—';
      return `${n.toFixed(2)}%`;
      formatType: params => {
        if (!params) return "";
        const rate = parseFloat(params);
        if (rate < 90) {
          return "danger";
        } else if (rate === 100) {
          return "success";
        } else {
          return "warning";
        }
    },
    formatType: (params) => {
      if (params == null || params === '') return 'info';
      const n = Number(params);
      if (Number.isNaN(n)) return 'info';
      if (n === 100) return 'success';
      if (n >= 75) return 'primary';
      if (n >= 50) return 'warning';
      if (n >= 25) return 'danger';
      return 'danger';
    },
    {
      label: "检测单位",
      prop: "checkCompany",
      width: 120,
    },
    {
      label: "检测结果",
      prop: "checkResult",
      dataType: "tag",
      formatType: params => {
        if (params == "不合格") {
          return "danger";
        } else if (params == "合格") {
          return "success";
        } else {
          return "danger";
        }
    },
  },
  {
    label: "提交状态",
    prop: "inspectState",
    dataType: "tag",
    formatData: (params) => {
      formatData: params => {
      if (params) {
        return "已提交";
      } else {
        return "未提交";
      }
    },
    formatType: (params) => {
      if (params) {
        return "success";
      } else {
        return "info";
      }
    },
  },
@@ -193,10 +256,10 @@
      {
        name: "编辑",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openForm("edit", row);
        },
        disabled: (row) => {
          disabled: row => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
          // 如果检验员有值，只有当前登录用户能编辑
@@ -204,29 +267,29 @@
            return row.checkName !== userStore.nickName;
          }
          return false;
        }
          },
      },
      {
        name: "查看",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          openForm("view", row);
        },
      },
      {
        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;
          // 如果检验员有值，只有当前登录用户能提交
@@ -234,26 +297,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);
        },
      },
@@ -263,24 +326,24 @@
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 changeDaterange = (value) => {
  const changeDaterange = value => {
  searchForm.value.entryDateStart = undefined;
  searchForm.value.entryDateEnd = undefined;
  if (value) {
@@ -295,7 +358,7 @@
  page.current = 1;
  getList();
};
const pagination = (obj) => {
  const pagination = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
@@ -303,44 +366,57 @@
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.map(item => {
          const quantity = parseFloat(item.quantity);
          const qualifiedQuantity = parseFloat(item.qualifiedQuantity);
          let passRate = null;
          if (!isNaN(quantity) && !isNaN(qualifiedQuantity) && quantity > 0) {
            passRate = ((qualifiedQuantity / quantity) * 100).toFixed(2) + "%";
          }
          return {
            ...item,
            passRate: passRate,
          };
        });
    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;
@@ -351,7 +427,7 @@
    type: "warning",
  })
      .then(() => {
        qualityInspectDel(ids).then((res) => {
        qualityInspectDel(ids).then(res => {
          proxy.$modal.msgSuccess("删除成功");
          getList();
        });
@@ -368,7 +444,11 @@
    type: "warning",
  })
      .then(() => {
        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "出厂检验.xlsx");
        proxy.download(
          "/quality/qualityInspect/export",
          { inspectType: 2 },
          "出厂检验.xlsx"
        );
      })
      .catch(() => {
        proxy.$modal.msg("已取消");
@@ -376,13 +456,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 = () => {
@@ -394,43 +474,49 @@
  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();
  userList.value = userLists.data;
  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);
    });
};
onMounted(() => {
  getList();
});
</script>

<style scoped></style>
<style scoped lang="scss">
  .actions {
    display: flex;
    justify-content: flex-end;
    margin-bottom: 10px;
  }
</style>