From f1f8020f505947958d45b854de8aed2e78be3e53 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 12 Dec 2025 17:38:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repairApply/SelectToolDialog.vue              |  2 +-
 .../equipmentRepair/repairApply/addRepair.vue     |  9 +++++----
 .../equipmentRepair/repairApply/repairList.vue    | 15 +++++++++++----
 .../repairAudit/repairAuditList.vue               |  5 +++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/views/equipmentRepair/repairApply/SelectToolDialog.vue b/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
index 7b44e6cf..576967c6 100644
--- a/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
+++ b/src/views/equipmentRepair/repairApply/SelectToolDialog.vue
@@ -112,7 +112,7 @@
       <el-table-column align="center" label="规格型号" prop="typeModelName"/>
       <el-table-column align="center" label="管理模式" prop="manageMode" width="110"/>
       <el-table-column align="center" label="设备编码" prop="code" width="150"/>
-      <el-table-column align="center" label="在修数量" prop="tobeRepairNum" width="100"/>
+      <el-table-column align="center" label="在库数量" prop="tobeRepairNum" width="100"/>
       <el-table-column align="center" label="维修数量" width="120">
         <template v-slot="{ row }">
           <el-input
diff --git a/src/views/equipmentRepair/repairApply/addRepair.vue b/src/views/equipmentRepair/repairApply/addRepair.vue
index 893e1e73..00af97c7 100644
--- a/src/views/equipmentRepair/repairApply/addRepair.vue
+++ b/src/views/equipmentRepair/repairApply/addRepair.vue
@@ -7,7 +7,7 @@
           <span style="font-size: 20px; font-weight: 800">维修申请设备</span>
         </el-col>
         <el-col v-if="!routerParams.isView" :span="20" style="display: flex; justify-content: flex-end">
-          <el-button type="primary" @click="handleNumDialog">添加</el-button>
+          <el-button v-if="!routerParams.isSubmit" type="primary" @click="handleNumDialog">添加</el-button>
           <el-button type="primary" @click="submit">确认申请</el-button>
         </el-col>
       </el-row>
@@ -106,7 +106,7 @@
         <!-- 操作列 -->
         <el-table-column label="操作" align="center" width="80px" v-if="!routerParams.isView">
           <template slot-scope="scope">
-            <el-button :disabled="scope.row.status && scope.row.status === '通过'"
+            <el-button v-if="!routerParams.isSubmit" :disabled="scope.row.status && scope.row.status === '通过'"
                        size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" style="color: red">
               删除
             </el-button>
@@ -115,7 +115,7 @@
       </el-table>
 
       <pagination
-        
+
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -265,6 +265,7 @@ export default {
     let title = '新增维修'
     if (this.routerParams.isView) title = '维修查看'
     else if (this.routerParams.isEdit) title = '维修编辑'
+    else if (this.routerParams.isSubmit) title = '维修提交'
 
     this.queryParams.id = this.routerParams.applyId || ''
     const obj = Object.assign({}, this.$route, { title })
@@ -575,7 +576,7 @@ export default {
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  
+
   ::v-deep .el-card__body {
     display: flex !important;
     flex-direction: column !important;
diff --git a/src/views/equipmentRepair/repairApply/repairList.vue b/src/views/equipmentRepair/repairApply/repairList.vue
index cdd98b3d..e45744a5 100644
--- a/src/views/equipmentRepair/repairApply/repairList.vue
+++ b/src/views/equipmentRepair/repairApply/repairList.vue
@@ -87,13 +87,14 @@
             <el-tag v-if="scope.row.status == '1'" type="warning" @click="openDialog(scope.row)" style="cursor: pointer">审批中</el-tag>
             <el-tag v-if="scope.row.status == '2'" type="success" @click="openDialog(scope.row)" style="cursor: pointer">已审批</el-tag>
             <el-tag v-if="scope.row.status == '3'" type="danger" @click="openDialog(scope.row)" style="cursor: pointer">审批驳回</el-tag>
+            <el-tag v-if="scope.row.status == '5'" type="info" style="cursor: pointer">待提交</el-tag>
           </template>
         </el-table-column>
 
         <el-table-column label="操作" align="center">
           <template slot-scope="{ row }">
             <el-button size="mini" type="text" icon="el-icon-zoom-in" @click="handleView(row)">查看</el-button>
-            <el-button v-if="row.status == '0' || row.status == '3'" size="mini" type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+            <el-button v-if="row.status == '0' || row.status == '3' || row.status == '5'" size="mini" type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
             <el-button v-if="row.status == '0' || row.status == '3'" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)" style="color: red"
               >删除</el-button
             >
@@ -103,7 +104,7 @@
 
       <!-- 分页 -->
       <pagination
-        
+
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -139,6 +140,7 @@ export default {
         endTime: null,
       },
       statusList: [
+        { label: '待提交', value: '5' },
         { label: '待审批', value: '0' },
         { label: '审批中', value: '1' },
         { label: '已审批', value: '2' },
@@ -251,7 +253,12 @@ export default {
     },
     // 编辑
     handleEdit(row) {
-      this.$router.push({ path: './addRepair', query: { applyId: row.id, isEdit: true } })
+      if (row.status=='5'){
+        this.$router.push({ path: './addRepair', query: { applyId: row.id, isSubmit: true } })
+      } else {
+        this.$router.push({ path: './addRepair', query: { applyId: row.id, isEdit: true } })
+      }
+
     },
     // 删除
     handleDelete(row) {
@@ -290,7 +297,7 @@ export default {
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  
+
   ::v-deep .el-card__body {
     display: flex !important;
     flex-direction: column !important;
diff --git a/src/views/equipmentRepair/repairAudit/repairAuditList.vue b/src/views/equipmentRepair/repairAudit/repairAuditList.vue
index 21b06b16..89c7f4c4 100644
--- a/src/views/equipmentRepair/repairAudit/repairAuditList.vue
+++ b/src/views/equipmentRepair/repairAudit/repairAuditList.vue
@@ -96,7 +96,7 @@
 
       <!-- 分页 -->
       <pagination
-        
+
         :total="total"
         :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
@@ -130,6 +130,7 @@ export default {
         createBy: null,
         startTime: null,
         endTime: null,
+        isAudit:1
       },
       statusList: [
         { label: '待审批', value: '0' },
@@ -278,7 +279,7 @@ export default {
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  
+
   ::v-deep .el-card__body {
     display: flex !important;
     flex-direction: column !important;