代码提交

2025-11-28 09:57:19 +08:00 · 2025-11-28 09:57:19 +08:00 · c7f07d2586
parent d43f527728
commit c7f07d2586
6 changed files with 413 additions and 321 deletions
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@ -161,6 +161,7 @@
    </el-form>

    <el-card class="content-box">
+
      <el-row>
        <el-col :span="24" style="text-align: right;">
          <el-button
@ -171,6 +172,14 @@
          >
            新增装备
          </el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleImport"
+            v-show=" !isAddVisible"
+          >
+            批量导入
+          </el-button>
        </el-col>
      </el-row>
      <!-- 表格 -->
@ -202,13 +211,17 @@
        </el-table-column>

        <el-table-column prop="name" label="装备名称" show-overflow-tooltip align="center" min-width="100"/>
-      <el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="specificationModel" label="规格型号" show-overflow-tooltip align="center"
+                         min-width="100"
+        />
        <el-table-column prop="originalCode" label="装备原始编码" show-overflow-tooltip align="center" min-width="100"/>
        <el-table-column prop="unit" label="计量单位" show-overflow-tooltip align="center" min-width="100"/>
        <el-table-column prop="manufacturer" label="生产厂家" show-overflow-tooltip align="center" min-width="100"/>
        <el-table-column prop="productionDate" label="出厂日期" show-overflow-tooltip align="center" min-width="100"/>
        <!--        <el-table-column prop="orderNumber" label="采购日期" align="center"/>-->
-      <el-table-column prop="originalValue" label="资产原值（元）" show-overflow-tooltip align="center" min-width="100"/>
+        <el-table-column prop="originalValue" label="资产原值（元）" show-overflow-tooltip align="center"
+                         min-width="100"
+        />
        <!--        <el-table-column prop="orderNumber" label="最大使用年限（年）" align="center"/>-->
        <!--        <el-table-column prop="orderNumber" label="下次维保日期" align="center"/>-->
        <el-table-column prop="province" label="所属省份" show-overflow-tooltip align="center" min-width="100"/>
@ -222,7 +235,9 @@
            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 2)">查看</span>
          </template>
        </el-table-column>
-      <el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center" min-width="100">
+        <el-table-column prop="inspectionReports" label="定期检验报告" show-overflow-tooltip align="center"
+                         min-width="100"
+        >
          <template v-slot="{ row }">
            <span style="color: #00a288; cursor: pointer" @click="handleView(row, 3)">查看</span>
          </template>
@ -317,7 +332,43 @@
        <el-button @click="dialogVisible = false">关 闭</el-button>
      </span>
    </el-dialog>
-    
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?orderId=' + orderId"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+          >下载模板
+          </el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
  </div>


@ -334,6 +385,7 @@ import {
  removeDeviceApi
 } from '@/api/EquipmentEntryApply'
 import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
