六矿汇总表导出文件和保存文件修改

ruoyi-ui/public/exportExcel.js

@@ -3,7 +3,7 @@ import Excel from 'exceljs';
 
 import FileSaver from 'file-saver';
 
-const exportExcel = function(luckysheet, value) {
+const exportExcel = function(luckysheet, value,contrast) {
   // 参数为luckysheet.getluckysheetfile()获取的对象
   // 1.创建工作簿，可以为工作簿添加属性
   const workbook = new Excel.Workbook();
@@ -18,7 +18,7 @@ const exportExcel = function(luckysheet, value) {
     const merge = (table.config && table.config.merge) || {};
     const borderInfo = (table.config && table.config.borderInfo) || {};
     // 3.设置单元格合并,设置单元格边框,设置单元格样式,设置值
-    setStyleAndValue(table.data, worksheet);
+    setStyleAndValue(table.data, worksheet,contrast);
     setMerge(merge, worksheet);
     setBorder(borderInfo, worksheet);
     return true;
@@ -88,7 +88,7 @@ var setBorder = function(luckyBorderInfo, worksheet) {
     // worksheet.getCell(rang.row_focus + 1, rang.column_focus + 1).border = border
   });
 };
-var setStyleAndValue = function(cellArr, worksheet) {
+var setStyleAndValue = function(cellArr, worksheet,contrast) {
   if (!Array.isArray(cellArr)) { return; }
   cellArr.forEach(function(row, rowid) {
     row.every(function(cell, columnid) {
@@ -122,6 +122,11 @@ var setStyleAndValue = function(cellArr, worksheet) {
       //  style 填入到_value中可以实现填充色
       let letter = createCellPos(columnid);
       let target = worksheet.getCell(letter + (rowid + 1));
+
+      if(contrast){
+          const column =worksheet.getColumn(1);
+          column.hidden=true;
+      }
       // console.log('1233', letter + (rowid + 1))
       for (const key in fill) {
         target.fill = fill;

ruoyi-ui/src/views/system/supplies/index.vue

@@ -77,6 +77,7 @@ var rule=[];
 var tempId;
 var roleId;
 var uuid1;
+var trueORfalse=false;
 export default {
     name: "Mymodule",
     data() {
@@ -106,7 +107,6 @@ export default {
     created() {
 //刷新页面时进行的操作
         this.getList();
-
     },
     mounted() {
 
@@ -127,6 +127,11 @@ export default {
             this.disableNextButton = this.selectedRule === '';
             //根据选中的下拉选项值获取相应的信息
             getSuppliesTemplate(this.selectedOption).then(response => {
+                if(this.selectedOption===7){
+                    trueORfalse=true;
+                }else{
+                    trueORfalse=false;
+                }
                 tempId= this.selectedOption;
                 uuid1=this.uuid=uuidv4().substring(0,8);
                 console.log(this.uuid);
@@ -168,7 +173,15 @@ export default {
             if(tempId===7){
                 getSuppliesTemplate(7).then(response => {
                     uuid1=this.uuid=uuidv4().substring(0,8);
-                    console.log(this.uuid);
+                    //console.log(this.uuid);
+                    // 通过遍历this.luckyrule找到对应的iem.roleName
+                    for (let i = 0; i < this.luckyrule.length; i++) {
+                        if (this.luckyrule[i].id === this.selectedRule) {
+                            let name = this.luckyrule[i].roleName;
+                            fileName=name.slice(0,-2);
+                            break;
+                        }
+                    }
                     const sysSupplies = response.rows;
                     this.luckysheetData = sysSupplies[0].templateContent;
                     //将接收到的json存到json_data中
@@ -206,6 +219,7 @@ export default {
             this.disableNextButton='';
             this.selectedRule='';
             this.luckyrule=[];
+            trueORfalse=false;
             uuid1='';
             //刷新luckysheet表格
             this.init();
@@ -284,8 +298,8 @@ export default {
             try {
                 const exportJson = await cons;
                 await this.summary(exportJson);
-                console.log('summary 执行完毕');
-                //this.submit(exportJson);
+                //console.log('summary 执行完毕');
+                this.submit(exportJson);
 
             } catch (Error) {
                     this.$message({
@@ -875,9 +889,6 @@ export default {
                                 "color": "#000000",
                                 "range": [{
                                     "row": [0, 0],
-
-
-
                                     "column": [0, 0]
                                 }]
                             }
@@ -912,7 +923,7 @@ export default {
                                 });*/
                                     config = luckysheet.getConfig(0);
                                     bord.range[0].row = [rowws + 1, rowws + 1];
-                                    bord.range[0].column = [0, sysRules[sysRules.length - 1].ct];
+                                    bord.range[0].column = [0, parseInt(sysRules[sysRules.length - 1].ct)];
                                     config.borderInfo.push(bord);
                                     luckysheet.setConfig(config);
                                 } else{
@@ -1062,7 +1073,7 @@ export default {
             this.from.templateId=this.dfrom.templateId=tempId;
             this.from.importUuid=this.dfrom.importUuid=uuid1;
             this.from.roleId=this.dfrom.roleId=roleId;
-            this.dfrom.historyName=name;
+            this.dfrom.historyName=name+'(导入文件)';
             this.dfrom.historyContent=str;
             this.dfrom.identifyingCode=0;
             this.from.status=this.dfrom.status=0;
@@ -1085,7 +1096,7 @@ export default {
         /** 导出设置 */
         handleExport: debounce(function() {
             // 处理点击事件
-            exportExcel(luckysheet.getAllSheets(),fileName)
+            exportExcel(luckysheet.getAllSheets(),fileName,trueORfalse)
         }, 500), // 设置延迟时间，单位为毫秒
     }
 // 配置项111