Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
db2e8eae
Commit
db2e8eae
authored
Feb 11, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
83840aeb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
86 additions
and
66 deletions
+86
-66
scmAccountManagement.vue
src/components/platformModule/scmAccountManagement.vue
+7
-6
scmHotelManagement.vue
src/components/platformModule/scmHotelManagement.vue
+79
-60
No files found.
src/components/platformModule/scmAccountManagement.vue
View file @
db2e8eae
...
@@ -154,8 +154,8 @@
...
@@ -154,8 +154,8 @@
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible =
false,clearData()"
>
取
消
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible =
false"
>
取
消
</button>
<button
class=
"normalBtn"
type=
"
primary
"
@
click=
"saveSCMAccount()"
>
保存
</button>
<button
class=
"normalBtn"
type=
"
button
"
@
click=
"saveSCMAccount()"
>
保存
</button>
</div>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
...
@@ -199,8 +199,9 @@
...
@@ -199,8 +199,9 @@
this
.
outerVisible
=
false
;
this
.
outerVisible
=
false
;
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
getList
()
this
.
getList
()
this
.
clearData
();
}
}
else
{
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
...
...
src/components/platformModule/scmHotelManagement.vue
View file @
db2e8eae
<
style
>
<
style
>
.scm
Account
Management
.avatar-uploader
.el-upload
{
.scm
Hotel
Management
.avatar-uploader
.el-upload
{
border
:
1px
dashed
#d9d9d9
;
border
:
1px
dashed
#d9d9d9
;
cursor
:
pointer
;
cursor
:
pointer
;
position
:
relative
;
position
:
relative
;
...
@@ -9,11 +9,11 @@
...
@@ -9,11 +9,11 @@
border-radius
:
50%
border-radius
:
50%
}
}
.scm
Account
Management
.avatar-uploader
.el-upload
:hover
{
.scm
Hotel
Management
.avatar-uploader
.el-upload
:hover
{
border-color
:
#409EFF
;
border-color
:
#409EFF
;
}
}
.scm
Account
Management
.avatar-uploader-icon
{
.scm
Hotel
Management
.avatar-uploader-icon
{
font-size
:
28px
;
font-size
:
28px
;
color
:
white
;
color
:
white
;
width
:
100px
;
width
:
100px
;
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
}
}
/* 上传样式 */
/* 上传样式 */
.scm
Account
Management
.avatar-uploader
.el-upload
{
.scm
Hotel
Management
.avatar-uploader
.el-upload
{
border
:
1px
dashed
#d9d9d9
;
border
:
1px
dashed
#d9d9d9
;
cursor
:
pointer
;
cursor
:
pointer
;
position
:
relative
;
position
:
relative
;
...
@@ -37,11 +37,11 @@
...
@@ -37,11 +37,11 @@
border-radius
:
50%
border-radius
:
50%
}
}
.scm
Account
Management
.avatar-uploader
.el-upload
:hover
{
.scm
Hotel
Management
.avatar-uploader
.el-upload
:hover
{
border-color
:
#409EFF
;
border-color
:
#409EFF
;
}
}
.scm
Account
Management
.avatar-uploader-icon
{
.scm
Hotel
Management
.avatar-uploader-icon
{
font-size
:
28px
;
font-size
:
28px
;
color
:
white
;
color
:
white
;
width
:
100px
;
width
:
100px
;
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
background
:
rgba
(
0
,
0
,
0
,
0.5
);
background
:
rgba
(
0
,
0
,
0
,
0.5
);
}
}
.scm
Account
Management
.avatar
{
.scm
Hotel
Management
.avatar
{
width
:
100px
;
width
:
100px
;
height
:
100px
;
height
:
100px
;
display
:
block
;
display
:
block
;
...
@@ -66,19 +66,21 @@
...
@@ -66,19 +66,21 @@
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne scm
Account
Management"
>
<div
class=
"flexOne scm
Hotel
Management"
>
<div
class=
"query-box"
>
<div
class=
"query-box"
>
<ul>
<ul>
<li>
<li>
<span><em>
姓名
</em>
<span><em>
名称
</em>
<el-input
class=
'w210'
v-model=
"msg.Name"
:placeholder=
"$t('pub.pleaseImport')"
<el-input
class=
'w210'
v-model=
"msg.
H
Name"
:placeholder=
"$t('pub.pleaseImport')"
@
keyup
.
enter
.
native=
"getList"
></el-input>
@
keyup
.
enter
.
native=
"getList"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span><em>
账号
</em>
<span><em>
类型
</em>
<el-input
class=
'w210'
v-model=
"msg.Account"
:placeholder=
"$t('pub.pleaseImport')"
<el-select
class=
'w210'
v-model=
"msg.HType"
:placeholder=
"$t('pub.unlimitedSel')"
>
@
keyup
.
enter
.
native=
"getList"
></el-input>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-0'
></el-option>
<el-option
v-for=
"item in TypeList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -86,15 +88,14 @@
...
@@ -86,15 +88,14 @@
<el-select
class=
'w210'
v-model=
"msg.Status"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-select
class=
'w210'
v-model=
"msg.Status"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-1'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-1'
></el-option>
<el-option
label=
"正常"
:value=
'0'
></el-option>
<el-option
label=
"正常"
:value=
'0'
></el-option>
<el-option
label=
"禁用"
:value=
'1'
></el-option>
<el-option
label=
"删除"
:value=
'1'
></el-option>
<el-option
label=
"删除"
:value=
'2'
></el-option>
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex(),getList()"
/>
@
click=
"resetPageIndex(),getList()"
/>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle='新增
账号信息'
"
class=
"normalBtn"
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle='新增
酒店配置信息',clearData()
"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
/>
:value=
"$t('pub.addBtn')"
/>
</li>
</li>
</ul>
</ul>
...
@@ -102,25 +103,26 @@
...
@@ -102,25 +103,26 @@
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<tr>
<th
width=
"80"
>
编号
</th>
<th
width=
"80"
>
编号
</th>
<th
width=
"100"
>
姓名
</th>
<th
width=
"100"
>
配置项名称
</th>
<th
width=
"100"
>
账号
</th>
<th
width=
"100"
>
类型
</th>
<th
width=
"100"
>
状态
</th>
<th
width=
"100"
>
状态
</th>
<th
width=
"100"
>
操作人
</th>
<th
width=
"100"
>
操作人
</th>
<th
width=
"100"
>
操作时间
</th>
<th
width=
"100"
>
操作时间
</th>
<th
width=
"100"
>
操作
</th>
<th
width=
"100"
>
操作
</th>
</tr>
</tr>
<tr
v-for=
"(item,index) in DataList"
v-loading=
'loading'
:key=
"index"
>
<tr
v-for=
"(item,index) in DataList"
v-loading=
'loading'
:key=
"index"
>
<td>
{{
item
.
Id
}}
</td>
<td>
{{
item
.
HConfig
Id
}}
</td>
<td>
{{
item
.
Name
}}
</td>
<td>
{{
item
.
H
Name
}}
</td>
<td>
{{
item
.
Account
}}
</td>
<td>
{{
item
.
HTypeStr
}}
</td>
<td>
{{
item
.
StatusStr
}}
</td>
<td>
{{
item
.
StatusStr
}}
</td>
<td>
{{
item
.
UpdateByName
}}
</td>
<td>
{{
item
.
UpdateByName
}}
</td>
<td>
{{
item
.
UpdateTimeStr
}}
</td>
<td>
{{
item
.
UpdateTimeStr
}}
</td>
<td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top-start"
>
<el-button
@
click=
"outerVisible = true,dialogTitle='修改
账号信息',GetAccount(item.
Id)"
type=
"primary"
<el-button
@
click=
"outerVisible = true,dialogTitle='修改
酒店配置信息',GetHotelConfig(item.HConfig
Id)"
type=
"primary"
icon=
"el-icon-edit"
circle
></el-button>
icon=
"el-icon-edit"
circle
></el-button>
</el-tooltip>
</el-tooltip>
<a
@
click=
"DeleteHotelConfig(item)"
>
删除
</a>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -130,28 +132,18 @@
...
@@ -130,28 +132,18 @@
<el-dialog
custom-class=
'w500'
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
>
<el-dialog
custom-class=
'w500'
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
>
<el-form
:model=
"addMsg"
ref=
"addMsg"
label-width=
"120px"
>
<el-form
:model=
"addMsg"
ref=
"addMsg"
label-width=
"120px"
>
<el-form-item
class=
'w400'
label=
"姓名"
>
<el-form-item
class=
'w400'
label=
"名称"
>
<el-input
type=
"text"
v-model=
"addMsg.Name"
placeholder=
"请输入姓名"
></el-input>
<el-input
type=
"text"
v-model=
"addMsg.HName"
placeholder=
"请输入名称"
></el-input>
</el-form-item>
<el-form-item
class=
'w400'
label=
"账号"
>
<el-input
type=
"text"
v-model=
"addMsg.Account"
placeholder=
"请输入账号"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
class=
'w400'
label=
"供应商"
>
<el-form-item
class=
'w400'
label=
"类型"
>
<el-select
class=
'w210'
v-model=
"addMsg.SupplierId"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-select
class=
'w210'
v-model=
"addMsg.HType"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-1'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-0'
></el-option>
</el-select>
<el-option
v-for=
"item in TypeList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
></el-option>
</el-form-item>
<el-form-item
class=
'w400'
label=
"状态"
>
<el-select
class=
'w210'
v-model=
"addMsg.Status"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'-1'
></el-option>
<el-option
label=
"正常"
:value=
'0'
></el-option>
<el-option
label=
"禁用"
:value=
'1'
></el-option>
<el-option
label=
"删除"
:value=
'2'
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,clearData()"
>
取
消
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,clearData()"
>
取消
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"saveSCMAccount()"
>
保存
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"saveSCMAccount()"
>
保存
</button>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -171,28 +163,28 @@
...
@@ -171,28 +163,28 @@
//请求数据
//请求数据
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
15
,
pageSize
:
15
,
Status
:
-
1
,
Status
:
0
,
Name
:
''
,
H
Name
:
''
,
Account
:
''
HType
:
0
,
},
},
TypeList
:
[],
//类型列表
addMsg
:
{
addMsg
:
{
Id
:
0
,
//编号
HConfigId
:
0
,
//编号
Name
:
""
,
//姓名
HType
:
0
,
//配置类型(1-公共设施,2-客房设施,3-活动设施服务,4-酒店服务,5-前台语言)
Account
:
""
,
//账号
HName
:
""
,
//配置名称
Pwd
:
"123456"
,
//密码
SupplierId
:
0
,
//供应商编号
HeadImg
:
""
,
//头像
},
},
}
}
},
},
mounted
()
{
mounted
()
{
this
.
GetConfigTypeList
();
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
//保存信息
//保存信息
saveSCMAccount
()
{
saveSCMAccount
()
{
this
.
apipost
(
'
admin_post_SetAdminAccount
'
,
this
.
addMsg
,
res
=>
{
this
.
apipost
(
'
scm_post_SetHotelConfigService
'
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
outerVisible
=
false
;
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
getList
()
this
.
getList
()
this
.
clearData
();
this
.
clearData
();
...
@@ -203,16 +195,13 @@
...
@@ -203,16 +195,13 @@
},
},
//清空数据
//清空数据
clearData
()
{
clearData
()
{
this
.
addMsg
.
Id
=
0
;
this
.
addMsg
.
HConfigId
=
0
;
this
.
addMsg
.
Name
=
""
;
this
.
addMsg
.
HType
=
0
;
this
.
addMsg
.
Account
=
""
;
this
.
addMsg
.
HName
=
""
;
this
.
addMsg
.
Pwd
=
"123456"
;
this
.
addMsg
.
SupplierId
=
0
;
this
.
addMsg
.
HeadImg
=
""
;
},
},
getList
()
{
//获取数据
getList
()
{
//获取数据
this
.
loading
=
true
this
.
loading
=
true
this
.
apipost
(
'scm_get_Get
SCMAccount
PageListService'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'scm_get_Get
HotelConfig
PageListService'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
DataList
=
res
.
data
.
data
.
pageData
;
this
.
DataList
=
res
.
data
.
data
.
pageData
;
...
@@ -221,9 +210,17 @@
...
@@ -221,9 +210,17 @@
},
err
=>
{})
},
err
=>
{})
},
},
//获取账号信息
//获取账号信息
GetAccount
(
id
)
{
GetConfigTypeList
()
{
this
.
apipost
(
'scm_get_GetSCMAccountService'
,
{
this
.
apipost
(
'scm_post_GetHotelConfigTypeService'
,
{},
res
=>
{
Id
:
id
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TypeList
=
res
.
data
.
data
;
}
},
err
=>
{})
},
//获取账号信息
GetHotelConfig
(
id
)
{
this
.
apipost
(
'scm_get_GetHotelConfigService'
,
{
HConfigId
:
id
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
addMsg
=
res
.
data
.
data
;
this
.
addMsg
=
res
.
data
.
data
;
...
@@ -237,6 +234,28 @@
...
@@ -237,6 +234,28 @@
resetPageIndex
()
{
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
this
.
currentPage
=
1
},
//删除酒店配置
DeleteHotelConfig
(
item
)
{
var
that
=
this
;
this
.
Confirm
(
"是否删除?"
,
function
()
{
var
msg
=
{
HConfigId
:
item
.
HConfigId
};
that
.
apipost
(
"scm_post_RemoveHotelConfigService"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
'删除成功!'
);
that
.
getList
();
}
else
{
that
.
Error
(
res
.
data
.
data
);
}
},
null
);
});
}
}
}
}
}
}
...
...
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