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

张诺

7 小时以前 84d0d2da3d5a00ec2a1612b23bd611cd1321121e

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

- 报产表单初始时间设为空字符串而非当前时间
- 审核人选择列表增加“任意用户”选项
- 调整审核按钮禁用逻辑，允许任意用户或指定审核人操作
- 审核表单新增最终审核人字段并自动填充

 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>
@@ -241,6 +249,11 @@
      },
    },
    {
      label: "最终审核人",
      prop: "sureAuditUserName",
      width: 120,
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      width: 120,
@@ -311,7 +324,7 @@
          clickFun: row => {
            handleAudit(row);
          },
          disabled: row => Number(row?.auditStatus) !== 0 || row.auditUserId !== userStore.id, // 已审核或不是指定审核人时禁用
          disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
        },
      ],
    },
@@ -505,16 +518,10 @@

   // 审核
  const handleAudit = (row) => {
    if (Number(row?.auditStatus) !== 0) {
      ElMessage.warning("该工单已审核");
      return;
    }
    if (row.auditUserId !== userStore.id) {
      ElMessage.warning("您不是该工单的指定审核人");
      return;
    }
    // 重置表单，默认选择通过
    form.value = {
      sureAuditUserId: userStore.id,
      sureAuditUserName: userStore.nickName,
      auditResult: "1",
      remarks: "",
    };
@@ -542,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),

 src/views/productionManagement/workOrder/index.vue

@@ -749,8 +749,8 @@
    reportForm.workOrderId = row.id;
    reportForm.reportWork = row.reportWork;
    reportForm.productMainId = row.productMainId;
    reportForm.startTime = nowTime;
    reportForm.endTime = nowTime;
    reportForm.startTime = "";
    reportForm.endTime = "";
    reportForm.scrapQty =
      row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
    nextTick(() => {
@@ -872,6 +872,11 @@
      .then(res => {
        if (res.code === 200) {
          userOptions.value = res.data || [];
          console.log(userOptions.value)
          userOptions.value.unshift({
            nickName:"任意用户",
            userId:"-1",
          })
        }
      })
      .catch(err => {