Skip to content

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

导入对比

parent 2b4bedff
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 58 deletions
ruoyi-ui/src/views/system/supplies/indexupload.vue
View file @ a3d95a9a
...@@ -10,24 +10,6 @@ ...@@ -10,24 +10,6 @@
maxlength="8" maxlength="8"
/> />
</el-form-item> </el-form-item>
<el-form-item label="列" prop="cell" label-width="80px">
<el-input
v-model="cell"
placeholder="请输入结束列"
clearable
@keyup.enter.native="handleFileChange1"
maxlength="8"
/>
</el-form-item>
<el-form-item label="单位" prop="dep" label-width="80px" >
<el-input
v-model="dep"
placeholder="请输入导入单位"
clearable
@keyup.enter.native="handleFileChange1"
maxlength="8"
/>
</el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -96,14 +78,13 @@ import {vueScript} from "@/utils/generator/html"; ...@@ -96,14 +78,13 @@ import {vueScript} from "@/utils/generator/html";
var fileName="新建XLSX工作表"; //定义表名 var fileName="新建XLSX工作表"; //定义表名
var data1; var data1;
var name1;
var map=new Map(); var map=new Map();
export default { export default {
name: "Mymodule", name: "Mymodule",
data() { data() {
return { return {
row:'', row:'',
cell:'',
dep:'',
//弹出页面的表名 //弹出页面的表名
// 是否显示弹出层 // 是否显示弹出层
fileList:[], fileList:[],
...@@ -137,7 +118,7 @@ export default { ...@@ -137,7 +118,7 @@ export default {
//刷新下拉选框内容 //刷新下拉选框内容
fileName="新建XLSX工作表"; fileName="新建XLSX工作表";
this.disableNextButton=''; this.disableNextButton='';
this.row=this.cell=this.dep=""; this.row="";
//刷新luckysheet表格 //刷新luckysheet表格
this.init(); this.init();
map.clear(); map.clear();
...@@ -233,10 +214,10 @@ export default { ...@@ -233,10 +214,10 @@ export default {
data: exportJson.sheets, data: exportJson.sheets,
userInfo: exportJson.info.name.creator userInfo: exportJson.info.name.creator
}) })
data1=exportJson.sheets; data1=exportJson.sheets[0];
let suffixArr = exportJson.info.name.split('.'); let suffixArr = exportJson.info.name.split('.');
fileName = suffixArr[0]; fileName = suffixArr[0];
this.dep=this.row=this.cell=''; this.row='';
} }
) )
}, },
...@@ -279,24 +260,12 @@ export default { ...@@ -279,24 +260,12 @@ export default {
}, },
handleFileChange1(evt) { handleFileChange1(evt) {
if (this.dep==="") {
this.$message({
message: "请先输入您要导入的单位",
type: "warning"});
return false
}
if (this.row==="") { if (this.row==="") {
this.$message({ this.$message({
message: "请先输入导入开始的行", message: "请先输入导入开始的行",
type: "warning"}); type: "warning"});
return false return false
} }
if (this.cell==="") {
this.$message({
message: "请先输入导入结束的列",
type: "warning"});
return false
}
let name = evt.name let name = evt.name
let suffixArr = name.split('.'), let suffixArr = name.split('.'),
suffix = suffixArr[suffixArr.length - 1]; suffix = suffixArr[suffixArr.length - 1];
...@@ -321,39 +290,44 @@ export default { ...@@ -321,39 +290,44 @@ export default {
let ddd=data1; let ddd=data1;
let as=0; let as=0;
for(let k=0;k<ddd.length;k++){ let d1=window.luckysheet.transToData(ddd.celldata);
let d1=window.luckysheet.transToData(ddd[k].celldata); let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
let d2=window.luckysheet.transToData(exportJson.sheets[k].celldata); name1=exportJson.sheets[0].name;
let array=[]; let array=[];
let c=this.cell-1;
let r=this.row-1; let r=this.row-1;
for(let i=r;i<d1[0].length;i++) { for(let i=r;i<d1.length;i++) {
for (let j = 0; j < c; j++) { for (let j = 0; j <=d1[0].length; j++) {
debugger
if(d1[i][j]===null){ if(d1[i][j]===null){
break;
} } else if (d1[i][j].m===undefined && d2[i][j].m===undefined){
if (d1[i][j].m!== d2[i][j].m) {
}else if (d1[i][j].m===undefined || d2[i][j].m===undefined){
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(this.dep,array); map.set(name1,array);
console.log(map); console.log(map);
}
if(as>0){ if(as>0){
this.$message({ this.$message({
message: "导入完成,本次导入共发现"+as+"条不同数据", message: "导入完成,本次导入共发现"+as+"条不同数据",
......
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