feat(productionOrder): 添加生产订单结束功能并优化界面组件

chenhj

6 小时以前 217cda7380e07a355053e6ca34fb77334248b7db

 src/views/productionManagement/workOrder/index.vue

@@ -176,6 +176,16 @@
                    readonly
                    style="width: 300px" />
        </el-form-item>
        <el-form-item label="投入总量(kg)"
                      prop="totalInvestment">
          <el-input v-model.number="reportForm.totalInvestment"
                    type="number"
                    min="1"
                    step="1"
                    style="width: 300px"
                    placeholder="请输入投入总量"
                    @input="handleTotalInvestmentInput" />
        </el-form-item>
        <el-form-item label="本次生产数量"
                      prop="quantity">
          <el-input v-model.number="reportForm.quantity"
@@ -196,6 +206,16 @@
                    placeholder="请输入报废数量"
                    @input="handleScrapQtyInput" />
        </el-form-item>
        <el-form-item label="检品数量"
                      prop="inspectedQuantity">
          <el-input v-model.number="reportForm.inspectedQuantity"
                    type="number"
                    min="0"
                    step="1"
                    style="width: 300px"
                    placeholder="请输入检品数量"
                    @input="handleInspectedQuantity"/>
        </el-form-item>
        <el-form-item label="班组信息">
          <el-select v-model="reportForm.userId"
                     style="width: 300px"
@@ -209,6 +229,30 @@
                       :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-form>
      <template #footer>
        <span class="dialog-footer">
@@ -223,7 +267,7 @@
</template>

<script setup>
  import { onMounted, ref, nextTick } from "vue";
  import { onMounted, ref, nextTick, computed } from "vue";
  import { ElMessageBox } from "element-plus";
  import dayjs from "dayjs";
  import {
@@ -233,10 +277,17 @@
    downProductWorkOrder,
  } from "@/api/productionManagement/workOrder.js";
  import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
  import { getBindDevices } from "@/api/productionManagement/productionProcess.js";
  import QRCode from "qrcode";
  import { getCurrentInstance, reactive, toRefs } from "vue";
  import FilesDia from "./components/filesDia.vue";
  import {
    listPage as listProcessParamPage,
  } from "@/api/productionManagement/productProcessParameter.js";

  const { proxy } = getCurrentInstance();

  const ProductionRecordForm = defineAsyncComponent(() => import("./components/ProductionRecordForm.vue"));

  const tableColumn = ref([
    {
@@ -264,12 +315,20 @@
      prop: "model",
    },
    {
      label: "UID码",
      prop: "uidNo",
    },
    {
      label: "单位",
      prop: "unit",
    },
    {
      label: "工序名称",
      prop: "processName",
    },
    {
      label: "投入总量(kg)",
      prop: "totalInvestment",
    },
    {
      label: "预计生产数量",
@@ -338,7 +397,7 @@
          clickFun: row => {
            showReportDialog(row);
          },
          disabled: row => row.planQuantity <= 0,
          disabled: row => row.planQuantity <= 0 || row.productOrderIsEnd,
        },
      ],
    },
@@ -356,17 +415,50 @@
  const workOrderFilesRef = ref(null);
  const reportFormRef = ref(null);
  const userOptions = ref([]);
  const deviceOptions = ref([]);
  const reportForm = reactive({
    planQuantity: 0,
    totalInvestment: 0,
    quantity: null,
    scrapQty: null,
    inspectedQuantity: null,
    userName: "",
    workOrderId: "",
    reportWork: "",
    productProcessRouteItemId: "",
    userId: "",
    productMainId: null,
    deviceId: null,
    otherData: {
      rows: []
    },
  });
  const productionRecordFormRef = ref();

  const currentDevice = computed(() => {
    if (!reportForm.deviceId) return null;
    return deviceOptions.value.find(device => device.id === reportForm.deviceId) || null;
  });

  // 投入总量验证规则
  const validateTotalInvestment = (rule, value, callback) => {
    if (value === null || value === undefined || value === "") {
      callback(new Error("请输入投入总量"));
      return;
    }
    const num = Number(value);
    if (isNaN(num) || !Number.isInteger(num) || num < 1) {
      callback(new Error("投入总量必须大于等于1"));
      return;
    }
    if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
      if (num < Number(reportForm.quantity)) {
        callback(new Error("投入总量必须大于本次生产数量"));
        return;
      }
    }
    callback();
  };

  // 本次生产数量验证规则
  const validateQuantity = (rule, value, callback) => {
@@ -375,10 +467,15 @@
      return;
    }
    const num = Number(value);
    // 整数且大于等于1
    if (isNaN(num) || !Number.isInteger(num) || num < 1) {
      callback(new Error("本次生产数量必须大于等于1"));
      return;
    }
    if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
      if (num > Number(reportForm.totalInvestment)) {
        callback(new Error("本次生产数量必须小于投入总量"));
        return;
      }
    }
    callback();
  };
