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 | 129 ++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 80 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index b721de6..4012821 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -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>
<!-- 鎶ュ伐寮圭獥 -->
@@ -147,6 +84,17 @@
style="width: 300px"
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"
@@ -358,7 +306,7 @@
},
{
label: "鎿嶄綔",
- width: "260",
+ width: "320",
align: "center",
dataType: "action",
fixed: "right",
@@ -367,6 +315,12 @@
name: "娴佽浆鍗�",
clickFun: row => {
downloadAndPrintWorkOrder(row);
+ },
+ },
+ {
+ name: "浜岀淮鐮�",
+ clickFun: row => {
+ showTransferCard(row);
},
},
{
@@ -411,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);
@@ -422,6 +376,7 @@
planQuantity: 0,
quantity: null,
scrapQty: null,
+ reportType: 0,
userName: "",
workOrderId: "",
reportWork: "",
@@ -640,15 +595,20 @@
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 => {
@@ -679,6 +639,7 @@
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;
@@ -783,6 +744,7 @@
const submitParams = {
quantity: quantity,
scrapQty: isNaN(scrapQty) ? 0 : scrapQty,
+ reportType: reportForm.reportType,
userId: reportForm.userId,
userName: reportForm.userName,
productionOperationTaskId: reportForm.workOrderId,
@@ -931,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