Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saas-manage
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chehuidong
saas-manage
Commits
b50420f2
Commit
b50420f2
authored
Oct 21, 2024
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加loading
parent
3fb0b51c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
74 additions
and
8 deletions
+74
-8
src/views/operation/exceptionMessage.vue
+8
-0
src/views/operation/lossOrder/index.vue
+18
-1
src/views/system/category-style.vue
+6
-1
src/views/system/sku-manage.vue
+23
-3
src/views/system/sku-sort.vue
+19
-3
No files found.
src/views/operation/exceptionMessage.vue
View file @
b50420f2
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
<el-button
<el-button
type=
"primary"
type=
"primary"
size=
"small"
size=
"small"
:loading=
"searchLoading"
icon=
"el-icon-search"
icon=
"el-icon-search"
@
click=
"search"
>
@
click=
"search"
>
查询
查询
...
@@ -33,6 +34,7 @@
...
@@ -33,6 +34,7 @@
<el-button
<el-button
type=
"warning"
type=
"warning"
size=
"small"
size=
"small"
:loading=
"sendLoading"
icon=
"el-icon-s-promotion"
icon=
"el-icon-s-promotion"
@
click=
"resendMsg()"
>
@
click=
"resendMsg()"
>
批量发送
批量发送
...
@@ -95,6 +97,8 @@ export default {
...
@@ -95,6 +97,8 @@ export default {
pageSize
:
50
,
pageSize
:
50
,
currentPage
:
1
,
currentPage
:
1
,
selection
:
[],
selection
:
[],
searchLoading
:
false
,
sendLoading
:
false
,
loading
:
false
loading
:
false
}
}
},
},
...
@@ -158,6 +162,7 @@ export default {
...
@@ -158,6 +162,7 @@ export default {
const
loading
=
this
.
$loading
({
const
loading
=
this
.
$loading
({
background
:
'rgba(0, 0, 0, 0.3)'
background
:
'rgba(0, 0, 0, 0.3)'
})
})
this
.
sendLoading
=
true
try
{
try
{
const
res
=
await
getMessageReSend
(
String
(
ids
))
const
res
=
await
getMessageReSend
(
String
(
ids
))
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
...
@@ -168,6 +173,7 @@ export default {
...
@@ -168,6 +173,7 @@ export default {
this
.
$message
.
error
(
res
.
message
)
this
.
$message
.
error
(
res
.
message
)
}
}
}
finally
{
}
finally
{
this
.
sendLoading
=
false
loading
.
close
()
loading
.
close
()
}
}
}
catch
{}
}
catch
{}
...
@@ -181,6 +187,7 @@ export default {
...
@@ -181,6 +187,7 @@ export default {
}
}
},
},
async
getList
()
{
async
getList
()
{
this
.
searchLoading
=
true
this
.
loading
=
true
this
.
loading
=
true
const
params
=
{
const
params
=
{
currentPage
:
this
.
currentPage
,
currentPage
:
this
.
currentPage
,
...
@@ -196,6 +203,7 @@ export default {
...
@@ -196,6 +203,7 @@ export default {
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
error
(
e
)
console
.
error
(
e
)
}
finally
{
}
finally
{
this
.
searchLoading
=
false
this
.
loading
=
false
this
.
loading
=
false
}
}
},
},
...
...
src/views/operation/lossOrder/index.vue
View file @
b50420f2
...
@@ -59,6 +59,7 @@
...
@@ -59,6 +59,7 @@
<el-button
<el-button
type=
"primary"
type=
"primary"
size=
"small"
size=
"small"
:loading=
"searchLoading"
icon=
"el-icon-search"
icon=
"el-icon-search"
@
click=
"search"
>
@
click=
"search"
>
查询
查询
...
@@ -68,6 +69,7 @@
...
@@ -68,6 +69,7 @@
<el-button
<el-button
type=
"danger"
type=
"danger"
size=
"small"
size=
"small"
:loading=
"delLoading"
icon=
"el-icon-delete"
icon=
"el-icon-delete"
@
click=
"deleteData()"
>
@
click=
"deleteData()"
>
删除
删除
...
@@ -77,6 +79,7 @@
...
@@ -77,6 +79,7 @@
<el-button
<el-button
type=
"primary"
type=
"primary"
size=
"small"
size=
"small"
:loading=
"downloadLoading"
icon=
"el-icon-download"
icon=
"el-icon-download"
@
click=
"downloadData()"
>
@
click=
"downloadData()"
>
重新下载
重新下载
...
@@ -86,6 +89,7 @@
...
@@ -86,6 +89,7 @@
<el-button
<el-button
type=
"default"
type=
"default"
size=
"small"
size=
"small"
:loading=
"transformLoading"
icon=
"el-icon-refresh"
icon=
"el-icon-refresh"
@
click=
"transformData()"
>
@
click=
"transformData()"
>
重新转化
重新转化
...
@@ -164,7 +168,7 @@
...
@@ -164,7 +168,7 @@
align=
"center"
align=
"center"
width=
"180"
width=
"180"
:show-overflow-tooltip=
"true"
></el-table-column>
:show-overflow-tooltip=
"true"
></el-table-column>
<el-table-column
<el-table-column
label=
"店铺简称"
label=
"店铺简称"
prop=
"shopShortName"
prop=
"shopShortName"
header-align=
"center"
header-align=
"center"
...
@@ -257,6 +261,10 @@ export default {
...
@@ -257,6 +261,10 @@ export default {
pageSize
:
50
,
pageSize
:
50
,
currentPage
:
1
,
currentPage
:
1
,
loading
:
false
,
loading
:
false
,
searchLoading
:
false
,
downloadLoading
:
false
,
delLoading
:
false
,
transformLoading
:
false
,
selection
:
[],
selection
:
[],
plateformList
:
[]
plateformList
:
[]
}
}
...
@@ -268,6 +276,7 @@ export default {
...
@@ -268,6 +276,7 @@ export default {
methods
:
{
methods
:
{
async
getList
()
{
async
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
this
.
searchLoading
=
true
try
{
try
{
const
res
=
await
listTableData
({
const
res
=
await
listTableData
({
...
this
.
searchForm
,
...
this
.
searchForm
,
...
@@ -280,9 +289,11 @@ export default {
...
@@ -280,9 +289,11 @@ export default {
})
})
this
.
manageData
=
res
.
data
.
records
this
.
manageData
=
res
.
data
.
records
this
.
total
=
res
.
data
.
total
this
.
total
=
res
.
data
.
total
this
.
searchLoading
=
this
.
false
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
error
(
e
)
console
.
error
(
e
)
}
finally
{
}
finally
{
this
.
searchLoading
=
this
.
false
this
.
loading
=
false
this
.
loading
=
false
}
}
},
},
...
@@ -315,6 +326,7 @@ export default {
...
@@ -315,6 +326,7 @@ export default {
}
catch
{
}
catch
{
return
return
}
}
this
.
downloadLoading
=
true
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
ids
.
join
()
ids
=
ids
.
join
()
const
l
=
this
.
$loading
({
const
l
=
this
.
$loading
({
...
@@ -328,6 +340,7 @@ export default {
...
@@ -328,6 +340,7 @@ export default {
console
.
error
(
e
)
console
.
error
(
e
)
}
finally
{
}
finally
{
l
.
close
()
l
.
close
()
this
.
downloadLoading
=
false
}
}
},
},
async
transformData
(
row
)
{
async
transformData
(
row
)
{
...
@@ -352,6 +365,7 @@ export default {
...
@@ -352,6 +365,7 @@ export default {
}
catch
{
}
catch
{
return
return
}
}
this
.
transformLoading
=
true
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
ids
.
join
()
ids
=
ids
.
join
()
const
l
=
this
.
$loading
({
const
l
=
this
.
$loading
({
...
@@ -364,6 +378,7 @@ export default {
...
@@ -364,6 +378,7 @@ export default {
}
catch
(
e
)
{
}
catch
(
e
)
{
console
.
error
(
e
)
console
.
error
(
e
)
}
finally
{
}
finally
{
this
.
transformLoading
=
false
l
.
close
()
l
.
close
()
}
}
},
},
...
@@ -389,6 +404,7 @@ export default {
...
@@ -389,6 +404,7 @@ export default {
}
catch
{
}
catch
{
return
return
}
}
if
(
!
row
)
this
.
delLoading
=
true
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
this
.
selection
.
map
((
item
)
=>
item
.
id
)
ids
=
ids
.
join
()
ids
=
ids
.
join
()
const
l
=
this
.
$loading
({
const
l
=
this
.
$loading
({
...
@@ -402,6 +418,7 @@ export default {
...
@@ -402,6 +418,7 @@ export default {
console
.
error
(
e
)
console
.
error
(
e
)
}
finally
{
}
finally
{
l
.
close
()
l
.
close
()
if
(
!
row
)
this
.
delLoading
=
false
}
}
},
},
handleSelectionChange
(
selection
)
{
handleSelectionChange
(
selection
)
{
...
...
src/views/system/category-style.vue
View file @
b50420f2
...
@@ -33,7 +33,9 @@
...
@@ -33,7 +33,9 @@
</el-button>
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-button
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
<el-button
:loading=
"exportLoading"
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
class=
"my-table-cont my-flex-1"
>
<div
class=
"my-table-cont my-flex-1"
>
...
@@ -249,6 +251,7 @@ export default {
...
@@ -249,6 +251,7 @@ export default {
is_title
:
1
,
is_title
:
1
,
sourceData
:
[],
sourceData
:
[],
dialogVisible
:
false
,
dialogVisible
:
false
,
exportLoading
:
false
,
delLoading
:
false
,
delLoading
:
false
,
refreshLoading
:
false
,
refreshLoading
:
false
,
addcurrencyform
:
{
addcurrencyform
:
{
...
@@ -426,6 +429,7 @@ export default {
...
@@ -426,6 +429,7 @@ export default {
methods
:
{
methods
:
{
importExcel
()
{
importExcel
()
{
this
.
exportLoading
=
true
const
input
=
document
.
createElement
(
'input'
)
const
input
=
document
.
createElement
(
'input'
)
input
.
style
.
display
=
'none'
input
.
style
.
display
=
'none'
input
.
type
=
'file'
input
.
type
=
'file'
...
@@ -444,6 +448,7 @@ export default {
...
@@ -444,6 +448,7 @@ export default {
this
.
$message
.
success
(
'导入成功'
)
this
.
$message
.
success
(
'导入成功'
)
this
.
getList
()
this
.
getList
()
}
}
this
.
exportLoading
=
false
}
}
},
},
onCurrentChange
(
currentPage
)
{
onCurrentChange
(
currentPage
)
{
...
...
src/views/system/sku-manage.vue
View file @
b50420f2
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<el-button
<el-button
type=
"primary"
type=
"primary"
@
click=
"search()"
@
click=
"search()"
:loading=
"searchLoading"
icon=
"el-icon-search"
icon=
"el-icon-search"
native-type=
"submit"
>
native-type=
"submit"
>
查询
查询
...
@@ -74,10 +75,20 @@
...
@@ -74,10 +75,20 @@
<el-button
type=
"success"
@
click=
"addDialog(1)"
>
新增
</el-button>
<el-button
type=
"success"
@
click=
"addDialog(1)"
>
新增
</el-button>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"danger"
@
click=
"deleteSection()"
>
删除
</el-button>
<el-button
:loading=
"delLoading"
type=
"danger"
@
click=
"deleteSection()"
>
删除
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-button
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
<el-button
:loading=
"exportLoading"
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
class=
"table-wrap"
v-loading=
"loading"
>
<div
class=
"table-wrap"
v-loading=
"loading"
>
...
@@ -227,6 +238,9 @@ export default {
...
@@ -227,6 +238,9 @@ export default {
userData
:
[],
userData
:
[],
selection
:
[],
selection
:
[],
dialogVisible
:
false
,
dialogVisible
:
false
,
searchLoading
:
false
,
delLoading
:
false
,
exportLoading
:
false
,
searchForm
:
{
searchForm
:
{
cateId
:
''
,
cateId
:
''
,
code
:
''
,
code
:
''
,
...
@@ -409,6 +423,7 @@ export default {
...
@@ -409,6 +423,7 @@ export default {
}
}
},
},
importExcel
()
{
importExcel
()
{
this
.
exportLoading
=
true
const
input
=
document
.
createElement
(
'input'
)
const
input
=
document
.
createElement
(
'input'
)
input
.
style
.
display
=
'none'
input
.
style
.
display
=
'none'
input
.
type
=
'file'
input
.
type
=
'file'
...
@@ -425,6 +440,7 @@ export default {
...
@@ -425,6 +440,7 @@ export default {
this
.
$message
.
success
(
'导入成功'
)
this
.
$message
.
success
(
'导入成功'
)
this
.
getList
()
this
.
getList
()
}
}
this
.
exportLoading
=
false
}
}
},
},
setpaginationOptions
(
opt
)
{
setpaginationOptions
(
opt
)
{
...
@@ -552,6 +568,7 @@ export default {
...
@@ -552,6 +568,7 @@ export default {
type
:
'warning'
type
:
'warning'
})
})
.
then
(()
=>
{
.
then
(()
=>
{
if
(
!
v
)
this
.
delLoading
=
true
const
url
=
`base/propertyValue/delete?ids=
${
ids
}
`
const
url
=
`base/propertyValue/delete?ids=
${
ids
}
`
axios
.
get
(
url
).
then
((
res
)
=>
{
axios
.
get
(
url
).
then
((
res
)
=>
{
// eslint-disable-next-line eqeqeq
// eslint-disable-next-line eqeqeq
...
@@ -562,9 +579,12 @@ export default {
...
@@ -562,9 +579,12 @@ export default {
})
})
this
.
getList
(
this
.
currentPage
)
this
.
getList
(
this
.
currentPage
)
}
}
if
(
!
v
)
this
.
delLoading
=
false
})
})
})
})
.
catch
(()
=>
{})
.
catch
(()
=>
{
if
(
!
v
)
this
.
delLoading
=
false
})
},
},
// 选择列表接口
// 选择列表接口
alllist
(
url
)
{
alllist
(
url
)
{
...
...
src/views/system/sku-sort.vue
View file @
b50420f2
...
@@ -36,10 +36,12 @@
...
@@ -36,10 +36,12 @@
<el-button
type=
"success"
@
click=
"addDialog(1)"
>
新增
</el-button>
<el-button
type=
"success"
@
click=
"addDialog(1)"
>
新增
</el-button>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"danger"
@
click=
"deleteSection()"
>
删除
</el-button>
<el-button
:loading=
"delLoading"
type=
"danger"
@
click=
"deleteSection()"
>
删除
</el-button>
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-form-item
style=
"margin-bottom: 0px"
>
<el-button
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
<el-button
:loading=
"exportLoading"
type=
"primary"
@
click=
"importExcel"
>
导入
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
class=
"table_wrap"
>
<div
class=
"table_wrap"
>
...
@@ -245,6 +247,9 @@ export default {
...
@@ -245,6 +247,9 @@ export default {
data
()
{
data
()
{
return
{
return
{
propDialogVisible
:
false
,
propDialogVisible
:
false
,
searchLoading
:
false
,
delLoading
:
false
,
exportLoading
:
false
,
checkedProps
:
[],
checkedProps
:
[],
productProperties
:
[],
productProperties
:
[],
is_title
:
1
,
is_title
:
1
,
...
@@ -400,6 +405,7 @@ export default {
...
@@ -400,6 +405,7 @@ export default {
methods
:
{
methods
:
{
importExcel
()
{
importExcel
()
{
this
.
exportLoading
=
true
const
input
=
document
.
createElement
(
'input'
)
const
input
=
document
.
createElement
(
'input'
)
input
.
style
.
display
=
'none'
input
.
style
.
display
=
'none'
input
.
type
=
'file'
input
.
type
=
'file'
...
@@ -413,6 +419,7 @@ export default {
...
@@ -413,6 +419,7 @@ export default {
this
.
$message
.
success
(
'导入成功'
)
this
.
$message
.
success
(
'导入成功'
)
this
.
getList
()
this
.
getList
()
}
}
this
.
exportLoading
=
false
}
}
}
,
}
,
async
changeDisableStatus
(
v
,
item
)
{
async
changeDisableStatus
(
v
,
item
)
{
...
@@ -577,6 +584,7 @@ export default {
...
@@ -577,6 +584,7 @@ export default {
}
,
}
,
// 查询
// 查询
getList
()
{
getList
()
{
this
.
searchLoading
=
true
const
{
pageSize
,
currentPage
}
=
this
.
paginationOptions
const
{
pageSize
,
currentPage
}
=
this
.
paginationOptions
axios
axios
.
get
(
'baseProperty/list_page'
,
{
.
get
(
'baseProperty/list_page'
,
{
...
@@ -596,6 +604,10 @@ export default {
...
@@ -596,6 +604,10 @@ export default {
dangerouslyUseHTMLString
:
true
dangerouslyUseHTMLString
:
true
}
)
}
)
}
}
this
.
searchLoading
=
false
}
)
.
catch
(()
=>
{
this
.
searchLoading
=
false
}
)
}
)
}
,
}
,
// 部门职员查询
// 部门职员查询
...
@@ -703,6 +715,7 @@ export default {
...
@@ -703,6 +715,7 @@ export default {
type
:
'warning'
type
:
'warning'
}
)
}
)
.
then
(()
=>
{
.
then
(()
=>
{
if
(
!
v
)
this
.
delLoading
=
true
const
url
=
`baseProperty/delete?ids=${ids
}
`
const
url
=
`baseProperty/delete?ids=${ids
}
`
axios
.
get
(
url
).
then
((
res
)
=>
{
axios
.
get
(
url
).
then
((
res
)
=>
{
// eslint-disable-next-line eqeqeq
// eslint-disable-next-line eqeqeq
...
@@ -717,9 +730,12 @@ export default {
...
@@ -717,9 +730,12 @@ export default {
dangerouslyUseHTMLString
:
true
dangerouslyUseHTMLString
:
true
}
)
}
)
}
}
if
(
!
v
)
this
.
delLoading
=
false
}
)
}
)
}
)
}
)
.
catch
(()
=>
{
}
)
.
catch
(()
=>
{
if
(
!
v
)
this
.
delLoading
=
false
}
)
}
}
}
}
}
}
...
...
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