From 63ba32711e04a6c0ccb2263e1b879f2380327121 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 6 Jun 2025 10:08:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(os-common):=20=E4=BC=98=E5=8C=96=20Excel?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改前端导入的权限，不下载模板，不更新原有数据
- 后端更新common，从ruoyi的gitee复制的

- 添加单元格样式封装，支持自定义样式
- 增加字典值和标签的互转方法
- 优化图片数据处理，支持多图片导出
- 改进下拉列表和提示信息的设置
- 修复导入导出的一些小问题
---
 src/plugins/download.js                       |  11 ++
 src/views/ems/info/dailyFaultRecord/index.vue |  10 +-
 .../ems/info/faultHandlingRecord/index.vue    |  10 +-
 .../info/plcBufferBatteryLifecycle/index.vue  |  10 +-
 .../securityDoorBatteryLifecycle/index.vue    |  10 +-
 .../ems/info/sparePartsInventory/index.vue    |  10 +-
 .../info/sparePartsInventoryCheck/index.vue   |  10 +-
 .../ems/info/sparePartsRegistration/index.vue |  10 +-
 .../ems/info/sparePartsUsageRecord/index.vue  | 118 +++++++++---------
 .../ems/info/supervisionChecklist/index.vue   |  10 +-
 .../ems/info/upsBatteryLifecycle/index.vue    |   2 +-
 11 files changed, 111 insertions(+), 100 deletions(-)

diff --git a/src/plugins/download.js b/src/plugins/download.js
index 42acd00..4f00b28 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -66,6 +66,17 @@ export default {
       downloadLoadingInstance.close();
     })
   },
+  // excel(data, name) {
+  //   const isBlob = blobValidate(data);
+  //   if (isBlob) {
+  //     const blob = new Blob([data], {
+  //       type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'
+  //     })
+  //     this.saveAs(blob, name)
+  //   } else {
+  //     this.printErrMsg(data);
+  //   }
+  // },
   saveAs(text, name, opts) {
     saveAs(text, name, opts);
   },
diff --git a/src/views/ems/info/dailyFaultRecord/index.vue b/src/views/ems/info/dailyFaultRecord/index.vue
index cd19af8..9ffbd4d 100644
--- a/src/views/ems/info/dailyFaultRecord/index.vue
+++ b/src/views/ems/info/dailyFaultRecord/index.vue
@@ -139,7 +139,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:dailyFaultRecord:import']"
+                        v-hasPermi="['ems/info:dailyFaultRecord:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -259,11 +259,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/faultHandlingRecord/index.vue b/src/views/ems/info/faultHandlingRecord/index.vue
index cba5ebf..b94ee17 100644
--- a/src/views/ems/info/faultHandlingRecord/index.vue
+++ b/src/views/ems/info/faultHandlingRecord/index.vue
@@ -105,7 +105,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:faultHandlingRecord:import']"
+                        v-hasPermi="['ems/info:faultHandlingRecord:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -220,11 +220,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/plcBufferBatteryLifecycle/index.vue b/src/views/ems/info/plcBufferBatteryLifecycle/index.vue
index d992b6d..ca3e9e9 100644
--- a/src/views/ems/info/plcBufferBatteryLifecycle/index.vue
+++ b/src/views/ems/info/plcBufferBatteryLifecycle/index.vue
@@ -201,7 +201,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:plcBufferBatteryLifecycle:import']"
+                        v-hasPermi="['ems/info:plcBufferBatteryLifecycle:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -417,11 +417,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/securityDoorBatteryLifecycle/index.vue b/src/views/ems/info/securityDoorBatteryLifecycle/index.vue
index c517fbb..b055d57 100644
--- a/src/views/ems/info/securityDoorBatteryLifecycle/index.vue
+++ b/src/views/ems/info/securityDoorBatteryLifecycle/index.vue
@@ -205,7 +205,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:securityDoorBatteryLifecycle:import']"
+                        v-hasPermi="['ems/info:securityDoorBatteryLifecycle:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -439,11 +439,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/sparePartsInventory/index.vue b/src/views/ems/info/sparePartsInventory/index.vue
index 5fe651b..ed64c1a 100644
--- a/src/views/ems/info/sparePartsInventory/index.vue
+++ b/src/views/ems/info/sparePartsInventory/index.vue
@@ -121,7 +121,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:sparePartsInventory:import']"
+                        v-hasPermi="['ems/info:sparePartsInventory:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -227,11 +227,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/sparePartsInventoryCheck/index.vue b/src/views/ems/info/sparePartsInventoryCheck/index.vue
index b946659..550a70d 100644
--- a/src/views/ems/info/sparePartsInventoryCheck/index.vue
+++ b/src/views/ems/info/sparePartsInventoryCheck/index.vue
@@ -89,7 +89,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:sparePartsInventoryCheck:import']"
+                        v-hasPermi="['ems/info:sparePartsInventoryCheck:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -175,11 +175,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/sparePartsRegistration/index.vue b/src/views/ems/info/sparePartsRegistration/index.vue
index 7ad6a50..155f260 100644
--- a/src/views/ems/info/sparePartsRegistration/index.vue
+++ b/src/views/ems/info/sparePartsRegistration/index.vue
@@ -209,7 +209,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:sparePartsRegistration:import']"
+                        v-hasPermi="['ems/info:sparePartsRegistration:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -425,11 +425,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/sparePartsUsageRecord/index.vue b/src/views/ems/info/sparePartsUsageRecord/index.vue
index a4d1e30..8f2eecd 100644
--- a/src/views/ems/info/sparePartsUsageRecord/index.vue
+++ b/src/views/ems/info/sparePartsUsageRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
                         <el-form-item label="日期" prop="date">
                             <el-input
                                     v-model="queryParams.date"
