优化

2025-12-10 10:36:05 +08:00 · 2025-12-10 10:36:05 +08:00 · 8e870faf5f
parent d2c4e2c65f
commit 8e870faf5f
25 changed files with 66 additions and 46 deletions
--- 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"
--- 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)
    },
  },
 }
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"