Skip to content

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

文件导入修改

parent a3d95a9a
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 50 deletions
ruoyi-ui/src/views/system/supplies/indexupload.vue
View file @ be91e179
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
v-model="row" v-model="row"
placeholder="请输入开始行" placeholder="请输入开始行"
clearable clearable
@keyup.enter.native="handleFileChange1" @keyup.enter.native="handleEnter"
maxlength="8" maxlength="8"
/> />
</el-form-item> </el-form-item>
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
action='' action=''
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:show-file-list=false
> >
<el-button plain size="mini" icon="el-icon-download" type="primary" >导入初始文件</el-button> <el-button plain size="mini" icon="el-icon-download" type="primary" >导入初始文件</el-button>
</el-upload> </el-upload>
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
:limit="1" :limit="1"
:file-list="fileList" :file-list="fileList"
:disabled="disableNextButton" :disabled="disableNextButton"
:show-file-list=false
> >
<el-button plain size="mini" icon="el-icon-download" type="primary" :disabled="disableNextButton" >导入对比文件</el-button> <el-button plain size="mini" icon="el-icon-download" type="primary" :disabled="disableNextButton" >导入对比文件</el-button>
</el-upload> </el-upload>
...@@ -52,8 +54,8 @@ ...@@ -52,8 +54,8 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button icon="el-icon-refresh" size="mini" @click="addToMap">生成</el-button> <el-button icon="el-icon-refresh" size="mini" @click="addToMap">生成</el-button>
</el-col><el-col :span="1.5"> </el-col><el-col :span="1.5">
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-col> </el-col>
</el-row> </el-row>
<!-- luckysheet容器 --> <!-- luckysheet容器 -->
...@@ -110,7 +112,7 @@ export default { ...@@ -110,7 +112,7 @@ export default {
if (event.keyCode === 13) { if (event.keyCode === 13) {
event.preventDefault(); // 阻止默认的回车事件 event.preventDefault(); // 阻止默认的回车事件
// 触发确定操作 // 触发确定操作
this.submit_from(); this.handleFileChange1();
} }
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -221,8 +223,8 @@ export default { ...@@ -221,8 +223,8 @@ export default {
} }
) )
}, },
/** 生成标签*/
addToMap(){ addToMap(){
console.log(map);
map.forEach((value,key)=>{ map.forEach((value,key)=>{
for(let i=0;i<value.length;i++){ for(let i=0;i<value.length;i++){
let row=value[i][0],cell=value[i][1]; let row=value[i][0],cell=value[i][1];
...@@ -247,7 +249,7 @@ export default { ...@@ -247,7 +249,7 @@ export default {
"top": 10, //批注框上边距 "top": 10, //批注框上边距
"width": 91, //批注框宽度 "width": 91, //批注框宽度
"height": 48, //批注框高度 "height": 48, //批注框高度
"value": sd+"，"+key+"表有误", //批准内容 "value": sd+'\n；'+key+"表有误", //批准内容
"isshow": false //批注框为显示状态 "isshow": false //批注框为显示状态
} }
}) })
...@@ -288,55 +290,55 @@ export default { ...@@ -288,55 +290,55 @@ export default {
return return
} }
let ddd=data1; let ddd=data1;
let as=0; let as=0;
let d1=window.luckysheet.transToData(ddd.celldata); let d1=window.luckysheet.transToData(ddd.celldata);
let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata); let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
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++) { for(let i=r;i<d1.length;i++) {
for (let j = 0; j <=d1[0].length; j++) { for (let j = 0; j <=d1[0].length; j++) {
if(d1[i][j]===null){
} else if (d1[i][j].m===undefined && d2[i][j].m===undefined){ if(d1[i][j]===null){
break
}
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"}) luckysheet.setCellValue(i, j, {bg: "#FF0000"})
as++ as++
array.push([i,j]); array.push([i,j]);
}else { }else {
if (d1[i][j].m!== d2[i][j].m) { 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, { /*luckysheet.setCellValue(i, j, {
ps: { //批注 ps: { //批注
"left": 92, //批注框左边距 "left": 92, //批注框左边距
"top": 10, //批注框上边距 "top": 10, //批注框上边距
"width": 91, //批注框宽度 "width": 91, //批注框宽度
"height": 48, //批注框高度 "height": 48, //批注框高度
"value": this.dep+"表有误", //批准内容 "value": this.dep+"表有误", //批准内容
"isshow": false //批注框为显示状态 "isshow": false //批注框为显示状态
} }
})*/ })*/
as++ as++
array.push([i,j]); array.push([i,j]);
}
}
} }
} }
map.set(name1,array);
console.log(map);
if(as>0){
this.$message({
message: "导入完成,本次导入共发现"+as+"条不同数据",
type: "warning"});
}else{
this.$message({
message: "导入完成,本次导入未发现不同数据",
type: "success"});
} }
}
map.set(name1,array);
if(as>0){
this.$message({
message: "导入完成,本次导入共发现"+as+"条不同数据",
type: "warning"});
}else{
this.$message({
message: "导入完成,本次导入未发现不同数据",
type: "success"});
}
} }
) )
......
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