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
51b4f6a3
Commit
51b4f6a3
authored
Nov 10, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小包团信息分房表
parent
ee8cabb8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3271 additions
and
3146 deletions
+3271
-3146
HotelManagement.vue
src/components/Hotel/HotelManagement.vue
+1
-1
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+1
-3
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+3269
-3142
No files found.
src/components/Hotel/HotelManagement.vue
View file @
51b4f6a3
...
@@ -494,7 +494,7 @@
...
@@ -494,7 +494,7 @@
<el-popconfirm
@
confirm=
"deleteFile(scope.row, scope.$index)"
:title=
"$t('objFill.quedinscm')"
>
<el-popconfirm
@
confirm=
"deleteFile(scope.row, scope.$index)"
:title=
"$t('objFill.quedinscm')"
>
<el-button
slot=
"reference"
class=
"editInfo"
type=
"danger"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
<el-button
slot=
"reference"
class=
"editInfo"
type=
"danger"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
</el-popconfirm>
</el-popconfirm>
<a
:href=
"scope.row.Url"
t
ype=
"download
"
>
<a
:href=
"scope.row.Url"
t
arget=
"_blank
"
>
<el-button
class=
"editInfo"
type=
"primary"
>
{{
$t
(
'objFill.xz'
)
}}
</el-button>
<el-button
class=
"editInfo"
type=
"primary"
>
{{
$t
(
'objFill.xz'
)
}}
</el-button>
</a>
</a>
</
template
>
</
template
>
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
51b4f6a3
...
@@ -1629,7 +1629,6 @@
...
@@ -1629,7 +1629,6 @@
<el-dropdown-item
v-if=
"CurrentUserInfo.RB_Group_id == 2 || ShangChuanFenFangbiao"
<el-dropdown-item
v-if=
"CurrentUserInfo.RB_Group_id == 2 || ShangChuanFenFangbiao"
@
click
.
native=
"ShowUploadWord(item, 2)"
>
{{ $t("op.UploadFFB") }}
@
click
.
native=
"ShowUploadWord(item, 2)"
>
{{ $t("op.UploadFFB") }}
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
v-if=
"CurrentUserInfo.RB_Group_id == 2 || ChaKanGuest"
>
<el-dropdown-item
v-if=
"CurrentUserInfo.RB_Group_id == 2 || ChaKanGuest"
>
<div
v-if=
"item.ScoreNum >= 0"
@
click=
"goInvetig('investigationList', item.TCID, 0)"
>
<div
v-if=
"item.ScoreNum >= 0"
@
click=
"goInvetig('investigationList', item.TCID, 0)"
>
{{ $t("op.LookPassengerSurvey") }}
{{ $t("op.LookPassengerSurvey") }}
...
@@ -1962,8 +1961,7 @@
...
@@ -1962,8 +1961,7 @@
</div>
</div>
<el-form
label-width=
"100px"
>
<el-form
label-width=
"100px"
>
<el-col
:span=
"8"
class=
"_pic_upload"
>
<el-col
:span=
"8"
class=
"_pic_upload"
>
<el-upload
:http-request=
"UploadAttachment"
drag
:multiple=
"true"
:show-file-list=
"false"
action=
""
<el-upload
:http-request=
"UploadAttachment"
drag
:show-file-list=
"false"
action=
""
accept=
"*.*"
>
accept=
"*.doc,*.docx"
>
<i
class=
"el-icon-plus avatar-uploader-icon"
></i>
<i
class=
"el-icon-plus avatar-uploader-icon"
></i>
<div
class=
"el-upload__text"
>
{{ $t("active.ld_djscwj") }}
</div>
<div
class=
"el-upload__text"
>
{{ $t("active.ld_djscwj") }}
</div>
</el-upload>
</el-upload>
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
51b4f6a3
<
style
>
<
style
>
@import
"../../../assets/css/newTravelManager.css"
;
@import
"../../../assets/css/newTravelManager.css"
;
.flex
{
display
:
flex
;
}
.TC_companyList
span
,
.TC_companyList
span
,
.TC_OtherCompany
span
{
.TC_OtherCompany
span
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -51,31 +55,68 @@
...
@@ -51,31 +55,68 @@
margin-bottom
:
10px
;
margin-bottom
:
10px
;
}
}
.TCL_Content
span
{
.go_date
{
display
:
inline-block
;
font-weight
:
700
;
font-size
:
14px
;
}
.TC_Content
._pic_upload
.el-upload-dragger
{
font-size
:
28px
;
color
:
#8c939d
;
width
:
126px
;
height
:
80px
;
line-height
:
41px
;
text-align
:
center
;
}
.TC_Content
._pic_upload
>
div
{
float
:
left
;
width
:
138px
;
height
:
92px
;
border
:
1px
dashed
rgba
(
210
,
210
,
210
,
1
);
border-radius
:
2px
;
cursor
:
pointer
;
margin-bottom
:
10px
;
padding
:
5px
;
margin-right
:
10px
;
margin-right
:
10px
;
position
:
relative
;
}
}
.AuditRedType
{
.TC_Content
.avatar-uploader-icon
{
color
:
red
;
height
:
auto
;
}
}
.AuditBlueType
{
.TC_HotelPop
{
color
:
blue
;
overflow
:
auto
;
max-height
:
650px
;
}
}
.AuditGreenType
{
.TC_HotelPop
table
td
{
color
:
green
;
padding
:
5px
0
;
text-align
:
center
;
}
.TC_HotelPop
table
th
{
text-align
:
center
;
}
.TC_CarNum
{
padding
:
5px
10px
;
background
:
#5151f5
;
color
:
#fff
;
font-size
:
12px
;
display
:
inline-block
;
border-radius
:
5px
;
}
}
.comSearchDiv
.el-checkbox
{
.comSearchDiv
.el-checkbox
{
margin-right
:
0
;
margin-right
:
0
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
>
<div
class=
"TC_Content "
>
<div
class=
"TC_Content
TC-MyList"
>
<div
class=
"
TC-MyList"
>
<div
class=
"query-box"
>
<div
class=
"query-box"
>
<!--v-if="queryCommonData.IsParentCompany==1"-->
<!--v-if="queryCommonData.IsParentCompany==1"-->
<div
class=
"TC_companyList"
v-if=
"CurrentUserInfo.RB_Branch_id!=1257"
>
<div
class=
"TC_companyList"
v-if=
"CurrentUserInfo.RB_Branch_id!=1257"
>
...
@@ -144,7 +185,8 @@
...
@@ -144,7 +185,8 @@
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</em>
<em>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</em>
<el-input
v-model=
"queryMsg.Title"
@
keyup
.
native
.
enter=
"getControlList"
class=
"w150"
clearable
></el-input>
<el-input
v-model=
"queryMsg.Title"
@
keyup
.
native
.
enter=
"getControlList"
class=
"w150"
clearable
>
</el-input>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -174,7 +216,8 @@
...
@@ -174,7 +216,8 @@
</div>
</div>
<div>
<div>
<span>
{{
$t
(
'visa.v_czuser'
)
}}
</span>
<span>
{{
$t
(
'visa.v_czuser'
)
}}
</span>
<el-select
class=
"w150"
v-model=
"queryMsg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w150"
v-model=
"queryMsg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
>
</el-option>
</el-option>
<el-option
v-for=
"item in queryCommonData.EmployeeList"
:label=
"item.EmName"
<el-option
v-for=
"item in queryCommonData.EmployeeList"
:label=
"item.EmName"
...
@@ -183,8 +226,9 @@
...
@@ -183,8 +226,9 @@
</div>
</div>
<div>
<div>
<span>
{{
$t
(
'visa.v_xcdays'
)
}}
</span>
<span>
{{
$t
(
'visa.v_xcdays'
)
}}
</span>
<el-input
maxlength=
"50"
v-model=
"queryMsg.DayNum"
@
keyup
.
native=
"checkInteger(queryMsg,'DayNum')"
<el-input
maxlength=
"50"
v-model=
"queryMsg.DayNum"
class=
"w150"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
@
keyup
.
native=
"checkInteger(queryMsg,'DayNum')"
class=
"w150"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</div>
</div>
<div>
<div>
...
@@ -598,6 +642,15 @@
...
@@ -598,6 +642,15 @@
<p
class=
"travelnowrap"
v-if=
"item.IsSetOut == 1"
>
<p
class=
"travelnowrap"
v-if=
"item.IsSetOut == 1"
>
<span
style=
"color: red"
>
{{ $t("objFill.quxiaofatuan") }}
</span>
<span
style=
"color: red"
>
{{ $t("objFill.quxiaofatuan") }}
</span>
</p>
</p>
<p
class=
"travelnowrap"
v-if=
"item.WordPath != ''"
>
<a
style=
"cursor: pointer"
:href=
"domainManager().ViittoFileUrl + item.WordPath"
>
{{ $t("Operation.Op_downLoadword") }}
</a>
</p>
<p
class=
"travelnowrap"
v-if=
"item.FenFangUrl != ''"
>
<a
style=
"cursor: pointer; color: blue"
:title=
"$t('objFill.v101.dmc.dianjscffwj')"
v-if=
"item.FenFangUrl && item.FenFangUrl != ''"
:href=
"item.FenFangUrl"
>
{{ $t("op.FFBDowmLoad") }}
</a>
</p>
<p
class=
"travelnowrap"
>
<p
class=
"travelnowrap"
>
<span>
{{$t('scen.sc_cp')}}
</span>
<span>
{{$t('scen.sc_cp')}}
</span>
{{item.OutBranchName}}
{{item.OutBranchName}}
...
@@ -1117,7 +1170,8 @@
...
@@ -1117,7 +1170,8 @@
<div
class=
"el-col"
>
<div
class=
"el-col"
>
<div
class=
"d7"
>
<div
class=
"d7"
>
<el-button
@
click
.
native=
'goUrl("RegistrationList", item.TCID,"报名清单")'
type=
"primary"
<el-button
@
click
.
native=
'goUrl("RegistrationList", item.TCID,"报名清单")'
type=
"primary"
style=
"background:#00C6FF; border-color:#00C6FF"
>
{{$t('Operation.Op_registrationList')}}
</el-button>
style=
"background:#00C6FF; border-color:#00C6FF"
>
{{$t('Operation.Op_registrationList')}}
</el-button>
<el-dropdown
trigger=
"click"
style=
"margin-bottom:5px;"
>
<el-dropdown
trigger=
"click"
style=
"margin-bottom:5px;"
>
<span
class=
"el-dropdown-link"
>
{{$t('pub.updateMsg')}}
<span
class=
"el-dropdown-link"
>
{{$t('pub.updateMsg')}}
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
...
@@ -1173,7 +1227,8 @@
...
@@ -1173,7 +1227,8 @@
<div
slot=
"content"
>
<div
slot=
"content"
>
<div
v-html=
"TipsContent(item,2)"
></div>
<div
v-html=
"TipsContent(item,2)"
></div>
</div>
</div>
<el-button
@
click
.
native=
'PushBusMessage(item)'
type=
"primary"
style=
"background:red !important;"
>
<el-button
@
click
.
native=
'PushBusMessage(item)'
type=
"primary"
style=
"background:red !important;"
>
{{
$t
(
'objFill.v101.yituisdche'
)
}}
{{
$t
(
'objFill.v101.yituisdche'
)
}}
</el-button>
</el-button>
</el-tooltip>
</el-tooltip>
...
@@ -1222,6 +1277,9 @@
...
@@ -1222,6 +1277,9 @@
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'ckSellPoint(item)'
>
{{$t('Operation.Op_bentuanMaidian')}}
<el-dropdown-item
@
click
.
native=
'ckSellPoint(item)'
>
{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"ShowUploadWord(item, 2)"
>
{{ $t("op.UploadFFB") }}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'reSubmit(item)'
v-if=
"item.AuditStatus==3"
>
<el-dropdown-item
@
click
.
native=
'reSubmit(item)'
v-if=
"item.AuditStatus==3"
>
{{$t('objFill.v101.chongxtjshe')}}
{{$t('objFill.v101.chongxtjshe')}}
</el-dropdown-item>
</el-dropdown-item>
...
@@ -1236,7 +1294,8 @@
...
@@ -1236,7 +1294,8 @@
</div>
</div>
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item>
<div
@
click=
'GoToleaderReimbursement(item)'
style=
"color:red"
>
{{$t('objFill.dijiecbzc')}}
</div>
<div
@
click=
'GoToleaderReimbursement(item)'
style=
"color:red"
>
{{$t('objFill.dijiecbzc')}}
</div>
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'ckOPInfo(item)'
>
{{$t('objFill.v101.qianzopshez')}}
<el-dropdown-item
@
click
.
native=
'ckOPInfo(item)'
>
{{$t('objFill.v101.qianzopshez')}}
</el-dropdown-item>
</el-dropdown-item>
...
@@ -1294,7 +1353,8 @@
...
@@ -1294,7 +1353,8 @@
v-if=
"(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' "
>
v-if=
"(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' "
>
<div
class=
"TCL_remarkTitle"
>
{{$t('Operation.Op_dijieRemark')}}:
</div>
<div
class=
"TCL_remarkTitle"
>
{{$t('Operation.Op_dijieRemark')}}:
</div>
<div
class=
"TCL_Content"
>
{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<div
class=
"TCL_Content"
>
{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a
v-if=
"item.HotelDiningBus.HotelChangeState>0"
@
click=
"goHotelDiningBus(item,item.HotelDiningBus,1)"
<a
v-if=
"item.HotelDiningBus.HotelChangeState>0"
@
click=
"goHotelDiningBus(item,item.HotelDiningBus,1)"
style=
"color:blue;cursor:pointer"
>
{{$t('Operation.Op_HotelChange')}}
</a>
style=
"color:blue;cursor:pointer"
>
{{$t('Operation.Op_HotelChange')}}
</a>
<a
v-if=
"item.HotelDiningBus.DiningChangeState>0"
<a
v-if=
"item.HotelDiningBus.DiningChangeState>0"
@
click=
"goHotelDiningBus(item,item.HotelDiningBus,2)"
@
click=
"goHotelDiningBus(item,item.HotelDiningBus,2)"
...
@@ -1481,6 +1541,26 @@
...
@@ -1481,6 +1541,26 @@
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SetSellingPoints"
>
{{$t('pub.sureBtn')}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SetSellingPoints"
>
{{$t('pub.sureBtn')}}
</button>
</div>
</div>
</div>
</div>
<div
class=
"combottomDiv OPremarkDiv"
v-if=
"queryCommonData.UploadWORDTip"
v-loading=
"queryCommonData.uploadLoading"
>
<div
class=
"combottomTitle"
>
<
template
v-if=
"queryCommonData.UploadItem.Type == 1"
>
{{
$t
(
"Operation.Op_scTrip"
)
}}
</
template
>
<
template
v-else
>
{{
$t
(
"op.UploadFFB"
)
}}
</
template
>
<button
style=
"float: right; margin-right: 100px"
class=
"hollowFixedBtn"
type=
"primary"
@
click=
"queryCommonData.UploadWORDTip = false"
>
{{ $t("pub.cancelBtn") }}
</button>
</div>
<el-form
label-width=
"100px"
>
<el-col
:span=
"8"
class=
"_pic_upload"
>
<el-upload
:http-request=
"UploadAttachment"
drag
:show-file-list=
"false"
action=
""
accept=
"*.*"
>
<i
class=
"el-icon-plus avatar-uploader-icon"
></i>
<div
class=
"el-upload__text"
>
{{ $t("active.ld_djscwj") }}
</div>
</el-upload>
</el-col>
</el-form>
</div>
<!--修改op信息-->
<!--修改op信息-->
<div
class=
"combottomDiv OPremarkDiv"
style=
"height:150px;"
v-show=
"VisaOPMsg.VisaShow"
>
<div
class=
"combottomDiv OPremarkDiv"
style=
"height:150px;"
v-show=
"VisaOPMsg.VisaShow"
>
<div
class=
"combottomTitle"
>
{{$t('objFill.v101.qianzopshez')}}
</div>
<div
class=
"combottomTitle"
>
{{$t('objFill.v101.qianzopshez')}}
</div>
...
@@ -1629,8 +1709,8 @@
...
@@ -1629,8 +1709,8 @@
<EditLeaveGroup
v-if=
"GroupTypeVisible"
:item=
"GroupTypeObj"
@
Cancel=
'CancelGroupType'
<EditLeaveGroup
v-if=
"GroupTypeVisible"
:item=
"GroupTypeObj"
@
Cancel=
'CancelGroupType'
@
Success=
"getControlList()"
/>
@
Success=
"getControlList()"
/>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
commonHotelInfo
from
"../../commonPage/commonHotelInfo.vue"
;
import
commonHotelInfo
from
"../../commonPage/commonHotelInfo.vue"
;
import
commonBusInfo
from
"../../commonPage/commonBusInfo.vue"
;
import
commonBusInfo
from
"../../commonPage/commonBusInfo.vue"
;
import
priceDialog
from
'../TravelNewQuotation/priceDialog.vue'
;
import
priceDialog
from
'../TravelNewQuotation/priceDialog.vue'
;
...
@@ -1739,6 +1819,12 @@
...
@@ -1739,6 +1819,12 @@
UnionText
:
this
.
$t
(
'sm.xianshiLianyun'
),
UnionText
:
this
.
$t
(
'sm.xianshiLianyun'
),
//本团卖点
//本团卖点
SellingPoints
:
false
,
SellingPoints
:
false
,
//上传WORD提示层
UploadWORDTip
:
false
,
//选择上传项
UploadItem
:
{},
//word上传提示层
uploadLoading
:
false
,
},
},
//查询参数
//查询参数
queryMsg
:
{
queryMsg
:
{
...
@@ -2008,6 +2094,47 @@
...
@@ -2008,6 +2094,47 @@
});
});
}
}
},
},
//显示弹窗层
ShowUploadWord
(
item
,
type
)
{
this
.
queryCommonData
.
UploadWORDTip
=
true
;
this
.
queryCommonData
.
UploadItem
=
item
;
this
.
queryCommonData
.
UploadItem
.
Type
=
type
;
},
//保存WORD路劲
UploadAttachment
(
file
)
{
var
that
=
this
;
let
newArr
=
[];
newArr
.
push
(
file
.
file
);
let
fileName
=
file
.
file
.
name
;
var
path
=
"/Upload/WordTrip/"
;
this
.
UploadSelfFileT
(
path
,
newArr
,
(
res
)
=>
{
if
(
res
.
data
.
StatusCode
==
1
)
{
that
.
queryCommonData
.
uploadLoading
=
true
;
let
uploadMsg
=
{
TCID
:
that
.
queryCommonData
.
UploadItem
.
TCID
,
Type
:
that
.
queryCommonData
.
UploadItem
.
Type
,
wordPath
:
res
.
data
.
FilePath
,
};
that
.
apipost
(
"travel_post_UploadWord"
,
uploadMsg
,
(
res
)
=>
{
that
.
queryCommonData
.
uploadLoading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
res
.
data
.
message
);
that
.
queryCommonData
.
UploadWORDTip
=
false
;
that
.
getControlList
();
}
else
{
that
.
Error
(
res
.
data
.
message
);
}
},
(
err
)
=>
{}
);
}
else
{
that
.
Error
(
this
.
$t
(
"objFill.shangcwjsb"
));
}
});
},
//复制、新增报价单
//复制、新增报价单
NewCopyPriceSheet
(
item
,
type
)
{
NewCopyPriceSheet
(
item
,
type
)
{
if
(
type
)
{
if
(
type
)
{
...
@@ -3200,4 +3327,4 @@
...
@@ -3200,4 +3327,4 @@
}
}
};
};
</
script
>
</
script
>
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