From 8e870faf5f9d7b1b337beab8cefad7263de9a06a Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 10 Dec 2025 10:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentDetailList.vue                   |  2 +-
 .../equipmentInput/index.vue                  | 64 ++++++++++++-------
 .../screen/cityScreen-old/EquipStatusMore.vue |  2 +-
 .../cityScreen-old/EquipTurnroundRate.vue     |  2 +-
 .../screen/cityScreen-old/EquipWarning.vue    |  2 +-
 src/views/screen/cityScreen-old/ProEquip.vue  |  2 +-
 .../cityScreen-old/RetirementWarning.vue      |  2 +-
 .../gwScreen/components/left/AllEquip.vue     |  2 +-
 .../components/left/EquipStatusMore.vue       |  2 +-
 .../components/left/UnitEquipConfig.vue       |  2 +-
 .../components/right/EquipUsageRateMore.vue   |  2 +-
 .../components/right/ProEquipMore.vue         |  2 +-
 .../components/right/UsageRateMore.vue        |  2 +-
 .../wsScreen/components/left/AllEquip.vue     |  2 +-
 .../components/left/EquipStatusMore.vue       |  2 +-
 .../components/left/UnitEquipConfig.vue       |  2 +-
 .../components/right/EquipUsageRateMore.vue   |  2 +-
 .../components/right/ProEquipMore.vue         |  2 +-
 .../components/right/UsageRateMore.vue        |  2 +-
 .../components/left/AllEquip.vue              |  2 +-
 .../components/left/EquipStatusMore.vue       |  2 +-
 .../components/left/UnitEquipConfig.vue       |  2 +-
 .../components/right/EquipUsageRateMore.vue   |  2 +-
 .../components/right/ProEquipMore.vue         |  2 +-
 .../components/right/UsageRateMore.vue        |  2 +-
 25 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/src/views/EquipmentEntryApply/EquipmentDetailList.vue b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
index b7b2439f..ee0048a4 100644
--- a/src/views/EquipmentEntryApply/EquipmentDetailList.vue
+++ b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
@@ -94,7 +94,7 @@
         </el-row>
         <!-- 表格 -->
         <div >
-        <el-table :data="tableData" border stripe :span-method="handleSpanMethod" height="546">
+        <el-table ref="tableRef" :data="tableData" border stripe :span-method="handleSpanMethod" height="546">
           <!--      <el-table :data="tableData"  >-->
           <el-table-column label="序号" align="center" width="55" type="index" />
           <el-table-column prop="orderNumber" label="录入单号" align="center" show-overflow-tooltip column-key="orderNumber"
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index 3f51e451..f4b45333 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -373,6 +373,7 @@ import {
   equipmentPassAndRejectApiNew,
   equipmentSubmitApiNew,
   removeDeviceApi,
+  getEquipmentAddIdApi,
 } from '@/api/EquipmentEntryApply'
 import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
 import { getToken } from '@/utils/auth'
