优化

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"

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() {
+    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: '',
+          orderNumber: this.orderNumber,
-        major: '',
+          major: '', // 专业
-        mainProcess: '',
+          process: [], // 工序
-        subProcess: '',
+          category: [], // 类目
-        mainCategory: '',
+          name: '', // 装备名称
-        subCategory: '',
+          specificationModel: '', // 规格型号
-        branch: '',
+          originalValue: '', // 资产原值
-        name: '',
+          productionDate: '', // 出厂日期
-        specificationModel: '',
+          manufacturerId: '', // 生产厂家
-        originalCode: '',
+          originalCode: '', // 装备原始编码
-        unit: '',
+          nextMaintenanceDate: '', // 下次维保日期
-        manufacturer: '',
+          maxServiceLifeYears: '', // 装备寿命
-        productionDate: '',
+          manageType: '0', // 管理模式
-        originalValue: '',
+          count: 1, // 装备数量
-        province: '',
+          unit: '', // 计数单位
-        appearanceImages: [],
+          purchaseDate: '', // 采购日期
-        certificates: [],
+          appearanceImages: [], // 装备图片
-        inspectionReports: [],
+          certificates: [], // 合格证
-        purchaseInvoices: [],
+          inspectionReports: [], // 检测证书
+          purchaseInvoices: [], // 采购发票
+          propertyVoList: [], // 特征属性
         }
         this.tableData.unshift(newRow)
+      } catch (error) {
+        console.log('🚀 ~ error:', error)
+      }
     },
   },
 }

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"