From fc940d1939db4b832f2fad50aeea1cdeb4a638f3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 12:00:25 +0800
Subject: [PATCH] 报工页面改为两列
---
src/views/productionManagement/workOrder/components/ProductionRecordForm.vue | 127 ++++++++++++++++---------------
src/views/productionManagement/workOrder/index.vue | 86 ++++++++++++---------
2 files changed, 113 insertions(+), 100 deletions(-)
diff --git a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
index fb309a1..908e637 100644
--- a/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
+++ b/src/views/productionManagement/workOrder/components/ProductionRecordForm.vue
@@ -84,67 +84,70 @@
<template>
<el-form ref="formRef" :model="formData" :rules="rules" :label-width="`${labelWidth}px`">
- <el-form-item
- v-for="(item, index) in formData.list"
- :key="item.id"
- :label="fieldLabel(item)"
- :prop="`list.${index}.value`"
- >
- <el-input-number
- v-if="getType(item) === '鏁板�兼牸寮�'"
- v-model="item.value"
- :controls="false"
- style="width: 100%"
- placeholder="璇疯緭鍏�"
- />
- <el-date-picker
- v-else-if="getType(item) === '鏃堕棿鏍煎紡'"
- v-model="item.value"
- type="datetime"
- value-format="YYYY-MM-DD HH:mm:ss"
- format="YYYY-MM-DD HH:mm:ss"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- />
- <el-date-picker
- v-else-if="getType(item) === '鏃ユ湡鏍煎紡'"
- v-model="item.value"
- type="date"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- />
- <el-select
- v-else-if="getType(item) === '鏄�/鍚﹂�夋'"
- v-model="item.value"
- placeholder="璇烽�夋嫨"
- clearable
- style="width: 100%"
- >
- <el-option label="鏄�" value="鏄�"/>
- <el-option label="鍚�" value="鍚�"/>
- </el-select>
- <el-select
- v-else-if="getType(item) === '鏈哄彴閫夋嫨'"
- v-model="item.value"
- placeholder="璇烽�夋嫨"
- clearable
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in deviceOptions"
- :key="index"
- :label="item.deviceName"
- :value="item.deviceName"
- ></el-option>
- </el-select>
- <el-input
- v-else
- v-model="item.value"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
+ <el-row :gutter="20">
+ <el-col :span="12" v-for="(item, index) in formData.list" :key="item.id">
+ <el-form-item
+ :label="fieldLabel(item)"
+ :prop="`list.${index}.value`"
+ >
+ <el-input-number
+ v-if="getType(item) === '鏁板�兼牸寮�'"
+ v-model="item.value"
+ :controls="false"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
+ <el-date-picker
+ v-else-if="getType(item) === '鏃堕棿鏍煎紡'"
+ v-model="item.value"
+ type="datetime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ />
+ <el-date-picker
+ v-else-if="getType(item) === '鏃ユ湡鏍煎紡'"
+ v-model="item.value"
+ type="date"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ />
+ <el-select
+ v-else-if="getType(item) === '鏄�/鍚﹂�夋'"
+ v-model="item.value"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/>
+ </el-select>
+ <el-select
+ v-else-if="getType(item) === '鏈哄彴閫夋嫨'"
+ v-model="item.value"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(device, deviceIndex) in deviceOptions"
+ :key="deviceIndex"
+ :label="device.deviceName"
+ :value="device.deviceName"
+ ></el-option>
+ </el-select>
+ <el-input
+ v-else
+ v-model="item.value"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</template>
\ No newline at end of file
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 28a22a4..b6c4300 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -182,47 +182,57 @@
</el-dialog>
<el-dialog v-model="reportDialogVisible"
title="鎶ュ伐"
- width="500px">
+ width="800px">
<el-form ref="reportFormRef"
:model="reportForm"
:rules="reportFormRules"
label-width="120px">
- <el-form-item label="寰呯敓浜ф暟閲�">
- <el-input v-model="reportForm.planQuantity"
- readonly
- style="width: 300px"/>
- </el-form-item>
- <el-form-item label="鏈鐢熶骇鏁伴噺" prop="quantity">
- <el-input v-model.number="reportForm.quantity"
- type="number"
- min="1"
- step="1"
- style="width: 300px"
- placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
- @input="handleQuantityInput"/>
- </el-form-item>
- <el-form-item label="鎶ュ簾鏁伴噺" prop="scrapQty">
- <el-input v-model.number="reportForm.scrapQty"
- type="number"
- min="0"
- step="1"
- style="width: 300px"
- placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
- @input="handleScrapQtyInput"/>
- </el-form-item>
- <el-form-item label="鐝粍淇℃伅">
- <el-select v-model="reportForm.userId"
- style="width: 300px"
- placeholder="璇烽�夋嫨鐝粍淇℃伅"
- clearable
- filterable
- @change="handleUserChange">
- <el-option v-for="user in userOptions"
- :key="user.userId"
- :label="user.userName"
- :value="user.userId"/>
- </el-select>
- </el-form-item>
+ <el-row :gutter="20">
+ <el-col :span="12">
+ <el-form-item label="寰呯敓浜ф暟閲�">
+ <el-input v-model="reportForm.planQuantity"
+ readonly
+ style="width: 100%"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏈鐢熶骇鏁伴噺" prop="quantity">
+ <el-input v-model.number="reportForm.quantity"
+ type="number"
+ min="1"
+ step="1"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
+ @input="handleQuantityInput"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎶ュ簾鏁伴噺" prop="scrapQty">
+ <el-input v-model.number="reportForm.scrapQty"
+ type="number"
+ min="0"
+ step="1"
+ style="width: 100%"
+ placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
+ @input="handleScrapQtyInput"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐝粍淇℃伅">
+ <el-select v-model="reportForm.userId"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鐝粍淇℃伅"
+ clearable
+ filterable
+ @change="handleUserChange">
+ <el-option v-for="user in userOptions"
+ :key="user.userId"
+ :label="user.userName"
+ :value="user.userId"/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<ProductionRecordForm ref="productionRecordFormRef" :list="processParamList"/>
</el-form>
<template #footer>
@@ -986,4 +996,4 @@
height: 140px !important;
}
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3