宝东 1.生产报工和生产排产 做成类似于销售台账那样根据订单号可以展开的 2.销项发票添加新增逻辑 3.主生产计划生产订单的单位和数量按照销售台账的数...

gaoluyang

2026-06-05 6462ec480f5d6ff9999ef26329445272808c3450

 src/views/productionManagement/workOrderEdit/index.vue

@@ -3,18 +3,27 @@
    <div class="search_form mb20">
      <div class="search-row">
        <div class="search-item">
          <span class="search_title">工单编号：</span>
          <el-input v-model="searchForm.workOrderNo"
                    style="width: 240px"
          <span class="search_title">生产订单号：</span>
          <el-input v-model="searchForm.npsNo"
                    style="width: 200px"
                    placeholder="请输入"
                    @change="handleQuery"
                    clearable
                    prefix-icon="Search" />
        </div>
        <div class="search-item">
          <span class="search_title">生产订单号：</span>
          <el-input v-model="searchForm.npsNo"
                    style="width: 240px"
          <span class="search_title">产品名称：</span>
          <el-input v-model="searchForm.productName"
                    style="width: 200px"
                    placeholder="请输入"
                    @change="handleQuery"
                    clearable
                    prefix-icon="Search" />
        </div>
        <div class="search-item">
          <span class="search_title">规格：</span>
          <el-input v-model="searchForm.model"
                    style="width: 200px"
                    placeholder="请输入"
                    @change="handleQuery"
                    clearable
@@ -27,18 +36,124 @@
      </div>
    </div>
    <div class="table_list">
      <PIMTable rowKey="id"
                :column="tableColumn"
                :tableData="tableData"
                :page="page"
                :tableLoading="tableLoading"
                @pagination="pagination">
        <template #completionStatus="{ row }">
      <el-table :data="tableData"
                border
                v-loading="tableLoading"
                :expand-row-keys="expandedRowKeys"
                :row-key="(row) => row.productionOrderId"
                @expand-change="expandChange"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
        <el-table-column type="expand"
                         width="60"
                         fixed="left">
          <template #default="props">
            <el-table :data="props.row.children"
                      border
                      v-loading="props.row.childrenLoading">
              <el-table-column align="center"
                               label="序号"
                               type="index"
                               width="60" />
              <el-table-column label="工单类型"
                               prop="workOrderType"
                               width="80" />
              <el-table-column label="工单编号"
                               prop="workOrderNo"
                               width="140"
                               show-overflow-tooltip />
              <el-table-column label="工序名称"
                               prop="operationName"
                               width="100"
                               show-overflow-tooltip />
              <el-table-column label="需求数量"
                               prop="planQuantity"
                               width="100" />
              <el-table-column label="完成数量"
                               prop="completeQuantity"
                               width="100" />
              <el-table-column label="完成进度"
                               width="140"
                               align="center">
                <template #default="{ row }">
          <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
                       :color="progressColor(toProgressPercentage(row?.completionStatus))"
                       :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
        </template>
      </PIMTable>
              </el-table-column>
              <el-table-column label="计划开始时间"
                               prop="planStartTime"
                               width="120" />
              <el-table-column label="计划结束时间"
                               prop="planEndTime"
                               width="120" />
              <el-table-column label="实际开始时间"
                               prop="actualStartTime"
                               width="120" />
              <el-table-column label="实际结束时间"
                               prop="actualEndTime"
                               width="120" />
              <el-table-column label="指定报工人"
                               prop="userNames"
                               width="120"
                               show-overflow-tooltip />
              <el-table-column label="操作"
                               width="210"
                               align="center"
                               fixed="right">
                <template #default="{ row }">
                  <el-button link
                             type="primary"
                             @click="handleEdit(row)">计划时间</el-button>
                  <el-button link
                             type="primary"
                             @click="handleAssignReporter(row)">指定报工人</el-button>
                </template>
              </el-table-column>
            </el-table>
          </template>
        </el-table-column>
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60" />
        <el-table-column label="生产订单号"
                         prop="npsNo"
                         width="160"
                         show-overflow-tooltip />
        <el-table-column label="产品名称"
                         prop="productName"
                         width="140"
                         show-overflow-tooltip />
        <el-table-column label="规格"
                         prop="model"
                         show-overflow-tooltip />
        <el-table-column label="工序名称"
                         prop="operationName"
                         minWidth="160"
                         show-overflow-tooltip />
        <el-table-column label="计划数量"
                         prop="planQuantity"
                         width="100" />
        <el-table-column label="完成数量"
                         prop="completeQuantity"
                         width="100" />
        <el-table-column label="完成进度"
                         width="140"
                         align="center">
          <template #default="{ row }">
            <el-progress :percentage="toProgressPercentage(row?.completionStatus)"
                         :color="progressColor(toProgressPercentage(row?.completionStatus))"
                         :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="page.total > 0"
                  :total="page.total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange" />
    </div>
    <el-dialog v-model="editDialogVisible"
               title="编辑计划时间"
