2025-10-22

优化

src/api/fixedCarrier/fixedCarrier.js

@@ -33,7 +33,8 @@ export const fixedCarrierDelete = data => createAPI('fixedCarrier/delete', 'POST
  * @param data
  * @returns {*}
  */
-export const getSiteAndBuByUserName = data => createAPI('qc/getSiteAndBuByUserName', 'POST', data)
+export const getSiteAndBuByUserName = data => createAPI('/pms/qc/getSiteAndBuByUserName', 'POST', data)
+
 
 
 

src/views/modules/fixedCarrier/fixedCarrier.vue

@@ -42,9 +42,9 @@
       border
       v-loading="dataListLoading"
       style="width: 100%;">
-      <el-table-column prop="buNo" label="BU" header-align="center" align="center" min-width="80"></el-table-column>
+      <el-table-column prop="buNo" label="BU" header-align="center" align="left" min-width="80"></el-table-column>
       <el-table-column prop="carrierNo" label="标签条码" header-align="center" align="left" min-width="120"></el-table-column>
-      <el-table-column prop="carrierTypeCode" label="载具类型编码" header-align="center" align="center" min-width="120"></el-table-column>
+      <el-table-column prop="carrierTypeCode" label="载具类型编码" header-align="center" align="left" min-width="120"></el-table-column>
       <el-table-column prop="carrierTypeName" label="载具类型名称" header-align="center" align="left" min-width="150"></el-table-column>
       <el-table-column prop="specification" label="规格描述" header-align="center" align="left" min-width="150"></el-table-column>
       <el-table-column prop="dimensions" label="尺寸" header-align="center" align="center" min-width="120"></el-table-column>
@@ -78,7 +78,7 @@
     </el-pagination>
 
     <!-- 新增和修改对话框 -->
-    <el-dialog :title="modalTitle" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="800px">
+    <el-dialog :title="modalTitle" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="600px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" ref="modalForm" style="margin-left: 7px;">
         <!-- 第一行 -->
         <el-row>
@@ -105,12 +105,12 @@
 
         <!-- 第二行 -->
         <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="载具类型编码" prop="carrierTypeCode">
               <el-input v-model="modalData.carrierTypeCode" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="载具类型名称" prop="carrierTypeName">
               <el-input v-model="modalData.carrierTypeName" style="width: 100%"></el-input>
             </el-form-item>
@@ -228,7 +228,7 @@ export default {
       pageIndex: 1,
       pageSize: 20,
       totalPage: 0,
-      height: 500,
+      height: 200,
       dataList: [],
       dataListLoading: false,
       modalFlag: false,
@@ -255,15 +255,38 @@ export default {
       },
       userBuList: [],
       rules: {
-        buNo: [{ required: true, message: '请选择BU', trigger: 'change' }],
-        carrierNo: [{ required: true, message: '请输入标签条码', trigger: 'blur' }],
-        carrierTypeCode: [{ required: true, message: '请输入载具类型编码', trigger: 'blur' }],
-        carrierTypeName: [{ required: true, message: '请输入载具类型名称', trigger: 'blur' }],
-        status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+        buNo: [{
+          required: true,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
+        carrierNo: [{
+          required: true,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
+        carrierTypeCode: [{
+          required: true,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
+        carrierTypeName: [{
+          required: true,
+          message: ' ',
+          trigger: ['blur','change']
+        }],
+        status: [{
+          required: true,
+          message: ' ',
+          trigger: ['blur','change']
+        }]
       }
     }
   },
   mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 170
+    })
     this.getSiteAndBu()
     this.getDataList()
   },
@@ -446,3 +469,4 @@ export default {
 
 
 
+

src/views/modules/yieldReport/com_mrb_register.vue

@@ -4,7 +4,7 @@
       <el-form :model="formData" :rules="rules" ref="mrbForm" label-width="65px" class="mrb-form">
         <el-form-item prop="mrb">
           <span slot="label" class="required-label">MRB</span>
-          <el-input v-model="formData.mrb" placeholder="请扫描/选择操作员" clearable></el-input>
+          <el-input v-model="formData.mrb" placeholder="请填写MRB异常单号" clearable></el-input>
         </el-form-item>
         <el-form-item prop="mrbInspectionReport">
           <span slot="label" class="required-label">质检单</span>
@@ -143,7 +143,7 @@ export default {
             if (data.code === 0 || data.code === 200) {
               this.$message.success('MRB异常单登记成功');
               this.$emit('update:visible', false);
-              // 触发确认事件，通知父组件打开过程检验对话框
+              // 触发确认事件，通知父组件刷新状态（不再打开过程检验对话框）
               this.$emit('confirmed');
             } else {
               this.$message.error(data.msg || 'MRB异常单登记失败');

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -585,14 +585,14 @@
           <legend class="customer-legend">质量检验</legend>
           <el-form style="text-align: center;">
             <el-form-item style="margin-top: 10px;">
-              <el-button class="customer-bun-mid" type="primary" @click="qualityInspectionModal"
+              <el-button class="customer-bun-mid" type="primary" @click="openProcessInspectionModal"
                          :style="processInspectionButtonStyle + 'margin-left: 15px; margin-bottom: 5px;'">
                 过程检验
               </el-button>
             </el-form-item>
 
             <el-form-item>
-              <el-button class="controller-bun" type="primary" @click="qualityInspectionModal"
+              <el-button class="controller-bun" type="primary" @click="openMrbRegisterModal"
                          style="margin-left: 15px; margin-bottom: 5px;margin-top: 10px;">
                 MRB异常单
               </el-button>
@@ -4649,21 +4649,28 @@ export default {
       });
     },
 
-    // 质量检验相关方法
-    qualityInspectionModal() {
-      // 先打开MRB异常单登记对话框
+    // 打开过程检验对话框
+    openProcessInspectionModal() {
+      // 直接打开过程检验对话框
+      this.showProcessInspectionFlag = true;
+      // 刷新过程检验待检验记录数量
+      this.checkProcessInspectionPendingCount();
+    },
+
+    // 打开MRB异常单登记对话框
+    openMrbRegisterModal() {
+      // 直接打开MRB异常单登记对话框
       this.showMrbRegisterFlag = true;
       this.$nextTick(() => {
         this.$refs.comMrbRegister.init(this.scheduleData);
       });
     },
 
-    // MRB异常单确认后的回调
+    // MRB异常单确认后的回调（不再打开过程检验对话框）
     onMrbConfirmed() {
-      // MRB异常单登记成功后，打开过程检验对话框
-      // 查询过程检验待检验记录数量
+      // MRB异常单登记成功后，只刷新过程检验按钮状态
       this.checkProcessInspectionPendingCount();
-      this.showProcessInspectionFlag = true;
+      // 不再自动打开过程检验对话框
     },
 
     // 查询过程检验待检验记录数量