Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
4799ccd8
Commit
4799ccd8
authored
1 year ago
by
xiangjiaojunxp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
666
parent
0f353d42
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
ruoyi-ui/src/views/system/supplies/indexupload.vue
ruoyi-ui/src/views/system/supplies/indexupload.vue
+15
-5
No files found.
ruoyi-ui/src/views/system/supplies/indexupload.vue
View file @
4799ccd8
...
...
@@ -219,9 +219,9 @@ export default {
data1
=
exportJson
.
sheets
[
0
];
let
suffixArr
=
exportJson
.
info
.
name
.
split
(
'
.
'
);
fileName
=
suffixArr
[
0
];
this
.
row
=
''
;
}
)
},
/** 生成标签*/
addToMap
(){
...
...
@@ -293,6 +293,7 @@ export default {
luckysheet
.
setCellValue
(
k
,
cell
,
key
);
luckysheet
.
setCellValue
(
k
,
cell
+
1
,
a
);
k
++
}
/*let k=0;
map.forEach((value,key)=>{
let num=luckysheet.getSheet().data[0].length;
...
...
@@ -310,7 +311,7 @@ export default {
k++
})
*/
}
*/
},
handleFileChange1
(
evt
)
{
if
(
this
.
row
===
""
)
{
...
...
@@ -358,14 +359,23 @@ export default {
if
(
d2
[
i
][
j
]
==
null
){
break
}
if
(
d1
[
i
][
j
].
m
==
undefined
&&
d2
[
i
][
j
].
m
==
undefined
){
if
(
d1
[
i
][
j
].
v
==
0
&&
d2
[
i
][
j
].
v
==
undefined
){
break
}
if
(
d1
[
i
][
j
].
v
==
0
&&
d2
[
i
][
j
].
v
==
null
){
break
}
if
(
d1
[
i
][
j
].
v
==
0
&&
d2
[
i
][
j
].
v
==
0
){
break
}
if
(
d1
[
i
][
j
].
v
==
undefined
&&
d2
[
i
][
j
].
v
==
undefined
){
}
else
if
(
d1
[
i
][
j
].
m
==
undefined
||
d2
[
i
][
j
].
m
==
undefined
){
}
else
if
(
d1
[
i
][
j
].
v
==
undefined
||
d2
[
i
][
j
].
v
==
undefined
){
luckysheet
.
setCellValue
(
i
,
j
,
{
bg
:
"
#e85f5f
"
})
as
++
array
.
push
([
i
+
1
,
j
+
1
]);
}
else
{
if
(
d1
[
i
][
j
].
m
!=
d2
[
i
][
j
].
m
)
{
if
(
d1
[
i
][
j
].
v
!=
d2
[
i
][
j
].
v
)
{
luckysheet
.
setCellValue
(
i
,
j
,
{
bg
:
"
#e85f5f
"
})
//查看是否有标签
/*luckysheet.setCellValue(i, j, {
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment