From dda0b701b96d7f80e33f1f1c495b20da2aa1b0ad Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 24 Jul 2026 10:46:03 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-24=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/com_mrb_register.vue  | 158 +++++++++++++-----
 1 file changed, 114 insertions(+), 44 deletions(-)

diff --git a/src/views/modules/yieldReport/com_mrb_register.vue b/src/views/modules/yieldReport/com_mrb_register.vue
index 282077e..9d939ee 100644
--- a/src/views/modules/yieldReport/com_mrb_register.vue
+++ b/src/views/modules/yieldReport/com_mrb_register.vue
@@ -46,26 +46,40 @@
       </template>
 
       <template v-else>
-        <el-form
-          ref="singleFormRef"
-          class="single-form"
-          :model="singleForm"
-          :rules="formRules"
-          label-width="90px">
-          <el-form-item label="卷号1" prop="rollNo">
-            <el-input v-model.trim="singleForm.rollNo" maxlength="100" clearable placeholder="请输入卷号"></el-input>
-          </el-form-item>
-          <el-form-item label="MRB" prop="mrb">
-            <el-input v-model.trim="singleForm.mrb" maxlength="100" clearable placeholder="请输入MRB异常单号"></el-input>
-          </el-form-item>
-          <el-form-item label="制程异常单" prop="mrbInspectionReport">
-            <el-input v-model.trim="singleForm.mrbInspectionReport" maxlength="100" clearable placeholder="请输入制程异常单号"></el-input>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input v-model.trim="singleForm.mrbRemark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="备注（选填）"></el-input>
-          </el-form-item>
+        <el-form ref="singleFormRef" class="mrb-entry-form" :model="singleForm" :rules="formRules" label-position="top">
+          <el-row :gutter="16" class="mrb-form-row">
+            <el-col :span="12">
+              <el-form-item class="mrb-field" label="工单号">
+                <el-input :value="scheduleData.orderNo" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="mrb-field" label="卷号" prop="rollNo">
+                <el-input v-model.trim="singleForm.rollNo" maxlength="100" clearable placeholder="请输入卷号"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="16" class="mrb-form-row">
+            <el-col :span="12">
+              <el-form-item class="mrb-field" label="MRB" prop="mrb">
+                <el-input v-model.trim="singleForm.mrb" maxlength="100" clearable placeholder="请输入MRB异常单号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item class="mrb-field" label="制程异常单" prop="mrbInspectionReport">
+                <el-input v-model.trim="singleForm.mrbInspectionReport" maxlength="100" clearable placeholder="请输入制程异常单号"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="16" class="mrb-form-row">
+            <el-col :span="24">
+              <el-form-item class="mrb-field mrb-field-full" label="备注">
+                <el-input v-model.trim="singleForm.mrbRemark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="备注（选填）"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-        <el-footer style="height:25px;margin-top: 70px;text-align:center">
+        <el-footer style="height:25px;margin-top: 60px;text-align:center">
           <el-button type="primary" :loading="loading" @click="submitForm">确定</el-button>
           <el-button @click="closeDialog">关闭</el-button>
         </el-footer>
@@ -78,29 +92,48 @@
       :close-on-click-modal="false"
       v-drag
       :visible.sync="editDialogVisible"
-      width="540px"
+      width="545px"
       :append-to-body="true"
       @close="handleEditClose">
       <el-form
         ref="editFormRef"
-        class="single-form"
+        class="mrb-entry-form"
         :model="editForm"
         :rules="formRules"
