fix: 报工时可补料、退料

spring

16 小时以前 285a7c193147c844e7e27b71e74980d065f33e13

 src/views/productionManagement/workOrderManagement/index.vue

@@ -164,6 +164,147 @@
      </template>
    </el-dialog>
    
    <el-dialog v-model="materialDialogVisible"
               title="物料"
               width="1200px"
               @close="handleCloseMaterialDialog">
      <el-table v-loading="materialTableLoading"
                :data="materialTableData"
                border
                row-key="id">
        <el-table-column label="工序名称"
                         prop="processName"
                         min-width="140" />
        <el-table-column label="原料名称"
                         prop="materialName"
                         min-width="140" />
        <el-table-column label="原料型号"
                         prop="materialModel"
                         min-width="140" />
        <el-table-column label="计量单位"
                         prop="unit"
                         min-width="100" />
        <el-table-column label="领用数量"
                         prop="pickQty"
                         min-width="100" />
        <el-table-column label="补料数量"
                         prop="supplementQty"
                         min-width="100" />
        <el-table-column label="退料数量"
                         prop="returnQty"
                         min-width="100" />
        <el-table-column label="实际数量"
                         prop="actualQty"
                         min-width="100" />
        <el-table-column label="操作"
                         align="center"
                         fixed="right"
                         width="220">
          <template #default="{ row }">
            <el-button type="primary"
                       link
                       @click="openSupplementDialog(row)">补料</el-button>
            <el-button type="warning"
                       link
                       @click="openReturnDialog(row)">退料</el-button>
            <el-button type="info"
                       link
                       @click="openSupplementRecordDialog(row)">补料记录</el-button>
          </template>
        </el-table-column>
      </el-table>
    </el-dialog>

    <FormDialog v-model="supplementDialogVisible"
                title="补料"
                width="500px"
                @confirm="handleSubmitSupplement">
      <el-form ref="supplementFormRef"
               :model="supplementForm"
               :rules="supplementRules"
               label-width="100px">
        <el-form-item label="补料数量"
                      prop="supplementQty">
          <el-input-number v-model="supplementForm.supplementQty"
                           :min="0.001"
                           :precision="3"
                           :step="1"
                           style="width: 100%;" />
        </el-form-item>
        <el-form-item label="补料原因"
                      prop="supplementReason">
          <el-input v-model="supplementForm.supplementReason"
                    type="textarea"
                    :rows="3"
                    maxlength="200"
                    show-word-limit
                    placeholder="请输入补料原因" />
        </el-form-item>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary"
                     :loading="supplementSubmitting"
                     @click="handleSubmitSupplement">确定</el-button>
          <el-button @click="supplementDialogVisible = false">取消</el-button>
        </span>
      </template>
    </FormDialog>

    <FormDialog v-model="returnDialogVisible"
                title="退料"
                width="500px"
                @confirm="handleSubmitReturn">
      <el-form ref="returnFormRef"
               :model="returnForm"
               :rules="returnRules"
               label-width="120px">
        <el-form-item label="退料数量"
                      prop="returnQty">
          <el-input-number v-model="returnForm.returnQty"
                           :min="0.001"
                           :precision="3"
                           :step="1"
                           style="width: 100%;" />
        </el-form-item>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary"
                     :loading="returnSubmitting"
                     @click="handleSubmitReturn">确定</el-button>
          <el-button @click="returnDialogVisible = false">取消</el-button>
        </span>
      </template>
    </FormDialog>

    <el-dialog v-model="supplementRecordDialogVisible"
               title="补料记录"
               width="900px">
      <el-table v-loading="supplementRecordLoading"
                :data="supplementRecordTableData"
                border
                row-key="id">
        <el-table-column label="补料数量"
                         prop="supplementQty"
                         min-width="100" />
        <el-table-column label="补料原因"
                         prop="supplementReason"
                         min-width="200" />
        <el-table-column label="补料人"
                         prop="supplementUserName"
                         min-width="120" />
        <el-table-column label="补料日期"
                         prop="supplementTime"
                         min-width="160" />
      </el-table>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="supplementRecordDialogVisible = false">关闭</el-button>
        </span>
      </template>
    </el-dialog>
    
    <FilesDia ref="workOrderFilesRef" />
  </div>
</template>
@@ -176,11 +317,16 @@
    productWorkOrderPage,
    addProductMain,
    downProductWorkOrder,
    listWorkOrderMaterialLedger,
    addWorkOrderMaterialSupplement,
    addWorkOrderMaterialReturn,
    listWorkOrderMaterialSupplementRecord,
  } from "@/api/productionManagement/workOrder.js";
  import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
  import QRCode from "qrcode";
  import { getCurrentInstance, reactive, toRefs } from "vue";
  import FilesDia from "./components/filesDia.vue";
  import FormDialog from "@/components/Dialog/FormDialog.vue";
  const { proxy } = getCurrentInstance();

  const tableColumn = ref([
@@ -255,7 +401,7 @@
    },
    {
      label: "操作",
      width: "200",
      width: "260",
      align: "center",
      dataType: "action",
      fixed: "right",
@@ -278,6 +424,12 @@
            showReportDialog(row);
          },
          disabled: row => row.planQuantity <= 0,
        },
        {
          name: "物料",
          clickFun: row => {
            openMaterialDialog(row);
          },
        },
      ],
    },
