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
818bdc05
Commit
818bdc05
authored
Feb 28, 2024
by
何远江
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
功能优化
parent
d603cd21
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
8 deletions
+16
-8
index.vue
src/components/PreviewExcel/index.vue
+11
-5
index.vue
src/views/order/convertOrder/index.vue
+1
-1
OrderChange.vue
src/views/order/orderChange/OrderChange.vue
+3
-1
OrderList.vue
src/views/order/orderList/OrderList.vue
+1
-1
No files found.
src/components/PreviewExcel/index.vue
View file @
818bdc05
...
...
@@ -12,8 +12,8 @@ import {
showsheetbarConfig
,
showstatisticBarConfig
}
from
'@/constants/excelConfig'
import
{
useRoute
}
from
'vue-router'
;
import
{
isFunction
}
from
'@/utils/is'
;
import
{
useRoute
}
from
'vue-router'
import
{
isFunction
}
from
'@/utils/is'
const
props
=
defineProps
([
'fileId'
])
const
luckysheet
=
(
window
as
any
).
luckysheet
...
...
@@ -47,9 +47,15 @@ const generateExcel = (path: string) => {
const
getFilePath
=
async
()
=>
{
try
{
loading
.
value
=
true
const
{
data
}
=
await
getOrderFileById
((
props
.
fileId
||
route
.
query
.
fileId
)
as
string
)
if
(
data
.
code
==
200
)
{
generateExcel
(
data
.
result
.
mergeFilePath
)
const
fileId
=
props
.
fileId
||
route
.
query
.
fileId
if
(
fileId
)
{
const
{
data
}
=
await
getOrderFileById
(
fileId
)
if
(
data
.
code
==
200
)
{
generateExcel
(
data
.
result
.
mergeFilePath
)
}
}
else
{
const
path
=
(
route
.
query
.
filePath
||
''
)
as
string
!!
path
&&
generateExcel
(
path
)
}
}
catch
{}
loading
.
value
=
false
...
...
src/views/order/convertOrder/index.vue
View file @
818bdc05
...
...
@@ -33,7 +33,7 @@
<vxe-column
field=
"customerId_dictText"
title=
"客户名称"
width=
"200"
></vxe-column>
<vxe-column
field=
"filePath"
title=
"订单文件"
>
<
template
#
default=
"{ row }"
>
<el-link
target=
"_blank"
:href=
"'/
api/sys/static/
' + row.filePath"
>
{{
<el-link
target=
"_blank"
:href=
"'/
preview-excel?path=
' + row.filePath"
>
{{
row
.
filePath
}}
</el-link>
</
template
>
...
...
src/views/order/orderChange/OrderChange.vue
View file @
818bdc05
...
...
@@ -182,11 +182,12 @@
</el-form-item>
</el-col>
</
template
>
<el-col
:span=
"24"
v-if=
"currentConfigColumn.scriptName"
>
<el-col
:span=
"24"
v-if=
"currentConfigColumn.scriptName
&& !!currentConfigColumn.content
"
>
<el-form-item
label=
"脚本语句"
>
<el-input
style=
"width: 220px"
rows=
"3"
disabled
type=
"textarea"
v-model
.
trim=
"currentConfigColumn.content"
></el-input>
...
...
@@ -373,6 +374,7 @@ const resetConfigForm = () => {
/** 脚本参数List */
const
currentScriptParamsList
=
computed
(()
=>
{
const
item
:
any
=
scriptList
.
value
.
find
((
v
)
=>
v
.
srciptName
==
currentConfigColumn
.
scriptName
)
Reflect
.
set
(
currentConfigColumn
,
'content'
,
item
?.
scriptContent
||
''
)
// 生成脚本参数表单
gScriptPs
(
item
?.
paramsName
)
return
item
?.
paramsName
!=
null
?
item
.
paramsName
:
[]
...
...
src/views/order/orderList/OrderList.vue
View file @
818bdc05
...
...
@@ -34,7 +34,7 @@
<vxe-column
field=
"customerId_dictText"
title=
"客户名称"
width=
"120"
></vxe-column>
<vxe-column
title=
"原始文件地址"
>
<
template
#
default=
"{ row }"
>
<el-link
target=
"_blank"
:href=
"'/
api/sys/static/
' + row.filePath"
>
{{
<el-link
target=
"_blank"
:href=
"'/
preview-excel?filePath=
' + row.filePath"
>
{{
row
.
filePath
}}
</el-link>
</
template
>
...
...
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