@@ -439,6 +440,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
+      orderNumber: '',
       manufacturerList: [],
       // 可添加表单数据
       formData: {
@@ -638,6 +640,7 @@ export default {
       }
 
       const orderNumber = row.orderNumber
+      this.orderNumber = orderNumber
       let count = 1
 
       // 计算从当前行开始，连续有多少个相同的 orderNumber
@@ -729,29 +732,46 @@ export default {
     importTemplate() {
       this.download('/material-mall/order/template', {}, `装备信息导入模板_${new Date().getTime()}.xlsx`)
     },
-    addList() {
-      const newRow = {
-        orderNumber: '',
-        major: '',
-        mainProcess: '',
-        subProcess: '',
-        mainCategory: '',
-        subCategory: '',
-        branch: '',
-        name: '',
-        specificationModel: '',
-        originalCode: '',
-        unit: '',
-        manufacturer: '',
-        productionDate: '',
-        originalValue: '',
-        province: '',
-        appearanceImages: [],
-        certificates: [],
-        inspectionReports: [],
-        purchaseInvoices: [],
+    async addList() {
+      try {
+        if (!this.$route.query.orderId) {
+          const result = await getEquipmentAddIdApi()
+          this.orderId = result.data.id
+          this.$router.replace({
+            query: {
+              orderId: result.data.id,
+              isAddVisible: this.isAddVisible,
+              isApprovalVisible: this.isApprovalVisible,
+            },
+          })
+        }
+        const newRow = {
+          orderNumber: this.orderNumber,
+          major: '', // 专业
+          process: [], // 工序
+          category: [], // 类目
+          name: '', // 装备名称
+          specificationModel: '', // 规格型号
+          originalValue: '', // 资产原值
+          productionDate: '', // 出厂日期
+          manufacturerId: '', // 生产厂家
+          originalCode: '', // 装备原始编码
+          nextMaintenanceDate: '', // 下次维保日期
+          maxServiceLifeYears: '', // 装备寿命
+          manageType: '0', // 管理模式
+          count: 1, // 装备数量
+          unit: '', // 计数单位
+          purchaseDate: '', // 采购日期
+          appearanceImages: [], // 装备图片
+          certificates: [], // 合格证
+          inspectionReports: [], // 检测证书
+          purchaseInvoices: [], // 采购发票
+          propertyVoList: [], // 特征属性
+        }
+        this.tableData.unshift(newRow)
+      } catch (error) {
+        console.log('🚀 ~ error:', error)
       }
-      this.tableData.unshift(newRow)
     },
   },
 }
diff --git a/src/views/screen/cityScreen-old/EquipStatusMore.vue b/src/views/screen/cityScreen-old/EquipStatusMore.vue
index 12022637..be3d1906 100644
--- a/src/views/screen/cityScreen-old/EquipStatusMore.vue
+++ b/src/views/screen/cityScreen-old/EquipStatusMore.vue
@@ -39,7 +39,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/cityScreen-old/EquipTurnroundRate.vue b/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
index 491e63f6..f7468727 100644
--- a/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
+++ b/src/views/screen/cityScreen-old/EquipTurnroundRate.vue
@@ -38,7 +38,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/cityScreen-old/EquipWarning.vue b/src/views/screen/cityScreen-old/EquipWarning.vue
index baecea71..890574e3 100644
--- a/src/views/screen/cityScreen-old/EquipWarning.vue
+++ b/src/views/screen/cityScreen-old/EquipWarning.vue
@@ -38,7 +38,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/cityScreen-old/ProEquip.vue b/src/views/screen/cityScreen-old/ProEquip.vue
index 9018d323..3775ad7b 100644
--- a/src/views/screen/cityScreen-old/ProEquip.vue
+++ b/src/views/screen/cityScreen-old/ProEquip.vue
@@ -38,7 +38,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/cityScreen-old/RetirementWarning.vue b/src/views/screen/cityScreen-old/RetirementWarning.vue
index 5037a924..1cea9e8e 100644
--- a/src/views/screen/cityScreen-old/RetirementWarning.vue
+++ b/src/views/screen/cityScreen-old/RetirementWarning.vue
@@ -38,7 +38,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/left/AllEquip.vue b/src/views/screen/gwScreen/components/left/AllEquip.vue
index 41915692..52282fa0 100644
--- a/src/views/screen/gwScreen/components/left/AllEquip.vue
+++ b/src/views/screen/gwScreen/components/left/AllEquip.vue
@@ -158,7 +158,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/left/EquipStatusMore.vue b/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
index da03c201..4582865d 100644
--- a/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/gwScreen/components/left/EquipStatusMore.vue
@@ -45,7 +45,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue b/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
index 477f92cf..d6d21a19 100644
--- a/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/gwScreen/components/left/UnitEquipConfig.vue
@@ -39,7 +39,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue b/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
index e5664676..29fbf47b 100644
--- a/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/gwScreen/components/right/EquipUsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/right/ProEquipMore.vue b/src/views/screen/gwScreen/components/right/ProEquipMore.vue
index 59ba7dcd..892b2315 100644
--- a/src/views/screen/gwScreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/gwScreen/components/right/ProEquipMore.vue
@@ -33,7 +33,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/gwScreen/components/right/UsageRateMore.vue b/src/views/screen/gwScreen/components/right/UsageRateMore.vue
index c56d9ac6..e0269a9b 100644
--- a/src/views/screen/gwScreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/gwScreen/components/right/UsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/left/AllEquip.vue b/src/views/screen/wsScreen/components/left/AllEquip.vue
index d1eea56f..52439bf7 100644
--- a/src/views/screen/wsScreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreen/components/left/AllEquip.vue
@@ -187,7 +187,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
index da03c201..4582865d 100644
--- a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
@@ -45,7 +45,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
index ce065735..67c6ddc7 100644
--- a/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreen/components/left/UnitEquipConfig.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
index b036c172..caab0be6 100644
--- a/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/EquipUsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/right/ProEquipMore.vue b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
index 3349c06f..0a0e8629 100644
--- a/src/views/screen/wsScreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/wsScreen/components/right/ProEquipMore.vue
@@ -33,7 +33,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreen/components/right/UsageRateMore.vue b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
index 3d18e118..34f8b189 100644
--- a/src/views/screen/wsScreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/wsScreen/components/right/UsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue b/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
index af03183b..4f60e32b 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/AllEquip.vue
@@ -187,7 +187,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
index 477f92cf..d6d21a19 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/EquipStatusMore.vue
@@ -39,7 +39,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
index 56303bd0..9f28afc6 100644
--- a/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
+++ b/src/views/screen/wsScreenWidescreen/components/left/UnitEquipConfig.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue b/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
index 4b528543..fcd92add 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/EquipUsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue b/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
index 246ad557..94c8dd50 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/ProEquipMore.vue
@@ -33,7 +33,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"
diff --git a/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue b/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
index 8ed6d0db..afbf61c4 100644
--- a/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
+++ b/src/views/screen/wsScreenWidescreen/components/right/UsageRateMore.vue
@@ -20,7 +20,7 @@
           highlight-current-row
           style="width: 100%"
           height="546"
-          
+          class="table-container"
         >
           <el-table-column
             type="index"