Skip to content

K
klck
Commit 19107c82 authored by xiangjiaojunxp's avatar xiangjiaojunxp
Browse files
Options

修改

parent be91e179
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 33 deletions
ruoyi-ui/src/views/system/supplies/indexupload.vue
View file @ 19107c82
...@@ -297,56 +297,64 @@ export default { ...@@ -297,56 +297,64 @@ export default {
name1=exportJson.sheets[0].name; name1=exportJson.sheets[0].name;
let array=[]; let array=[];
let r=this.row-1; let r=this.row-1;
for(let i=r;i<d1.length;i++) { try {
for (let j = 0; j <=d1[0].length; j++) { for(let i=r;i<d1.length;i++) {
for (let j = 0; j <=d1[0].length; j++) {
if(d1[i][j]===null){ if(d1[i][j]===null){
break break
} }
if (d1[i][j].m===undefined && d2[i][j].m===undefined){ if (d1[i][j].m===undefined && d2[i][j].m===undefined){
}else if (d1[i][j].m===undefined || d2[i][j].m===undefined){ }else if (d1[i][j].m===undefined || d2[i][j].m===undefined){
luckysheet.setCellValue(i, j, {bg: "#FF0000"})
as++
array.push([i,j]);
}else {
if (d1[i][j].m!== d2[i][j].m) {
luckysheet.setCellValue(i, j, {bg: "#FF0000"}) luckysheet.setCellValue(i, j, {bg: "#FF0000"})
//查看是否有标签
/*luckysheet.setCellValue(i, j, {
ps: { //批注
"left": 92, //批注框左边距
"top": 10, //批注框上边距
"width": 91, //批注框宽度
"height": 48, //批注框高度
"value": this.dep+"表有误", //批准内容
"isshow": false //批注框为显示状态
}
})*/
as++ as++
array.push([i,j]); array.push([i,j]);
}else {
if (d1[i][j].m!== d2[i][j].m) {
luckysheet.setCellValue(i, j, {bg: "#FF0000"})
//查看是否有标签
/*luckysheet.setCellValue(i, j, {
ps: { //批注
"left": 92, //批注框左边距
"top": 10, //批注框上边距
"width": 91, //批注框宽度
"height": 48, //批注框高度
"value": this.dep+"表有误", //批准内容
"isshow": false //批注框为显示状态
}
})*/
as++
array.push([i,j]);
}
} }
} }
} }
} map.set(name1,array);
map.set(name1,array); if(as>0){
if(as>0){ this.$message({
this.$message({ message: "导入完成,本次导入共发现"+as+"条不同数据",
message: "导入完成,本次导入共发现"+as+"条不同数据", type: "warning"});
type: "warning"}); }else{
}else{ this.$message({
message: "导入完成,本次导入未发现不同数据",
type: "success"});
}
}catch (err){
this.$message({ this.$message({
message: "导入完成,本次导入未发现不同数据", message: "导入失败,导入文件与对比文件有所不匹",
type: "success"}); type: "error"});
} }
} }
) )
}, },
/** 导出设置 */ /** 导出设置 */
handleExport: debounce(function() { handleExport: debounce(function() {
// 处理点击事件 // 处理点击事件
exportExcel(luckysheet.getAllSheets(),fileName) exportExcel(luckysheet.getAllSheets(),fileName+"(对比后数据)")
}, 500), // 设置延迟时间，单位为毫秒 }, 500), // 设置延迟时间，单位为毫秒
} }
// 配置项111 // 配置项111
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment