新增报工明细分页查询功能，优化生产报工界面，调整搜索表单字段

yyb

6 小时以前 6ff76a6ab6d25947084d36f0fdf104719830d1f9

新增报工明细分页查询功能，优化生产报工界面，调整搜索表单字段

 src/api/productionManagement/productionProductMain.js

@@ -9,3 +9,12 @@
        params: query,
    });
}

// 明细分页查询
export function productionProductMainListPageDetail(query) {
    return request({
        url: "/productionProductMain/listPageDetail",
        method: "get",
        params: query,
    });
}

 src/views/productionManagement/productionReporting/index.vue

@@ -1,18 +1,19 @@
// 报工台账
<template>
  <div class="app-container">
    <div class="search_form">
      <el-form :model="searchForm"
               :inline="true">
        <el-form-item label="报工人员名称:">
          <el-input v-model="searchForm.nickName"
        <el-form-item label="工单号:">
          <el-input v-model="searchForm.workOrderNo"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="工单号:">
          <el-input v-model="searchForm.workOrderNo"
        <el-form-item label="生产订单号:">
          <el-input v-model="searchForm.productOrderNpsNo"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
@@ -28,8 +29,6 @@
    <div class="table_list">
      <div style="text-align: right"
           class="mb10">
        <!-- <el-button type="primary"
                   @click="openForm('add')">生产报工</el-button> -->
        <el-button @click="handleOut">导出</el-button>
      </div>
      <PIMTable rowKey="id"
@@ -37,88 +36,30 @@
                :tableData="tableData"
                :page="page"
                :isSelection="true"
                :expandRowKeys="expandedRowKeys"
                @expand-change="expandChange"
                @selection-change="handleSelectionChange"
                :tableLoading="tableLoading"
                @pagination="pagination"
                :total="page.total">
        <template #expand="{ row }">
          <el-table :data="expandData"
                    border
                    show-summary
                    :summary-method="summarizeMainTable"
                    v-loading="childrenLoading">
            <el-table-column align="center"
                             label="序号"
                             type="index"
                             width="60" />
            <el-table-column label="本次生产数量"
                             prop="finishedNum"
                             align="center"
                             width="400">
              <template #default="scope">
                <el-input-number :step="0.01"
                                 :min="0"
                                 style="width: 100%"
                                 v-model="scope.row.finishedNum"
                                 :disabled="!scope.row.editType"
                                 :precision="2"
                                 placeholder="请输入"
                                 clearable
                                 @change="changeNum(scope.row)" />
              </template>
            </el-table-column>
            <!--                        <el-table-column label="待生产数量" prop="pendingNum" width="240" align="center"></el-table-column>-->
            <el-table-column label="生产人"
                             prop="schedulingUserId"
                             width="400">
              <template #default="scope">
                <el-select v-model="scope.row.schedulingUserId"
                           placeholder="选择人员"
                           :disabled="!scope.row.editType"
                           style="width: 100%;">
                  <el-option v-for="user in userList"
                             :key="user.userId"
                             :label="user.nickName"
                             :value="user.userId" />
                </el-select>
              </template>
            </el-table-column>
            <el-table-column label="生产日期"
                             prop="schedulingDate"
                             width="400">
              <template #default="scope">
                <el-date-picker v-model="scope.row.schedulingDate"
                                type="date"
                                :disabled="!scope.row.editType"
                                placeholder="请选择日期"
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                clearable
                                style="width: 100%" />
              </template>
            </el-table-column>
            <el-table-column label="操作"
                             >
              <template #default="scope">
                <el-button link
                           type="primary"
                           size="small"
                           @click="changeEditType(scope.row)"
                           v-if="!scope.row.editType"
                           :disabled="scope.row.parentStatus === 3">编辑</el-button>
                <el-button link
                           type="primary"
                           size="small"
                           @click="saveReceiptPayment(scope.row)"
                           v-if="scope.row.editType">保存</el-button>
              </template>
            </el-table-column>
          </el-table>
        </template>
      </PIMTable>
                :total="page.total" />
    </div>

    <el-dialog v-model="detailVisible"
               title="报工明细"
               width="1400px"
               destroy-on-close>
      <PIMTable rowKey="id"
                :column="detailTableColumn"
                :tableData="detailTableData"
                :page="detailPage"
                :tableLoading="detailLoading"
                @pagination="detailPagination"
                :total="detailPage.total" />
      <template #footer>
        <div class="dialog-footer">
          <el-button @click="detailVisible = false">关闭</el-button>
        </div>
      </template>
    </el-dialog>

    <form-dia ref="formDia"
              @close="handleQuery"></form-dia>
    <input-modal v-if="isShowInput"
