1.生产工单做流转单2.生产订单工艺路线做排序删除3.生产工单加报工

zhangwencui

2026-01-06 6f32ae6d2545c8279032105bf263eb2552fe6a09

 src/views/productionManagement/productionReporting/index.vue

@@ -1,37 +1,53 @@
<template>
   <div class="app-container">
      <div class="search_form">
         <el-form :model="searchForm" :inline="true">
      <el-form :model="searchForm"
               :inline="true">
            <el-form-item label="报工人员名称:">
               <el-input v-model="searchForm.nickName" placeholder="请输入" clearable prefix-icon="Search"
          <el-input v-model="searchForm.nickName"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                              style="width: 200px;"
                              @change="handleQuery" />
            </el-form-item>
            <el-form-item label="工单号:">
               <el-input v-model="searchForm.workOrderNo" placeholder="请输入" clearable prefix-icon="Search"
          <el-input v-model="searchForm.workOrderNo"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                              style="width: 200px;"
                              @change="handleQuery" />
            </el-form-item>
            <el-form-item label="工单状态:">
               <el-select v-model="searchForm.workOrderStatus" placeholder="请选择工单状态" style="width: 140px" clearable>
                  <el-option label="待确认" :value="1"></el-option>
            <el-option label="待生产" :value="2"></el-option>
            <el-option label="生产中" :value="3"></el-option>
            <el-option label="已生产" :value="4"></el-option>
          <el-select v-model="searchForm.workOrderStatus"
                     placeholder="请选择工单状态"
                     style="width: 140px"
                     clearable>
            <el-option label="待确认"
                       :value="1"></el-option>
            <el-option label="待生产"
                       :value="2"></el-option>
            <el-option label="生产中"
                       :value="3"></el-option>
            <el-option label="已生产"
                       :value="4"></el-option>
               </el-select>
            </el-form-item>
            <el-form-item>
               <el-button type="primary" @click="handleQuery">搜索</el-button>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
            </el-form-item>
         </el-form>
      </div>
      <div class="table_list">
         <div style="text-align: right" class="mb10">
            <el-button type="primary" @click="openForm('add')">生产报工</el-button>
      <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"
      <PIMTable rowKey="id"
            :column="tableColumn"
            :tableData="tableData"
            :page="page"
@@ -41,100 +57,89 @@
            @selection-change="handleSelectionChange"
            :tableLoading="tableLoading"
            @pagination="pagination"
            :total="page.total"
         >
                :total="page.total">
            <template #expand="{ row }">
               <el-table
                  :data="expandData"
          <el-table :data="expandData"
                  border
                  show-summary
                  :summary-method="summarizeMainTable"
                  v-loading="childrenLoading"
               >
                  <el-table-column
                     align="center"
                    v-loading="childrenLoading">
            <el-table-column align="center"
                     label="序号"
                     type="index"
                     width="60"
                  />
                  <el-table-column label="本次生产数量" prop="finishedNum" align="center" width="400">
                             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%"
                <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)"
                        />
                                 @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">
            <el-table-column label="生产人"
                             prop="schedulingUserId"
                             width="400">
                     <template #default="scope">
                        <el-select
                           v-model="scope.row.schedulingUserId"
                <el-select v-model="scope.row.schedulingUserId"
                           placeholder="选择人员"
                           :disabled="!scope.row.editType"
                           style="width: 100%;"
                        >
                           <el-option
                              v-for="user in userList"
                           style="width: 100%;">
                  <el-option v-for="user in userList"
                              :key="user.userId"
                              :label="user.nickName"
                              :value="user.userId"
                           />
                             :value="user.userId" />
                        </el-select>
                     </template>
                  </el-table-column>
                  <el-table-column label="生产日期" prop="schedulingDate" width="400">
            <el-table-column label="生产日期"
                             prop="schedulingDate"
                             width="400">
                     <template #default="scope">
                        <el-date-picker
                           v-model="scope.row.schedulingDate"
                <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%"
                        />
                                style="width: 100%" />
                     </template>
                  </el-table-column>
                  <el-table-column label="操作" width="60">
            <el-table-column label="操作"
                             width="60">
                     <template #default="scope">
                        <el-button
                           link
                <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
                           :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
                        >
                           v-if="scope.row.editType">保存</el-button>
                     </template>
                  </el-table-column>
               </el-table>
            </template>
         </PIMTable>
      </div>
      <form-dia ref="formDia" @close="handleQuery"></form-dia>
    <input-modal
        v-if="isShowInput"
        v-model:visible="isShowInput"
    />
    <output-modal
        v-if="isShowOutput"
        v-model:visible="isShowOutput"
    />
    <form-dia ref="formDia"
              @close="handleQuery"></form-dia>
    <input-modal v-if="isShowInput"
                 v-model:visible="isShowInput" />
    <output-modal v-if="isShowOutput"
                  v-model:visible="isShowOutput" />
   </div>
</template>

@@ -144,11 +149,9 @@
import {ElMessageBox} from "element-plus";
import {
   productionReportUpdate,
   workListPageById
    workListPageById,
} from "@/api/productionManagement/productionReporting.js";
import {
  productionProductMainListPage,
} from "@/api/productionManagement/production_product_main.js";
  import { productionProductMainListPage } from "@/api/productionManagement/production_product_main.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
import OutputModal from "@/views/productionManagement/productionReporting/Output.vue";
@@ -163,7 +166,7 @@
const { searchForm } = toRefs(data);
const expandedRowKeys = ref([]);
const expandData = ref([]);
const userList = ref([])
  const userList = ref([]);
