From e1570f458b2ab42bb1a212be8de63134a50b2af1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 16:09:03 +0800
Subject: [PATCH] 生产核算增加折算工时，隐藏工资
---
src/views/productionManagement/workOrderManagement/index.vue | 185 ++++++++++++++++++++++++---------------------
1 files changed, 98 insertions(+), 87 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index 4f09330..4012821 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -1,6 +1,6 @@
<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>
@@ -13,7 +13,7 @@
</div>
<div class="search-item">
<span class="search_title">鐢熶骇璁㈠崟鍙凤細</span>
- <el-input v-model="searchForm.productOrderNpsNo"
+ <el-input v-model="searchForm.npsNo"
style="width: 240px"
placeholder="璇疯緭鍏�"
@change="handleQuery"
@@ -40,79 +40,16 @@
</template>
</PIMTable>
</div>
- <!-- 娴佽浆鍗″脊绐� -->
+ <!-- 浜岀淮鐮佸脊绐� -->
<el-dialog v-model="transferCardVisible"
- title="娴佽浆鍗�"
- width="1000px">
- <div class="transfer-card-title">宸ュ崟娴佽浆鍗�</div>
- <div class="transfer-card-container">
- <div class="transfer-card-info">
- <div class="info-group">
- <div class="info-item">
- <span class="info-label">宸ュ崟缂栧彿</span>
- <span class="info-value">{{ transferCardRowData.workOrderNo }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">浜у搧鍚嶇О</span>
- <span class="info-value">{{ transferCardRowData.productName }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">浜у搧瑙勬牸</span>
- <span class="info-value">{{ transferCardRowData.model }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">璁″垝寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.planStartTime }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">璁″垝缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.planEndTime }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">澶囨敞</span>
- <span class="info-value">{{ transferCardRowData.remark }}</span>
- </div>
- </div>
- <div class="info-group">
- <div class="info-item">
- <span class="info-label">闇�姹傛暟閲�</span>
- <span class="info-value">{{ transferCardRowData.planQuantity }}</span>
- </div>
- <div class="info-item">
- <span class="info-value">{{ transferCardRowData.completeQuantity }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">鑹搧鏁伴噺</span>
- <span class="info-value">0</span>
- </div>
- <div class="info-item">
- <span class="info-label">涓嶈壇鍝佹暟</span>
- <span class="info-value">0</span>
- </div>
- <div class="info-item">
- <span class="info-label">瀹為檯寮�濮嬫椂闂�</span>
- <span class="info-value">{{ transferCardRowData.actualStartTime }}</span>
- </div>
- <div class="info-item">
- <span class="info-label">瀹為檯缁撴潫鏃堕棿</span>
- <span class="info-value">{{ transferCardRowData.actualEndTime }}</span>
- </div>
- </div>
- </div>
- <div class="transfer-card-qr">
- <div class="qr-container">
- <img :src="transferCardQrUrl"
- alt="娴佽浆鍗′簩缁寸爜"
- style="width: 200px; height: 200px;" />
- </div>
- </div>
- </div>
- <div class="print-button-container"
- style=" text-align: center;
- margin-bottom: 40px;">
- <el-button type="primary"
- style="margin-top: 20px;"
- @click="printTransferCard">鎵撳嵃娴佽浆鍗�</el-button>
+ title="浜岀淮鐮�"
+ width="420px"
+ align-center>
+ <div class="qr-only-dialog">
+ <canvas ref="transferCardQrCanvas"
+ width="280"
+ height="280"
+ class="qr-canvas" />
</div>
</el-dialog>
<!-- 鎶ュ伐寮圭獥 -->
@@ -148,6 +85,17 @@
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput" />
</el-form-item>
+ <el-form-item label="鎶ュ伐绫诲瀷"
+ prop="reportType">
+ <el-select v-model="reportForm.reportType"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨鎶ュ伐绫诲瀷">
+ <el-option label="鍚堟牸" :value="0" />
+ <el-option label="杞诲井杩斿伐" :value="1" />
+ <el-option label="涓ラ噸杩斿伐" :value="2" />
+ <el-option label="鎶ュ簾" :value="3" />
+ </el-select>
+ </el-form-item>
<el-form-item label="鐝粍淇℃伅">
<el-select v-model="reportForm.userId"
style="width: 300px"
@@ -160,6 +108,17 @@
: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"
@@ -244,6 +203,7 @@
@refresh="getList" />
<FileList v-if="fileDialogVisible"
v-model:visible="fileDialogVisible"
+ :editable="!currentWorkOrderRow?.endOrder"
:record-type="'production_operation_task'"
:record-id="currentWorkOrderId" />
</div>
@@ -258,13 +218,16 @@
addProductMain,
downProductWorkOrder,
} 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";
- const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
+ const FileList = defineAsyncComponent(() =>
+ import("@/components/Dialog/FileList.vue")
+ );
import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
@@ -343,7 +306,7 @@
},
{
label: "鎿嶄綔",
- width: "260",
+ width: "320",
align: "center",
dataType: "action",
fixed: "right",
@@ -352,6 +315,12 @@
name: "娴佽浆鍗�",
clickFun: row => {
downloadAndPrintWorkOrder(row);
+ },
+ },
+ {
+ name: "浜岀淮鐮�",
+ clickFun: row => {
+ showTransferCard(row);
},
},
{
@@ -371,6 +340,7 @@
clickFun: row => {
showReportDialog(row);
},
+ showHide: row => !row.endOrder,
disabled: row => {
if (row.planQuantity <= 0) return true;
if (!row.userIds) return false;
@@ -395,7 +365,7 @@
const tableLoading = ref(false);
const transferCardVisible = ref(false);
const transferCardData = ref([]);
- const transferCardQrUrl = ref("");
+ const transferCardQrCanvas = ref(null);
const transferCardRowData = ref(null);
const reportDialogVisible = ref(false);
const fileDialogVisible = ref(false);
@@ -406,6 +376,7 @@
planQuantity: 0,
quantity: null,
scrapQty: null,
+ reportType: 0,
userName: "",
workOrderId: "",
reportWork: "",
@@ -414,6 +385,7 @@
productMainId: null,
productionOrderRoutingOperationId: "",
productionOrderId: "",
+ workHour: 0,
paramGroups: {},
});
@@ -523,7 +495,7 @@
const data = reactive({
searchForm: {
workOrderNo: "",
- productOrderNpsNo: "",
+ npsNo: "",
},
});
const { searchForm } = toRefs(data);
@@ -532,7 +504,7 @@
if (!Number.isFinite(n)) return 0;
if (n <= 0) return 0;
if (n >= 100) return 100;
- return Math.round(n);
+ return parseFloat(n.toFixed(2));
};
const progressColor = percentage => {
const p = toProgressPercentage(percentage);
@@ -623,26 +595,51 @@
const showTransferCard = async row => {
transferCardRowData.value = row;
- const qrContent = String(row.id);
-
- transferCardQrUrl.value = await QRCode.toDataURL(qrContent);
transferCardVisible.value = true;
+ await nextTick();
+ const qrContent = String(row.id);
+ if (transferCardQrCanvas.value) {
+ const ctx = transferCardQrCanvas.value.getContext("2d");
+ ctx?.clearRect(0, 0, 280, 280);
+ await QRCode.toCanvas(transferCardQrCanvas.value, qrContent, {
+ width: 280,
+ margin: 1,
+ errorCorrectionLevel: "M",
+ });
+ }
};
- const printTransferCard = () => {
- window.print();
- };
+ const currentWorkOrderRow = ref(null);
const openWorkOrderFiles = row => {
currentWorkOrderId.value = row.id;
+ currentWorkOrderRow.value = row;
fileDialogVisible.value = true;
};
- const showReportDialog = row => {
+ 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;
- reportForm.planQuantity = row.planQuantity;
+ 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.reportType = row.reportType ?? 0;
reportForm.productProcessRouteItemId = row.productProcessRouteItemId;
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
@@ -652,6 +649,11 @@
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) {
@@ -742,6 +744,7 @@
const submitParams = {
quantity: quantity,
scrapQty: isNaN(scrapQty) ? 0 : scrapQty,
+ reportType: reportForm.reportType,
userId: reportForm.userId,
userName: reportForm.userName,
productionOperationTaskId: reportForm.workOrderId,
@@ -751,6 +754,7 @@
productionOrderRoutingOperationId:
reportForm.productionOrderRoutingOperationId,
productionOrderId: reportForm.productionOrderId,
+ workHour: reportForm.workHour,
productionOperationParamList: productionOperationParamList,
};
@@ -889,6 +893,13 @@
text-align: center;
margin-top: 20px;
}
+ .qr-only-dialog {
+ padding: 12px 0 28px;
+ }
+ .qr-canvas {
+ display: block;
+ margin: 0 auto;
+ }
.param-grid {
margin-top: 10px;
border-top: 1px solid #ebe9f3;
--
Gitblit v1.9.3