Merge remote-tracking branch 'origin/dev_天津_君歌化工new' into dev_天津_君歌化工new

yuan

8 天以前 cc5f8607d1f80fdb5d31b29d87b25d708505b03a

 src/views/qualityManagement/finalInspection/index.vue

@@ -4,44 +4,29 @@
      <el-form ref="searchFormRef"
               :model="searchForm"
               class="demo-form-inline">
        <el-row :gutter="20">
          <el-col :span="4">
            <el-form-item label="产品名称"
        <el-row :gutter="32">
          <el-col :span="6">
            <el-form-item label="名称"
                          prop="productName">
              <el-input v-model="searchForm.productName"
                        style="width: 240px"
                        placeholder="请输入产品名称搜索"
                        style="width: 300px"
                        placeholder="请输入名称搜索"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="检测日期"
          <el-col :span="8">
            <el-form-item label="检验日期"
                          prop="entryDate">
              <el-date-picker v-model="searchForm.entryDate"
                              style="width: 360px"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              type="daterange"
                              placeholder="请选择"
                              start-placeholder="起止日期"
                              end-placeholder="起止日期"
                              range-separator="-"
                              clearable
                              @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>
          <!-- 按钮 -->
@@ -75,46 +60,14 @@
                @pagination="pagination"
                :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%"
               @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"
                       :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 @click="closeDia">取消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
  import { Search } from "@element-plus/icons-vue";
  import {
    onMounted,
    ref,
@@ -123,121 +76,73 @@
    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,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
  import FilesDia from "@/views/qualityManagement/finalInspection/components/filesDia.vue";
  import dayjs from "dayjs";
  import { userListNoPage } from "@/api/system/user.js";
  import useUserStore from "@/store/modules/user";

  const data = reactive({
    searchForm: {
      productName: "",
      salesContractNo: "",
      workOrderNo: "",
      entryDate: undefined, // 录入日期
      entryDate: undefined, // 检验日期
      entryDateStart: undefined,
      entryDateEnd: undefined,
    },
    rules: {
      checkName: [{ required: true, message: "请选择", trigger: "change" }],
    },
  });
  const { searchForm } = toRefs(data);
  const tableColumn = ref([
    {
      label: "检测日期",
      label: "检验日期",
      prop: "checkTime",
      width: 120,
    },
    {
      label: "销售单号",
      prop: "salesContractNo",
      width: 120,
    },
    {
      label: "生产工单号",
      prop: "workOrderNo",
      width: 120,
    },
    {
      label: "检验员",
      prop: "checkName",
    },
    {
      label: "产品名称",
      label: "名称",
      prop: "productName",
    },
    {
      label: "规格型号",
      label: "图号",
      prop: "model",
    },
    {
      label: "单位",
      prop: "unit",
      label: "材质",
      prop: "material",
    },
    {
      label: "总数量",
      label: "数量",
      prop: "quantity",
      width: 100,
    },
    {
      label: "合格数量",
      prop: "qualifiedQuantity",
      label: "抽检数",
      prop: "samplingCount",
      width: 100,
    },
    {
      label: "不合格数量",
      prop: "unqualifiedQuantity",
      width: 100,
    },
    {
      label: "合格率",
      prop: "passRate",
      label: "判定",
      prop: "verdict",
      width: 100,
      dataType: "tag",
      formatType: params => {
        if (!params) return "";
        const rate = parseFloat(params);
        if (rate < 90) {
          return "danger";
        } else if (rate === 100) {
        if (params == "合格") {
          return "success";
        } else {
          return "warning";
        }
      },
    },
    {
      label: "检测单位",
      prop: "checkCompany",
      width: 120,
    },
    {
      label: "检测结果",
      prop: "checkResult",
      dataType: "tag",
      formatType: params => {
        if (params == "不合格") {
        } else if (params == "不合格") {
          return "danger";
        } else if (params == "合格") {
          return "success";
        } else {
          return "danger";
          return "info";
        }
      },
    },
    {
      label: "提交状态",
      prop: "inspectState",
      width: 100,
      formatData: params => {
        if (params) {
          return "已提交";
@@ -251,22 +156,13 @@
      label: "操作",
      align: "center",
      fixed: "right",
      width: 280,
      width: 290,
      operation: [
        {
          name: "编辑",
          type: "text",
          clickFun: row => {
            openForm("edit", row);
          },
          disabled: row => {
            // 已提交则禁用
            if (row.inspectState == 1) return true;
            // 如果检验员有值，只有当前登录用户能编辑
            if (row.checkName) {
              return row.checkName !== userStore.nickName;
            }
            return false;
          },
        },
        {
@@ -289,44 +185,20 @@
          clickFun: row => {
            submit(row.id);
          },
          disabled: row => {
            // 已提交则禁用
            if (row.inspectState == 1) return true;
            // 如果检验员有值，只有当前登录用户能提交
            if (row.checkName) {
              return row.checkName !== userStore.nickName;
            }
            return false;
          },
        },
        {
          name: "分配检验员",
          type: "text",
          clickFun: row => {
            if (!row.checkName) {
              open(row);
            } else {
              proxy.$modal.msgError("检验员已存在");
            }
          },
          disabled: row => {
            return row.inspectState == 1 || row.checkName;
          },
        },
        {
          name: "下载",
          type: "text",
          clickFun: row => {
            downLoadFile(row);
          },
        },
        // {
        //   name: "下载",
        //   type: "text",
        //   clickFun: row => {
        //     downLoadFile(row);
        //   },
        // },
      ],
    },
  ]);
  const tableData = ref([]);
  const selectedRows = ref([]);
  const tableLoading = ref(false);
  const currentRow = ref(null);
  const page = reactive({
    current: 1,
    size: 100,
@@ -334,14 +206,7 @@
  });
  const formDia = ref();
  const filesDia = ref();
  const inspectionFormDia = ref();
  const { proxy } = getCurrentInstance();
  const userStore = useUserStore();
  const userList = ref([]);
  const form = ref({
    checkName: "",
  });
  const dialogFormVisible = ref(false);

  const changeDaterange = value => {
    searchForm.value.entryDateStart = undefined;
@@ -370,18 +235,7 @@
    qualityInspectListPage({ ...params, inspectType: 2 })
      .then(res => {
        tableLoading.value = false;
        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,
          };
        });
        tableData.value = res.data.records;
        page.total = res.data.total;
      })
      .catch(err => {
@@ -397,12 +251,6 @@
  const openForm = (type, row) => {
    nextTick(() => {
      formDia.value?.openDialog(type, row);
    });
  };
  // 打开新增检验弹框
  const openInspectionForm = (type, row) => {
    nextTick(() => {
      inspectionFormDia.value?.openDialog(type, row);
    });
  };
  // 打开附件弹框
@@ -455,40 +303,13 @@
      });
  };

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

  // 关闭弹框
  const closeDia = () => {
    proxy.resetForm("formRef");
    dialogFormVisible.value = false;
  };

  const submitForm = () => {
    if (currentRow.value) {
      const data = {
        ...form.value,
        id: currentRow.value.id,
      };
      qualityInspectUpdate(data).then(res => {
        proxy.$modal.msgSuccess("提交成功");
        closeDia();
        getList();
      });
    }
  };

  const open = async row => {
    let userLists = await userListNoPage();
    userList.value = userLists.data;
    currentRow.value = row;
    dialogFormVisible.value = true;
  };

  const downLoadFile = row => {
@@ -500,7 +321,7 @@

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