const tableColumn = ref([
  {
    label: "报工单号",
@@ -184,22 +187,22 @@
      label: "报工状态",
      prop: "status",
      dataType: "tag",
      formatData: (params) => {
      formatData: params => {
         if (params == 3) {
            return "已报工";
         } else if (params == 1) {
            return "待生产";
         } else {
            return '生产中';
          return "生产中";
         }
      },
      formatType: (params) => {
      formatType: params => {
         if (params == 3) {
            return "success";
         } else if (params == 1) {
            return "primary";
         } else {
            return 'warning';
          return "warning";
         }
      },
   },
@@ -207,7 +210,7 @@
    label: "工单状态",
    prop: "workOrderStatus",
    dataType: "tag",
    formatData: (params) => {
      formatData: params => {
      switch (params) {
        case "1":
          return "待确认";
@@ -221,7 +224,7 @@
          return "";
      }
    },
    formatType: (params) => {
      formatType: params => {
      switch (params) {
        case "1":
          return "primary";
@@ -246,19 +249,19 @@
      {
        name: "查看投入",
        type: "text",
        clickFun: (row) => {
          showInput(row)
        }
          clickFun: row => {
            showInput(row);
          },
      },
      {
        name: "查看产出",
        type: "text",
        clickFun: (row) => {
          showOutput(row)
        }
          clickFun: row => {
            showOutput(row);
      },
    ]
  }
        },
      ],
    },
]);
const tableData = ref([]);
const selectedRows = ref([]);
@@ -269,8 +272,8 @@
   size: 100,
   total: 0,
});
const formDia = ref()
const { proxy } = getCurrentInstance()
  const formDia = ref();
  const { proxy } = getCurrentInstance();

// 查询列表
/** 搜索按钮操作 */
@@ -278,7 +281,7 @@
   page.current = 1;
   getList();
};
const changeDaterange = (value) => {
  const changeDaterange = value => {
   if (value) {
      searchForm.value.entryDateStart = value[0];
      searchForm.value.entryDateEnd = value[1];
@@ -288,7 +291,7 @@
   }
   handleQuery();
};
const pagination = (obj) => {
  const pagination = obj => {
   page.current = obj.page;
   page.size = obj.limit;
   getList();
@@ -296,22 +299,25 @@
const getList = () => {
   tableLoading.value = true;
   const params = { ...searchForm.value, ...page };
   params.entryDate = undefined
   expandedRowKeys.value = []
   productionProductMainListPage(params).then(res => {
    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)
          pendingFinishNum:
            (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
      }));
      page.total = res.data.total;
   }).catch(err => {
      tableLoading.value = false;
   })
      .catch(err => {
        tableLoading.value = false;
      });
};
// 展开行
const expandChange = (row, expandedRows) => {
   userListNoPageByTenantId().then((res) => {
    userListNoPageByTenantId().then(res => {
      userList.value = res.data;
   });
   if (expandedRows.length > 0) {
@@ -319,14 +325,16 @@
         expandedRowKeys.value = [];
         try {
            childrenLoading.value = true;
            workListPageById({ id: row.id }).then((res) => {
          workListPageById({ id: row.id }).then(res => {
               childrenLoading.value = false;
               const index = tableData.value.findIndex((item) => item.id === row.id);
            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 // 新增父表状态
                pendingNum:
                  (Number(item.schedulingNum) || 0) -
                  (Number(item.finishedNum) || 0),
                parentStatus: row.status, // 新增父表状态
                  }));
               }
               expandedRowKeys.value.push(row.id);
@@ -335,46 +343,50 @@
            childrenLoading.value = false;
            console.log(error);
         }
      })
      });
   } else {
      expandedRowKeys.value = [];
   }
};
const changeNum = (row) => {
  const changeNum = row => {
   // 找到父表格数据
   const parentRow = tableData.value.find(item => item.id === expandedRowKeys.value[0]);
    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 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.finishedNum =
        schedulingNum - (totalFinishedNum - Number(row.finishedNum));
      proxy.$modal.msgWarning("所有本次生产数量之和不可大于排产数量");
   }
   row.pendingNum = row.schedulingNum - row.finishedNum;
}
  };
// 编辑修改状态
const changeEditType = (row) => {
  const changeEditType = row => {
   row.editType = !row.editType;
};
// 保存记录
const saveReceiptPayment = (row) => {
   productionReportUpdate(row).then((res) => {
  const saveReceiptPayment = row => {
    productionReportUpdate(row).then(res => {
      row.editType = !row.editType;
      getList();
      proxy.$modal.msgSuccess("提交成功");
   });
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  const handleSelectionChange = selection => {
   selectedRows.value = selection;
};
const summarizeMainTable = (param) => {
   return proxy.summarizeTable(param, [
      "finishedNum"
   ]);
  const summarizeMainTable = param => {
    return proxy.summarizeTable(param, ["finishedNum"]);
};
// 打开弹框
const openForm = (type, row) => {
@@ -387,22 +399,22 @@
      return;
   }
   nextTick(() => {
      const rowInfo = type === 'add' ? selectedRows.value[0] : row
      formDia.value?.openDialog(type, rowInfo)
   })
      const rowInfo = type === "add" ? selectedRows.value[0] : row;
      formDia.value?.openDialog(type, rowInfo);
    });
};

// 打开投入模态框
const isShowInput = ref(false);
const showInput = (row) => {
  const showInput = row => {
   isShowInput.value = true;
}
  };

// 打开产出模态框
const isShowOutput = ref(false);
const showOutput = (row) => {
  const showOutput = row => {
   isShowOutput.value = true;
}
  };

// 导出
const handleOut = () => {