From ce6a2bac234c48dce836f6c5d45c63da7c1e7424 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 31 三月 2026 11:48:16 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management into dev_长治_健齿齿科器材
---
src/views/productionManagement/workOrder/index.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index ea22e4f..eaceff1 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -173,6 +173,13 @@
label-width="120px">
<el-row :gutter="30">
<el-col :span="12">
+ <el-form-item label="浜у搧鍚嶇О">
+ <el-input v-model="reportForm.productName"
+ readonly
+ style="width: 300px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="寰呯敓浜ф暟閲�">
<el-input v-model="reportForm.planQuantity"
readonly
@@ -250,6 +257,8 @@
<el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="160" />
<el-table-column prop="model" label="鍨嬪彿" min-width="150" />
<el-table-column prop="unit" label="鍗曚綅" width="90" align="center" />
+ <el-table-column prop="customer" label="渚涘簲鍟�" min-width="160" show-overflow-tooltip />
+ <el-table-column prop="batchNo" label="鎵瑰彿" min-width="180" show-overflow-tooltip />
<el-table-column prop="reportQty" label="棰嗙敤鏁伴噺" width="160" align="center">
<template #default="{ row }">
<el-input-number
@@ -288,7 +297,7 @@
<el-dialog
v-model="addMaterialDialogVisible"
title="閫夋嫨鍘熸潗鏂�"
- width="1000px"
+ width="1400px"
top="5vh"
:close-on-click-modal="false"
append-to-body
@@ -308,6 +317,8 @@
<el-table-column prop="productName" label="浜у搧鍚嶇О" min-width="160" />
<el-table-column prop="model" label="鍨嬪彿" min-width="150" />
<el-table-column prop="unit" label="鍗曚綅" width="90" align="center" />
+ <el-table-column prop="customer" label="渚涘簲鍟�" min-width="160" show-overflow-tooltip />
+ <el-table-column prop="batchNo" label="鎵瑰彿" min-width="180" show-overflow-tooltip />
<el-table-column prop="requisitionQty" label="鍙鐢ㄦ暟閲�" width="140" align="center" />
</el-table>
@@ -476,6 +487,8 @@
const userOptions = ref([]);
const deviceOptions = ref([]);
const reportForm = reactive({
+ // 鎶ュ伐寮规閲屸�滀骇鍝佸悕绉扳�濆彧璇诲洖鏄�
+ productName: "",
planQuantity: 0,
totalInvestment: 0,
quantity: null,
@@ -889,6 +902,8 @@
const showReportDialog = async row => {
currentReportRowData.value = row;
processParamList.value = await getProcessParamList(row)
+ // 鍏煎鍚庣/琛ㄦ牸瀛楁鍛藉悕锛氫紭鍏� row.productName锛屽叾娆� row.productCategory
+ reportForm.productName = row.productName ?? row.productCategory ?? ''
reportForm.planQuantity = row.planQuantity;
reportForm.totalInvestment = row.totalInvestment;
reportForm.quantity =
--
Gitblit v1.9.3