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
c1920649
Commit
c1920649
authored
Sep 27, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
c79d2bf9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
129 additions
and
173 deletions
+129
-173
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+113
-111
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+8
-27
TravelPrice2.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice2.vue
+3
-3
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+5
-32
No files found.
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
c1920649
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
c1920649
...
@@ -398,11 +398,11 @@
...
@@ -398,11 +398,11 @@
<ul
class=
"days"
>
<ul
class=
"days"
>
<li
class=
"liList"
v-for=
"(dayobject,index) in days"
:key=
"index+1000"
>
<li
class=
"liList"
v-for=
"(dayobject,index) in days"
:key=
"index+1000"
>
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.noChecked"
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.noChecked"
class=
"other-month"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
class=
"other-month"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
<!---->
<!---->
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.checked"
class=
"checked1"
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.checked"
class=
"checked1"
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
<!---->
<!---->
<span
v-else-if=
"dayobject.checkState==$calendarUtils.checkState.hasValue"
<span
v-else-if=
"dayobject.checkState==$calendarUtils.checkState.hasValue"
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
</li>
</li>
...
@@ -664,14 +664,6 @@
...
@@ -664,14 +664,6 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}"
>
{{standardCurrencyName}}结算
</span>
'otherPlat':standardCurrencyName=='',}"
>
{{standardCurrencyName}}结算
</span>
</el-form-item>
</el-form-item>
<!-- <el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">组团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item
style=
"margin-top:1px;"
>
<el-form-item
style=
"margin-top:1px;"
>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
供应商
</span>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
供应商
</span>
<el-select
class=
"w180"
v-model=
"priceData.SupplierId"
>
<el-select
class=
"w180"
v-model=
"priceData.SupplierId"
>
...
@@ -884,7 +876,8 @@
...
@@ -884,7 +876,8 @@
<el-select
class=
"w180"
v-model=
"priceData.PriceTeamType"
>
<el-select
class=
"w180"
v-model=
"priceData.PriceTeamType"
>
<
template
v-for=
"item in TeamListArr"
>
<
template
v-for=
"item in TeamListArr"
>
<!--去掉小包团2023-04-19-->
<!--去掉小包团2023-04-19-->
<el-option
v-if=
"item.Id!=4"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
<el-option
v-if=
"item.Id==1||item.Id==2||item.Id==3||item.Id==4"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-option>
</
template
>
</
template
>
</el-select>
</el-select>
...
@@ -1111,9 +1104,7 @@
...
@@ -1111,9 +1104,7 @@
import
TravelPriceFlightList
from
"../TravelGroupControl/TravelPriceFlightList.vue"
;
import
TravelPriceFlightList
from
"../TravelGroupControl/TravelPriceFlightList.vue"
;
import
TravelPriceFlightList_Self
from
"../TravelGroupControl/TravelPriceFlightList_Self.vue"
;
import
TravelPriceFlightList_Self
from
"../TravelGroupControl/TravelPriceFlightList_Self.vue"
;
export
default
{
export
default
{
props
:
[
"priceList"
,
"priceIsDirect"
,
"OfferList"
,
"PostConfig"
,
"modifyTcid"
,
"TeamType"
,
"CurrentUserInfo"
,
props
:
[
"priceList"
,
"PostConfig"
,
"modifyTcid"
,
"CurrentUserInfo"
,
"IsDirect"
],
"IsDirect"
],
data
()
{
data
()
{
return
{
return
{
outerVisible
:
false
,
outerVisible
:
false
,
...
@@ -1993,8 +1984,7 @@
...
@@ -1993,8 +1984,7 @@
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TeamListArr
=
res
.
data
.
data
;
this
.
TeamListArr
=
res
.
data
.
data
;
// 屏蔽单项服务
this
.
TeamListArr
.
splice
(
-
1
)
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -2090,14 +2080,6 @@
...
@@ -2090,14 +2080,6 @@
},
},
deep
:
true
deep
:
true
},
},
//监听报价单日期
OfferList
:
{
//深度监听,可监听到对象、数组的变化
handler
:
function
(
val
,
oldVal
)
{
this
.
initCalendar
();
},
deep
:
true
}
},
},
components
:
{
components
:
{
TravelPriceFlightList
:
TravelPriceFlightList
,
TravelPriceFlightList
:
TravelPriceFlightList
,
...
@@ -2105,5 +2087,4 @@
...
@@ -2105,5 +2087,4 @@
TravelPriceFlightListSelf
:
TravelPriceFlightList_Self
,
TravelPriceFlightListSelf
:
TravelPriceFlightList_Self
,
}
}
};
};
</
script
>
</
script
>
\ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @
c1920649
...
@@ -883,7 +883,7 @@
...
@@ -883,7 +883,7 @@
<el-select
class=
"w180"
v-model=
"priceData.PriceTeamType"
>
<el-select
class=
"w180"
v-model=
"priceData.PriceTeamType"
>
<
template
v-for=
"item in TeamListArr"
>
<
template
v-for=
"item in TeamListArr"
>
<!--去掉小包团2023-04-19-->
<!--去掉小包团2023-04-19-->
<el-option
v-if=
"item.Id
!=4
"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
<el-option
v-if=
"item.Id
==2||item.Id==3
"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-option>
</
template
>
</
template
>
</el-select>
</el-select>
...
@@ -1994,8 +1994,7 @@
...
@@ -1994,8 +1994,7 @@
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TeamListArr
=
res
.
data
.
data
;
this
.
TeamListArr
=
res
.
data
.
data
;
// 屏蔽单项服务
this
.
TeamListArr
.
splice
(
-
1
)
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -2043,6 +2042,7 @@
...
@@ -2043,6 +2042,7 @@
priceList
:
{
priceList
:
{
//深度监听,可监听到对象、数组的变化
//深度监听,可监听到对象、数组的变化
handler
:
function
(
val
,
oldVal
)
{
handler
:
function
(
val
,
oldVal
)
{
console
.
log
(
"travel_price2"
);
this
.
returnPriceList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
priceList
));
this
.
returnPriceList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
priceList
));
//当团期修改
//当团期修改
if
(
this
.
modifyTcid
>
0
)
{
if
(
this
.
modifyTcid
>
0
)
{
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
c1920649
...
@@ -385,11 +385,11 @@
...
@@ -385,11 +385,11 @@
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.noChecked"
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.noChecked"
class=
"other-month"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
class=
"other-month"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
<!---->
<!---->
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.checked"
<span
v-if=
"dayobject.checkState==$calendarUtils.checkState.checked"
class=
"checked1"
class=
"checked1"
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
<!---->
<!---->
<span
<span
v-else-if=
"dayobject.checkState==$calendarUtils.checkState.hasValue"
v-else-if=
"dayobject.checkState==$calendarUtils.checkState.hasValue"
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
@
click=
"clickedDay(dayobject)"
>
{{
dayobject
.
day
.
getDate
()
}}
</span>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -865,7 +865,7 @@
...
@@ -865,7 +865,7 @@
<
script
>
<
script
>
import
TravelPriceFlightList
from
"../TravelGroupControl/TravelPriceFlightList.vue"
;
import
TravelPriceFlightList
from
"../TravelGroupControl/TravelPriceFlightList.vue"
;
export
default
{
export
default
{
props
:
[
"priceList"
,
"
priceIsDirect"
,
"OfferList"
,
"PostConfig"
,
"modifyTcid"
,
"TeamType
"
],
props
:
[
"priceList"
,
"
PostConfig"
,
"modifyTcid"
,
"CurrentUserInfo"
,
"IsDirect
"
],
data
()
{
data
()
{
return
{
return
{
outerVisible
:
false
,
outerVisible
:
false
,
...
@@ -1178,25 +1178,6 @@
...
@@ -1178,25 +1178,6 @@
this
.
returnPriceList
.
push
(
obj
);
this
.
returnPriceList
.
push
(
obj
);
})
})
}
else
{
}
else
{
// var that = this;
// if (this.returnPriceList && this.returnPriceList.length > 0) {
// this.returnPriceList.forEach(item => {
// if (item.TCID > 0) {
// that.apipost(
// "travel_post_RemoveTravelPrice", {
// TCID: item.TCID
// },
// res => {
// if (res.data.resultCode == 1) {
// } else {
// that.Info(res.data.message);
// }
// },
// null
// );
// }
// })
// }
//取消选中
//取消选中
this
.
days
.
forEach
(
x
=>
{
this
.
days
.
forEach
(
x
=>
{
x
.
checkState
=
'2'
;
x
.
checkState
=
'2'
;
...
@@ -1788,14 +1769,6 @@
...
@@ -1788,14 +1769,6 @@
},
},
deep
:
true
deep
:
true
},
},
//监听报价单日期
OfferList
:
{
//深度监听,可监听到对象、数组的变化
handler
:
function
(
val
,
oldVal
)
{
this
.
initCalendar
();
},
deep
:
true
}
},
},
components
:
{
components
:
{
TravelPriceFlightList
:
TravelPriceFlightList
TravelPriceFlightList
:
TravelPriceFlightList
...
...
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