From adad5440042122a2e3b3cede5f31f633268cec6c Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 20 Jan 2026 15:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=BA=93=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/audit/addAudit.vue         |  10 +-
 src/views/business/warehouse/auditDetails.vue | 153 +++++++++++++++---
 src/views/business/warehouse/auditList.vue    |   4 +-
 src/views/business/warehouse/details.vue      |   2 +-
 src/views/business/warehouse/index.vue        |   4 +-
 5 files changed, 144 insertions(+), 29 deletions(-)

diff --git a/src/views/business/audit/addAudit.vue b/src/views/business/audit/addAudit.vue
index af257f38..874f7079 100644
--- a/src/views/business/audit/addAudit.vue
+++ b/src/views/business/audit/addAudit.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 基础页面 -->
-  <div class="app-container" shadow="never"> 
-    <el-card v-show="showSearch" style="margin-bottom: 20px">
+  <div class="app-container"> 
+    <el-card v-show="showSearch" style="margin-bottom: 20px" shadow="never">
       <GoBack :title="'出库审核'" @goBack="goBack" />
       <el-form :model="queryParams" ref="queryForm"  size="small" inline  label-width="150px" >
         <el-form-item label="需求单位" prop="useUnit">
@@ -716,13 +716,11 @@ export default {
     }
 
     .node-info {
-      font-size: 12px;
-     
-      font-style: normal;
+      font-size: 12px; 
       background: rgba(52, 226, 199,0.08); 
       color: #3F3F3F;
       padding: 15px;
-      border-radius:3px;
+      border-radius:5px;
       line-height: 1.8;
     }
   }
diff --git a/src/views/business/warehouse/auditDetails.vue b/src/views/business/warehouse/auditDetails.vue
index 2485f566..0abd1b91 100644
--- a/src/views/business/warehouse/auditDetails.vue
+++ b/src/views/business/warehouse/auditDetails.vue
@@ -35,9 +35,126 @@
       </el-form>
 
     </el-card>
