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
787ae6e1
Commit
787ae6e1
authored
Apr 22, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务单据修改旅客名单
parent
dd85e7e9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2163 additions
and
17 deletions
+2163
-17
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+7
-1
FreelineManagement.vue
src/components/activity/FreelineManagement.vue
+1376
-0
ItineraryCustomizer.vue
src/components/activity/ItineraryCustomizer.vue
+619
-0
RegimentLabel.vue
src/components/activity/RegimentLabel.vue
+96
-0
Rotationchart.vue
src/components/activity/Rotationchart.vue
+38
-16
config.js
src/router/config.js
+27
-0
No files found.
src/components/FinancialModule/addFinancialDocuments.vue
View file @
787ae6e1
...
...
@@ -1227,7 +1227,12 @@ export default {
this
.
IsUploadPic
=
data
.
IsUploadPic
;
this
.
msg
.
IsPublic
=
data
.
IsPublic
;
this
.
GetDetail
=
data
;
this
.
Description
=
this
.
GetDetail
.
Description
;
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
10
){
}
else
{
this
.
Description
=
this
.
GetDetail
.
Description
;
}
if
(
this
.
orderObj
){
this
.
msg
.
OrderID
=
this
.
orderObj
.
OrderID
?
this
.
orderObj
.
OrderID
:
0
;
this
.
OrderSource
=
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
...
...
@@ -1315,6 +1320,7 @@ export default {
that
.
describeList
.
forEach
(
item
=>
{
that
.
Description
+=
item
.
GuestName
+
" "
;
})
console
.
log
(
"that.Description"
,
that
.
Description
)
}
},
mounted
(){
...
...
src/components/activity/FreelineManagement.vue
0 → 100644
View file @
787ae6e1
This diff is collapsed.
Click to expand it.
src/components/activity/ItineraryCustomizer.vue
0 → 100644
View file @
787ae6e1
This diff is collapsed.
Click to expand it.
src/components/activity/RegimentLabel.vue
0 → 100644
View file @
787ae6e1
<
style
>
.user_time_picker
.el-date-editor--date
>
.el-input__inner
{
padding
:
0
10px
;
font-size
:
13px
;
}
.user_time_picker
.el-date-editor--date
>
span
.el-input__prefix
{
display
:
none
;
}
.user_time_picker
.el-date-editor--date
>
span
.el-input__suffix
{
top
:
-4px
;
right
:
2px
;
}
.zidingyiFz
i
{
font-size
:
14px
!important
;}
</
style
>
<
template
>
<div
class=
"flexOne"
>
<div
style=
"overflow:auto"
>
<input
type=
"button"
class=
"normalBtn"
value=
"添加"
style=
"float:right"
/>
</div>
<table
style=
"margin-top:10px"
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<th>
排序
</th>
<th>
标签名
</th>
<th>
操作
</th>
</tr>
<tr
v-for=
"item in dataList"
:key=
"item.SNO"
>
<td>
{{
item
.
SNO
}}
</td>
<td>
{{
item
.
Content
}}
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top"
>
<el-button
type=
"primary"
class=
'zidingyiFz'
icon=
"iconfont icon-bangdingzhagnhuxinxi"
circle
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<!--
<el-pagination
background
@
current-change=
"handleCurrentChange"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
>
</el-pagination>
-->
<el-dialog
custom-class=
'w400'
title=
"团期标签"
:visible
.
sync=
"LabelVisible"
>
<el-form
:model=
"pwdMsg"
label-width=
"100px"
:rules=
"rulesPwd"
ref=
"pwdMsg"
>
<el-form-item
label=
"标签类型"
prop=
"EmName"
>
<el-input
class=
'w217'
type=
"text"
v-model=
"addMsg.EmName"
:placeholder=
"$t('pub.pleaseImport')"
readonly
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('system.table_acc')"
prop=
"EmAccount"
>
<el-input
class=
'w217'
type=
"text"
v-model=
"addMsg.EmAccount"
:placeholder=
"$t('pub.pleaseImport')"
readonly
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('adm.adm_newPd')"
prop=
"Pwd"
>
<el-input
class=
'w217'
type=
"password"
v-model=
"pwdMsg.Pwd"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</el-form-item>
<el-form-item
:label=
"$t('adm.adm_Reinput')"
prop=
"Pwd1"
>
<el-input
class=
'w217'
type=
"password"
v-model=
"pwdMsg.Pwd1"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"innerVisible=false,resetForm('pwdMsg')"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm1('pwdMsg')"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
</div>
</el-dialog>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
msg
:{
name
:
'theme'
,
code
:
1
,
},
dataList
:[],
LabelVisible
:
false
,
}
},
mounted
()
{
this
.
getList
();
},
methods
:
{
handleCurrentChange
(){},
getList
(){
this
.
apipost
(
'travel_get_GetTravelPriceTag'
,
this
.
msg
,
res
=>
{
console
.
log
(
"res"
,
res
);
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataList
=
res
.
data
.
data
;
}
else
{}
},
err
=>
{})
},
}
}
</
script
>
\ No newline at end of file
src/components/activity/Rotationchart.vue
View file @
787ae6e1
...
...
@@ -171,17 +171,7 @@
<span
v-if=
"item.slideStatus==2"
class=
"free"
style=
"background: #E95252;"
>
禁用
</span>
<div
class=
"zezhao"
>
<i
class=
"el-icon-edit"
title=
"编辑"
@
click
.
stop=
"EditImg(item)"
></i>
<el-popover
placement=
"right"
width=
"400"
trigger=
"click"
>
<el-select
v-model=
"editForm.slideStatus"
placeholder=
"请选择状态"
>
<el-option
label=
"不限"
:value=
"0"
></el-option>
<el-option
label=
"b2b"
:value=
"1"
></el-option>
</el-select>
<i
class=
"el-icon-printer"
slot=
"reference"
title=
"修改状态"
@
click
.
stop=
"EditStatus(item)"
></i>
</el-popover>
<i
class=
"el-icon-printer"
slot=
"reference"
title=
"修改状态"
@
click
.
stop=
"EditStatus(item)"
></i>
</div>
</div>
</li>
...
...
@@ -196,7 +186,21 @@
:total=
"total"
></el-pagination>
</div>
<!-- 修改状态 -->
<el-dialog
title=
"修改状态"
:visible
.
sync=
"changestatus"
width=
"400px"
>
<el-select
v-model=
"editForm.slideStatus"
placeholder=
"请选择状态"
>
<el-option
label=
"启用"
:value=
"1"
></el-option>
<el-option
label=
"禁用"
:value=
"2"
></el-option>
<el-option
label=
"删除"
:value=
"3"
></el-option>
</el-select>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"changestatus = false"
size=
"small"
>
取 消
</el-button>
<el-button
type=
"danger"
@
click=
"ChangeStatus"
size=
"small"
>
确 定
</el-button>
</span>
</el-dialog>
<div
class=
"divShow"
v-show=
"divShow"
>
<p
class=
"_tit"
>
轮播图
</p>
<el-form
class=
"choose_form"
ref=
"form_div"
:rules=
"rules"
:model=
"form_div"
label-width=
"80px"
>
...
...
@@ -279,6 +283,7 @@
name
:
'Rotationchart'
,
data
(){
return
{
changestatus
:
false
,
editForm
:{},
picIsShow
:
false
,
form
:{
...
...
@@ -320,8 +325,21 @@
this
.
GetList
()
},
methods
:{
ChangeStatus
(){
this
.
changestatus
=
false
;
this
.
apiJavaPost
(
"/api/dmc/slide/updateSlideStatus"
,
this
.
editForm
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
GetList
();
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
},
EditStatus
(
item
){
this
.
changestatus
=
true
;
this
.
editForm
.
id
=
item
.
id
;
},
EditImg
(
item
){
this
.
form_div
=
Object
.
assign
({},
item
);
...
...
@@ -340,8 +358,11 @@
SaveImg
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
this
.
form_div
.
imageUrl
==
""
){
this
.
Error
(
"请上传图片!"
)
return
;
}
this
.
apiJavaPost
(
"/api/dmc/slide/setSlide"
,
this
.
form_div
,
res
=>
{
console
.
log
(
"res"
,
res
);
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
GetList
();
...
...
@@ -410,13 +431,14 @@
this
.
picObj
=
[];
this
.
initialIndex
=
index
;
this
.
dataList
.
forEach
((
x
,
index
)
=>
{
this
.
picObj
.
push
(
x
.
imageUrl
);
if
(
x
.
slideStatus
!=
2
){
this
.
picObj
.
push
(
x
.
imageUrl
);
}
})
},
// 获取列表数据
GetList
(){
this
.
apiJavaPost
(
"/api/dmc/slide/getSlideList"
,
this
.
form
,
res
=>
{
console
.
log
(
"res"
,
res
);
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
...
...
src/router/config.js
View file @
787ae6e1
...
...
@@ -3016,6 +3016,33 @@ export default {
title
:
'B2B菜单管理'
}
},
{
path
:
'/FreelineManagement'
,
name
:
'FreelineManagement'
,
component
:
resolve
=>
require
([
'@/components/activity/FreelineManagement'
],
resolve
),
meta
:
{
title
:
'自由行推荐管理'
}
},
{
path
:
'/ItineraryCustomizer'
,
name
:
'ItineraryCustomizer'
,
component
:
resolve
=>
require
([
'@/components/activity/ItineraryCustomizer'
],
resolve
),
meta
:
{
title
:
'行程定制师'
}
},
{
path
:
'/RegimentLabel'
,
name
:
'RegimentLabel'
,
component
:
resolve
=>
require
([
'@/components/activity/RegimentLabel'
],
resolve
),
meta
:
{
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