-        label-width="90px">
-        <el-form-item label="卷号" prop="rollNo">
-          <el-input v-model.trim="editForm.rollNo" maxlength="100" clearable placeholder="请输入卷号"></el-input>
-        </el-form-item>
-        <el-form-item label="MRB" prop="mrb">
-          <el-input v-model.trim="editForm.mrb" maxlength="100" clearable placeholder="请输入MRB异常单号"></el-input>
-        </el-form-item>
-        <el-form-item label="制程异常单" prop="mrbInspectionReport">
-          <el-input v-model.trim="editForm.mrbInspectionReport" maxlength="100" clearable placeholder="请输入制程异常单号"></el-input>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model.trim="editForm.mrbRemark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="备注（选填）"></el-input>
-        </el-form-item>
+        label-position="top">
+        <el-row :gutter="16" class="mrb-form-row">
+          <el-col :span="12">
+            <el-form-item class="mrb-field" label="工单号">
+              <el-input :value="scheduleData.orderNo" readonly></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item class="mrb-field" label="卷号" prop="rollNo">
+              <el-input v-model.trim="editForm.rollNo" maxlength="100" clearable placeholder="请输入卷号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16" class="mrb-form-row">
+          <el-col :span="12">
+            <el-form-item class="mrb-field" label="MRB" prop="mrb">
+              <el-input v-model.trim="editForm.mrb" maxlength="100" clearable placeholder="请输入MRB异常单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item class="mrb-field" label="制程异常单" prop="mrbInspectionReport">
+              <el-input v-model.trim="editForm.mrbInspectionReport" maxlength="100" clearable placeholder="请输入制程异常单号"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16" class="mrb-form-row">
+          <el-col :span="24">
+            <el-form-item class="mrb-field mrb-field-full" label="备注">
+              <el-input v-model.trim="editForm.mrbRemark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="备注（选填）"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <el-footer style="height:25px;margin-top: 70px;text-align:center">
+      <el-footer style="height:25px;margin-top: 60px;text-align:center">
         <el-button type="primary" :loading="loading" @click="confirmEdit">确定</el-button>
         <el-button @click="editDialogVisible = false">关闭</el-button>
       </el-footer>
@@ -169,7 +202,7 @@ export default {
       return this.mode !== 'single'
     },
     dialogWidth () {
-      return this.isListMode ? '1000px' : '540px'
+      return this.isListMode ? '1000px' : '545px'
     },
     editDialogTitle () {
       return this.editDialogMode === 'edit' ? 'MRB异常单编辑' : 'MRB异常单登记'
@@ -562,18 +595,55 @@ export default {
   color: #c0c4cc;
 }
 
-.dialog-footer {
-  text-align: center;
-  margin-top: 15px;
+.mrb-entry-form {
+  margin-left: 7px;
+  margin-top: -5px;
+}
+
+.mrb-entry-form /deep/ .el-form-item {
+  margin-bottom: 12px;
+}
+
+.mrb-entry-form /deep/ .el-form-item__label {
+  font-weight: 500;
+  color: #606266;
+  padding-bottom: 4px;
+}
+
+.mrb-entry-form .mrb-field {
+  width: 100%;
+}
+
+.mrb-entry-form .mrb-field-full {
+  width: 100%;
+}
+
+.mrb-entry-form .mrb-field /deep/ .el-input,
+.mrb-entry-form .mrb-field-full /deep/ .el-textarea {
+  width: 100%;
+}
+
+.mrb-entry-form .mrb-field /deep/ .el-input__inner,
+.mrb-entry-form .mrb-field-full /deep/ .el-textarea__inner {
+  border-radius: 6px;
+  border: 1px solid #dcdfe6;
+  transition: all 0.2s ease;
+}
+
+.mrb-entry-form .mrb-field /deep/ .el-input__inner:focus,
+.mrb-entry-form .mrb-field-full /deep/ .el-textarea__inner:focus {
+  border-color: #9ac3d0;
+  box-shadow: 0 0 0 2px rgba(154, 195, 208, 0.1);
 }
 
-.dialog-footer-single {
-  height: 25px;
-  margin-top: 70px;
+.mrb-entry-form .mrb-field-full /deep/ .el-textarea__inner {
+  resize: none;
 }
 
-.single-form {
-  padding: 6px 8px 0;
+.mrb-dialog-footer {
+  height: 35px;
+  margin-top: 24px;
+  text-align: center;
 }
 </style>