From ade4155408a163bd95027b295595963e14faa365 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 25 Aug 2026 11:05:52 +0800
Subject: [PATCH] MRB

---
 .../src/views/modules/mrb/mrbRecord.vue       | 202 +++++++++---------
 1 file changed, 106 insertions(+), 96 deletions(-)

diff --git a/cclqms-vue/src/views/modules/mrb/mrbRecord.vue b/cclqms-vue/src/views/modules/mrb/mrbRecord.vue
index 1de34bc..3dec883 100644
--- a/cclqms-vue/src/views/modules/mrb/mrbRecord.vue
+++ b/cclqms-vue/src/views/modules/mrb/mrbRecord.vue
@@ -173,152 +173,155 @@
         <div :style="{ height: secondHeight + 'px' }" class="mrb-bottom-pane">
           <template v-if="isCurrentIqcType">
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.reportNo')">
+              <el-form-item :label="$t('mrb.field.reportNoBi')">
                 <el-input :value="currentRow.reportNo || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
               <el-form-item :label="$t('mrb.field.bu')">
-                <el-input :value="currentRow.buNo || ''" disabled style="width: 120px"></el-input>
+                <el-input :value="currentRow.buNo || ''" disabled style="width: 110px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.status')">
-                <el-input :value="currentRow.status || ''" disabled style="width: 110px"></el-input>
+              <el-form-item :label="$t('mrb.field.dateBi')">
+                <el-date-picker :value="currentRow.mrbDate" disabled type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 140px"></el-date-picker>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.type')">
-                <el-input :value="currentRow.type || ''" disabled style="width: 90px"></el-input>
+              <el-form-item :label="$t('mrb.field.initiatorBi')">
+                <el-input :value="currentRow.initiator || ''" disabled style="width: 110px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.date')">
-                <el-date-picker :value="currentRow.mrbDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
+              <el-form-item :label="$t('mrb.field.sqeEngineerBi')">
+                <el-input :value="currentRow.sqeEngineerName || currentRow.sqeEngineer || ''" disabled style="width: 215px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.initiator')">
-                <el-input :value="currentRow.initiator || ''" disabled style="width: 180px"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('mrb.field.sqeEngineer')">
-                <el-input :value="currentRow.sqeEngineer || ''" disabled style="width: 260px"></el-input>
-              </el-form-item>
               <el-form-item :label="$t('mrb.field.operationsCenter')">
                 <el-input :value="currentRow.operationsCenter || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.industryType')">
+              <el-form-item :label="$t('mrb.field.industryTypeBi')">
                 <el-input :value="currentRow.industryType || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
+              <el-form-item :label="$t('mrb.field.materialPnBi')">
+                <el-input :value="currentRow.materialPn || ''" disabled style="width: 135px"></el-input>
+                <el-input :value="currentRow.materialPnName || ''" disabled style="width: 282px"></el-input>
+              </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.materialPn')">
-                <el-input :value="currentRow.materialPn || ''" disabled style="width: 396px"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('mrb.field.purchaseNo')">
+              <el-form-item :label="$t('mrb.field.purchaseNoBi')">
                 <el-input :value="currentRow.purchaseNo || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.supplierLotNo')">
+              <el-form-item :label="$t('mrb.field.supplierLotNoBi')">
                 <el-input :value="currentRow.supplierLotNo || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
+              <el-form-item :label="$t('mrb.field.supplierNoBi')">
+                <el-input :value="currentRow.supplierNo || ''" disabled style="width: 135px"></el-input>
+                <el-input :value="currentRow.supplierNoName || ''" disabled style="width: 282px"></el-input>
+              </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.supplierNo')">
-                <el-input :value="currentRow.supplierNo || ''" disabled style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('mrb.field.materialCategory')">
+              <el-form-item :label="$t('mrb.field.materialCategoryBi')">
                 <el-input :value="currentRow.materialCategory || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.purchaseQty')">
+              <el-form-item :label="$t('mrb.field.purchaseQtyBi')">
                 <el-input :value="currentRow.purchaseQty || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.defectRate')">
-                <el-input :value="currentRow.defectRate || ''" disabled style="width: 120px"></el-input>
+              <el-form-item :label="$t('mrb.field.defectRateBi')">
+                <el-input-number :value="currentRow.defectRate" disabled :precision="2" :step="0.01" :controls="false" style="width: 180px"></el-input-number>
               </el-form-item>
