Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

2 天以前 86ebbcd63e211f4a99e1b5585ddaf7ad805c461a

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/api/qualityManagement/nonconformingManagement.js

@@ -1,42 +1,50 @@
import request from '@/utils/request'
import request from "@/utils/request";

// 查询不合格管理列表
export function qualityUnqualifiedListPage(query) {
    return request({
        url: '/quality/qualityUnqualified/listPage',
        method: 'get',
    url: "/quality/qualityUnqualified/listPage",
    method: "get",
        params: query,
    })
  });
}
// 新增不合格管理列表
export function qualityUnqualifiedAdd(query) {
    return request({
        url: '/quality/qualityUnqualified/add',
        method: 'post',
    url: "/quality/qualityUnqualified/add",
    method: "post",
        data: query,
    })
  });
}
// 修改不合格管理列表
export function qualityUnqualifiedUpdate(query) {
    return request({
        url: '/quality/qualityUnqualified/update',
        method: 'post',
    url: "/quality/qualityUnqualified/update",
    method: "post",
        data: query,
    })
  });
}
// 不合格处理
export function qualityUnqualifiedDeal(query) {
  return request({
    url: "/quality/qualityUnqualified/deal",
    method: "post",
    data: query,
  });
}
// 删除不合格管理列表
export function qualityUnqualifiedDel(query) {
    return request({
        url: '/quality/qualityUnqualified/del',
        method: 'delete',
    url: "/quality/qualityUnqualified/del",
    method: "delete",
        data: query,
    })
  });
}
// 查询不合格管理信息
export function getQualityUnqualifiedInfo(query) {
    return request({
        url: '/quality/qualityUnqualified/' + query,
        method: 'get',
    url: "/quality/qualityUnqualified/" + query,
    method: "get",
        data: query,
    })
  });
}

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

@@ -9,14 +9,6 @@
      <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="inspectState">
              <el-select v-model="form.inspectState">
                <el-option label="待处理" :value="0" />
                <el-option label="已处理" :value="1" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="类别：" prop="inspectType">
              <el-select v-model="form.inspectType">
                <el-option label="原材料检验" :value="0" />
@@ -150,7 +142,6 @@
    quantity: "",
    checkCompany: "",
    checkResult: "",
    inspectState: '',
    inspectType: '',
    defectivePhenomena: '',
    dealResult: '',
@@ -178,7 +169,8 @@
  getProductOptions();
  if (operationType.value === 'edit') {
    getQualityUnqualifiedInfo(row.id).then(res => {
      form.value = {...res.data}
      const { inspectState, ...rest } = (res.data || {})
      form.value = { ...rest }
    })
  }
}
@@ -222,13 +214,15 @@
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      // 状态字段不在表单填写，也不传给后端
      const { inspectState, ...payload } = (form.value || {})
      if (operationType.value === "add") {
        qualityUnqualifiedAdd(form.value).then(res => {
        qualityUnqualifiedAdd(payload).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
      } else {
        qualityUnqualifiedUpdate(form.value).then(res => {
        qualityUnqualifiedUpdate(payload).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })

 src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue

@@ -9,14 +9,6 @@
      <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="inspectState">
              <el-select v-model="form.inspectState">
                <el-option label="待处理" :value="0" />
                <el-option label="已处理" :value="1" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="类别：" prop="inspectType">
              <el-select v-model="form.inspectType" disabled>
                <el-option label="原材料检验" :value="0" />
@@ -131,8 +123,7 @@
import {productTreeList} from "@/api/basicData/product.js";
import {
  getQualityUnqualifiedInfo,
  qualityUnqualifiedAdd,
  qualityUnqualifiedUpdate
  qualityUnqualifiedDeal
} from "@/api/qualityManagement/nonconformingManagement.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
@@ -152,7 +143,6 @@
    quantity: "",
    checkCompany: "",
    checkResult: "",
    inspectState: '',
    inspectType: '',
    defectivePhenomena: '',
    dealResult: '',
@@ -186,7 +176,8 @@
  getProductOptions();
  if (operationType.value === 'edit') {
    getQualityUnqualifiedInfo(row.id).then(res => {
      form.value = {...res.data}
      const { inspectState, ...rest } = (res.data || {})
      form.value = { ...rest }
    })
  }
}
@@ -230,17 +221,12 @@
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      if (operationType.value === "add") {
        qualityUnqualifiedAdd(form.value).then(res => {
      // 状态字段不在表单填写，也不传给后端；处理统一走 /deal 接口
      const { inspectState, ...payload } = (form.value || {})
      qualityUnqualifiedDeal(payload).then(() => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
      } else {
        qualityUnqualifiedUpdate(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
      }
    }
  })
}

 src/views/qualityManagement/nonconformingManagement/index.vue

@@ -185,6 +185,7 @@
        clickFun: (row) => {
          openForm("edit", row);
        },
        disabled: (row) => row.inspectState === 1,
      },
      {
        name: "处理",
@@ -192,6 +193,7 @@
        clickFun: (row) => {
          openInspectionForm("edit", row);
        },
        disabled: (row) => row.inspectState === 1,
      },
    ],
  },
@@ -247,12 +249,20 @@

// 打开弹框
const openForm = (type, row) => {
  if (type !== 'add' && row?.inspectState === 1) {
    proxy.$modal.msgWarning("已处理的数据不能再编辑");
    return;
  }
  nextTick(() => {
    formDia.value?.openDialog(type, row)
  })
};
// 打开处理弹框
const openInspectionForm = (type, row) => {
  if (row?.inspectState === 1) {
    proxy.$modal.msgWarning("已处理的数据不能再处理");
    return;
  }
  nextTick(() => {
    inspectionFormDia.value?.openDialog(type, row)
  })