fix(生产管理): 修复工单报产和审核逻辑

张诺

10 小时以前 84d0d2da3d5a00ec2a1612b23bd611cd1321121e

 src/views/productionManagement/productionReporting/index.vue

@@ -134,6 +134,14 @@
      <!-- 审核表单 -->
      <div style=" padding: 15px; border-radius: 4px;">
        <el-form ref="auditFormRef" :model="form" :rules="auditFormRules" label-width="100px">
          <el-form-item label="最终审核人" prop="sureAuditUserName">
            <el-input
                v-model="form.sureAuditUserName"
                :rows="4"
                disabled
                show-word-limit
            />
          </el-form-item>
          <el-form-item label="审核结果" prop="auditResult">
            <el-radio-group v-model="form.auditResult" @change="handleAuditResultChange" size="large">
              <el-radio label=1 >通过</el-radio>
@@ -180,6 +188,9 @@
  import { productionProductMainListPage, productAudit } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
  import useUserStore from "@/store/modules/user";

  const userStore = useUserStore();

  const data = reactive({
    searchForm: {
@@ -209,13 +220,18 @@
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 120,
    },
    {
      label: "报工人员",
      prop: "nickName",
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
     {
      label: "审核人",
      prop: "auditUserName",
      width: 120,
    },
     {
@@ -231,6 +247,11 @@
        const typeMap = { 0: "info", 1: "success", 2: "danger" };
        return typeMap[val] ?? "";
      },
    },
    {
      label: "最终审核人",
      prop: "sureAuditUserName",
      width: 120,
    },
    {
      label: "工单编号",
@@ -268,11 +289,6 @@
      width: 120,
    },
    {
      label: "审核人",
      prop: "auditUserName",
      width: 120,
    },
    {
      label: "备注信息",
      prop: "auditOpinion",
      minWidth: 120,
@@ -305,11 +321,10 @@
        },
        {
          name:"审核",
          color: "#E6A23C",
          clickFun: row => {
            handleAudit(row);
          },
          disabled: row => Number(row?.auditStatus) !== 0, // 已审核时禁用审核按钮
          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
        },
      ],
    },
@@ -503,12 +518,10 @@

   // 审核
  const handleAudit = (row) => {
    if (Number(row?.auditStatus) === 1) {
      ElMessage.warning("该工单已审核");
      return;
    }
    // 重置表单，默认选择通过
    form.value = {
      sureAuditUserId: userStore.id,
      sureAuditUserName: userStore.nickName,
      auditResult: "1",
      remarks: "",
    };
@@ -536,9 +549,10 @@
  };

  // 提交审核
  const submitAudit = (auditResult) => {
  const submitAudit = () => {
    auditFormRef.value?.validate().then(() => {
      auditLoading.value = true;
      console.log(form);
      const auditData = {
        id: auditRowData.value.id,
        auditStatus: Number(form.value.auditResult),