-            </el-form>
-            <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.defectQty')">
+              <el-form-item :label="$t('mrb.field.defectQtyBi')">
                 <el-input :value="currentRow.defectQty || ''" disabled style="width: 180px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.materialDefectType')">
-                <el-input :value="currentRow.materialDefectType || ''" disabled style="width: 180px"></el-input>
+            </el-form>
+
+            <el-form :inline="true" label-position="top" :model="currentRow">
+              <el-form-item :label="$t('mrb.field.materialDefectTypeBi')">
+                <el-input :value="currentRow.materialDefectType || ''" disabled style="width: 373px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.processStation')">
-                <el-input :value="currentRow.processStation || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.processStationBi')">
+                <el-input :value="currentRow.processStation || ''" disabled style="width: 373px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.nonconformanceDescription')" style="display: block;">
-                <el-input type="textarea" :rows="3" resize="none" :value="currentRow.nonconformanceDescription || ''" disabled style="width: 804px;height: 30px"></el-input>
+              <el-form-item :label="$t('mrb.field.nonconformanceDescriptionBi')" style="display: block;">
+                <el-input type="textarea" :rows="3" resize="none" :value="currentRow.nonconformanceDescription || ''" disabled style="width: 824px;height: 30px"></el-input>
               </el-form-item>
             </el-form>
           </template>
 
           <template v-else>
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.reportNo')">
-                <el-input :value="currentRow.reportNo || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.reportNoBi')">
+                <el-input :value="currentRow.reportNo || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
               <el-form-item :label="$t('mrb.field.bu')">
-                <el-input :value="currentRow.buNo || ''" disabled style="width: 120px"></el-input>
+                <el-input :value="currentRow.buNo || ''" disabled style="width: 110px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.status')">
-                <el-input :value="currentRow.status || ''" disabled style="width: 110px"></el-input>
+              <el-form-item :label="$t('mrb.field.dateBi')">
+                <el-date-picker :value="currentRow.mrbDate" disabled type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 140px"></el-date-picker>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.type')">
-                <el-input :value="currentRow.type || ''" disabled style="width: 90px"></el-input>
+              <el-form-item :label="$t('mrb.field.initiatorBi')">
+                <el-input :value="currentRow.initiator || ''" disabled style="width: 110px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.date')">
-                <el-date-picker :value="currentRow.mrbDate" disabled type="date" value-format="yyyy-MM-dd" style="width: 150px"></el-date-picker>
+              <el-form-item :label="$t('mrb.field.ipqeSupervisorBi')">
+                <el-input :value="currentRow.ipqeProductionSupervisor || ''" disabled style="width: 215px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.initiator')">
-                <el-input :value="currentRow.initiator || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.operationsCenter')">
+                <el-input :value="currentRow.operationsCenter || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.ipqeSupervisor')">
-                <el-input :value="currentRow.ipqeProductionSupervisor || ''" disabled style="width: 260px"></el-input>
+              <el-form-item :label="$t('mrb.field.workCellBi')">
+                <el-input :value="currentRow.workCell || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.operationsCenter')">
-                <el-input :value="currentRow.operationsCenter || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.productPnBi')">
+                <el-input :value="currentRow.productPn || ''" disabled style="width: 120px"></el-input>
+                <el-input :value="currentRow.productPnName || ''" disabled style="width: 281px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.productPn')">
-                <el-input :value="currentRow.productPn || ''" disabled style="width: 260px"></el-input>
+              <el-form-item :label="$t('mrb.field.directCustomerBi')">
+                <el-input :value="currentRow.directCustomer || ''" disabled style="width: 120px"></el-input>
+                <el-input :value="currentRow.directCustomerName || ''" disabled style="width: 281px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.directCustomer')">
-                <el-input :value="currentRow.directCustomer || ''" disabled style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('mrb.field.endCustomer')">
-                <el-input :value="currentRow.endCustomer || ''" disabled style="width: 260px"></el-input>
+              <el-form-item :label="$t('mrb.field.endCustomerBi')">
+                <el-input :value="currentRow.endCustomer || ''" disabled style="width: 120px"></el-input>
+                <el-input :value="currentRow.endCustomerName || ''" disabled style="width: 281px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.shopOrder')">
-                <el-input :value="currentRow.shopOrder || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.shopOrderBi')">
+                <el-input :value="currentRow.shopOrder || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.shopOrderQty')">
-                <el-input :value="currentRow.shopOrderQty || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.shopOrderQtyBi')">
+                <el-input :value="currentRow.shopOrderQty || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.defectQty')">
-                <el-input :value="currentRow.defectQty || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.defectQtyBi')">
+                <el-input :value="currentRow.defectQty || ''" disabled style="width: 195px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.defectRate')">
-                <el-input :value="currentRow.defectRate || ''" disabled style="width: 120px"></el-input>
+              <el-form-item :label="$t('mrb.field.defectRateBi2')">
+                <el-input-number :value="currentRow.defectRate" disabled :precision="2" :step="0.01" :controls="false" style="width: 195px"></el-input-number>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.workCell')">
-                <el-input :value="currentRow.workCell || ''" disabled style="width: 180px"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('mrb.field.station')">
-                <el-input :value="currentRow.station || ''" disabled style="width: 180px"></el-input>
+              <el-form-item :label="$t('mrb.field.stationBi')">
+                <el-input :value="currentRow.station || ''" disabled style="width: 404px"></el-input>
               </el-form-item>
