fix: 生产报工领原材料修改

spring

10 小时以前 7ce932e6c23bdc01ef973d3158c653be3121b566

fix: 生产报工领原材料修改

 src/views/productionManagement/productionOrder/MaterialRequisitionDialog.vue

@@ -19,11 +19,11 @@
            <el-table-column prop="productName" label="产品名称" min-width="150" />
            <el-table-column prop="model" label="型号" min-width="150" />
            <el-table-column prop="unit" label="单位" width="80" align="center" />
            <el-table-column prop="qualitity" label="可领用数量" width="100" align="center">
            <!-- <el-table-column prop="qualitity" label="可领用数量" width="100" align="center">
              <template #default="{ row }">
                {{ row.qualitity || 0 }}
              </template>
            </el-table-column>
            </el-table-column> -->
            <el-table-column prop="requisitionQty" label="领用数量" width="120" align="center">
              <template #default="{ row }">
                <el-input-number
@@ -78,11 +78,11 @@
        <el-table-column prop="productName" label="产品名称" min-width="150" />
        <el-table-column prop="model" label="型号" min-width="150" />
        <el-table-column prop="unit" label="单位" width="80" align="center" />
        <el-table-column prop="qualitity" label="可领用数量" width="100" align="center">
        <!-- <el-table-column prop="qualitity" label="可领用数量" width="100" align="center">
          <template #default="{ row }">
            {{ row.qualitity || 0 }}
          </template>
        </el-table-column>
        </el-table-column> -->
      </el-table>

      <template #footer>

 src/views/productionManagement/workOrder/components/ProductionRecordForm.vue

@@ -1,22 +1,31 @@
<script setup lang="ts">
import {computed, reactive, ref, watch} from "vue";
import {computed, reactive, ref, watch, withDefaults} from "vue";

defineOptions({
  name: "ProductionRecordForm"
});