+import { getToken } from '@/utils/auth'

 export default {
  name: 'EquipmentInput',
@ -342,7 +394,7 @@ export default {
  created() {
    console.log(this.$route)
    this.orderId = this.$route.query && this.$route.query.orderId
-    this.isAddVisible = this.$route.query && this.$route.query.isAddVisible == 'true'
+    this.isAddVisible = this.$route.query && this.$route.query.isAddVisible
    this.isApprovalVisible = this.$route.query && this.$route.query.isApprovalVisible
    if (!this.orderId) {
      this.pageTitle = '新增设备录入'
@ -367,6 +419,20 @@ export default {
      // 表格数据
      tableData: [],
      total: 0,
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/material-mall/order/importData'
+      },
      queryParams: {
        orderCreateUser: '',
        orderCreateTime: '',
@ -411,11 +477,11 @@ export default {
        { key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
        { key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
        { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
-        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true },
+        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true }
      ],
      dialogVisible: false,
      dialogTitle: '',
-      dialogList: [],
+      dialogList: []
    }
  },
  watch: {
@ -429,6 +495,22 @@ export default {
    this.getManufacturerSelectList()
  },
  methods: {
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
+      this.getList()
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit()
+    },
    // 获取厂家
    getManufacturerSelectList() {
      getManufacturerSelectApi().then((res) => {
@ -582,7 +664,10 @@ export default {
        }
      }
    },
-
+    handleImport() {
+      this.upload.title = '导入'
+      this.upload.open = true
+    },
    //编辑
    editRowInfo(row) {
      // this.orderId = orderId.toString()
@ -638,7 +723,7 @@ export default {
        this.dialogList = row.purchaseInvoices || []
      }
      this.dialogVisible = true
-    },
+    }
  }
 }
 </script>
@ -745,6 +830,7 @@ export default {
    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
      background-color: #CCF1E9 !important;
    }
+
    .el-table__body tr.hover-row > td.el-table__cell {
      background-color: #ccf1e9 !important;
    }
--- a/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/maintenanceRecord/index.vue
@ -124,7 +124,8 @@
        </el-row>
        <div class="dialog-table">
          <table border="1" cellspacing="0" cellpadding="6"
-                 style="width: 100%; border-collapse: collapse; text-align: center;">
+                 style="width: 100%; border-collapse: collapse; text-align: center;"
+          >
            <thead>
            <tr>
              <th style="width: 100px;">序号</th>
@ -248,7 +249,7 @@ export default {
        {
          ...this.queryParams
        },
-        `装备流转记录.xlsx`
+        `维修记录_${new Date().getTime()}.xlsx`
      )
    },

--- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
@ -258,7 +258,7 @@ export default {
        {
          ...this.queryParams
        },
-        `装备流转记录.xlsx`
+        `出库记录_${new Date().getTime()}.xlsx`
      )
    },

--- a/src/views/EquipmentRoamRecord/retirementRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/retirementRecord/index.vue
@ -259,7 +259,7 @@ export default {
        {
          ...this.queryParams
        },
-        `装备流转记录.xlsx`
+        `退役记录_${new Date().getTime()}.xlsx`
      )
    },

--- a/src/views/EquipmentRoamRecord/returnRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/returnRecord/index.vue
@ -11,7 +11,8 @@

            <el-form-item label="操作时间">
              <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" style="width: 240px"
-                value-format="yyyy-MM-dd" end-placeholder="结束日期" start-placeholder="开始日期" />
+                              value-format="yyyy-MM-dd" end-placeholder="结束日期" start-placeholder="开始日期"
+              />
            </el-form-item>
          </el-col>
          <el-col :span="12" style="text-align: right;">
@ -85,7 +86,8 @@

      <div class="pagination-container-fage" style="flex-shrink: 0;">
        <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getRoamRecordList" />
+                    @pagination="getRoamRecordList"
+        />
      </div>
    </el-card>
    <!-- 出库记录单 -->
@ -115,7 +117,9 @@
          </el-col>
        </el-row>
        <div class="dialog-table">
-          <table border="1" cellspacing="0" cellpadding="6" style="width: 100%; border-collapse: collapse; text-align: center;">
+          <table border="1" cellspacing="0" cellpadding="6"
+                 style="width: 100%; border-collapse: collapse; text-align: center;"
+          >
            <thead>
            <tr>
              <th style="width: 100px;">序号</th>
@ -245,7 +249,7 @@ export default {
        {
          ...this.queryParams
        },
-        `装备流转记录.xlsx`
+        `退库记录_${new Date().getTime()}.xlsx`
      )
    },

@ -282,7 +286,6 @@ export default {
 }


-
 .button-group {
  float: right;
  margin-left: 10px;
@ -296,6 +299,7 @@ export default {
  margin-bottom: 20px;
  border-radius: 8px;
  padding: 0;
+
  ::v-deep .el-card__body {
    padding: 20px !important;
  }
@ -432,6 +436,7 @@ export default {
    }
  }
 }
+
 table {
  width: 100%;
  border-collapse: collapse; /* ✅ 连起来的关键 */
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@ -4,7 +4,7 @@

    <el-row :gutter="20">
      <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <el-col :span="5" :xs="24">
        <div class="head-container">
          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
                    style="margin-bottom: 20px"
@ -22,7 +22,7 @@
      <!--用户数据-->
      <!--    查询条件卡片-->

-      <el-col :span="20" :xs="24">
+      <el-col :span="19" :xs="24">
        <div class="card-container">
          <div class="card-header query-header">
            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"