-              <el-form-item :label="$t('mrb.field.nonconformanceType')">
-                <el-input :value="currentRow.nonconformanceType || ''" disabled style="width: 396px"></el-input>
+              <el-form-item :label="$t('mrb.field.nonconformanceTypeBi')">
+                <el-input :value="currentRow.nonconformanceType || ''" disabled style="width: 404px"></el-input>
               </el-form-item>
             </el-form>
+
             <el-form :inline="true" label-position="top" :model="currentRow">
-              <el-form-item :label="$t('mrb.field.nonconformanceDescription')" style="display: block;">
-                <el-input type="textarea" :rows="3" resize="none" :value="currentRow.nonconformanceDescription || ''" disabled style="width: 804px;height: 30px"></el-input>
+              <el-form-item :label="$t('mrb.field.nonconformanceDescriptionBi')" style="display: block;">
+                <el-input type="textarea" :rows="3" resize="none" :value="currentRow.nonconformanceDescription || ''" disabled style="width: 824px;height: 30px"></el-input>
               </el-form-item>
             </el-form>
           </template>
 
-          <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 47px">
+          <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 45px">
             <el-form-item :label="$t('mrb.field.baseInfoAttachment')" style="display: block;">
               <div class="mrb-attachment-box">
                 <template v-if="currentBaseInfoAttachmentList.length > 0">
@@ -342,31 +345,38 @@
       <el-tab-pane :label="currentConfirmTabLabel" name="confirmInfo">
         <div :style="{ height: secondHeight + 'px' }" class="mrb-bottom-pane">
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item :label="$t('mrb.field.issueScar')">
-              <el-input :value="formatIssueScar(currentRow.issueScar)" disabled style="width: 180px"></el-input>
+            <el-form-item :label="$t('mrb.field.issueScarBi')">
+              <el-input :value="formatIssueScar(currentRow.issueScar)" disabled style="width: 404px"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('mrb.field.buyer')">
-              <el-input :value="currentRow.buyer || ''" disabled style="width: 260px"></el-input>
+            <el-form-item :label="$t('mrb.field.mrbConclusionBi')">
+              <el-input :value="currentRow.mrbConclusion || ''" disabled style="width: 404px"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('mrb.field.planner')">
-              <el-input :value="currentRow.planner || ''" disabled style="width: 260px"></el-input>
+          </el-form>
+
+          <el-form :inline="true" label-position="top" :model="currentRow">
+            <el-form-item :label="$t('mrb.field.buyerBi')">
+              <el-input :value="currentRow.buyer || ''" disabled style="width: 120px"></el-input>
+              <el-input :value="currentRow.buyerName || ''" disabled style="width: 281px"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('mrb.field.mrbConclusion')">
-              <el-input :value="currentRow.mrbConclusion || ''" disabled style="width: 260px"></el-input>
+            <el-form-item :label="$t('mrb.field.plannerBi')">
+              <el-input :value="currentRow.planner || ''" disabled style="width: 120px"></el-input>
+              <el-input :value="currentRow.plannerName || ''" disabled style="width: 281px"></el-input>
             </el-form-item>
           </el-form>
