From c948f7e7dbd9d5f81cb92a21b0f569284b9230be Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 17 Jan 2025 09:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repair/repairManage/component/edit.vue         |  5 ++++-
 .../repair/scrapManage/component/homeApply.vue     | 14 +++++++-------
 .../testExamine/component/queryToolsApply.vue      |  7 +++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/material/repair/repairManage/component/edit.vue b/src/views/material/repair/repairManage/component/edit.vue
index 652ce344..abf91755 100644
--- a/src/views/material/repair/repairManage/component/edit.vue
+++ b/src/views/material/repair/repairManage/component/edit.vue
@@ -692,7 +692,7 @@
                       :options="partTypeTreeTwo"
                       :searchable="false"
                       :disable-branch-nodes="true"
-                      :show-count="true"
+                      :show-count="false" 
                       :expand-on-click-node="false"
                       placeholder="请选择配件型号"
                       style="width: 200px;"
@@ -1442,6 +1442,9 @@ export default {
     },
     filterTree(nodes) {
       return nodes.map((node) => {
+        if(node.level==3){
+          node.label=node.label+`（${node.storageNum}）`
+        }
         if (node.children) {
           node.children = this.filterTree(node.children);
         }
diff --git a/src/views/material/repair/scrapManage/component/homeApply.vue b/src/views/material/repair/scrapManage/component/homeApply.vue
index d9bfb1dc..ddb44be0 100644
--- a/src/views/material/repair/scrapManage/component/homeApply.vue
+++ b/src/views/material/repair/scrapManage/component/homeApply.vue
@@ -132,13 +132,13 @@
       <el-table-column
         label="报废单号"
         align="center"
-        prop="scrapCode"
+        prop="scrapCode" width="150"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="维修单号"
         align="center"
-        prop="repairCode"
+        prop="repairCode" width="150"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -157,7 +157,7 @@
       <el-table-column
         label="提交时间"
         align="center"
-        prop="createTime"
+        prop="createTime" width="180"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -170,14 +170,14 @@
       <el-table-column
         label="审核时间"
         align="center"
-        prop="auditTime"
+        prop="auditTime" width="180"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
 
       <el-table-column
         label="状态"
-        align="center"
+        align="center" width="150"
         prop="taskStatusName"
         :show-overflow-tooltip="true"
       >
@@ -189,7 +189,7 @@
         prop="remark"
         :show-overflow-tooltip="true"
       />  -->
-      <el-table-column label="操作" align="center" width="200">
+      <el-table-column label="操作" align="center" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -287,7 +287,7 @@ export default {
 
     //是否可用勾选框
     selectable(row) {
-      if (row.status == "1") {
+      if (row.taskStatus == "1"||row.taskStatus == "2") {
         return false;
       } else {
         return true;
diff --git a/src/views/material/repair/testExamine/component/queryToolsApply.vue b/src/views/material/repair/testExamine/component/queryToolsApply.vue
index f964b487..a86e13b7 100644
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/src/views/material/repair/testExamine/component/queryToolsApply.vue
@@ -67,6 +67,13 @@
         :show-overflow-tooltip="true"
       >
       </el-table-column>
+      <el-table-column
+        label="设备编码"
+        align="center"
+        prop="maCode"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
       <el-table-column
         label="退料数量"
         align="center"