const props = defineProps({
  list: {
    type: Array,
    default() {
      return [];
    }
  },
  labelWidth: {
    type: Number,
    default: 120
type DeviceOption = {
  id: string | number;
  deviceName: string;
  deviceCode?: string | number | null;
  rpm?: string | number | null;
};

const props = withDefaults(
  defineProps<{
    list: any[];
    labelWidth: number;
    deviceOptions: DeviceOption[];
    selectedDeviceId: string | number | null;
  }>(),
  {
    list: () => [],
    labelWidth: 120,
    deviceOptions: () => [],
    selectedDeviceId: null,
  }
});
);

const formRef = ref();
const formData = reactive({
@@ -32,6 +41,76 @@

const getType = (item: any) => item.type || "文本格式";

const machineSelectItem = computed(() => {
  return formData.list.find(item => getType(item) === '机台选择') || null;
});

const selectedDevice = computed(() => {
  const machineValue = machineSelectItem.value?.value;
  if (machineValue === null || machineValue === undefined || machineValue === '') return null;
  return props.deviceOptions.find(device => String(device.id) === String(machineValue)) || null;
});

const AUTO_DEVICE_CODE_ID = "__auto_deviceCode__";
const AUTO_RPM_ID = "__auto_rpm__";

let isSyncingAutoFields = false;

const syncAutoDeviceFields = () => {
  if (isSyncingAutoFields) return;
  isSyncingAutoFields = true;

  try {
    const machineIndex = formData.list.findIndex(item => getType(item) === "机台选择");
    if (machineIndex === -1) return;

  const removeById = (id: string) => {
    const idx = formData.list.findIndex(x => x?.id === id);
    if (idx !== -1) formData.list.splice(idx, 1);
  };

  removeById(AUTO_DEVICE_CODE_ID);
  removeById(AUTO_RPM_ID);

  const dev = selectedDevice.value as any;
  let insertPos = machineIndex + 1;

  const hasCode =
    dev &&
    dev.deviceCode !== null &&
    dev.deviceCode !== undefined &&
    String(dev.deviceCode) !== "";

  const hasRpm = dev && dev.rpm !== null && dev.rpm !== undefined;

    if (hasCode) {
    formData.list.splice(insertPos, 0, {
      id: AUTO_DEVICE_CODE_ID,
      parameterItem: "设备编号",
      value: dev.deviceCode,
      // 只读展示：避免影响后端参数结构（submitData 会过滤）
      readonly: true,
      isRequired: "0",
      __autoExtra: true,
    });
    insertPos++;
  }

    if (hasRpm) {
    formData.list.splice(insertPos, 0, {
      id: AUTO_RPM_ID,
      parameterItem: "转数",
      value: dev.rpm,
      readonly: true,
      isRequired: "0",
      __autoExtra: true,
    });
  }
  } finally {
    isSyncingAutoFields = false;
  }
};

const rules = computed(() => {
  const result: Record<string, any[]> = {};
  formData.list.forEach((item, index) => {
@@ -43,10 +122,15 @@
});

const initData = () => {
  formData.list = props.list || [];
  // 重要：不要直接复用 props.list 的引用，否则后续 splice formData.list 会触发 props watch，导致递归更新
  formData.list = (props.list || []).map(item => ({ ...item }));
  formData.list.forEach(item => {
    if (item.value === undefined) {
      item.value = null;
    }
    // 如果参数中存在“机台选择”，则使用父组件传入的默认机台回填
    if (getType(item) === '机台选择' && (item.value === null || item.value === undefined || item.value === '')) {
      item.value = props.selectedDeviceId ?? item.value;
    }
  });
};
@@ -55,7 +139,8 @@
  const valid = await formRef.value.validate().catch(() => false)

  if (valid) {
    return formData.list
    // 自动插入的只读字段不参与提交，避免后端参数结构变化
    return formData.list.filter(item => !item.__autoExtra)
  } else {
    return null
  }
@@ -65,8 +150,18 @@
    () => props.list,
    () => {
      initData();
      // 初始化后再同步自动插入字段
      syncAutoDeviceFields();
    },
    {immediate: true, deep: true}
);

watch(
  () => selectedDevice.value,
  () => {
    syncAutoDeviceFields();
  },
  { immediate: true }
);

defineExpose({
@@ -76,9 +171,11 @@

<template>
  <el-form ref="formRef" :model="formData" :rules="rules" :label-width="`${labelWidth}px`">
    <el-row :gutter="30">
      <el-col :span="12" v-for="(item, index) in formData.list"
    :key="item.id">
    <el-form-item
        v-for="(item, index) in formData.list"
        :key="item.id"
        
        :label="fieldLabel(item)"
        :prop="`list.${index}.value`"
    >
@@ -117,12 +214,29 @@
        <el-option label="是" value="是"/>
        <el-option label="否" value="否"/>
      </el-select>
      <el-select
          v-else-if="getType(item) === '机台选择'"
          v-model="item.value"
          placeholder="请选择"
          clearable
          style="width: 100%"
      >
        <el-option
          v-for="device in props.deviceOptions"
          :key="device.id"
          :label="device.deviceName"
          :value="device.id"
        />
      </el-select>
      <el-input
          v-else
          v-model="item.value"
          placeholder="请输入"
          clearable
          :disabled="item.readonly"
          :clearable="!item.readonly"
      />
    </el-form-item>
  </el-col>
    </el-row>
  </el-form>
</template>

 src/views/productionManagement/workOrder/index.vue

@@ -166,17 +166,21 @@
    </el-dialog>
    <el-dialog v-model="reportDialogVisible"
               title="报工"
               width="500px">
               width="1400px">
      <el-form ref="reportFormRef"
               :model="reportForm"
               :rules="reportFormRules"
               label-width="120px">
        <el-form-item label="待生产数量">
          <el-input v-model="reportForm.planQuantity"
                    readonly
                    style="width: 300px" />
        </el-form-item>
        <el-form-item label="投入总量(kg)"
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="待生产数量">
              <el-input v-model="reportForm.planQuantity"
                        readonly
                        style="width: 300px" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="投入总量(kg)"
                      prop="totalInvestment">
          <el-input v-model.number="reportForm.totalInvestment"
                    type="number"
@@ -186,7 +190,8 @@
                    placeholder="请输入投入总量"
                    @input="handleTotalInvestmentInput" />
        </el-form-item>
        <el-form-item label="本次生产数量"
          </el-col>
          <el-col :span="12"><el-form-item label="本次生产数量"
                      prop="quantity">
          <el-input v-model.number="reportForm.quantity"
                    type="number"
@@ -195,8 +200,8 @@
                    style="width: 300px"
                    placeholder="请输入本次生产数量"
                    @input="handleQuantityInput" />
        </el-form-item>
        <el-form-item label="报废数量"
        </el-form-item></el-col>
          <el-col :span="12"><el-form-item label="报废数量"
                      prop="scrapQty">
          <el-input v-model.number="reportForm.scrapQty"
                    type="number"
@@ -205,8 +210,9 @@
                    style="width: 300px"
                    placeholder="请输入报废数量"
                    @input="handleScrapQtyInput" />
        </el-form-item>
        <el-form-item label="检品数量"
        </el-form-item></el-col>
        <el-col :span="12">
          <el-form-item label="检品数量"
                      prop="inspectedQuantity">
          <el-input v-model.number="reportForm.inspectedQuantity"
                    type="number"
@@ -216,7 +222,9 @@
                    placeholder="请输入检品数量"
                    @input="handleInspectedQuantity"/>
        </el-form-item>
        <el-form-item label="班组信息">
        </el-col>
        <el-col :span="12">
          <el-form-item label="班组信息">
          <el-select v-model="reportForm.userId"
                     style="width: 300px"
                     placeholder="请选择班组信息"
@@ -229,30 +237,56 @@
                       :value="user.userId" />
          </el-select>
        </el-form-item>
        <el-form-item label="设备选择">
          <el-select v-model="reportForm.deviceId"
                     style="width: 300px"
                     placeholder="请选择设备"
                     clearable
                     filterable
                     @change="handleDeviceChange">
            <el-option v-for="device in deviceOptions"
                       :key="device.id"
                       :label="device.deviceName"
                       :value="device.id" />
          </el-select>
        </el-form-item>
        <el-form-item v-if="currentDevice" label="设备编号">
          <el-input v-model="currentDevice.deviceCode"
                    disabled
                    style="width: 300px" />
        </el-form-item>
        <el-form-item v-if="currentDevice" label="转数">
          <el-input v-model="currentDevice.rpm"
                    disabled
                    style="width: 300px" />
        </el-form-item>
        <ProductionRecordForm ref="productionRecordFormRef" :list="processParamList"/>
        </el-col>
        </el-row>
        <ProductionRecordForm
          ref="productionRecordFormRef"
          :list="processParamList"
          :device-options="deviceOptions"
          :selected-device-id="reportForm.deviceId"
        />

        <div style="margin-top: 20px">
          <div style="display: flex; justify-content: flex-end; margin-bottom: 10px">
            <el-button type="primary" @click="openAddMaterialDialog">新增原材料</el-button>
          </div>

          <el-table
            :data="reportForm.drawMaterialList"
            border
            style="width: 100%"
            height="220px"
            empty-text="暂无原材料领用明细"
          >
            <el-table-column type="index" label="序号" width="60" align="center" />
            <el-table-column prop="productName" label="产品名称" min-width="160" />
            <el-table-column prop="model" label="型号" min-width="150" />
            <el-table-column prop="unit" label="单位" width="90" align="center" />
            <el-table-column prop="reportQty" label="领用数量" width="160" align="center">
              <template #default="{ row }">
                <el-input-number
                  v-model.number="row.reportQty"
                  :min="0"
                  :precision="2"
                  :controls="false"
                  :max="row.qualitity || 0"
                  :disabled="!row.qualitity"
                  style="width: 100%"
                />
              </template>
            </el-table-column>
            <el-table-column prop="remark" label="备注" min-width="160">
              <template #default="{ row }">
                <el-input v-model="row.remark" placeholder="请输入备注" clearable />
              </template>
            </el-table-column>
            <el-table-column label="操作" width="80" align="center">
              <template #default="{ $index }">
                <el-button type="danger" link @click="removeDrawMaterialRow($index)">删除</el-button>
              </template>
            </el-table-column>
          </el-table>
        </div>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
@@ -262,12 +296,49 @@
        </span>
      </template>
    </el-dialog>

    <el-dialog
      v-model="addMaterialDialogVisible"
      title="选择原材料"
      width="1000px"
      top="5vh"
      :close-on-click-modal="false"
      append-to-body
      destroy-on-close
    >
      <div>
        <el-table
          :data="availableMaterials"
          border
          style="width: 100%"
          height="45vh"
          row-key="id"
          @selection-change="handleAddMaterialSelectionChange"
        >
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column type="index" label="序号" width="60" align="center" />
          <el-table-column prop="productName" label="产品名称" min-width="160" />
          <el-table-column prop="model" label="型号" min-width="150" />
          <el-table-column prop="unit" label="单位" width="90" align="center" />
          <el-table-column prop="qualitity" label="可领用数量" width="140" align="center" />
        </el-table>

        <!-- 已选择明细展示放在报工弹框下方的 reportForm.drawMaterialList 表格里 -->
      </div>

      <template #footer>
        <span class="dialog-footer">
          <el-button @click="addMaterialDialogVisible = false">取消</el-button>
          <el-button type="primary" @click="handleConfirmAddMaterial">确定</el-button>
        </span>
      </template>
    </el-dialog>
    <FilesDia ref="workOrderFilesRef" />
  </div>
</template>

<script setup>
  import { onMounted, ref, nextTick, computed } from "vue";
  import { onMounted, ref, nextTick } from "vue";
  import { ElMessageBox } from "element-plus";
  import dayjs from "dayjs";
  import {
@@ -429,16 +500,18 @@
    userId: "",
    productMainId: null,
    deviceId: null,
    // 报工时选择的原材料领用明细
    drawMaterialList: [],
    otherData: {
      rows: []
    },
  });
  const productionRecordFormRef = ref();

  const currentDevice = computed(() => {
    if (!reportForm.deviceId) return null;
    return deviceOptions.value.find(device => device.id === reportForm.deviceId) || null;
  });
  // 原材料领用（新增/选择弹框）
  const availableMaterials = ref([]); // 来自当前行的 drawMaterials（json解析成list）
  const addMaterialDialogVisible = ref(false);
  const selectedAddMaterials = ref([]); // 弹框里用户选中的条目（可编辑 reportQty）

  // 投入总量验证规则
  const validateTotalInvestment = (rule, value, callback) => {
@@ -771,6 +844,72 @@
    return res.data.records
  };

  // 原材料领用：drawMaterials（json -> list）与 drawMaterialList（最终提交）
  const parseMaybeJsonList = (val) => {
    if (!val) return [];
    if (Array.isArray(val)) return val;
    if (typeof val === 'string') {
      try {
        const parsed = JSON.parse(val);
        return Array.isArray(parsed) ? parsed : [];
      } catch (e) {
        return [];
      }
    }
    return [];
  };

  const normalizeDrawMaterialItem = (item) => {
    if (!item) return null;
    return {
      ...item,
      reportQty: item.reportQty ?? item.requisitionQty ?? 0,
      remark: item.remark ?? '',
    };
  };

  const materialKey = (item) => String(item?.id ?? item?.productModelId ?? '');

  const openAddMaterialDialog = () => {
    if (!availableMaterials.value || availableMaterials.value.length === 0) {
      proxy.$modal.msgWarning("当前工单没有可领用的原材料");
      return;
    }
    selectedAddMaterials.value = [];
    addMaterialDialogVisible.value = true;
  };

  const handleAddMaterialSelectionChange = (selection) => {
    selectedAddMaterials.value = (selection || []).map((x) => normalizeDrawMaterialItem({ ...x }));
  };

  const handleConfirmAddMaterial = () => {
    if (!selectedAddMaterials.value || selectedAddMaterials.value.length === 0) {
      proxy.$modal.msgWarning("请先选择原材料");
      return;
    }

    const existingKeys = new Set((reportForm.drawMaterialList || []).map(materialKey));
    const newItems = selectedAddMaterials.value
      .filter((it) => !existingKeys.has(materialKey(it)))
      .map(normalizeDrawMaterialItem)
      .filter(Boolean);

    if (newItems.length === 0) {
      proxy.$modal.msgWarning("所选原材料已存在，无需重复添加");
      addMaterialDialogVisible.value = false;
      return;
    }

    reportForm.drawMaterialList = [...(reportForm.drawMaterialList || []), ...newItems];
    addMaterialDialogVisible.value = false;
  };

  const removeDrawMaterialRow = (index) => {
    if (!Array.isArray(reportForm.drawMaterialList)) return;
    reportForm.drawMaterialList.splice(index, 1);
  };

  const processParamList = ref([])
  const showReportDialog = async row => {
    currentReportRowData.value = row;
@@ -790,6 +929,15 @@
    
    // 获取工序绑定设备列表
    getDeviceList(row.processId);

    // 原材料：可选项来自当前行 drawMaterials（json -> list）
    availableMaterials.value = parseMaybeJsonList(row.drawMaterials);

    // 最终领用清单：优先回显 drawMaterialList（若后端已返回）；否则为空
    const existingDrawList = parseMaybeJsonList(row.drawMaterialList);
    reportForm.drawMaterialList = (existingDrawList || []).map(normalizeDrawMaterialItem).filter(Boolean);
    selectedAddMaterials.value = [];
    addMaterialDialogVisible.value = false;
    
    nextTick(() => {
      reportFormRef.value?.clearValidate();
@@ -818,6 +966,8 @@
      const data = await productionRecordFormRef.value.submitData();
      console.log("生产记录表单数据:", data);
      reportForm.otherData.rows = data || [];
      // 机台选择由 ProductionRecordForm 的“机台选择”参数决定
      reportForm.deviceId = getDeviceFromRecordParams(data) ?? reportForm.deviceId;
    } catch (error) {
      console.error("获取生产记录表单数据失败", error);
      return;
@@ -882,6 +1032,8 @@
        ...reportForm,
        quantity: quantity,
        scrapQty: scrapQty,
        // drawMaterialList 直接传数组（不做 JSON.stringify）
        drawMaterialList: reportForm.drawMaterialList || [],
        otherData: JSON.stringify(reportForm.otherData)
      };

@@ -947,9 +1099,10 @@
    }
  };

  // 设备选择变化时更新 deviceId
  const handleDeviceChange = deviceId => {
    reportForm.deviceId = deviceId;
  const getDeviceFromRecordParams = (rows) => {
    if (!Array.isArray(rows)) return null;
    const machineRow = rows.find(r => r?.type === '机台选择');
    return machineRow?.value ?? null;
  };

  onMounted(() => {