fix(workOrder): 修正工单报告数量计算逻辑

张诺

8 小时以前 80fea9ca648dcebc3b44fa068c927fa67dafb7fb

 src/views/productionManagement/workOrder/index.vue

@@ -326,21 +326,19 @@
      </template>
    </el-dialog>
    <el-dialog v-model="scheduleDialogVisible"
               :title="`生产排产(工单编号:${currentReportRowData?.workOrderNo || '-'})`"
               :title="scheduleDialogTitle"
               width="1000px"
               :close-on-click-modal="false">
      <div class="schedule-panel">
        <el-row style="margin-bottom: 12px;">
        <el-row v-if="!isScheduleHistoryMode" style="margin-bottom: 12px;">
          <el-col>
            <el-button type="primary" plain :disabled="scheduleLoading || scheduleSaving" @click="addScheduleRow">
              新增一行
            </el-button>
          </el-col>
        </el-row>

        <el-table :data="scheduleRows" border style="width: 100%" v-loading="scheduleLoading">
          <el-table-column type="index" label="序号" width="70" align="center" />

          <el-table-column type="index" label="序号" width="70" align="center" :index="indexMethod" />
          <el-table-column label="本次上机机台" min-width="220">
            <template #default="{ row }">
              <el-select
@@ -349,7 +347,7 @@
                  filterable
                  clearable
                  style="width: 100%"
                  :disabled="scheduleSaving"
                  :disabled="scheduleSaving || isScheduleHistoryMode"
                  @change="val => handleScheduleDeviceChange(val, row)"
              >
                <el-option
@@ -364,7 +362,18 @@

          <el-table-column label="本次上机人" min-width="220">
            <template #default="{ row }">
              <div v-if="isScheduleHistoryMode" class="schedule-user-tags">
                <el-tag
                    v-for="(userId, index) in row.userIds"
                    :key="`${userId}-${index}`"
                    type="primary"
                >
                  {{ resolveScheduleUserName(userId) }}
                </el-tag>
                <span v-if="!row.userIds?.length">-</span>
              </div>
              <el-select
                  v-else
                  v-model="row.userIds"
                  placeholder="请选择上机人"
                  filterable
@@ -394,12 +403,12 @@
                  format="YYYY-MM-DD HH:mm:ss"
                  placeholder="请选择上机时间"
                  style="width: 100%"
                  :disabled="scheduleSaving"
                  :disabled="scheduleSaving || isScheduleHistoryMode"
              />
            </template>
          </el-table-column>

          <el-table-column label="操作" width="110" align="center">
          <el-table-column v-if="!isScheduleHistoryMode" label="操作" width="110" align="center">
            <template #default="{ row }">
              <el-button
                  link
@@ -415,7 +424,7 @@
        </el-table>

        <Pagination
            v-show="schedulePage.total > 0"
            v-show="isScheduleHistoryMode && schedulePage.total > 0"
            style="margin-top: 12px"
            :total="schedulePage.total"
            :page="schedulePage.current"
@@ -426,8 +435,13 @@

      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" :loading="scheduleSaving" @click="handleSaveSchedule">保存排产</el-button>
          <el-button :disabled="scheduleSaving" @click="scheduleDialogVisible = false">取消</el-button>
          <template v-if="isScheduleHistoryMode">
            <el-button @click="scheduleDialogVisible = false">关闭</el-button>
          </template>
          <template v-else>
            <el-button type="primary" :loading="scheduleSaving" @click="handleSaveSchedule">保存排产</el-button>
            <el-button :disabled="scheduleSaving" @click="scheduleDialogVisible = false">取消</el-button>
          </template>
        </span>
      </template>
    </el-dialog>
@@ -625,17 +639,12 @@
    return;
  }

  const first = scheduleRows.value[0] || {};
  const deviceId = first.deviceId || currentReportRowData.value?.deviceId || "";
  const userOptions = deviceId ? buildScheduleUserOptionsByDeviceId(deviceId) : [...baseScheduleUsers.value];
  const defaultUserId = userOptions[0]?.userId ? String(userOptions[0].userId) : "";

  scheduleRows.value.push(
    createScheduleRow({
      id: "",
      deviceId,
      deviceName: first.deviceName || currentReportRowData.value?.deviceName || "",
      userIds: defaultUserId ? [defaultUserId] : [],
      deviceId:"",
      deviceName:"",
      userIds: [],
      startTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
    })
  );
@@ -647,7 +656,7 @@
  if (!workOrderRow?.id) {
    schedulePage.current = 1;
    schedulePage.total = 0;
    scheduleRows.value = [createScheduleRow({})];
    scheduleRows.value = [];
    return;
  }

@@ -673,13 +682,12 @@
      return;
    }

    const rows = buildScheduleRowsFromRecords(records);

    scheduleRows.value = rows.length > 0 ? rows : [createScheduleRow({})];
    const rows = records.map(record => mapMachineRecordToScheduleRow(record));
    scheduleRows.value = rows;
  } catch (error) {
    console.error("获取排产记录失败", error);
    schedulePage.total = 0;
    scheduleRows.value = [createScheduleRow({})];
    scheduleRows.value = [];
    ElMessage.error("获取排产记录失败");
  } finally {
    scheduleLoading.value = false;
@@ -687,12 +695,12 @@
};

