张诺
昨天 ccd67e291e00a2ad9c29ad8df43de6fab5a4afed
src/views/productionManagement/workOrder/index.vue
@@ -98,12 +98,12 @@
            </div>
            <!-- <div class="info-item">
              <span class="info-label">工单状态</span>
              <span class="info-value">{{
                transferCardRowData.status === 1 ? '待确认' :
                transferCardRowData.status === 2 ? '待生产' :
                transferCardRowData.status === 3 ? '生产中' :
                transferCardRowData.status === 4 ? '已生产' :
                transferCardRowData.status
              <span class="info-value">{{
                transferCardRowData.status === 1 ? '待确认' :
                transferCardRowData.status === 2 ? '待生产' :
                transferCardRowData.status === 3 ? '生产中' :
                transferCardRowData.status === 4 ? '已生产' :
                transferCardRowData.status
              }}</span>
            </div> -->
            <div class="info-item">
@@ -165,7 +165,7 @@
      </div>
    </el-dialog>
    <el-dialog v-model="reportDialogVisible"
               title="报工"
               :title="`报工(机台:${currentReportRowData?.deviceName || '-'})`"
               width="500px">
      <el-form ref="reportFormRef"
               :model="reportForm"
@@ -203,6 +203,39 @@
                     clearable
                     filterable
                     @change="handleUserChange">
            <el-option v-for="user in userOptions"
                       :key="user.userId"
                       :label="user.nickName"
                       :value="user.userId" />
          </el-select>
        </el-form-item>
        <el-form-item label="开始时间"
                      prop="startTime">
          <el-date-picker v-model="reportForm.startTime"
                          type="datetime"
                          value-format="YYYY-MM-DD HH:mm:ss"
                          format="YYYY-MM-DD HH:mm:ss"
                          style="width: 300px"
                          placeholder="请选择开始时间"
                          clearable />
        </el-form-item>
        <el-form-item label="结束时间"
                      prop="endTime">
          <el-date-picker v-model="reportForm.endTime"
                          type="datetime"
                          value-format="YYYY-MM-DD HH:mm:ss"
                          format="YYYY-MM-DD HH:mm:ss"
                          style="width: 300px"
                          placeholder="请选择结束时间"
                          clearable />
        </el-form-item>
        <el-form-item label="审核人" prop="auditUserId">
          <el-select v-model="reportForm.auditUserId"
                     style="width: 300px"
                     placeholder="请选择审核人"
                     clearable
                     filterable
                     @change="handleReviewerIdChange">
            <el-option v-for="user in userOptions"
                       :key="user.userId"
                       :label="user.nickName"
@@ -305,6 +338,10 @@
      prop: "processName",
    },
    {
      label: "机台名称",
      prop: "deviceName",
    },
    {
      label: "需求数量",
      prop: "planQuantity",
      width: "140",
@@ -353,6 +390,8 @@
          clickFun: row => {
            handleEdit(row);
          },
          // 当需求数量等于完成数量的时候,按钮不可点击
          disabled: row => Number(row?.planQuantity) === Number(row?.completeQuantity),
        },
        {
          name: "流转卡",
@@ -371,16 +410,16 @@
          clickFun: row => {
            showReportDialog(row);
          },
          disabled: row => row.planQuantity <= 0,
          disabled: row => Number(row?.planQuantity) <= Number(row?.completeQuantity) || row.planQuantity <= 0,
        },
        {
          name:"审核",
          color: "#f56c6c",
          clickFun: row => {
            handleAudit(row);
          },
          disabled: row => Number(row?.auditStatus) === 1,
        }
        // {
        //   name:"审核",
        //   color: "#f56c6c",
        //   clickFun: row => {
        //     handleAudit(row);
        //   },
        //   disabled: row => Number(row?.auditStatus) === 1,
        // }
      ],
    },
  ]);
@@ -405,6 +444,8 @@
    planQuantity: 0,
    quantity: null,
    scrapQty: null,
    startTime: "",
    endTime: "",
    userName: "",
    workOrderId: "",
    reportWork: "",
@@ -503,6 +544,9 @@
  const reportFormRules = {
    quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
    scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
    startTime: [{ required: true, message: "请选择开始时间", trigger: "change" }],
    endTime: [{ required: true, message: "请选择结束时间", trigger: "change" }],
    auditUserId: [{ required: true, message: "请选择审核人", trigger: "change" }],
  };
  // 处理本次生产数量输入,限制必须大于等于1
@@ -696,14 +740,17 @@
  };
  const showReportDialog = row => {
    const nowTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
    currentReportRowData.value = row;
    reportForm.planQuantity = row.planQuantity;
    reportForm.planQuantity = row.planQuantity - row.completeQuantity;
    reportForm.quantity =
      row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
    reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
    reportForm.workOrderId = row.id;
    reportForm.reportWork = row.reportWork;
    reportForm.productMainId = row.productMainId;
    reportForm.startTime = nowTime;
    reportForm.endTime = nowTime;
    reportForm.scrapQty =
      row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
    nextTick(() => {
@@ -784,6 +831,20 @@
        return;
      }
      if (!reportForm.startTime || !reportForm.endTime) {
        ElMessageBox.alert("开始时间和结束时间不能为空", "提示", {
          confirmButtonText: "确定",
        });
        return;
      }
      if (dayjs(reportForm.startTime).isSame(dayjs(reportForm.endTime)) || dayjs(reportForm.startTime).isAfter(dayjs(reportForm.endTime))) {
        ElMessageBox.alert("开始时间必须小于结束时间", "提示", {
          confirmButtonText: "确定",
        });
        return;
      }
      const submitData = {
        ...reportForm,
        quantity: quantity,
@@ -829,6 +890,17 @@
      reportForm.userName = "";
    }
  };
  // 审核人
  const handleReviewerIdChange = userId => {
    if (userId) {
      const selectedUser = userOptions.value.find(user => user.userId === userId);
      if (selectedUser) {
        reportForm.auditUserName = selectedUser.nickName;
      }
    } else {
      reportForm.auditUserName = "";
    }
  }
  onMounted(() => {
    getList();