From 4e684cf78bf5526a4d43d5922a229861948cb311 Mon Sep 17 00:00:00 2001
From: git_rabbit <zhaozhengyi1b@126.com>
Date: Sat, 17 Jan 2026 10:12:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=8A=A5=E8=A1=A8/=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86):=20=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为报工表单添加必填字段验证，确保炉号、进料单和客户定单在相应工序中必须填写
调整库存管理页面表格列显示，隐藏仓库编码和名称，增加工单号和备注列
---
 .../productionMaterial/MmInventory.vue        | 23 +++++--------
 src/views/touchScreen/report/index.vue        | 34 +++++++++++++++++--
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 3f8346c..ac5c055 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -538,7 +538,7 @@
         </el-dialog>
 
         <!-- 进出库记录弹出框 -->
-        <el-dialog :title="title" v-model="openRecord" width="80%" top="5vh">
+        <el-dialog :title="title" v-model="openRecord" width="90%" top="5vh">
             <el-form :model="queryParamsRecord" label-position="right" inline ref="queryRecordRef" @submit.prevent>
                 <el-form-item label="出入库" prop="searchType">
                     <el-select @change="handleRecordFlagChange" v-model="queryParamsRecord.recordFlag" filterable placeholder="请选择出入库">
@@ -585,8 +585,6 @@
                 <el-table-column prop="outboundNo" label="出库单号" align="center" />
                 <el-table-column prop="materialCode" label="物料编码" align="center" />
                 <el-table-column prop="materialName" label="物料名称" align="center" v-if="columns.showColumn('materialName')" />
-                <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
-                <el-table-column prop="warehouseName" label="仓库名称" align="center" v-if="columns.showColumn('warehouseName')" />
                 <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
                 <el-table-column prop="locationName" label="库位名称" align="center" v-if="columns.showColumn('locationName')" />
                 <el-table-column prop="quantity" label="出库数量" align="center" v-if="columns.showColumn('quantity')">
@@ -612,15 +610,9 @@
                             disabled
                             >已撤销</el-button
                         >
-                        <el-button
-                            v-else
-                            type="info"
-                            size="small"
-                            title="撤销"
-                            v-hasPermi="['mmrecordinbound:delete']"
-                            @click="handleCancel(scope.row)"
+                        <el-button v-else type="info" size="small" title="撤销" v-hasPermi="['mmrecordinbound:delete']" @click="handleCancel(scope.row)"
                             >撤销</el-button
-                        > 
+                        >
                     </template>
                 </el-table-column>
             </el-table>
@@ -651,9 +643,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="transactionType" label="入库类型" align="center" v-if="columns.showColumn('transactionType')" />
-                <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
                 <el-table-column prop="batchNo" label="批次号" align="center" v-if="columns.showColumn('batchNo')" />
-                <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
+                <el-table-column prop="workorder" label="工单号" align="center" />
+                <el-table-column prop="operator" label="操作员" align="center" />
+                <el-table-column prop="remarks" label="备注" align="center" />
                 <el-table-column label="操作">
                     <template #default="scope">
                         <el-button
@@ -717,8 +710,8 @@ const queryParams = reactive({
 const columns = ref([
     // { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
     { visible: true, align: 'center', type: '', prop: 'materialCode', label: '物料编码', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
-    { visible: true, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseCode', label: '仓库编码', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationCode', label: '库位编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationName', label: '库位名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'batchNo', label: '批次号', showOverflowTooltip: true },
diff --git a/src/views/touchScreen/report/index.vue b/src/views/touchScreen/report/index.vue
index 0760d19..f5622d2 100644
--- a/src/views/touchScreen/report/index.vue
+++ b/src/views/touchScreen/report/index.vue
@@ -17,9 +17,9 @@
                                     <el-card v-if="formData.workorder" class="mt-4">
                                         <v-text-field type="number" :label="processId === 10 ? '报工数' : '完成数'" v-model="formData.finishNum"></v-text-field>
                                         <v-text-field type="number" label="不良数" v-model="formData.badNum"></v-text-field>
-                                        <v-text-field v-if="processId === 10" label="炉号" v-model="formData.stoveCode"></v-text-field>
-                                        <v-text-field v-if="processId === 10" label="进料单" v-model="formData.feedOrder"></v-text-field>
-                                        <v-text-field v-if="processId === 90" label="客户定单" v-model="formData.customerOrder"></v-text-field>
+                                        <v-text-field v-if="processId === 10" label="炉号" v-model="formData.stoveCode" required></v-text-field>
+                                        <v-text-field v-if="processId === 10" label="进料单" v-model="formData.feedOrder" required></v-text-field>
+                                        <v-text-field v-if="processId === 90" label="客户定单" v-model="formData.customerOrder" required></v-text-field>
                                         <v-text-field label="作业员" v-model="formData.worker"></v-text-field>
                                         <div class="d-flex justify-end">
                                             <v-btn class="bg-blue-darken-1" @click="submit">{{ getButtonName() }}</v-btn>
@@ -321,6 +321,34 @@ function processChange() {
 }
 
 function submit() {
+    // 表单验证
+    if (processId.value === 10) {
+        // 领料工序：炉号和进料单必填
+        if (!formData.value.stoveCode) {
+            dialog.show = true
+            dialog.class = 'bg-amber'
+            dialog.title = '验证提示'
+            dialog.text = '请填写炉号'
+            return
+        }
+        if (!formData.value.feedOrder) {
+            dialog.show = true
+            dialog.class = 'bg-amber'
+            dialog.title = '验证提示'
+            dialog.text = '请填写进料单'
+            return
+        }
+    } else if (processId.value === 90) {
+        // 出货工序：客户定单必填
+        if (!formData.value.customerOrder) {
+            dialog.show = true
+            dialog.class = 'bg-amber'
+            dialog.title = '验证提示'
+            dialog.text = '请填写客户定单'
+            return
+        }
+    }
+
     proxy
         .$confirm('确定提交数据吗？')
         .then(() => {