@@ -400,37 +497,87 @@

  // 验证规则
  const reportFormRules = {
    totalInvestment: [{ required: true, validator: validateTotalInvestment, trigger: "blur" }],
    quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
    scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
  };

  // 处理本次生产数量输入，限制必须大于等于1
  const handleQuantityInput = value => {
  // 处理投入总量输入
  const handleTotalInvestmentInput = value => {
    if (value === "" || value === null || value === undefined) {
      reportForm.quantity = null;
      reportForm.totalInvestment = null;
      reportForm.scrapQty = null;
      return;
    }
    const num = Number(value);
    if (isNaN(num)) {
      return;
    }
    // 如果小于1，清除
    if (num < 1) {
      reportForm.quantity = null;
      reportForm.totalInvestment = null;
      reportForm.scrapQty = null;
      return;
    }
    // 如果是小数取整数部分
    if (!Number.isInteger(num)) {
      const intValue = Math.floor(num);
      // 如果取整后小于1，清除
      if (intValue < 1) {
        reportForm.totalInvestment = null;
        reportForm.scrapQty = null;
        return;
      }
      reportForm.totalInvestment = intValue;
    } else {
      reportForm.totalInvestment = num;
    }
    // 如果 quantity 有值，自动计算 scrapQty = totalInvestment - quantity
    if (reportForm.quantity !== null && reportForm.quantity !== undefined && reportForm.quantity !== "") {
      const total = Number(reportForm.totalInvestment);
      const qty = Number(reportForm.quantity);
      if (total > qty) {
        reportForm.scrapQty = total - qty;
      } else {
        reportForm.scrapQty = null;
      }
    }
  };

  // 处理本次生产数量输入，限制必须大于等于1
  const handleQuantityInput = value => {
    if (value === "" || value === null || value === undefined) {
      reportForm.quantity = null;
      reportForm.scrapQty = null;
      return;
    }
    const num = Number(value);
    if (isNaN(num)) {
      return;
    }
    if (num < 1) {
      reportForm.quantity = null;
      reportForm.scrapQty = null;
      return;
    }
    if (!Number.isInteger(num)) {
      const intValue = Math.floor(num);
      if (intValue < 1) {
        reportForm.quantity = null;
        reportForm.scrapQty = null;
        return;
      }
      reportForm.quantity = intValue;
      return;
    } else {
      reportForm.quantity = num;
    }
    reportForm.quantity = num;
    // 如果 totalInvestment 有值，自动计算 scrapQty = totalInvestment - quantity
    if (reportForm.totalInvestment !== null && reportForm.totalInvestment !== undefined && reportForm.totalInvestment !== "") {
      const total = Number(reportForm.totalInvestment);
      const qty = Number(reportForm.quantity);
      if (total > qty) {
        reportForm.scrapQty = total - qty;
      } else {
        reportForm.scrapQty = null;
      }
    }
  };

  // 处理报废数量
@@ -440,22 +587,38 @@
      return;
    }
    const num = Number(value);
    // 如果是NaN，保持原值
    if (isNaN(num)) {
      return;
    }
    // 如果是负数，清除输入
    if (num < 0) {
      reportForm.scrapQty = null;
      return;
    }
    // 如果是小数，取整数部分
    if (!Number.isInteger(num)) {
      reportForm.scrapQty = Math.floor(num);
      return;
    }
    // 有效的非负整数（包括0）
    reportForm.scrapQty = num;
  };

  const handleInspectedQuantity = value => {
    if (value === "" || value === null || value === undefined) {
      reportForm.inspectedQuantity = null;
      return;
    }
    const num = Number(value);
    if (isNaN(num)) {
      return;
    }
    if (num < 0) {
      reportForm.inspectedQuantity = null;
      return;
    }
    if (!Number.isInteger(num)) {
      reportForm.inspectedQuantity = Math.floor(num);
      return;
    }
    reportForm.inspectedQuantity = num;
  };
  const currentReportRowData = ref(null);
  const page = reactive({
@@ -594,17 +757,40 @@
      });
  };

  const showReportDialog = row => {
  const processParamPage = reactive({
    current: 1,
    size: 9999,
    total: 0,
  });
  const getProcessParamList = async (row) => {
    const params = {
      processId: row.processId,
      ...processParamPage,
    };
    const res = await listProcessParamPage(params)
    return res.data.records
  };

  const processParamList = ref([])
  const showReportDialog = async row => {
    currentReportRowData.value = row;
    processParamList.value = await getProcessParamList(row)
    reportForm.planQuantity = row.planQuantity;
    reportForm.totalInvestment = row.totalInvestment;
    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.inspectedQuantity = row.inspectedQuantity;
    reportForm.scrapQty =
      row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
    reportForm.deviceId = row.deviceId || null;
    
    // 获取工序绑定设备列表
    getDeviceList(row.processId);
    
    nextTick(() => {
      reportFormRef.value?.clearValidate();
    });
@@ -627,7 +813,16 @@
    workOrderFilesRef.value?.openDialog(row);
  };

  const handleReport = () => {
  const handleReport = async () => {
    try {
      const data = await productionRecordFormRef.value.submitData();
      console.log("生产记录表单数据:", data);
      reportForm.otherData.rows = data || [];
    } catch (error) {
      console.error("获取生产记录表单数据失败", error);
      return;
    }
    
    reportFormRef.value?.validate(valid => {
      if (!valid) {
        return false;
@@ -676,20 +871,20 @@
        return;
      }

      if (quantity > reportForm.planQuantity) {
        ElMessageBox.alert("本次生产数量不能超过待生产数量", "提示", {
          confirmButtonText: "确定",
        });
        return;
      }
      // if (quantity > reportForm.planQuantity) {
      //   ElMessageBox.alert("本次生产数量不能超过待生产数量", "提示", {
      //     confirmButtonText: "确定",
      //   });
      //   return;
      // }

      const submitData = {
        ...reportForm,
        quantity: quantity,
        scrapQty: scrapQty,
        otherData: JSON.stringify(reportForm.otherData)
      };

      // console.log(submitData);
      addProductMain(submitData).then(res => {
        if (res.code === 200) {
          proxy.$modal.msgSuccess("报工成功");
@@ -700,6 +895,11 @@
            confirmButtonText: "确定",
          });
        }
      }).catch(err => {
        console.error("报工失败", err);
        ElMessageBox.alert("报工失败", "提示", {
          confirmButtonText: "确定",
        });
      });
    });
  };
@@ -717,6 +917,24 @@
      });
  };

  // 获取设备列表
  const getDeviceList = (processId) => {
    if (!processId) {
      deviceOptions.value = [];
      return;
    }
    getBindDevices(processId)
      .then(res => {
        if (res.code === 200) {
          deviceOptions.value = res.data || [];
        }
      })
      .catch(err => {
        console.error("获取设备列表失败", err);
        deviceOptions.value = [];
      });
  };

  // 用户选择变化时更新 userName
  const handleUserChange = userId => {
    if (userId) {
@@ -729,6 +947,11 @@
    }
  };

  // 设备选择变化时更新 deviceId
  const handleDeviceChange = deviceId => {
    reportForm.deviceId = deviceId;
  };

  onMounted(() => {
    getList();
    getUserList();