From ac00bb7b8eae1bf6aabb7f1ae67c2e5aa5b8ae90 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 12 六月 2026 10:21:12 +0800
Subject: [PATCH] 宝东 1.样式问题
---
src/views/productionManagement/workOrderManagement/index.vue | 1501 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 789 insertions(+), 712 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 95fb703..948eb1b 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -1,20 +1,29 @@
<template>
<div class="app-container">
- <div class="search_form">
+ <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.productOrderNpsNo"
- 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-progress :percentage="toProgressPercentage(row?.completionStatus)"
- :color="progressColor(toProgressPercentage(row?.completionStatus))"
- :status="toProgressPercentage(row?.completionStatus) >= 100 ? 'success' : ''" />
- </template>
- </PIMTable>
+ <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>
+ </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="鎿嶄綔"
+ width="210"
+ align="center"
+ fixed="right">
+ <template #default="{ row }">
+ <el-button link
+ type="primary"
+ @click="downloadAndPrintWorkOrder(row)">娴佽浆鍗�</el-button>
+ <el-button link
+ type="primary"
+ @click="openWorkOrderFiles(row)">闄勪欢</el-button>
+ <el-button link
+ type="primary"
+ :disabled="getReportDisabled(row)"
+ @click="showReportDialog(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="transferCardVisible"
@@ -128,14 +243,14 @@
readonly
style="width: 300px" />
</el-form-item>
- <el-form-item label="鏈鐢熶骇鏁伴噺"
+ <el-form-item label="鐢熶骇鍚堟牸鏁伴噺"
prop="quantity">
<el-input v-model.number="reportForm.quantity"
type="number"
- min="1"
+ min="0"
step="1"
style="width: 300px"
- placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
+ placeholder="璇疯緭鍏ョ敓浜у悎鏍兼暟閲�"
@input="handleQuantityInput" />
</el-form-item>
<el-form-item label="鎶ュ簾鏁伴噺"
@@ -160,6 +275,16 @@
:label="user.nickName"
:value="user.userId" />
</el-select>
+ </el-form-item>
+ <el-form-item label="宸ユ椂"
+ v-if="currentReportRowData?.type == 0"
+ prop="workHour">
+ <el-input v-model.number="reportForm.workHour"
+ type="number"
+ min="0"
+ style="width: 280px"
+ placeholder="璇疯緭鍏ュ伐鏃�" /><span style="margin-left:10px"
+ class="param-unit">h</span>
</el-form-item>
<div v-if="params.length > 0"
class="param-grid"
@@ -242,734 +367,686 @@
<MaterialDialog v-model="materialDialogVisible"
:row-data="currentMaterialOrderRow"
@refresh="getList" />
- <FilesDia ref="workOrderFilesRef" />
+ <FileList v-if="fileDialogVisible"
+ v-model:visible="fileDialogVisible"
+ :editable="!currentWorkOrderRow?.endOrder"
+ :record-type="'production_operation_task'"
+ :record-id="currentWorkOrderId" />
</div>
</template>
<script setup>
- import { onMounted, ref, nextTick } from "vue";
- import { ElMessageBox } from "element-plus";
- import dayjs from "dayjs";
- import {
- productWorkOrderPage,
- addProductMain,
- downProductWorkOrder,
- } from "@/api/productionManagement/workOrder.js";
- import { findProcessParamListOrder } from "@/api/productionManagement/productProcessRoute.js";
- import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
- import { getDicts } from "@/api/system/dict/data";
- import QRCode from "qrcode";
- import { getCurrentInstance, reactive, toRefs } from "vue";
- import FilesDia from "./components/filesDia.vue";
- import MaterialDialog from "./components/MaterialDialog.vue";
- const { proxy } = getCurrentInstance();
+import { onMounted, ref, nextTick, defineAsyncComponent } from "vue";
+import { ElMessageBox } from "element-plus";
+import {
+ productWorkOrderPage,
+ addProductMain,
+ downProductWorkOrder,
+ getWorkOrdersByOrderId,
+} from "@/api/productionManagement/workOrder.js";
+import { listMaterialPickingDetail } from "@/api/productionManagement/productionOrder.js";
+import { findProcessParamListOrder } from "@/api/productionManagement/productProcessRoute.js";
+import { getUserProfile, userListNoPageByTenantId } from "@/api/system/user.js";
+import { getDicts } from "@/api/system/dict/data";
+import QRCode from "qrcode";
+import { getCurrentInstance, reactive, toRefs } from "vue";
+import MaterialDialog from "./components/MaterialDialog.vue";
+import pagination from "@/components/PIMTable/Pagination.vue";
+const FileList = defineAsyncComponent(() =>
+ import("@/components/Dialog/FileList.vue")
+);
- 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: "鎿嶄綔",
- width: "260",
- align: "center",
- dataType: "action",
- fixed: "right",
- operation: [
- {
- name: "娴佽浆鍗�",
- clickFun: row => {
- downloadAndPrintWorkOrder(row);
- },
- },
- {
- name: "闄勪欢",
- clickFun: row => {
- openWorkOrderFiles(row);
- },
- },
- // {
- // name: "鐗╂枡",
- // clickFun: row => {
- // openMaterialDialog(row);
- // },
- // },
- {
- name: "鎶ュ伐",
- clickFun: row => {
- showReportDialog(row);
- },
- disabled: row => row.planQuantity <= 0,
- },
- ],
- },
- ]);
+import useUserStore from "@/store/modules/user";
+const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
- const tableData = ref([]);
- const tableLoading = ref(false);
- const transferCardVisible = ref(false);
- const transferCardData = ref([]);
- const transferCardQrUrl = ref("");
- const transferCardRowData = ref(null);
- const reportDialogVisible = ref(false);
- const workOrderFilesRef = ref(null);
- const reportFormRef = ref(null);
- const userOptions = ref([]);
- const reportForm = reactive({
- planQuantity: 0,
- quantity: null,
- scrapQty: null,
- userName: "",
- workOrderId: "",
- reportWork: "",
- productProcessRouteItemId: "",
- userId: "",
- productMainId: null,
- productionOrderRoutingOperationId: "",
- productionOrderId: "",
- paramGroups: {},
- });
+const tableData = ref([]);
+const tableLoading = ref(false);
+const expandedRowKeys = ref([]);
+const transferCardVisible = ref(false);
+const transferCardQrUrl = ref("");
+const transferCardRowData = ref(null);
+const reportDialogVisible = ref(false);
+const fileDialogVisible = ref(false);
+const currentWorkOrderId = ref(null);
+const reportFormRef = ref(null);
+const userOptions = ref([]);
+const reportForm = reactive({
+ planQuantity: 0,
+ quantity: null,
+ scrapQty: null,
+ userName: "",
+ workOrderId: "",
+ reportWork: "",
+ productProcessRouteItemId: "",
+ userId: "",
+ productMainId: null,
+ productionOrderRoutingOperationId: "",
+ productionOrderId: "",
+ workHour: 0,
+ paramGroups: {},
+});
- const params = ref({});
- const dictOptions = ref({});
- const paramLoading = ref(false);
+const params = ref([]);
+const dictOptions = ref({});
+const paramLoading = ref(false);
- // 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
- const validateQuantity = (rule, value, callback) => {
- if (value === null || value === undefined || value === "") {
- callback(new Error("璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"));
- return;
- }
- const num = Number(value);
- // 鏁存暟涓斿ぇ浜庣瓑浜�1
- if (isNaN(num) || !Number.isInteger(num) || num < 1) {
- callback(new Error("鏈鐢熶骇鏁伴噺蹇呴』澶т簬绛変簬1"));
- return;
- }
+const validateQuantity = (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
+ callback(new Error("璇疯緭鍏ョ敓浜у悎鏍兼暟閲�"));
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num) || !Number.isInteger(num) || num < 0) {
+ callback(new Error("鐢熶骇鍚堟牸鏁伴噺蹇呴』澶т簬绛変簬0"));
+ return;
+ }
+ callback();
+};
+
+const validateScrapQty = (rule, value, callback) => {
+ if (value === null || value === undefined || value === "") {
callback();
- };
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num) || !Number.isInteger(num) || num < 0) {
+ callback(new Error("鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0"));
+ return;
+ }
+ callback();
+};
- // 鎶ュ簾鏁伴噺楠岃瘉瑙勫垯
- const validateScrapQty = (rule, value, callback) => {
- if (value === null || value === undefined || value === "") {
- callback();
- return;
- }
- const num = Number(value);
- // 鏁存暟涓斿ぇ浜庣瓑浜�0
- if (isNaN(num) || !Number.isInteger(num) || num < 0) {
- callback(new Error("鎶ュ簾鏁伴噺蹇呴』澶т簬绛変簬0"));
- return;
- }
- callback();
- };
+const reportFormRules = {
+ quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
+ scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
+};
- // 楠岃瘉瑙勫垯
- const reportFormRules = {
- quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
- scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
- };
-
- // 澶勭悊鏈鐢熶骇鏁伴噺杈撳叆锛岄檺鍒跺繀椤诲ぇ浜庣瓑浜�1
- const handleQuantityInput = value => {
- if (value === "" || value === null || value === undefined) {
+const handleQuantityInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.quantity = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) return;
+ if (num < 0) {
+ reportForm.quantity = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ const intValue = Math.floor(num);
+ if (intValue < 0) {
reportForm.quantity = null;
return;
}
- const num = Number(value);
- if (isNaN(num)) {
- return;
- }
- // 濡傛灉灏忎簬1锛屾竻闄�
- if (num < 1) {
- reportForm.quantity = null;
- return;
- }
- // 濡傛灉鏄皬鏁板彇鏁存暟閮ㄥ垎
- if (!Number.isInteger(num)) {
- const intValue = Math.floor(num);
- // 濡傛灉鍙栨暣鍚庡皬浜�1锛屾竻闄�
- if (intValue < 1) {
- reportForm.quantity = null;
- return;
- }
- reportForm.quantity = intValue;
- return;
- }
- reportForm.quantity = num;
- };
+ reportForm.quantity = intValue;
+ return;
+ }
+ reportForm.quantity = num;
+};
- // 澶勭悊鎶ュ簾鏁伴噺
- const handleScrapQtyInput = value => {
- if (value === "" || value === null || value === undefined) {
- reportForm.scrapQty = null;
- return;
+const handleScrapQtyInput = value => {
+ if (value === "" || value === null || value === undefined) {
+ reportForm.scrapQty = null;
+ return;
+ }
+ const num = Number(value);
+ if (isNaN(num)) return;
+ if (num < 0) {
+ reportForm.scrapQty = null;
+ return;
+ }
+ if (!Number.isInteger(num)) {
+ reportForm.scrapQty = Math.floor(num);
+ return;
+ }
+ reportForm.scrapQty = num;
+};
+
+const currentReportRowData = ref(null);
+const materialDialogVisible = ref(false);
+const currentMaterialOrderRow = ref(null);
+const page = reactive({
+ current: 1,
+ size: 10,
+ total: 0,
+});
+
+const data = reactive({
+ searchForm: {
+ npsNo: "",
+ productName: "",
+ model: "",
+ },
+});
+const { searchForm } = toRefs(data);
+
+const toProgressPercentage = val => {
+ const n = Number(val);
+ if (!Number.isFinite(n)) return 0;
+ if (n <= 0) return 0;
+ if (n >= 100) return 100;
+ return parseFloat(n.toFixed(2));
+};
+
+const progressColor = percentage => {
+ const p = toProgressPercentage(percentage);
+ if (p < 30) return "#f56c6c";
+ if (p < 50) return "#e6a23c";
+ if (p < 80) return "#409eff";
+ return "#67c23a";
+};
+
+const getReportDisabled = row => {
+ if (row.planQuantity <= 0) return true;
+ if (!row.userIds) return false;
+ try {
+ const userIds =
+ typeof row.userIds === "string"
+ ? JSON.parse(row.userIds)
+ : row.userIds;
+ if (Array.isArray(userIds)) {
+ return !userIds.some(id => String(id) === String(userStore.id));
}
- const num = Number(value);
- // 濡傛灉鏄疦aN锛屼繚鎸佸師鍊�
- 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;
- };
+ return true;
+ } catch (e) {
+ return true;
+ }
+};
- const currentReportRowData = ref(null);
- const materialDialogVisible = ref(false);
- const currentMaterialOrderRow = ref(null);
- const page = reactive({
- current: 1,
- size: 100,
- total: 0,
- });
+const handleQuery = () => {
+ page.current = 1;
+ expandedRowKeys.value = [];
+ getList();
+};
- const data = reactive({
- searchForm: {
- workOrderNo: "",
- productOrderNpsNo: "",
- },
- });
- const { searchForm } = toRefs(data);
- const toProgressPercentage = val => {
- const n = Number(val);
- if (!Number.isFinite(n)) return 0;
- if (n <= 0) return 0;
- if (n >= 100) return 100;
- return Math.round(n);
- };
- const progressColor = percentage => {
- const p = toProgressPercentage(percentage);
- if (p < 30) return "#f56c6c";
- if (p < 50) return "#e6a23c";
- if (p < 80) return "#409eff";
- return "#67c23a";
- };
+const paginationChange = obj => {
+ page.current = obj.page;
+ page.size = obj.limit;
+ expandedRowKeys.value = [];
+ getList();
+};
- // 鏌ヨ鍒楄〃
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- const handleQuery = () => {
- page.current = 1;
- getList();
- };
-
- const pagination = obj => {
- page.current = obj.page;
- page.size = obj.limit;
- getList();
- };
-
- const getList = () => {
- tableLoading.value = true;
- const params = { ...searchForm.value, ...page };
- productWorkOrderPage(params)
- .then(res => {
- tableLoading.value = false;
- tableData.value = res.data.records;
- page.total = res.data.total;
- })
- .catch(() => {
- tableLoading.value = false;
+const getList = () => {
+ tableLoading.value = true;
+ const params = { ...searchForm.value, current: page.current, size: page.size };
+ return productWorkOrderPage(params)
+ .then(res => {
+ tableLoading.value = false;
+ const records = res.data.records || [];
+ records.forEach(item => {
+ item.children = [];
+ item.childrenLoading = false;
});
- };
-
- // 涓嬭浇骞舵墦鍗板伐鍗曟祦杞崱锛堟枃浠舵祦锛�
- const downloadAndPrintWorkOrder = async row => {
- if (!row || !row.id) {
- proxy.$modal.msgError("缂哄皯宸ュ崟ID锛屾棤娉曚笅杞芥祦杞崱");
- return;
- }
- const fileName = row.workOrderNo
- ? `宸ュ崟娴佽浆鍗${row.workOrderNo}.xlsx`
- : "宸ュ崟娴佽浆鍗�.xlsx";
- try {
- // 璋冪敤鎺ュ彛锛屼互 responseType: 'blob' 鑾峰彇鏂囦欢娴�
- const blob = await downProductWorkOrder(row.id);
-
- if (!blob) {
- proxy.$modal.msgError("鏈幏鍙栧埌娴佽浆鍗℃枃浠�");
- return;
- }
-
- // 鍒涘缓 Blob URL
- const fileBlob =
- blob instanceof Blob
- ? blob
- : new Blob([blob], { type: blob.type || "application/octet-stream" });
- const url = window.URL.createObjectURL(fileBlob);
-
- // 鍒涘缓闅愯棌 iframe锛岀敤浜庤Е鍙戞祻瑙堝櫒鎵撳嵃
- const iframe = document.createElement("iframe");
- iframe.style.position = "fixed";
- iframe.style.right = "0";
- iframe.style.bottom = "0";
- iframe.style.width = "0";
- iframe.style.height = "0";
- iframe.style.border = "0";
- iframe.src = url;
- document.body.appendChild(iframe);
-
- iframe.onload = () => {
- try {
- iframe.contentWindow?.focus();
- iframe.contentWindow?.print();
- } catch (e) {
- console.error("鑷姩璋冪敤鎵撳嵃澶辫触", e);
- // 閫�鑰屾眰鍏舵锛屾墦寮�鏂扮獥鍙ｇ敱鐢ㄦ埛鎵嬪姩鎵撳嵃
- window.open(url);
- }
- };
- } catch (e) {
- console.error("涓嬭浇宸ュ崟娴佽浆鍗″け璐�", e);
- proxy.$modal.msgError("涓嬭浇宸ュ崟娴佽浆鍗″け璐�");
- }
- };
-
- const showTransferCard = async row => {
- transferCardRowData.value = row;
- const qrContent = String(row.id);
-
- transferCardQrUrl.value = await QRCode.toDataURL(qrContent);
- transferCardVisible.value = true;
- };
-
- const printTransferCard = () => {
- window.print();
- };
-
- const openWorkOrderFiles = row => {
- workOrderFilesRef.value?.openDialog(row);
- };
-
- const showReportDialog = row => {
- currentReportRowData.value = row;
- reportForm.planQuantity = row.planQuantity;
- 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.scrapQty =
- row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
- reportForm.productionOrderRoutingOperationId =
- row.productionOrderRoutingOperationId;
- reportForm.productionOrderId = row.productionOrderId;
- nextTick(() => {
- reportFormRef.value?.clearValidate();
- if (row.productionOrderRoutingOperationId && row.productionOrderId) {
- loadParams(row.productionOrderRoutingOperationId, row.productionOrderId);
- }
+ tableData.value = records;
+ page.total = res.data.total;
+ })
+ .catch(() => {
+ tableLoading.value = false;
});
- getUserProfile()
- .then(res => {
- if (res.code === 200) {
- reportForm.userId = res.data.userId;
- reportForm.userName = res.data.nickName;
- }
- })
- .catch(err => {
- console.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触", err);
- });
+};
- reportDialogVisible.value = true;
- };
-
- const openMaterialDialog = row => {
- currentMaterialOrderRow.value = row;
- materialDialogVisible.value = true;
- };
-
- const handleReport = () => {
- reportFormRef.value?.validate(valid => {
- if (!valid) {
- return false;
- }
-
- if (reportForm.planQuantity <= 0) {
- ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- // 楠岃瘉鏈鐢熶骇鏁伴噺
- if (
- reportForm.quantity === null ||
- reportForm.quantity === undefined ||
- reportForm.quantity === ""
- ) {
- ElMessageBox.alert("璇疯緭鍏ユ湰娆＄敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- const quantity = Number(reportForm.quantity);
-
- if (isNaN(quantity) || quantity <= 0) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺蹇呴』澶т簬0", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- // 楠岃瘉鎶ュ簾鏁伴噺
- const scrapQty = Number(reportForm.scrapQty);
- if (!isNaN(scrapQty) && scrapQty < 0) {
- ElMessageBox.alert("鎶ュ簾鏁伴噺涓嶈兘灏忎簬0", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- if (!isNaN(scrapQty) && scrapQty > quantity) {
- ElMessageBox.alert("鎶ュ簾鏁伴噺涓嶈兘澶т簬鏈鐢熶骇鏁伴噺", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
-
- const productionOperationParamList = params.value.map(param => ({
- ...param,
- inputValue: reportForm.paramGroups[param.id] ?? "",
- }));
-
- const submitParams = {
- quantity: quantity,
- scrapQty: isNaN(scrapQty) ? 0 : scrapQty,
- userId: reportForm.userId,
- userName: reportForm.userName,
- productionOperationTaskId: reportForm.workOrderId,
- productProcessRouteItemId: reportForm.productProcessRouteItemId,
- reportWork: reportForm.reportWork,
- productMainId: reportForm.productMainId,
- productionOrderRoutingOperationId:
- reportForm.productionOrderRoutingOperationId,
- productionOrderId: reportForm.productionOrderId,
- productionOperationParamList: productionOperationParamList,
- };
-
- addProductMain(submitParams)
+// 閲嶆柊鍔犺浇鎸囧畾鐖惰鐨勫瓙宸ュ簭鏁版嵁
+const reloadExpandedChildren = () => {
+ const expandedIds = expandedRowKeys.value;
+ if (expandedIds.length === 0) return;
+ expandedIds.forEach(parentId => {
+ const parentRow = tableData.value.find(
+ item => String(item.productionOrderId) === String(parentId)
+ );
+ if (parentRow) {
+ parentRow.childrenLoading = true;
+ getWorkOrdersByOrderId(parentId)
.then(res => {
- proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
- reportDialogVisible.value = false;
- getList();
+ parentRow.childrenLoading = false;
+ const idx = tableData.value.findIndex(
+ item => String(item.productionOrderId) === String(parentId)
+ );
+ if (idx > -1) {
+ tableData.value[idx].children = res.data || [];
+ }
})
.catch(() => {
- ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
+ parentRow.childrenLoading = false;
});
- });
- };
-
- const handleUserChange = val => {
- const user = userOptions.value.find(item => item.userId === val);
- reportForm.userName = user ? user.nickName : "";
- };
-
- const getDictOptions = async dictType => {
- if (!dictType) return [];
- if (dictOptions.value[dictType]) return dictOptions.value[dictType];
- try {
- const res = await getDicts(dictType);
- if (res.code === 200) {
- dictOptions.value[dictType] = res.data;
- return res.data;
- }
- return [];
- } catch (error) {
- console.error("鑾峰彇瀛楀吀鏁版嵁澶辫触:", error);
- return [];
}
- };
-
- const loadParams = (productionOrderRoutingOperationId, productionOrderId) => {
- paramLoading.value = true;
- findProcessParamListOrder({
- productionOrderRoutingOperationId,
- productionOrderId,
- })
- .then(res => {
- if (res.code === 200) {
- const paramList = res.data || [];
- params.value = paramList;
- reportForm.paramGroups = {};
- paramList.forEach(param => {
- if (!reportForm.paramGroups[param.id]) {
- reportForm.paramGroups[param.id] = "";
- }
- if (param.paramType == "3" && param.paramFormat) {
- getDictOptions(param.paramFormat);
- }
- });
- }
- })
- .catch(err => {
- console.error("鑾峰彇宸ュ簭鍙傛暟澶辫触:", err);
- })
- .finally(() => {
- paramLoading.value = false;
- });
- };
-
- onMounted(() => {
- getList();
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- userListNoPageByTenantId().then(res => {
- if (res.code === 200) {
- userOptions.value = res.data;
- }
- });
});
+};
+
+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 downloadAndPrintWorkOrder = async row => {
+ if (!row || !row.id) {
+ proxy.$modal.msgError("缂哄皯宸ュ崟ID锛屾棤娉曚笅杞芥祦杞崱");
+ return;
+ }
+ try {
+ const blob = await downProductWorkOrder(row.id);
+ if (!blob) {
+ proxy.$modal.msgError("鏈幏鍙栧埌娴佽浆鍗℃枃浠�");
+ return;
+ }
+ const fileBlob =
+ blob instanceof Blob
+ ? blob
+ : new Blob([blob], { type: blob.type || "application/octet-stream" });
+ const url = window.URL.createObjectURL(fileBlob);
+ const iframe = document.createElement("iframe");
+ iframe.style.position = "fixed";
+ iframe.style.right = "0";
+ iframe.style.bottom = "0";
+ iframe.style.width = "0";
+ iframe.style.height = "0";
+ iframe.style.border = "0";
+ iframe.src = url;
+ document.body.appendChild(iframe);
+ iframe.onload = () => {
+ try {
+ iframe.contentWindow?.focus();
+ iframe.contentWindow?.print();
+ } catch (e) {
+ console.error("鑷姩璋冪敤鎵撳嵃澶辫触", e);
+ window.open(url);
+ }
+ };
+ } catch (e) {
+ console.error("涓嬭浇宸ュ崟娴佽浆鍗″け璐�", e);
+ proxy.$modal.msgError("涓嬭浇宸ュ崟娴佽浆鍗″け璐�");
+ }
+};
+
+const showTransferCard = async row => {
+ transferCardRowData.value = row;
+ const qrContent = String(row.id);
+ transferCardQrUrl.value = await QRCode.toDataURL(qrContent);
+ transferCardVisible.value = true;
+};
+
+const printTransferCard = () => {
+ window.print();
+};
+
+const currentWorkOrderRow = ref(null);
+
+const openWorkOrderFiles = row => {
+ currentWorkOrderId.value = row.id;
+ currentWorkOrderRow.value = row;
+ fileDialogVisible.value = true;
+};
+
+const showReportDialog = async row => {
+ if (row.productionOrderId) {
+ try {
+ const res = await listMaterialPickingDetail(row.productionOrderId);
+ const records = Array.isArray(res.data)
+ ? res.data
+ : res.data?.records || [];
+ if (res.code === 200 && records.length === 0) {
+ proxy.$modal.msgError("鏈鏂欐棤娉曟姤宸�");
+ return;
+ }
+ } catch (error) {
+ console.error("鏌ヨ棰嗘枡璇︽儏澶辫触:", error);
+ }
+ }
+ currentReportRowData.value = row;
+ const planQuantity = Number(row.planQuantity || 0);
+ const completeQuantity = Number(row.completeQuantity || 0);
+ const remainingQuantity = Math.max(0, planQuantity - completeQuantity);
+ reportForm.planQuantity = remainingQuantity;
+ 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.scrapQty = 0;
+ reportForm.productionOrderRoutingOperationId =
+ row.productionOrderRoutingOperationId;
+ reportForm.productionOrderId = row.productionOrderId;
+ if (row.type == 0) {
+ reportForm.workHour = row.workHour || 0;
+ } else {
+ reportForm.workHour = 0;
+ }
+ nextTick(() => {
+ reportFormRef.value?.clearValidate();
+ if (row.productionOrderRoutingOperationId && row.productionOrderId) {
+ loadParams(row.productionOrderRoutingOperationId, row.productionOrderId);
+ }
+ });
+ getUserProfile()
+ .then(res => {
+ if (res.code === 200) {
+ reportForm.userId = res.data.userId;
+ reportForm.userName = res.data.nickName;
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触", err);
+ });
+
+ reportDialogVisible.value = true;
+};
+
+const handleReport = () => {
+ reportFormRef.value?.validate(valid => {
+ if (!valid) {
+ return false;
+ }
+ if (reportForm.planQuantity <= 0) {
+ ElMessageBox.alert("寰呯敓浜ф暟閲忎负0锛屾棤娉曟姤宸�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+ if (
+ reportForm.quantity === null ||
+ reportForm.quantity === undefined ||
+ reportForm.quantity === ""
+ ) {
+ ElMessageBox.alert("璇疯緭鍏ョ敓浜у悎鏍兼暟閲�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+ const quantity = Number(reportForm.quantity);
+ if (isNaN(quantity) || quantity < 0) {
+ ElMessageBox.alert("鐢熶骇鍚堟牸鏁伴噺蹇呴』澶т簬绛変簬0", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+ const scrapQty = Number(reportForm.scrapQty);
+ if (!isNaN(scrapQty) && scrapQty < 0) {
+ ElMessageBox.alert("鎶ュ簾鏁伴噺涓嶈兘灏忎簬0", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ const productionOperationParamList = params.value.map(param => ({
+ ...param,
+ inputValue: reportForm.paramGroups[param.id] ?? "",
+ }));
+
+ const submitParams = {
+ quantity: quantity,
+ scrapQty: isNaN(scrapQty) ? 0 : scrapQty,
+ userId: reportForm.userId,
+ userName: reportForm.userName,
+ productionOperationTaskId: reportForm.workOrderId,
+ productProcessRouteItemId: reportForm.productProcessRouteItemId,
+ reportWork: reportForm.reportWork,
+ productMainId: reportForm.productMainId,
+ productionOrderRoutingOperationId:
+ reportForm.productionOrderRoutingOperationId,
+ productionOrderId: reportForm.productionOrderId,
+ workHour: reportForm.workHour,
+ productionOperationParamList: productionOperationParamList,
+ };
+
+ addProductMain(submitParams)
+ .then(res => {
+ proxy.$modal.msgSuccess("鎶ュ伐鎴愬姛");
+ reportDialogVisible.value = false;
+ getList().then(() => {
+ reloadExpandedChildren();
+ });
+ })
+ .catch(() => {
+ ElMessageBox.alert("鎶ュ伐澶辫触", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ });
+ });
+};
+
+const handleUserChange = val => {
+ const user = userOptions.value.find(item => item.userId === val);
+ reportForm.userName = user ? user.nickName : "";
+};
+
+const getDictOptions = async dictType => {
+ if (!dictType) return [];
+ if (dictOptions.value[dictType]) return dictOptions.value[dictType];
+ try {
+ const res = await getDicts(dictType);
+ if (res.code === 200) {
+ dictOptions.value[dictType] = res.data;
+ return res.data;
+ }
+ return [];
+ } catch (error) {
+ console.error("鑾峰彇瀛楀吀鏁版嵁澶辫触:", error);
+ return [];
+ }
+};
+
+const loadParams = (productionOrderRoutingOperationId, productionOrderId) => {
+ paramLoading.value = true;
+ findProcessParamListOrder({
+ productionOrderRoutingOperationId,
+ productionOrderId,
+ })
+ .then(res => {
+ if (res.code === 200) {
+ const paramList = res.data || [];
+ params.value = paramList;
+ reportForm.paramGroups = {};
+ paramList.forEach(param => {
+ if (!reportForm.paramGroups[param.id]) {
+ reportForm.paramGroups[param.id] = "";
+ }
+ if (param.paramType == "3" && param.paramFormat) {
+ getDictOptions(param.paramFormat);
+ }
+ });
+ }
+ })
+ .catch(err => {
+ console.error("鑾峰彇宸ュ簭鍙傛暟澶辫触:", err);
+ })
+ .finally(() => {
+ paramLoading.value = false;
+ });
+};
+
+onMounted(() => {
+ userStore.getInfo();
+ getList();
+ userListNoPageByTenantId().then(res => {
+ if (res.code === 200) {
+ userOptions.value = res.data;
+ }
+ });
+});
</script>
<style scoped lang="scss">
- .search-row {
- display: flex;
- align-items: center;
- gap: 12px;
- }
- .search-item {
- display: flex;
- align-items: center;
- }
- .search_title {
- margin-right: 8px;
- font-size: 14px;
- color: #606266;
- }
- .transfer-card-title {
- text-align: center;
- font-size: 24px;
- font-weight: bold;
- margin-bottom: 20px;
- color: #303133;
- }
- .transfer-card-container {
- display: flex;
- justify-content: space-between;
- padding: 20px;
- }
- .transfer-card-info {
- flex: 1;
- margin-right: 20px;
- }
- .info-group {
- margin-bottom: 20px;
- }
- .info-item {
- display: flex;
- margin-bottom: 10px;
- }
- .info-label {
- width: 100px;
- font-weight: bold;
- color: #606266;
- }
- .info-value {
- flex: 1;
- color: #303133;
- }
- .transfer-card-qr {
- display: flex;
- flex-direction: column;
- align-items: center;
- }
- .qr-container {
- text-align: center;
- }
- .print-button-container {
- text-align: center;
- margin-top: 20px;
- }
- .param-grid {
- margin-top: 10px;
- border-top: 1px solid #ebe9f3;
- padding-top: 10px;
- }
- .param-item {
- margin-bottom: 12px;
- }
- .param-input-group {
- display: flex;
- align-items: center;
- gap: 8px;
- }
- .param-input {
- flex: 1;
- }
- .param-select {
- flex: 1;
- }
- .param-unit {
- color: #909399;
- font-size: 12px;
- min-width: 30px;
- }
+.search-row {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+}
+.search-item {
+ display: flex;
+ align-items: center;
+}
+.search_title {
+ margin-right: 8px;
+ font-size: 14px;
+ color: #606266;
+}
+.transfer-card-title {
+ text-align: center;
+ font-size: 24px;
+ font-weight: bold;
+ margin-bottom: 20px;
+ color: #303133;
+}
+.transfer-card-container {
+ display: flex;
+ justify-content: space-between;
+ padding: 20px;
+}
+.transfer-card-info {
+ flex: 1;
+ margin-right: 20px;
+}
+.info-group {
+ margin-bottom: 20px;
+}
+.info-item {
+ display: flex;
+ margin-bottom: 10px;
+}
+.info-label {
+ width: 100px;
+ font-weight: bold;
+ color: #606266;
+}
+.info-value {
+ flex: 1;
+ color: #303133;
+}
+.transfer-card-qr {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+.qr-container {
+ text-align: center;
+}
+.print-button-container {
+ text-align: center;
+ margin-top: 20px;
+}
+.param-grid {
+ margin-top: 10px;
+ border-top: 1px solid #ebe9f3;
+ padding-top: 10px;
+}
+.param-item {
+ margin-bottom: 12px;
+}
+.param-input-group {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+.param-input {
+ flex: 1;
+}
+.param-select {
+ flex: 1;
+}
+.param-unit {
+ color: #909399;
+ font-size: 12px;
+ min-width: 30px;
+}
</style>
<style lang="scss">
- @media print {
- @page {
- size: landscape;
+@media print {
+ @page {
+ size: landscape;
+ }
+ body * {
+ visibility: hidden;
+ }
+ .el-dialog__wrapper,
+ .el-dialog,
+ .el-dialog__body,
+ .transfer-card-title,
+ .transfer-card-container,
+ .transfer-card-container *,
+ .info-item,
+ .info-label,
+ .info-value {
+ visibility: visible;
+ }
+ .print-button-container {
+ visibility: hidden;
+ }
+ .el-dialog__wrapper {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ margin: 0;
+ }
+ .el-dialog {
+ width: 100% !important;
+ max-width: 800px;
+ margin: 0 auto !important;
+ }
+ .el-dialog__header,
+ .el-dialog__footer {
+ display: none;
+ }
+ .el-dialog__body {
+ padding: 20px;
+ }
+ .transfer-card-container {
+ height: auto;
+ display: flex;
+ gap: 20px;
+ }
+ .transfer-card-info {
+ flex: 1;
+ .info-group {
+ width: 100%;
+ float: none;
+ margin-bottom: 20px;
}
- body * {
- visibility: hidden;
- }
- .el-dialog__wrapper,
- .el-dialog,
- .el-dialog__body,
- .transfer-card-title,
- .transfer-card-container,
- .transfer-card-container *,
- .info-item,
- .info-label,
- .info-value {
- visibility: visible;
- }
- .print-button-container {
- visibility: hidden;
- }
- .el-dialog__wrapper {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- margin: 0;
- }
- .el-dialog {
- width: 100% !important;
- max-width: 800px;
- margin: 0 auto !important;
- }
- .el-dialog__header,
- .el-dialog__footer {
- display: none;
- }
- .el-dialog__body {
- padding: 20px;
- }
- .transfer-card-container {
- height: auto;
+ .info-item {
display: flex;
- gap: 20px;
- }
- .transfer-card-info {
- flex: 1;
- .info-group {
- width: 100%;
- float: none;
- margin-bottom: 20px;
+ margin-bottom: 10px;
+ .info-label {
+ width: 100px;
+ font-weight: bold;
+ margin-right: 15px;
+ white-space: nowrap;
}
- .info-item {
- display: flex;
- margin-bottom: 10px;
- .info-label {
- width: 100px;
- font-weight: bold;
- margin-right: 15px;
- white-space: nowrap;
- }
- .info-value {
- flex: 1;
- word-break: break-word;
- }
+ .info-value {
+ flex: 1;
+ word-break: break-word;
}
- }
- .transfer-card-qr {
- width: 160px;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: flex-start;
- }
- .qr-container img {
- width: 140px !important;
- height: 140px !important;
}
}
+ .transfer-card-qr {
+ width: 160px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-start;
+ }
+ .qr-container img {
+ width: 140px !important;
+ height: 140px !important;
+ }
+}
</style>
--
Gitblit v1.9.3