@@ -127,117 +242,21 @@
    productWorkOrderPage,
    updateProductWorkOrder,
    assignProductWorkOrder,
  getWorkOrdersByOrderId,
  } from "@/api/productionManagement/workOrder.js";
  import { listUser } from "@/api/system/user.js";
import pagination from "@/components/PIMTable/Pagination.vue";

  const { proxy } = getCurrentInstance();

  const tableColumn = ref([
    {
      label: "工单类型",
      prop: "workOrderType",
      width: "80",
    },
    {
      label: "工单编号",
      prop: "workOrderNo",
      width: "140",
    },
    {
      label: "生产订单号",
      prop: "npsNo",
      width: "140",
    },
    {
      label: "产品名称",
      prop: "productName",
      width: "140",
    },
    {
      label: "规格",
      prop: "model",
    },
    {
      label: "单位",
      prop: "unit",
    },
    {
      label: "工序名称",
      prop: "operationName",
      width: "100",
    },
    {
      label: "需求数量",
      prop: "planQuantity",
      width: "140",
    },
    {
      label: "完成数量",
      prop: "completeQuantity",
      width: "140",
    },
    {
      label: "完成进度",
      prop: "completionStatus",
      dataType: "slot",
      slot: "completionStatus",
      width: "140",
    },
    {
      label: "计划开始时间",
      prop: "planStartTime",
      width: "140",
    },
    {
      label: "计划结束时间",
      prop: "planEndTime",
      width: "140",
    },
    {
      label: "实际开始时间",
      prop: "actualStartTime",
      width: "140",
    },
    {
      label: "实际结束时间",
      prop: "actualEndTime",
      width: "140",
    },
    {
      label: "指定报工人",
      prop: "userNames",
      width: "180",
    },
    {
      label: "操作",
      width: "200",
      align: "center",
      dataType: "action",
      fixed: "right",
      operation: [
        {
          name: "计划时间",
          clickFun: row => {
            handleEdit(row);
          },
        },
        {
          name: "指定报工人",
          clickFun: row => {
            handleAssignReporter(row);
          },
        },
      ],
    },
  ]);

  const tableData = ref([]);
  const tableLoading = ref(false);
const expandedRowKeys = ref([]);
  const editDialogVisible = ref(false);
  const editrow = ref(null);
  const page = reactive({
    current: 1,
    size: 100,
  size: 10,
    total: 0,
  });

@@ -258,8 +277,9 @@

  const data = reactive({
    searchForm: {
      workOrderNo: "",
      npsNo: "",
    productName: "",
    model: "",
    },
  });
  const { searchForm } = toRefs(data);
@@ -282,27 +302,57 @@

  const handleQuery = () => {
    page.current = 1;
  expandedRowKeys.value = [];
    getList();
  };

  const pagination = obj => {
const paginationChange = obj => {
    page.current = obj.page;
    page.size = obj.limit;
  expandedRowKeys.value = [];
    getList();
  };

  const getList = () => {
    tableLoading.value = true;
    const params = { ...searchForm.value, ...page };
  const params = { ...searchForm.value, current: page.current, size: page.size };
    productWorkOrderPage(params)
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records;
      const records = res.data.records || [];
      records.forEach(item => {
        item.children = [];
        item.childrenLoading = false;
      });
      tableData.value = records;
        page.total = res.data.total;
      })
      .catch(() => {
        tableLoading.value = false;
      });
};

const expandChange = (row, expandedRows) => {
  if (expandedRows.length > 0) {
    expandedRowKeys.value = [];
    row.childrenLoading = true;
    getWorkOrdersByOrderId(row.productionOrderId)
      .then(res => {
        row.childrenLoading = false;
        const idx = tableData.value.findIndex(
          item => item.productionOrderId === row.productionOrderId
        );
        if (idx > -1) {
          tableData.value[idx].children = res.data || [];
        }
        expandedRowKeys.value.push(row.productionOrderId);
      })
      .catch(() => {
        row.childrenLoading = false;
      });
  } else {
    expandedRowKeys.value = [];
  }
  };

  const handleEdit = row => {
@@ -327,7 +377,6 @@
  const handleAssignReporter = row => {
    currentWorkOrder.value = row;
    assignReporterDialogVisible.value = true;
    // 回显已勾选的人员
    if (row.userIds) {
      try {
        selectedEmployeeIds.value = JSON.parse(row.userIds);
@@ -379,7 +428,6 @@
      id: currentWorkOrder.value.id,
      userIds: JSON.stringify(selectedEmployeeIds.value),
    };
    console.log(updateData, "updateData");

    assignProductWorkOrder(updateData)
      .then(() => {
@@ -403,18 +451,15 @@
    align-items: center;
    gap: 12px;
  }

  .search-item {
    display: flex;
    align-items: center;
  }

  .search_title {
    margin-right: 8px;
    font-size: 14px;
    color: #606266;
  }

  .assign-reporter-content {
    .selected-tags-box {
      margin-bottom: 16px;