@@ -132,36 +73,22 @@
  import FormDia from "@/views/productionManagement/productionReporting/components/formDia.vue";
  import { ElMessageBox } from "element-plus";
  import {
    productionReportUpdate,
    workListPageById,
    productionReportDelete,
  } from "@/api/productionManagement/productionReporting.js";
  import { productionProductMainListPage } from "@/api/productionManagement/productionProductMain.js";
  import { userListNoPageByTenantId } from "@/api/system/user.js";
  import {
    productionProductMainListPage,
    productionProductMainListPageDetail,
  } from "@/api/productionManagement/productionProductMain.js";
  import InputModal from "@/views/productionManagement/productionReporting/Input.vue";

  const data = reactive({
    searchForm: {
      nickName: "",
      workOrderNo: "",
      workOrderStatus: "",
      productOrderNpsNo: "",
    },
  });
  const { searchForm } = toRefs(data);
  const expandedRowKeys = ref([]);
  const expandData = ref([]);
  const userList = ref([]);
  const tableColumn = ref([
    {
      label: "报工单号",
      prop: "productNo",
      width: 120,
    },
    {
      label: "报工人员",
      prop: "nickName",
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
@@ -178,6 +105,11 @@
      width: 120,
    },
    {
      label: "生产订单号",
      prop: "productOrderNpsNo",
      width: 140,
    },
    {
      label: "产品名称",
      prop: "productName",
      width: 120,
@@ -188,24 +120,38 @@
      width: 120,
    },
    {
      label: "产出数量",
      prop: "quantity",
      label: "总工时",
      prop: "projectTotalHours",
      width: 120,
    },
    {
      label: "报废数量",
      prop: "scrapQty",
      width: 120,
      label: "工序标准工时(小时)",
      prop: "processStandardHours",
      width: 160,
    },
    {
      label: "单位",
      prop: "unit",
      width: 120,
    },
    
    {
      label: "创建时间",
      prop: "createTime",
      label: "实际报工工时(小时)",
      prop: "actualReportHours",
      width: 160,
    },
    {
      label: "每日人员工时(小时)",
      prop: "dailyPersonHours",
      width: 160,
    },
    {
      label: "产出总数量",
      prop: "outputTotalQuantity",
      width: 120,
    },
    {
      label: "报废总数量",
      prop: "scrapTotalQuantity",
      width: 120,
    },
    {
@@ -213,6 +159,99 @@
      label: "操作",
      align: "center",
      fixed: "right",
      operation: [
        {
          name: "明细",
          type: "text",
          clickFun: row => {
            openDetail(row);
          },
        },
      ],
    },
  ]);
  const detailTableColumn = ref([
    {
      label: "报工单号",
      prop: "productNo",
      width: 140,
    },
    {
      label: "报工人员",
      prop: "userName",
      width: 120,
    },
    {
      label: "工序",
      prop: "process",
      width: 120,
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      width: 140,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: 140,
    },
    {
      label: "生产订单号",
      prop: "productOrderNpsNo",
      width: 140,
    },
    {
      label: "产品名称",
      prop: "productName",
      width: 140,
    },
    {
      label: "产品规格型号",
      prop: "productModelName",
      width: 160,
    },
    {
      label: "合格",
      prop: "quantity",
      width: 100,
    },
    {
      label: "不合格",
      prop: "scrapQty",
      width: 100,
    },
    {
      label: "单位",
      prop: "unit",
      width: 100,
    },
    {
      label: "工序标准工时(小时)",
      prop: "processStandardHours",
      width: 160,
    },
    {
      label: "实际报工工时(小时)",
      prop: "actualReportHours",
      width: 160,
    },
    {
      label: "每日人员工时(小时)",
      prop: "dailyPersonHours",
      width: 160,
    },
    {
      label: "创建时间",
      prop: "createTime",
      width: 160,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
      fixed: "right",
      width: 180,
      operation: [
        {
          name: "查看投入",
@@ -232,32 +271,30 @@
    },
  ]);
  const tableData = ref([]);
  const detailTableData = ref([]);
  const selectedRows = ref([]);
  const tableLoading = ref(false);
  const childrenLoading = ref(false);
  const detailLoading = ref(false);
  const page = reactive({
    current: 1,
    size: 100,
    total: 0,
  });
  const detailPage = reactive({
    current: 1,
    size: 10,
    total: 0,
  });
  const formDia = ref();
  const { proxy } = getCurrentInstance();
  const detailVisible = ref(false);
  const currentDetailRow = ref(null);

  // 查询列表
  /** 搜索按钮操作 */
  const handleQuery = () => {
    page.current = 1;
    getList();
  };
  const changeDaterange = value => {
    if (value) {
      searchForm.value.entryDateStart = value[0];
      searchForm.value.entryDateEnd = value[1];
    } else {
      searchForm.value.entryDateStart = undefined;
      searchForm.value.entryDateEnd = undefined;
    }
    handleQuery();
  };
  const deleteReport = row => {
    ElMessageBox.confirm("确定删除该报工吗？", "提示", {
@@ -269,6 +306,9 @@
        if (res.code === 200) {
          proxy.$modal.msgSuccess("删除成功");
          getList();
          if (detailVisible.value) {
            getDetailList();
          }
        } else {
          ElMessageBox.alert(res.msg || "删除失败", "提示", {
            confirmButtonText: "确定",
@@ -285,96 +325,51 @@
  const getList = () => {
    tableLoading.value = true;
    const params = { ...searchForm.value, ...page };
    params.entryDate = undefined;
    expandedRowKeys.value = [];
    productionProductMainListPage(params)
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records.map(item => ({
          ...item,
          pendingFinishNum:
            (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
        }));
        tableData.value = res.data.records || [];
        page.total = res.data.total;
      })
      .catch(err => {
        tableLoading.value = false;
      });
  };
  // 展开行
  const expandChange = (row, expandedRows) => {
    userListNoPageByTenantId().then(res => {
      userList.value = res.data;
    });
    if (expandedRows.length > 0) {
      nextTick(() => {
        expandedRowKeys.value = [];
        try {
          childrenLoading.value = true;
          workListPageById({ id: row.id }).then(res => {
            childrenLoading.value = false;
            const index = tableData.value.findIndex(item => item.id === row.id);
            if (index > -1) {
              expandData.value = res.data.map(item => ({
                ...item,
                pendingNum:
                  (Number(item.schedulingNum) || 0) -
                  (Number(item.finishedNum) || 0),
                parentStatus: row.status, // 新增父表状态
              }));
            }
            expandedRowKeys.value.push(row.id);
          });
        } catch (error) {
          childrenLoading.value = false;
          console.log(error);
        }
      });
    } else {
      expandedRowKeys.value = [];
    }
  };
  const changeNum = row => {
    // 找到父表格数据
    const parentRow = tableData.value.find(
      item => item.id === expandedRowKeys.value[0]
    );
    // 计算所有子表格 finishedNum 的总和
    const totalFinishedNum = expandData.value.reduce(
      (sum, item) => sum + (Number(item.finishedNum) || 0),
      0
    );
    // 父表格的排产数量
    const schedulingNum = parentRow ? Number(parentRow.schedulingNum) : 0;

    if (totalFinishedNum > schedulingNum) {
      // 回退本次输入
      row.finishedNum =
        schedulingNum - (totalFinishedNum - Number(row.finishedNum));
      proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
    }
    row.pendingNum = row.schedulingNum - row.finishedNum;
  };
  // 编辑修改状态
  const changeEditType = row => {
    row.editType = !row.editType;
  };
  // 保存记录
  const saveReceiptPayment = row => {
    productionReportUpdate(row).then(res => {
      row.editType = !row.editType;
      getList();
      proxy.$modal.msgSuccess("提交成功");
    });
  };
  // 表格选择数据
  const handleSelectionChange = selection => {
    selectedRows.value = selection;
  };
  const summarizeMainTable = param => {
    return proxy.summarizeTable(param, ["finishedNum"]);
  const openDetail = row => {
    currentDetailRow.value = row;
    detailPage.current = 1;
    detailVisible.value = true;
    getDetailList();
  };
  // 打开弹框
  const getDetailList = () => {
    if (!currentDetailRow.value?.id) return;
    detailLoading.value = true;
    productionProductMainListPageDetail({
      id: currentDetailRow.value.id,
      current: detailPage.current,
      size: detailPage.size,
    })
      .then(res => {
        detailLoading.value = false;
        detailTableData.value = (res.data.records || []).map(item => ({
          ...item,
          userName: item.userName || item.nickName,
        }));
        detailPage.total = res.data.total || 0;
      })
      .catch(() => {
        detailLoading.value = false;
      });
  };
  const detailPagination = obj => {
    detailPage.current = obj.page;
    detailPage.size = obj.limit;
    getDetailList();
  };
  const openForm = (type, row) => {
    if (selectedRows.value.length !== 1) {
      proxy.$message.error("请选择一条数据");