From 6e0d29e59eda58ce6e242fb5dc49d1857e506b51 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 26 Mar 2026 20:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processMainte/dsPartBasicInfo.vue         | 25 ++++++++++---------
 .../workReportingManagement/workRecord.vue    |  2 +-
 src/views/system/menu.vue                     |  1 +
 src/views/workRate/index.vue                  |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
index c2b7736..6c9e0e8 100644
--- a/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
+++ b/src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
@@ -286,7 +286,7 @@
             </el-col>
             <el-col :span="6" v-if="notGlassCake">
               <el-form-item label="是否印字:" prop="isPrint">
-                <el-radio-group v-model="formData.isPrint" >
+                <el-radio-group v-model="formData.isPrint">
                   <el-radio value="2">单</el-radio>
                   <el-radio value="3">双</el-radio>
                   <el-radio value="1">否</el-radio>
@@ -794,12 +794,11 @@ export default {
     },
     // 获取零件信息详情数据
     getPartDetails() {
-      let query_ = {}
-      if(!this.updateRow.partVersion){
+      let query_ = {};
+      if (!this.updateRow.partVersion) {
         query_ = { taskId: this.updateRow.id, version: this.updateRow.version };
-      }
-      else{
-        query_ = { version: this.updateRow.partVersion,partCode:this.updateRow.partCode };
+      } else {
+        query_ = { version: this.updateRow.partVersion, partCode: this.updateRow.partCode };
       }
       getPartDetail(query_).then(res => {
         this.formData = res.data.data.dsPartEntity;
@@ -933,20 +932,22 @@ export default {
           if (this.formData.plateCode || this.formData.plateThickness) {
             if (!this.formData.plateGoodsCode) {
               isReturn = true;
-              this.submitLoading = false
+              this.submitLoading = false;
             }
           }
-          if (isReturn && this.notSinTer) {
-            this.submitLoading = false;
-            return this.$message.warning('请选择镀层物料');
+          if (this.partType == '烧结') {
+            if (isReturn && this.notSinTer) {
+              this.submitLoading = false;
+              return this.$message.warning('请选择物料编码');
+            }
           }
+
           if (this.formData.craftWay.indexOf('涂色') != -1) {
             if (
               this.formData.tsdNum === null &&
               this.formData.tsbNum === null &&
               this.formData.tjtNum === null
             ) {
-              
               this.submitLoading = false;
               return this.$message.warning('一级路线包含涂色，请填写涂色数据');
             }
@@ -1035,7 +1036,7 @@ export default {
   line-height: 50px !important;
 }
 :deep(.avue-crud .el-table th.el-table__cell) {
-  height:36px !important; /* 设置你想要的高度 */
+  height: 36px !important; /* 设置你想要的高度 */
   line-height: 36px !important;
 }
 </style>
diff --git a/src/views/productionManagement/workReportingManagement/workRecord.vue b/src/views/productionManagement/workReportingManagement/workRecord.vue
index a0e6c5d..50dc9fb 100644
--- a/src/views/productionManagement/workReportingManagement/workRecord.vue
+++ b/src/views/productionManagement/workReportingManagement/workRecord.vue
@@ -228,7 +228,7 @@ export default {
             width:150,
           },
           {
-            label: '调整人',
+            label: '报工人',
             prop: 'workerName',
             search: false,
             sortable: true,
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 967d472..7460ef4 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -81,6 +81,7 @@ export default {
         searchShow: true,
         searchMenuSpan: 6,
         dialogWidth: '60%',
+        height:'auto',
         tree: true,
         border: true,
         index: true,
diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue
index 46922f0..d18eb0a 100644
--- a/src/views/workRate/index.vue
+++ b/src/views/workRate/index.vue
@@ -7,7 +7,7 @@
     @close="closeDialog"
     fullscreen
   >
-    <el-collapse v-model="activeName" accordion>
+    <el-collapse v-model="activeName" >
       <el-collapse-item title="订单信息" name="1">
         <template #title="{ isActive }"> 订单信息 </template>
         <div class="order-box">