+
           <el-form :inline="true" label-position="top" :model="currentRow">
-            <el-form-item :label="isCurrentIqcType ? $t('mrb.field.sqeComments') : $t('mrb.field.comments')" style="display: block;">
-              <el-input type="textarea" :rows="3" resize="none" :value="currentRow.sqeComments || ''" disabled style="width: 804px;height: 30px"></el-input>
+            <el-form-item :label="isCurrentIqcType ? $t('mrb.field.sqeCommentsBi') : $t('mrb.field.commentsBi')" style="display: block;">
+              <el-input type="textarea" :rows="3" resize="none" :value="currentRow.sqeComments || ''" disabled style="width: 824px;height: 30px"></el-input>
             </el-form-item>
           </el-form>
+
           <el-form :inline="true" label-position="top" :model="currentRow" style="margin-top: 45px">
             <el-form-item :label="$t('mrb.field.countersignList')" style="display: block;">
               <el-table
                 :data="currentRowCountersignItemList"
                 border
                 :height="220"
-                style="width: 804px">
+                style="width: 824px">
                 <el-table-column prop="itemNo" :label="$t('mrb.field.itemNo')" width="140" header-align="center" align="center" />
                 <el-table-column prop="itemDesc" :label="$t('mrb.field.itemDesc')" min-width="220" header-align="center" />
                 <el-table-column prop="executor" :label="$t('mrb.field.executor')" width="160" header-align="center" />
@@ -644,16 +654,16 @@
                     <dict-data-select v-model="formData.operationsCenter" dict-type="mrb_operations_center" :use-default-value="false" clearable :disabled="formReadOnly" />
                   </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('mrb.field.workCellBi')">
+                    <dict-data-select v-model="formData.workCell" dict-type="mrb_work_cell" :use-default-value="false" clearable :disabled="formReadOnly" />
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item>
                     <span slot="label" class="click-label" @click="getBaseList(chooseTagNo.productPn, 3)"><a herf="#">{{ $t('mrb.field.productPnBi') }}</a></span>
                     <el-input v-model="formData.productPn" :disabled="formReadOnly" @blur="productPnBlur(chooseTagNo.productPn)" style="width: 120px" />
-                    <el-input v-model="formData.productPnName" disabled style="width: 279px" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item :label="$t('mrb.field.workCellBi')">
-                    <dict-data-select v-model="formData.workCell" dict-type="mrb_work_cell" :use-default-value="false" clearable :disabled="formReadOnly" />
+                    <el-input v-model="formData.productPnName" disabled style="width: 281px" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -663,14 +673,14 @@
                   <el-form-item>
                     <span slot="label" class="click-label" @click="getBaseList(chooseTagNo.directCustomer, 4)"><a herf="#">{{ $t('mrb.field.directCustomerBi') }}</a></span>
                     <el-input v-model="formData.directCustomer" :disabled="formReadOnly" @blur="directCustomerBlur(chooseTagNo.directCustomer)" style="width: 120px" />
-                    <el-input v-model="formData.directCustomerName" disabled style="width: 279px" />
+                    <el-input v-model="formData.directCustomerName" disabled style="width: 281px" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item>
                     <span slot="label" class="click-label" @click="getBaseList(chooseTagNo.endCustomer, 5)"><a herf="#">{{ $t('mrb.field.endCustomerBi') }}</a></span>
                     <el-input v-model="formData.endCustomer" :disabled="formReadOnly" @blur="endCustomerBlur(chooseTagNo.endCustomer)" style="width: 120px" />
-                    <el-input v-model="formData.endCustomerName" disabled style="width: 279px" />
+                    <el-input v-model="formData.endCustomerName" disabled style="width: 281px" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -729,7 +739,7 @@
               </el-row>
 
               <el-form-item :label="$t('mrb.field.nonconformanceDescriptionBi')" style="margin-top: 40px">
-                <el-input type="textarea" :rows="3" resize="none" v-model="formData.nonconformanceDescription" :disabled="formReadOnly" style="width: 804px" />
+                <el-input type="textarea" :rows="3" resize="none" v-model="formData.nonconformanceDescription" :disabled="formReadOnly" style="width: 824px" />
               </el-form-item>
               <el-form :inline="true" label-position="top" :model="formData" style="margin-top: 45px">
                 <el-form-item style="display: block;">