From 6ff76a6ab6d25947084d36f0fdf104719830d1f9 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 28 四月 2026 16:00:40 +0800
Subject: [PATCH] 新增报工明细分页查询功能，优化生产报工界面，调整搜索表单字段
---
src/views/productionManagement/productionReporting/index.vue | 391 +++++++++++++++++++++++++++----------------------------
src/api/productionManagement/productionProductMain.js | 9 +
2 files changed, 202 insertions(+), 198 deletions(-)
diff --git a/src/api/productionManagement/productionProductMain.js b/src/api/productionManagement/productionProductMain.js
index 0493f8b..1b7dcb6 100644
--- a/src/api/productionManagement/productionProductMain.js
+++ b/src/api/productionManagement/productionProductMain.js
@@ -9,3 +9,12 @@
params: query,
});
}
+
+// 鏄庣粏鍒嗛〉鏌ヨ
+export function productionProductMainListPageDetail(query) {
+ return request({
+ url: "/productionProductMain/listPageDetail",
+ method: "get",
+ params: query,
+ });
+}
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 8490b85..f3e7882 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/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("璇烽�夋嫨涓�鏉℃暟鎹�");
--
Gitblit v1.9.3