@@ -25,22 +25,22 @@
                                     @keyup.enter.native="handleQuery"
                             />
                         </el-form-item>
-                        <el-form-item label="使用数量" prop="quantityUsed">
-                            <el-input
-                                    v-model="queryParams.quantityUsed"
-                                    placeholder="请输入使用数量"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="剩余数量" prop="remainingQuantity">
-                            <el-input
-                                    v-model="queryParams.remainingQuantity"
-                                    placeholder="请输入剩余数量"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
+<!--                        <el-form-item label="使用数量" prop="quantityUsed">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.quantityUsed"-->
+<!--                                    placeholder="请输入使用数量"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item label="剩余数量" prop="remainingQuantity">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.remainingQuantity"-->
+<!--                                    placeholder="请输入剩余数量"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
                         <el-form-item label="领用库房" prop="issuingWarehouse">
                             <el-input
                                     v-model="queryParams.issuingWarehouse"
@@ -49,51 +49,51 @@
                                     @keyup.enter.native="handleQuery"
                             />
                         </el-form-item>
-                        <el-form-item label="更换位置" prop="replacementLocation">
-                            <el-input
-                                    v-model="queryParams.replacementLocation"
-                                    placeholder="请输入更换位置"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="领用人" prop="personReceived">
-                            <el-input
-                                    v-model="queryParams.personReceived"
-                                    placeholder="请输入领用人"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="库管确认人" prop="warehouseManagerConfirmation">
-                            <el-input
-                                    v-model="queryParams.warehouseManagerConfirmation"
-                                    placeholder="请输入库管确认人"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="库存表状态" prop="inventoryStatus">
-                            <el-input
-                                    v-model="queryParams.inventoryStatus"
-                                    placeholder="请输入库存表状态"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="部门仓库" prop="departmentWarehouse">
-                            <el-input
-                                    v-model="queryParams.departmentWarehouse"
-                                    placeholder="请输入部门仓库"
-                                    clearable
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
+<!--                        <el-form-item label="更换位置" prop="replacementLocation">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.replacementLocation"-->
+<!--                                    placeholder="请输入更换位置"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item label="领用人" prop="personReceived">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.personReceived"-->
+<!--                                    placeholder="请输入领用人"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item label="库管确认人" prop="warehouseManagerConfirmation">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.warehouseManagerConfirmation"-->
+<!--                                    placeholder="请输入库管确认人"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item label="库存表状态" prop="inventoryStatus">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.inventoryStatus"-->
+<!--                                    placeholder="请输入库存表状态"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item label="部门仓库" prop="departmentWarehouse">-->
+<!--                            <el-input-->
+<!--                                    v-model="queryParams.departmentWarehouse"-->
+<!--                                    placeholder="请输入部门仓库"-->
+<!--                                    clearable-->
+<!--                                    @keyup.enter.native="handleQuery"-->
+<!--                            />-->
+<!--                        </el-form-item>-->
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
-        </el-form> -->
+        </el-form>
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
@@ -135,7 +135,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:sparePartsUsageRecord:import']"
+                        v-hasPermi="['ems/info:sparePartsUsageRecord:add']"
                 >导入</el-button>
             </el-col>
             <el-col :span="1.5">
diff --git a/src/views/ems/info/supervisionChecklist/index.vue b/src/views/ems/info/supervisionChecklist/index.vue
index 7a4ae55..146d76e 100644
--- a/src/views/ems/info/supervisionChecklist/index.vue
+++ b/src/views/ems/info/supervisionChecklist/index.vue
@@ -143,7 +143,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:supervisionChecklist:import']"
+                        v-hasPermi="['ems/info:supervisionChecklist:add']"
                 >导入</el-button>
             </el-col>
             <el-col :span="1.5">
@@ -287,11 +287,11 @@
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
                 <div class="el-upload__tip text-center" slot="tip">
-                    <div class="el-upload__tip" slot="tip">
-                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
-                    </div>
+<!--                    <div class="el-upload__tip" slot="tip">-->
+<!--                        <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据-->
+<!--                    </div>-->
                     <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+<!--                    <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">
diff --git a/src/views/ems/info/upsBatteryLifecycle/index.vue b/src/views/ems/info/upsBatteryLifecycle/index.vue
index a3d39ed..b1d3e5e 100644
--- a/src/views/ems/info/upsBatteryLifecycle/index.vue
+++ b/src/views/ems/info/upsBatteryLifecycle/index.vue
@@ -209,7 +209,7 @@
                         icon="el-icon-upload2"
                         size="mini"
                         @click="handleImport"
-                        v-hasPermi="['ems/info:upsBatteryLifecycle:import']"
+                        v-hasPermi="['ems/info:upsBatteryLifecycle:add']"
                 >导入</el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>