+    <el-row :gutter="24">
+        <el-col :span="6">
+          <el-card shadow="never"  style="min-height: 640px;">
+            <div style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #F0F0F0;"> 
+                <span style="font-size: 20px; font-weight: 800;margin-right: 48px;">审批进度</span>  
+            </div>
+            <div class="approval-progress" v-if="showApprovalProgress && processConfig && processConfig.nodeList && !collapsed" > 
+              <el-timeline>
+                <el-timeline-item
+                  v-for="node in processConfig.nodeList"
+                  :key="node.id"
+                  :timestamp="getNodeRecord(node) ? getNodeRecord(node).approveTime : ''"
+                  placement="top"
+                > 
+                  <template #dot>
+                    <img src="../../../assets/images/timeIcon.png" class="custom-icon" alt="">
+                  </template>
+                  <div class="timeline-content">
+                    <div class="node-title">
+                      <span class="node-name">节点{{ node.nodeOrder }}：{{ node.nodeName }}</span>
+                      <el-tag :type="getNodeTagType(node)">
+                        {{ getNodeStatusLabel(node) }}
+                      </el-tag>
+                    </div>
+                    <div class="node-info">
+                      <div>审批人：{{ node.name }}</div>
+                      <div v-if="getNodeRecord(node)">
+                        <div>审批结果：{{ getNodeRecord(node).approveResult === '1' ? '通过' : '驳回' }}</div>
+                        <div>审批意见：{{ getNodeRecord(node).approveOpinion }}</div>
+                        <div>审批时间：{{ getNodeRecord(node).approveTime }}</div>
+                      </div>
+                      <div v-else-if="node.nodeOrder === approvalInstance.currentNodeOrder">
+                        状态：待审批
+                      </div>
+                      <div v-else>
+                        状态：等待上一节点审批
+                      </div>
+                    </div>
+                  </div>
+                </el-timeline-item>
+              </el-timeline>
+            </div>
+            <div v-if="showApprovalActions && canApprove && !collapsed && !routerParams.isView" style="margin-top: 30px">
+              <div style="margin-bottom: 15px; font-weight: bold;">审批操作</div>
+              <el-form ref="approveForm" :model="approveData" label-width="100px">
+                <el-form-item label="审批意见">
+                  <el-input
+                    v-model="approveData.opinion"
+                    type="textarea"
+                    rows="4"
+                    placeholder="请输入审批意见"
+                    maxlength="500"
+                    show-word-limit
+                  />
+                </el-form-item>
+                <el-form-item>
+                  <el-button type="success" @click="handlePass">通过</el-button>
+                  <el-button type="danger" @click="handleFail">驳回</el-button>
+                  <el-button @click="handleCancel">取消</el-button>
+                </el-form-item>
+              </el-form>
+            </div> 
+          </el-card>
+        </el-col>
+        <el-col :span="18">
+          <el-card shadow="never">
+            <div class="mb8" style="display: flex;align-items: center;padding-bottom: 20px;border-bottom: 1px solid #F0F0F0;"> 
+                <span style="font-size: 20px; font-weight: 800;margin-right: 48px;">退库审核列表</span>
+                <span style="font-size: 16px;color: #808080;">共{{tableList.length}}条记录</span> 
+            </div>  
+            <el-table
+              v-loading="isLoading"
+              :data="tableList"
+              highlight-current-row
+              border
+              stripe
+              class="my-table"
+              style="width: 100%"
+            >
+              <el-table-column
+                type="index"
+                width="55"
+                label="序号"
+                align="center"
+              />
+              <el-table-column label="分类" align="center" prop="devType" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.devType==1">{{ '装备' }}</span>
+                  <span v-if="scope.row.devType==2">{{ '工具' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="类目" align="center" prop="category" :show-overflow-tooltip="true"/>
+              <el-table-column label="名称" align="center" prop="typeName" :show-overflow-tooltip="true" width="120px"/>
+              <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
+              <el-table-column label="管理模式" align="center" prop="manageType" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.manageType==0">{{ '编码设备' }}</span>
+                  <span v-if="scope.row.manageType==1">{{ '数量设备' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="设备编码" align="center" prop="devCode" :show-overflow-tooltip="true" width="140px"/>
+              <el-table-column label="当前自用" align="center" prop="useNum" :show-overflow-tooltip="true"/>
+              <el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" width="80px"/>
+              <el-table-column label="出库日期" align="center" prop="updateTime" width="120px"/>
+              <el-table-column label="退库日期" align="center" prop="useTime" width="120px"/>
 
-    <el-card shadow="never">
-      <el-row :gutter="10" class="mb8" justify="end">
+              <el-table-column label="是否维修" align="center" prop="isRepair" width="80px">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.isRepair == '0'" type="warning">否</el-tag>
+                  <el-tag v-if="scope.row.isRepair == '1'" type="success">是</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="维修数量" align="center" prop="realNum" width="80px"/>
+            </el-table>
+          </el-card>
+        </el-col> 
+     </el-row>
+
+    <!-- <el-card shadow="never">
+      <el-row :gutter="10" class="mb8" justify="end" style="padding: 10px 0;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
         <el-col :span="4">
           <span style="font-size: 20px; font-weight: 800">退库审核列表</span>
         </el-col>
@@ -90,8 +207,7 @@
             <el-table-column label="维修数量" align="center" prop="realNum" width="80px"/>
           </el-table>
         </el-col>
-        <el-col :span="collapsed ? 1 : 6">
-          <!-- 审批进度 -->
+        <el-col :span="collapsed ? 1 : 6"> 
           <div class="approval-progress" v-if="showApprovalProgress && processConfig && processConfig.nodeList && !collapsed" >
             <div class="section-header" >审批进度</div>
             <el-timeline>
@@ -127,8 +243,7 @@
               </el-timeline-item>
             </el-timeline>
           </div>
-
-          <!-- 审批操作 -->
+ 
           <div v-if="showApprovalActions && canApprove && !collapsed && !routerParams.isView" style="margin-top: 30px">
             <div style="margin-bottom: 15px; font-weight: bold;">审批操作</div>
             <el-form ref="approveForm" :model="approveData" label-width="100px">
@@ -150,8 +265,7 @@
             </el-form>
           </div>
 
-          <div style="position: absolute; width: 10px; top: 50%; right: 0">
-            <!-- 右侧折叠/展开按钮 -->
+          <div style="position: absolute; width: 10px; top: 50%; right: 0"> 
             <el-button
               size="mini"
               @click="collapsed = !collapsed"
@@ -160,14 +274,8 @@
             />
           </div>
         </el-col>
-      </el-row>
-
-
-      <!-- 返回按钮 -->
-      <!-- <div v-if="showApprovalActions && !canApprove" style="margin-top: 30px">
-        <el-button @click="handleCancel">返回</el-button>
-      </div> -->
-    </el-card>
+      </el-row> 
+    </el-card> -->
 
   </div>
 </template>
@@ -574,6 +682,7 @@ export default {
     color: #34E2C7;
 }
 .approval-progress {
+  padding-top: 20px;
   ::v-deep .el-timeline-item__wrapper {
     padding-left: 30px;
   }
@@ -582,6 +691,7 @@ export default {
     .node-title {
       display: flex;
       align-items: center;
+      justify-content: space-between;
       gap: 10px;
       margin-bottom: 8px;
 
@@ -592,10 +702,17 @@ export default {
     }
 
     .node-info {
-      font-size: 12px;
-      color: #606266;
+      font-size: 12px; 
+      background: rgba(52, 226, 199,0.08); 
+      color: #3F3F3F;
+      padding: 15px;
+      border-radius:5px;
       line-height: 1.8;
     }
   }
 }
+.custom-icon{
+  width: 20px;
+  height: 20px;
+}
 </style>
diff --git a/src/views/business/warehouse/auditList.vue b/src/views/business/warehouse/auditList.vue
index ef9ba102..4fa75f05 100644
--- a/src/views/business/warehouse/auditList.vue
+++ b/src/views/business/warehouse/auditList.vue
@@ -2,7 +2,7 @@
   <!-- 基础页面 -->
   <div class="app-container">
     <el-card v-show="showSearch" style="margin-bottom: 20px;padding-bottom: 15px;" shadow="never">
-      <el-form :model="queryParams" ref="queryForm" label-width="140px" inline @submit.native.prevent>
+      <el-form :model="queryParams" ref="queryForm" label-width="150px" inline @submit.native.prevent>
         <el-form-item label="需求单位" prop="useUnit">
           <el-select
             v-model="queryParams.useUnit"
@@ -83,7 +83,7 @@
     </el-card>
 
     <el-card class="content-box" shadow="never">
-      <el-row :gutter="10" class="mb8" justify="end">
+      <el-row :gutter="10" class="mb8" justify="end" style="padding: 10px 0;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
         <el-col :span="6" style="display: flex;align-items: center;">
           <span style="font-size: 20px; font-weight: 800;margin-right: 48px;">退库审核列表</span>
           <span style="font-size: 16px;color: #808080;">共{{total}}条记录</span>
diff --git a/src/views/business/warehouse/details.vue b/src/views/business/warehouse/details.vue
index 5786b01e..7696c61d 100644
--- a/src/views/business/warehouse/details.vue
+++ b/src/views/business/warehouse/details.vue
@@ -84,7 +84,7 @@
     </el-card>
 
     <el-card shadow="never">
-      <el-row :gutter="10" class="mb8" justify="end">
+      <el-row :gutter="10" class="mb8" justify="end" style="padding: 10px 0;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;">
         <el-col :span="4">
           <span style="font-size: 20px; font-weight: 800">退库申请设备</span>
         </el-col>
diff --git a/src/views/business/warehouse/index.vue b/src/views/business/warehouse/index.vue
index e4581ac9..bba6d39a 100644
--- a/src/views/business/warehouse/index.vue
+++ b/src/views/business/warehouse/index.vue
@@ -2,7 +2,7 @@
   <!-- 基础页面 -->
   <div class="app-container">
     <el-card v-show="showSearch" style="margin-bottom: 20px;padding-bottom: 15px;" shadow="never">
-      <el-form :model="queryParams" ref="queryForm" inline label-width="140px">
+      <el-form :model="queryParams" ref="queryForm" inline label-width="150px">
         <el-form-item label="需求单位" prop="useUnit">
           <el-select
             v-model="queryParams.useUnit"
@@ -86,7 +86,7 @@
     </el-card>
 
     <el-card class="content-box" shadow="never">
-      <el-row :gutter="10" class="mb8" justify="end"> 
+      <el-row :gutter="10" class="mb8" justify="end" style="padding: 10px 0;margin-bottom: 15px;border-bottom: 1px solid #F0F0F0;"> 
         <el-col :span="6" style="display: flex;align-items: center;">
           <span style="font-size: 20px; font-weight: 800;margin-right: 48px;">退库申请列表</span>
           <span style="font-size: 16px;color: #808080;">共{{total}}条记录</span>