@@ -340,6 +492,13 @@
    quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
    scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
  };
  const supplementRules = {
    supplementQty: [{ required: true, message: "请输入补料数量", trigger: "blur" }],
    supplementReason: [{ required: true, message: "请输入补料原因", trigger: "blur" }],
  };
  const returnRules = {
    returnQty: [{ required: true, message: "请输入退料数量", trigger: "blur" }],
  };

  // 处理本次生产数量输入，限制必须大于等于1
  const handleQuantityInput = value => {
@@ -396,6 +555,27 @@
  };
  
  const currentReportRowData = ref(null);
  const materialDialogVisible = ref(false);
  const materialTableLoading = ref(false);
  const materialTableData = ref([]);
  const currentMaterialRow = ref(null);
  const currentMaterialOrderRow = ref(null);
  const supplementDialogVisible = ref(false);
  const supplementSubmitting = ref(false);
  const supplementFormRef = ref(null);
  const supplementForm = reactive({
    supplementQty: null,
    supplementReason: "",
  });
  const returnDialogVisible = ref(false);
  const returnSubmitting = ref(false);
  const returnFormRef = ref(null);
  const returnForm = reactive({
    returnQty: null,
  });
  const supplementRecordDialogVisible = ref(false);
  const supplementRecordLoading = ref(false);
  const supplementRecordTableData = ref([]);
  const page = reactive({
    current: 1,
    size: 100,
@@ -547,6 +727,129 @@
    reportDialogVisible.value = true;
  };

  const openMaterialDialog = async row => {
    currentMaterialOrderRow.value = row;
    materialDialogVisible.value = true;
    materialTableLoading.value = true;
    materialTableData.value = [];
    try {
      const res = await listWorkOrderMaterialLedger({
        workOrderId: row.id,
        processId: row.processId,
        productProcessRouteItemId: row.productProcessRouteItemId,
      });
      materialTableData.value = res.data || [];
    } catch (e) {
      console.error("获取物料台账失败", e);
      proxy.$modal.msgError("获取物料台账失败");
    } finally {
      materialTableLoading.value = false;
    }
  };

  const handleCloseMaterialDialog = () => {
    materialTableData.value = [];
    currentMaterialRow.value = null;
    currentMaterialOrderRow.value = null;
  };

  const openSupplementDialog = row => {
    currentMaterialRow.value = row;
    supplementForm.supplementQty = null;
    supplementForm.supplementReason = "";
    supplementDialogVisible.value = true;
    nextTick(() => {
      supplementFormRef.value?.clearValidate();
    });
  };

  const handleSubmitSupplement = () => {
    supplementFormRef.value?.validate(async valid => {
      if (!valid) return;
      if (!currentMaterialRow.value?.id) {
        proxy.$modal.msgWarning("缺少物料明细ID");
        return;
      }
      supplementSubmitting.value = true;
      try {
        await addWorkOrderMaterialSupplement({
          materialLedgerId: currentMaterialRow.value.id,
          supplementQty: Number(supplementForm.supplementQty),
          supplementReason: supplementForm.supplementReason,
          workOrderId: currentMaterialOrderRow.value?.id,
        });
        proxy.$modal.msgSuccess("补料成功");
        supplementDialogVisible.value = false;
        await openMaterialDialog(currentMaterialOrderRow.value);
      } catch (e) {
        console.error("补料失败", e);
        proxy.$modal.msgError("补料失败");
      } finally {
        supplementSubmitting.value = false;
      }
    });
  };

  const openReturnDialog = row => {
    currentMaterialRow.value = row;
    returnForm.returnQty = null;
    returnDialogVisible.value = true;
    nextTick(() => {
      returnFormRef.value?.clearValidate();
    });
  };

  const handleSubmitReturn = () => {
    returnFormRef.value?.validate(async valid => {
      if (!valid) return;
      if (!currentMaterialRow.value?.id) {
        proxy.$modal.msgWarning("缺少物料明细ID");
        return;
      }
      const returnQty = Number(returnForm.returnQty);
      const minQty =
        Number(currentMaterialRow.value.pickQty || 0) +
        Number(currentMaterialRow.value.supplementQty || 0);
      if (returnQty < minQty) {
        proxy.$modal.msgWarning(`退料数量不能低于领用数量+补料数量（${minQty}）`);
        return;
      }
      returnSubmitting.value = true;
      try {
        await addWorkOrderMaterialReturn({
          materialLedgerId: currentMaterialRow.value.id,
          returnQty,
          workOrderId: currentMaterialOrderRow.value?.id,
        });
        proxy.$modal.msgSuccess("退料成功");
        returnDialogVisible.value = false;
        await openMaterialDialog(currentMaterialOrderRow.value);
      } catch (e) {
        console.error("退料失败", e);
        proxy.$modal.msgError("退料失败");
      } finally {
        returnSubmitting.value = false;
      }
    });
  };

  const openSupplementRecordDialog = async row => {
    supplementRecordDialogVisible.value = true;
    supplementRecordLoading.value = true;
    supplementRecordTableData.value = [];
    try {
      const res = await listWorkOrderMaterialSupplementRecord({
        materialLedgerId: row.id,
      });
      supplementRecordTableData.value = res.data || [];
    } catch (e) {
      console.error("获取补料记录失败", e);
      proxy.$modal.msgError("获取补料记录失败");
    } finally {
      supplementRecordLoading.value = false;
    }
  };

  const handleReport = () => {
    reportFormRef.value?.validate(valid => {
      if (!valid) {