const removeScheduleRow = async (row) => {
  if (!row) return;
  if (!row || isScheduleHistoryMode.value) return;

  if (!row.id) {
    scheduleRows.value = scheduleRows.value.filter((item) => item !== row);
    if (!scheduleRows.value.length) {
      scheduleRows.value = [createScheduleRow({})];
      addScheduleRow();
    }
    return;
  }
@@ -743,6 +751,7 @@
};

const handleSchedulePagination = ({page, limit}) => {
  if (!isScheduleHistoryMode.value) return;
  schedulePage.current = page;
  schedulePage.size = limit;
  refreshScheduleRows();
@@ -817,6 +826,16 @@
  return payload;
};

const indexMethod = (index) => {
  return (schedulePage.current - 1) * schedulePage.size + index + 1;
};

const scheduleDialogMode = ref("create");
const isScheduleHistoryMode = computed(() => scheduleDialogMode.value === "history");
const scheduleDialogTitle = computed(() =>
  `${isScheduleHistoryMode.value ? "排产记录" : "生产排产"}(工单编号:${currentReportRowData.value?.workOrderNo || "-"})`
);

const mapMachineRecordToScheduleRow = (record) => {
  const id = record?.id ?? "";
  const deviceId = record?.machineId ?? record?.deviceId ?? "";
@@ -862,11 +881,29 @@
  );
};

const resetCreateScheduleRows = () => {
  schedulePage.current = 1;
  schedulePage.total = 0;
  scheduleRows.value = [];
  addScheduleRow();
};

const openScheduleDialog = async (row) => {
  scheduleDialogMode.value = "create";
  currentReportRowData.value = row;
  baseScheduleUsers.value = buildBaseScheduleUsersByRow(row);
  userTemp.value = [...baseScheduleUsers.value];
  scheduleDialogVisible.value = true;
  resetCreateScheduleRows();
};

const openHistoryTimelineDialog = async (row) => {
  scheduleDialogMode.value = "history";
  currentReportRowData.value = row;
  baseScheduleUsers.value = buildBaseScheduleUsersByRow(row);
  userTemp.value = [...baseScheduleUsers.value];
  schedulePage.current = 1;
  schedulePage.total = 0;
  scheduleRows.value = [];
  scheduleDialogVisible.value = true;

@@ -874,6 +911,7 @@
};

const handleSaveSchedule = async () => {
  if (isScheduleHistoryMode.value) return;
  if (scheduleSaving.value) return;
  if (!validateScheduleRows()) return;

@@ -898,7 +936,7 @@
    }

    proxy.$modal.msgSuccess("排产已保存");
    await refreshScheduleRows();
    resetCreateScheduleRows();
    getList();
  } catch (error) {
    console.error("保存排产失败", error);
@@ -980,7 +1018,7 @@
  },
  {
    label: "操作",
    width: "200",
    width: "220",
    align: "center",
    dataType: "action",
    fixed: "right",
@@ -1009,7 +1047,7 @@
          showReportDialog(row);
        },
        // 用户当前id
        disabled: row => row.completeQuantity === row.planQuantity ||
        disabled: row => row.completeQuantity >= row.planQuantity ||
            !isCurrentUserInUserIds(row)
      },
      {
@@ -1020,6 +1058,17 @@
            return;
          }
          openScheduleDialog(row);
        },
        disabled: row => !row.canSchedule || row.completeQuantity >= row.planQuantity
      },
      {
        name: "排产记录",
        clickFun: row => {
          if (!row.canSchedule) {
            ElMessage.warning("当前用户不在该工序人员中，不能查看排产记录");
            return;
          }
          openHistoryTimelineDialog(row);
        },
        disabled: row => !row.canSchedule
      }
@@ -1181,6 +1230,12 @@
  }
  const num = Number(value);
  if (isNaN(num)) {
    return;
  }
  // 如果超过待生产数量
  if (num > reportForm.planQuantity) {
    proxy.$modal.msgWarning("本次生产数量不能大于待生产数量");
    reportForm.quantity = reportForm.planQuantity;
    return;
  }
  // 如果小于1，清除
@@ -1377,9 +1432,10 @@
};

const showReportDialog = row => {

  currentReportRowData.value = row;
  reportForm.planQuantity = row.planQuantity - row.completeQuantity;
  reportForm.quantity = row.quantity !== undefined && row.quantity !== null ? row.quantity : null;
  reportForm.quantity = row.planQuantity - row.completeQuantity;
  reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
  reportForm.workOrderId = row.id;
  reportForm.reportWork = row.reportWork;
@@ -1640,6 +1696,14 @@
    justify-content: flex-start;
  }
}

.schedule-user-tags {
  display: flex;
  flex-wrap: wrap;
  gap: 8px;
  min-height: 32px;
  align-items: center;
}
</style>

<style lang="scss">