Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-baoshen-excel
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
何远江
topsun-baoshen-excel
Commits
0b28e20a
Commit
0b28e20a
authored
Feb 23, 2024
by
何远江
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设置产品对照带出默认客户
parent
fdf85418
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
13 deletions
+20
-13
ExcelOperate.vue
...ws/comment-excel/components/ExcelOperate/ExcelOperate.vue
+3
-1
ProductCompare.vue
...omment-excel/components/ProductCompare/ProductCompare.vue
+16
-11
SetArea.vue
src/views/comment-excel/components/SetArea/SetArea.vue
+1
-1
No files found.
src/views/comment-excel/components/ExcelOperate/ExcelOperate.vue
View file @
0b28e20a
...
...
@@ -6,6 +6,9 @@
<div
class=
"w-[420px] h-full bg-white"
>
<p
class=
"pl-2 text-lg font-bold leading-[40px] bg-slate-200"
>
标注配置
</p>
<SetArea
@
success=
"onSaveSuccess"
:areaTypeLen=
"areaTypeLen"
/>
<div
class=
"pl-2 pb-2"
>
<el-button
type=
"primary"
size=
"small"
@
click=
"setProdCompare"
>
设置产品对照
</el-button>
</div>
<div
class=
"pt-2 pl-2 pr-2 pb-2 text-sm border-t-2 border-b-2"
>
<p
class=
"font-bold"
>
标记区域
</p>
...
...
@@ -89,7 +92,6 @@
</vxe-pager>
</div>
<el-button
type=
"primary"
size=
"small"
@
click=
"setProdCompare"
>
设置产品对照
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"toRun"
>
执行解析
</el-button>
</div>
</el-scrollbar>
...
...
src/views/comment-excel/components/ProductCompare/ProductCompare.vue
View file @
0b28e20a
...
...
@@ -83,9 +83,11 @@ import { reactive, ref, watch } from 'vue'
import
ProductModal
from
'@/components/ProductModal/ProductModal.vue'
import
CustomerModal
from
'@/components/CustomerModal/CustomerModal.vue'
import
{
MoreFilled
}
from
'@element-plus/icons-vue'
import
{
ElMessage
}
from
'element-plus'
;
import
{
saveExcelProdFileConf
}
from
'@/api/product'
;
import
{
ElMessage
}
from
'element-plus'
import
{
saveExcelProdFileConf
}
from
'@/api/product'
import
{
useCommentExcel
}
from
'@/stores/commentExcel'
const
{
getFileInfo
}
=
useCommentExcel
()
const
props
=
defineProps
([
'visible'
])
const
emits
=
defineEmits
([
'confirm'
,
'update:visible'
,
'success'
])
const
formRef
=
ref
()
...
...
@@ -110,20 +112,23 @@ watch(
(
val
)
=>
{
modalVisible
.
value
=
val
if
(
val
)
{
formState
.
excelFiled
=
getText
()
// 如果有客户,默认带出来
formState
.
customerId
=
getFileInfo
.
customerId
||
''
formState
.
customerId_dictText
=
getFileInfo
.
customerId_dictText
||
''
formState
.
excelFiled
=
getText
()
}
}
)
const
getText
=
()
=>
{
const
rangeJson
=
luckysheet
.
getRangeJson
()
const
effectVal
:
any
=
[]
rangeJson
.
forEach
(
item
=>
{
const
vs
=
Object
.
values
(
item
)
effectVal
.
push
(...
vs
.
filter
(
v
=>
!!
v
))
})
return
effectVal
.
join
(
';'
)
const
rangeJson
=
luckysheet
.
getRangeJson
()
const
effectVal
:
any
=
[]
rangeJson
.
forEach
((
item
)
=>
{
const
vs
=
Object
.
values
(
item
)
effectVal
.
push
(...
vs
.
filter
((
v
)
=>
!!
v
))
})
return
effectVal
.
join
(
';'
)
}
// 表单提交
const
onSubmit
=
async
()
=>
{
...
...
src/views/comment-excel/components/SetArea/SetArea.vue
View file @
0b28e20a
...
...
@@ -114,7 +114,7 @@ const saveArea = async () => {
<
style
lang=
"scss"
>
.setdata-step
{
.el-steps--simple
{
padding
:
8px
15px
;
padding
:
8px
15px
0
;
}
.el-step.is-simple
{
.el-step__title
{
...
...
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