Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
肖康
/
cloudSystem
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0bdf731e
authored
May 17, 2021
by
肖康
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
x
parent
6ffe61e9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
121 additions
and
121 deletions
src/assets/css/goods/goods.less
src/assets/css/goods/goods.min.css
src/assets/css/public/common.less
src/assets/css/public/common.min.css
src/assets/css/store/enter.less
src/assets/css/store/enter.min.css
src/views/Goods/goods.vue
src/views/Store/enter.vue
src/views/Store/list.vue
src/assets/css/goods/goods.less
View file @
0bdf731e
.goods{
.goods-con{
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #E5EBF6;
padding:20px;
.goods {
.pdf {
span {
font-size: 20px;
}
.search-btn{
color:#666;
&:hover {
color : #1969F9;
cursor: pointer;
width: 76px;
height: 37px;
line-height: 37px;
background: #1969F9;
}
}
.goods-con {
background : #FFFFFF;
border-radius: 4px;
border : 1px solid #E5EBF6;
padding : 20px;
}
.search-btn {
cursor : pointer;
width : 76px;
height : 37px;
line-height : 37px;
background : #1969F9;
border-radius: 2px;
font-size: 14px;
color:#fff;
text-align: center;
&:hover{
font-size : 14px;
color : #fff;
text-align : center;
&:hover {
background: #0050E0;
}
}
.btn-nav{
margin-top: 11px;
.btn-nav {
margin-top : 11px;
margin-bottom: 22px;
.dcg{
width: 66px;
height: 26px;
.dcg
{
width
: 66px;
height
: 26px;
border-radius: 2px;
text-align: center;
line-height: 26px;
border: 1px solid #1969F9;
background: #E5EEFF;;
color:#1969F9;
text-align : center;
line-height : 26px;
border : 1px solid #1969F9;
background : #E5EEFF;
;
color : #1969F9;
margin-right: 10px;
font-size: 14px;
transition: all 0.5s;
&:hover{
font-size : 14px;
transition : all 0.5s;
&:hover {
background: #1969F9;
cursor: pointer;
color
:
#fff;
cursor
: pointer;
color
:
#fff;
}
&.delbtn{
border:1px solid #FC1F00;
&.delbtn {
border : 1px solid #FC1F00;
background: #FFE7E3;
color:#FC1F00;
&:hover{
color : #FC1F00;
&:hover {
background: #FF715D;
color
:
#fff;
color
:
#fff;
}
}
&.updatex{
&.updatex {}
}
}
.updatex{
width: 66px;
height: 26px;
line-height: 26px;
text-align: center;
background: #FFEEDD;
border: 1px solid #FF870D;
.updatex
{
width
: 66px;
height
: 26px;
line-height
: 26px;
text-align
: center;
background
: #FFEEDD;
border
: 1px solid #FF870D;
border-radius: 2px;
color:#FF870D;
font-size: 14px;
cursor: pointer;
width: 66px;
&:hover{
color : #FF870D;
font-size : 14px;
cursor : pointer;
width : 66px;
&:hover {
background: #FCA955;
color
:
#fff;
color
:
#fff;
}
}
}
.brand-img{
width: 80%;
.brand-img {
width : 80%;
height: 80;
}
...
...
src/assets/css/goods/goods.min.css
View file @
0bdf731e
.goods
.goods-con
{
background
:
#FFFFFF
;
border-radius
:
4px
;
border
:
1px
solid
#E5EBF6
;
padding
:
20px
}
.goods
.search-btn
{
cursor
:
pointer
;
width
:
76px
;
height
:
37px
;
line-height
:
37px
;
background
:
#1969F9
;
border-radius
:
2px
;
font-size
:
14px
;
color
:
#fff
;
text-align
:
center
}
.goods
.search-btn
:hover
{
background
:
#0050E0
}
.goods
.btn-nav
{
margin-top
:
11px
;
margin-bottom
:
22px
}
.goods
.btn-nav
.dcg
{
width
:
66px
;
height
:
26px
;
border-radius
:
2px
;
text-align
:
center
;
line-height
:
26px
;
border
:
1px
solid
#1969F9
;
background
:
#E5EEFF
;
color
:
#1969F9
;
margin-right
:
10px
;
font-size
:
14px
;
transition
:
all
.5s
}
.goods
.btn-nav
.dcg
:hover
{
background
:
#1969F9
;
cursor
:
pointer
;
color
:
#fff
}
.goods
.btn-nav
.dcg.delbtn
{
border
:
1px
solid
#FC1F00
;
background
:
#FFE7E3
;
color
:
#FC1F00
}
.goods
.btn-nav
.dcg.delbtn
:hover
{
background
:
#FF715D
;
color
:
#fff
}
.goods
.btn-nav
.updatex
{
height
:
26px
;
line-height
:
26px
;
text-align
:
center
;
background
:
#FFEEDD
;
border
:
1px
solid
#FF870D
;
border-radius
:
2px
;
color
:
#FF870D
;
font-size
:
14px
;
cursor
:
pointer
;
width
:
66px
}
.goods
.btn-nav
.updatex
:hover
{
background
:
#FCA955
;
color
:
#fff
}
.goods
.brand-img
{
width
:
80%
;
height
:
80
}
\ No newline at end of file
.goods
.pdf
{
color
:
#666
}
.goods
.pdf
span
{
font-size
:
20px
}
.goods
.pdf
:hover
{
color
:
#1969F9
;
cursor
:
pointer
}
.goods
.goods-con
{
background
:
#FFFFFF
;
border-radius
:
4px
;
border
:
1px
solid
#E5EBF6
;
padding
:
20px
}
.goods
.search-btn
{
cursor
:
pointer
;
width
:
76px
;
height
:
37px
;
line-height
:
37px
;
background
:
#1969F9
;
border-radius
:
2px
;
font-size
:
14px
;
color
:
#fff
;
text-align
:
center
}
.goods
.search-btn
:hover
{
background
:
#0050E0
}
.goods
.btn-nav
{
margin-top
:
11px
;
margin-bottom
:
22px
}
.goods
.btn-nav
.dcg
{
width
:
66px
;
height
:
26px
;
border-radius
:
2px
;
text-align
:
center
;
line-height
:
26px
;
border
:
1px
solid
#1969F9
;
background
:
#E5EEFF
;
color
:
#1969F9
;
margin-right
:
10px
;
font-size
:
14px
;
transition
:
all
.5s
}
.goods
.btn-nav
.dcg
:hover
{
background
:
#1969F9
;
cursor
:
pointer
;
color
:
#fff
}
.goods
.btn-nav
.dcg.delbtn
{
border
:
1px
solid
#FC1F00
;
background
:
#FFE7E3
;
color
:
#FC1F00
}
.goods
.btn-nav
.dcg.delbtn
:hover
{
background
:
#FF715D
;
color
:
#fff
}
.goods
.btn-nav
.updatex
{
height
:
26px
;
line-height
:
26px
;
text-align
:
center
;
background
:
#FFEEDD
;
border
:
1px
solid
#FF870D
;
border-radius
:
2px
;
color
:
#FF870D
;
font-size
:
14px
;
cursor
:
pointer
;
width
:
66px
}
.goods
.btn-nav
.updatex
:hover
{
background
:
#FCA955
;
color
:
#fff
}
.goods
.brand-img
{
width
:
80%
;
height
:
80
}
\ No newline at end of file
src/assets/css/public/common.less
View file @
0bdf731e
...
...
@@ -387,6 +387,13 @@ body {
}
.el-cascader-panel{
min-height: 150px;
max-height: 300px;
}
.placehoload .el-input__inner::-webkit-input-placeholder {
color: #333;
}
//js跟随提示框
.el-tooltip__popper {
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
...
...
src/assets/css/public/common.min.css
View file @
0bdf731e
This diff is collapsed.
Click to expand it.
src/assets/css/store/enter.less
View file @
0bdf731e
.enter{
.el-upload-list--text{
display: none;
}
.enter-con{
background: #FFFFFF;
border-radius: 4px;
...
...
src/assets/css/store/enter.min.css
View file @
0bdf731e
.enter
.enter-con
{
background
:
#FFFFFF
;
border-radius
:
4px
;
border
:
1px
solid
#E5EBF6
;
padding
:
20px
;
}
.enter
.search-btn
{
cursor
:
pointer
;
width
:
76px
;
height
:
37px
;
line-height
:
37px
;
background
:
#1969F9
;
border-radius
:
2px
;
font-size
:
14px
;
color
:
#fff
;
text-align
:
center
;
}
.enter
.search-btn
:hover
{
background
:
#0050E0
;
}
.enter
.btn-nav
{
margin-top
:
11px
;
margin-bottom
:
22px
;
}
.enter
.btn-nav
.dcg
{
width
:
66px
;
height
:
26px
;
border-radius
:
2px
;
text-align
:
center
;
line-height
:
26px
;
border
:
1px
solid
#1969F9
;
background
:
#fff
;
color
:
#1969F9
;
margin-right
:
10px
;
font-size
:
14px
;
transition
:
all
0.5s
;
}
.enter
.btn-nav
.dcg.long
{
width
:
95px
;
}
.enter
.btn-nav
.dcg
:hover
{
background
:
#1969F9
;
cursor
:
pointer
;
color
:
#fff
;
}
.enter
.btn-nav
.dcg.delbtn
{
border
:
1px
solid
#FC1F00
;
background
:
#FFE7E3
;
color
:
#FC1F00
;
}
.enter
.btn-nav
.dcg.delbtn
:hover
{
background
:
#FF715D
;
color
:
#fff
;
}
/*# sourceMappingURL=enter.min.css.map */
\ No newline at end of file
.enter
.el-upload-list--text
{
display
:
none
}
.enter
.enter-con
{
background
:
#FFFFFF
;
border-radius
:
4px
;
border
:
1px
solid
#E5EBF6
;
padding
:
20px
}
.enter
.search-btn
{
cursor
:
pointer
;
width
:
76px
;
height
:
37px
;
line-height
:
37px
;
background
:
#1969F9
;
border-radius
:
2px
;
font-size
:
14px
;
color
:
#fff
;
text-align
:
center
}
.enter
.search-btn
:hover
{
background
:
#0050E0
}
.enter
.btn-nav
{
margin-top
:
11px
;
margin-bottom
:
22px
}
.enter
.btn-nav
.dcg
{
width
:
66px
;
height
:
26px
;
border-radius
:
2px
;
text-align
:
center
;
line-height
:
26px
;
border
:
1px
solid
#1969F9
;
background
:
#fff
;
color
:
#1969F9
;
margin-right
:
10px
;
font-size
:
14px
;
transition
:
all
.5s
}
.enter
.btn-nav
.dcg.long
{
width
:
95px
}
.enter
.btn-nav
.dcg
:hover
{
background
:
#1969F9
;
cursor
:
pointer
;
color
:
#fff
}
.enter
.btn-nav
.dcg.delbtn
{
border
:
1px
solid
#FC1F00
;
background
:
#FFE7E3
;
color
:
#FC1F00
}
.enter
.btn-nav
.dcg.delbtn
:hover
{
background
:
#FF715D
;
color
:
#fff
}
\ No newline at end of file
src/views/Goods/goods.vue
View file @
0bdf731e
This diff is collapsed.
Click to expand it.
src/views/Store/enter.vue
View file @
0bdf731e
...
...
@@ -24,8 +24,11 @@
</el-form>
<div
class=
"btn-nav clr"
>
<el-upload
class=
"upload-demo fl"
:action=
"uploadUrl"
:on-change=
"handleChange"
multiple
>
<div
class=
"fl dcg"
>
导入
</div>
<div
class=
"fl dcg long"
@
click=
"checkdr"
>
查看导入结果
</div>
</el-upload>
<div
class=
"fl dcg long"
@
click=
"checkdr"
>
查看导入结果
</div>
<div
class=
"fl dcg"
@
click=
"downwj"
>
下载模版
</div>
<div
class=
"fl dcg delbtn"
@
click=
"del"
>
删除
</div>
</div>
...
...
@@ -53,7 +56,8 @@
<el-table-column
prop=
"create_time"
label=
"上传时间"
min-width=
"20%"
>
</el-table-column>
</el-table>
<el-pagination
layout=
"prev, pager, next,jumper"
:page-size=
"limit"
:total=
"total"
@
current-change=
"handleCurrentChange"
:current-page=
"page"
>
<el-pagination
layout=
"prev, pager, next,jumper"
:page-size=
"limit"
:total=
"total"
@
current-change=
"handleCurrentChange"
:current-page=
"page"
>
</el-pagination>
</div>
</div>
...
...
@@ -66,7 +70,9 @@
import
Vue
from
'vue'
;
import
Menu
from
"@/components/menu.vue"
;
import
Tool
from
'../../tool'
import
{
NODE_ENVS
}
from
"../../ajax"
;
import
{
NODE_ENVS
}
from
"../../ajax"
;
import
{
Form
,
FormItem
,
...
...
@@ -83,10 +89,11 @@
Message
,
MessageBox
,
Dialog
,
Upload
,
Pagination
}
from
'element-ui'
Vue
.
use
(
Button
).
use
(
Form
).
use
(
Select
).
use
(
Option
).
use
(
Input
).
use
(
FormItem
).
use
(
Dialog
).
use
(
Pagination
)
Vue
.
use
(
DatePicker
).
use
(
Dropdown
).
use
(
DropdownMenu
).
use
(
DropdownItem
).
use
(
TableColumn
).
use
(
Table
)
Vue
.
use
(
DatePicker
).
use
(
Dropdown
).
use
(
DropdownMenu
).
use
(
DropdownItem
).
use
(
TableColumn
).
use
(
Table
)
.
use
(
Upload
)
export
default
{
name
:
"enter"
,
...
...
@@ -95,7 +102,7 @@
total
:
0
,
limit
:
10
,
page
:
1
,
uploadUrl
:
NODE_ENVS
+
'/api/uploadSku/import'
,
formInline
:
{
status
:
''
,
date
:
''
...
...
@@ -121,7 +128,7 @@
if
(
res
.
err_code
===
0
)
{
this
.
tableData
=
res
.
data
.
list
||
[];
this
.
total
=
Number
(
res
.
data
.
total
)
||
0
;
this
.
total
=
Number
(
res
.
data
.
total
)
||
0
;
}
else
{
Message
(
res
.
err_msg
);
}
...
...
@@ -131,6 +138,20 @@
this
.
page
=
1
;
this
.
getData
();
},
handleChange
(
file
,
fileList
)
{
console
.
log
(
file
.
response
);
if
(
!
file
.
response
)
{
return
}
if
(
file
.
response
.
err_code
===
0
)
{
Message
(
"导入成功"
)
this
.
page
=
1
;
this
.
getData
();
}
else
{
Message
(
res
.
err_msg
);
}
},
checkdr
()
{
if
(
this
.
multipleSelection
.
length
>
1
)
{
Message
(
"只能选择一条数据导入"
)
...
...
@@ -140,7 +161,7 @@
Message
(
"请至少选择一条数据导入"
)
return
}
window
.
location
.
href
=
NODE_ENVS
+
'/api/uploadSku/downResult?id='
+
this
.
multipleSelection
[
0
][
'id'
]
window
.
location
.
href
=
NODE_ENVS
+
'/api/uploadSku/downResult?id='
+
this
.
multipleSelection
[
0
][
'id'
]
},
downwj
()
{
...
...
@@ -176,7 +197,7 @@
},
handleCurrentChange
(
val
)
{
this
.
page
=
val
;
this
.
page
=
val
;
this
.
getData
();
},
handleSelectionChange
(
val
)
{
...
...
src/views/Store/list.vue
View file @
0bdf731e
...
...
@@ -166,7 +166,7 @@
<el-input
v-model=
"scope.row.dlhq"
placeholder=
"如:2-5"
>
</el-input>
<div
class=
"selectdw"
>
<el-select
v-model=
"scope.row.dlhqdw"
>
<el-select
v-model=
"scope.row.dlhqdw"
placeholder=
"天"
class=
"placehoload"
>
<el-option
label=
"天"
value=
"天"
></el-option>
<el-option
label=
"周"
value=
"周"
></el-option>
</el-select>
...
...
@@ -178,10 +178,10 @@
<el-table-column
label=
"修改香港交期"
min-width=
"20%"
>
<
template
slot-scope=
"scope"
>
<div
class=
"updatebox"
>
<el-input
v-model=
"scope.row.hkhq"
placeholder=
"如:2-5"
>
<el-input
v-model=
"scope.row.hkhq"
placeholder=
"如:2-5"
>
</el-input>
<div
class=
"selectdw"
>
<el-select
v-model=
"scope.row.hkhqdw"
>
<el-select
v-model=
"scope.row.hkhqdw"
placeholder=
"天"
class=
"placehoload"
>
<el-option
label=
"天"
value=
"天"
></el-option>
<el-option
label=
"周"
value=
"周"
></el-option>
</el-select>
...
...
@@ -356,6 +356,7 @@
//修改货期弹窗
this
.
dialogVisible2
=
true
this
.
huoqidata
=
this
.
selectData
}
},
submitHq
()
{
...
...
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