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
2fe389e4
Commit
2fe389e4
authored
Jan 25, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
3c9e19de
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
36 additions
and
35 deletions
+36
-35
zh.js
src/assets/common/lang/zh.js
+1
-0
EducationvideoList.vue
src/components/EducationvideoList.vue
+1
-1
ImpressionTicketCommission.vue
...Module/ImpressionTicketing/ImpressionTicketCommission.vue
+1
-1
ImpressionTicketDetails.vue
...ialModule/ImpressionTicketing/ImpressionTicketDetails.vue
+1
-1
ImpressionTicketUserDetails.vue
...odule/ImpressionTicketing/ImpressionTicketUserDetails.vue
+1
-1
index.vue
...components/FinancialModule/MonthlyCostStatement/index.vue
+13
-13
invoicesManager.vue
src/components/FinancialModule/invoicesManager.vue
+3
-3
HotelDiscount.vue
src/components/Hotel/HotelDiscount.vue
+1
-1
passengerInfo.vue
src/components/SalesModule/passengerInfo.vue
+1
-1
productOrderList.vue
src/components/SalesModule/productOrderList.vue
+1
-1
TicketManager.vue
src/components/Ticketing/TicketManager.vue
+1
-1
directorCarList.vue
src/components/TravelManager/Lxy/directorCarList.vue
+1
-1
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+1
-1
CostNewPriceCC.vue
...nents/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
+1
-1
CostNewPriceForm.vue
...nts/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
+1
-1
editTeamInfo.vue
src/components/TravelManager/TravelTeam/editTeamInfo.vue
+1
-1
lineoffer.vue
src/components/TravelManager/customizedcar/lineoffer.vue
+2
-2
CouponList.vue
src/components/activity/CouponList.vue
+1
-1
Rotationchart.vue
src/components/activity/Rotationchart.vue
+2
-2
TravelInfoList.vue
src/components/activity/TravelInfoList.vue
+1
-1
No files found.
src/assets/common/lang/zh.js
View file @
2fe389e4
...
...
@@ -2921,6 +2921,7 @@ export const MonthCost = {
MonthCost_chongdi
:
'冲抵'
,
MonthCost_glyjfkd
:
'关联月结付款单'
,
MonthCost_cbyjb
:
'成本月结表'
,
MonthCost_rbch
:
'日本车行'
,
}
...
...
src/components/EducationvideoList.vue
View file @
2fe389e4
...
...
@@ -92,7 +92,7 @@
<el-form-item
style=
"display:inline-block"
label=
"标签"
prop=
"Label"
>
<!--
<el-input
style=
"width:220px"
v-model=
"addMsg.Label"
></el-input>
-->
<el-select
style=
"width:220px"
v-model=
"addMsg.Label"
placeholder=
"请选择状态"
>
<el-option
label=
"酒店
"
value=
"酒店"
></el-option>
<el-option
:label=
"$t('hotel.hotel')
"
value=
"酒店"
></el-option>
<el-option
label=
"景点"
value=
"景点"
></el-option>
<el-option
label=
"餐食"
value=
"餐食"
></el-option>
<el-option
label=
"交通"
value=
"交通"
></el-option>
...
...
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue
View file @
2fe389e4
...
...
@@ -36,7 +36,7 @@
<em>
提成归属公司
</em>
<el-select
filterable
v-model=
'msg.EmBranchId'
@
change=
'handleCurrentChange(1)'
>
<el-option
label=
"不限
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
...
...
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @
2fe389e4
...
...
@@ -32,7 +32,7 @@
<em>
提成归属公司
</em>
<el-select
filterable
v-model=
'msg.EmpBranchId'
@
change=
'handleCurrentChange(1)'
>
<el-option
label=
"不限
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
...
...
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @
2fe389e4
...
...
@@ -130,7 +130,7 @@
<em>
提成归属公司
</em>
<el-select
filterable
v-model=
'msg.EmBranchId'
@
change=
'handleCurrentChange(1)'
>
<el-option
label=
"不限
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
:label=
"$t('system.ph_buxian')
"
:value=
"-1"
:key=
"-1"
></el-option>
<el-option
v-for=
"item in companyList"
:label=
'item.BName'
...
...
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @
2fe389e4
...
...
@@ -135,10 +135,10 @@
<
el
-
col
:
span
=
"4"
>
<
el
-
form
-
item
:
label
=
"$t('system.table_rank')+':'"
>
<
el
-
select
filterable
v
-
model
=
'msg.Sort'
>
<
el
-
option
key
=
"-1"
value
=
"-1"
label
=
"不限
"
><
/el-option
>
<
el
-
option
key
=
"0"
value
=
"0"
label
=
"团期
"
><
/el-option
>
<
el
-
option
key
=
"1"
value
=
"1"
label
=
"汇款日期
"
><
/el-option
>
<
el
-
option
key
=
"2"
value
=
"2"
label
=
"单号
"
><
/el-option
>
<
el
-
option
key
=
"-1"
value
=
"-1"
:
label
=
"$t('system.ph_buxian')
"
><
/el-option
>
<
el
-
option
key
=
"0"
value
=
"0"
:
label
=
"$t('fnc.tuanqi')
"
><
/el-option
>
<
el
-
option
key
=
"1"
value
=
"1"
:
label
=
"$t('fnc.hkriqi')
"
><
/el-option
>
<
el
-
option
key
=
"2"
value
=
"2"
:
label
=
"$t('fnc.danhao')
"
><
/el-option
>
<
el
-
option
key
=
"3"
value
=
"3"
label
=
"交易流水号"
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
...
...
@@ -221,15 +221,15 @@
<
el
-
form
-
item
:
label
=
"$t('fnc.ddbianhao')+':'"
>
<
el
-
input
v
-
model
=
"msg.OrderID"
><
/el-input
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"订单类型
"
>
<
el
-
form
-
item
:
label
=
"$t('OrderList.search.orderType')
"
>
<
el
-
select
filterable
v
-
model
=
'msg.OtherType'
class
=
""
>
<
el
-
option
key
=
"0"
value
=
"0"
label
=
"不限
"
><
/el-option
>
<
el
-
option
key
=
"63"
value
=
"63"
label
=
"团队
"
><
/el-option
>
<
el
-
option
key
=
"61"
value
=
"61"
label
=
"酒店
"
><
/el-option
>
<
el
-
option
key
=
"66"
value
=
"66"
label
=
"门票
"
><
/el-option
>
<
el
-
option
key
=
"67"
value
=
"67"
label
=
"车辆
"
><
/el-option
>
<
el
-
option
key
=
"62"
value
=
"62"
label
=
"签证
"
><
/el-option
>
<
el
-
option
key
=
"5"
value
=
"5"
label
=
"日本车行
"
><
/el-option
>
<
el
-
option
key
=
"0"
value
=
"0"
:
label
=
"$t('system.ph_buxian')
"
><
/el-option
>
<
el
-
option
key
=
"63"
value
=
"63"
:
label
=
"$t('active.cl_team')
"
><
/el-option
>
<
el
-
option
key
=
"61"
value
=
"61"
:
label
=
"$t('hotel.hotel')
"
><
/el-option
>
<
el
-
option
key
=
"66"
value
=
"66"
:
label
=
"$t('scen.sc_piao')
"
><
/el-option
>
<
el
-
option
key
=
"67"
value
=
"67"
:
label
=
"$t('MarketingActi.car')
"
><
/el-option
>
<
el
-
option
key
=
"62"
value
=
"62"
:
label
=
"$t('active.cl_qianzheng')
"
><
/el-option
>
<
el
-
option
key
=
"5"
value
=
"5"
:
label
=
"$t('MonthCost.MonthCost_rbch')
"
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
<
/el-col
>
...
...
@@ -246,7 +246,7 @@
<
el
-
col
:
span
=
"4"
>
<
el
-
form
-
item
label
=
"车行客户:"
>
<
el
-
select
filterable
v
-
model
=
'msg.JapanCarCustomerId'
>
<
el
-
option
:
value
=
"0"
label
=
"不限
"
><
/el-option
>
<
el
-
option
:
value
=
"0"
:
label
=
"$t('system.ph_buxian')
"
><
/el-option
>
<
el
-
option
v
-
for
=
"item in JapanCarCustomerList"
:
key
=
"item.Id"
:
value
=
"item.Id"
:
label
=
"item.CustomerName"
><
/el-option
>
<
/el-select
>
<
/el-form-item
>
...
...
src/components/FinancialModule/invoicesManager.vue
View file @
2fe389e4
...
...
@@ -136,11 +136,11 @@
<el-form-item
label=
"发票类型"
>
<el-select
v-model=
"msg.InvoiceApplyType"
filterable
@
change=
"msg.InvoiceApplyType==4?msg.TCNUM='':''"
>
<el-option
:value=
"1"
label=
"跟团游"
></el-option>
<el-option
:value=
"2"
label=
"签证
"
></el-option>
<el-option
:value=
"2"
:label=
"$t('active.cl_qianzheng')
"
></el-option>
<el-option
:value=
"4"
label=
"单机票"
></el-option>
<el-option
:value=
"5"
label=
"车"
></el-option>
<el-option
:value=
"6"
label=
"酒店
"
></el-option>
<el-option
:value=
"7"
label=
"门票
"
></el-option>
<el-option
:value=
"6"
:label=
"$t('hotel.hotel')
"
></el-option>
<el-option
:value=
"7"
:label=
"$t('scen.sc_piao')
"
></el-option>
</el-select>
</el-form-item>
</el-col>
...
...
src/components/Hotel/HotelDiscount.vue
View file @
2fe389e4
...
...
@@ -147,7 +147,7 @@
</table>
<el-row
style=
"margin-bottom:15px"
>
<div
v-show=
"addMsg.AccountType==1"
>
<el-form-item
label=
"酒店
"
>
<el-form-item
:label=
"$t('hotel.hotel')
"
>
<el-select
style=
"width:201px"
v-model=
"addMsg.NewHotelID"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
<el-option
v-for=
"item in HotelList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
></el-option>
...
...
src/components/SalesModule/passengerInfo.vue
View file @
2fe389e4
...
...
@@ -64,7 +64,7 @@
<em>
产品类型
</em>
<el-select
class=
"passengerInfo_header_input1"
v-model=
'msg.IsAllograph'
clearable
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
value=
"-1"
></el-option>
<el-option
label=
"签证
"
value=
"1"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')
"
value=
"1"
></el-option>
<el-option
label=
"跟团"
value=
"2"
></el-option>
</el-select>
</div>
...
...
src/components/SalesModule/productOrderList.vue
View file @
2fe389e4
...
...
@@ -291,7 +291,7 @@
<el-select
class=
"w150"
v-model=
"msg.SelectOP"
filterable
placeholder=
"未维护OP"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
<el-option
v-if=
"!isVisa"
label=
"主团"
:value=
"1"
></el-option>
<el-option
label=
"签证
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')
"
:value=
"2"
></el-option>
</el-select>
</span>
</li>
...
...
src/components/Ticketing/TicketManager.vue
View file @
2fe389e4
...
...
@@ -2689,7 +2689,7 @@
</table>
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"BillingChargeDialog = false"
>
{{$t('pub.cancelBtn')}}
</el-button>
"
<el-button
size=
"small"
@
click=
"BillingChargeDialog = false"
>
{{$t('pub.cancelBtn')}}
</el-button>
<el-button
:loading=
"Btnloading"
size=
"small"
type=
"danger"
@
click=
"SumbitBillingCharge"
v-if=
"BillingChargeTitle!='开票费用详情'"
>
{{$t('pub.searchBtn')}}
</el-button>
</span>
...
...
src/components/TravelManager/Lxy/directorCarList.vue
View file @
2fe389e4
...
...
@@ -65,7 +65,7 @@
</el-table-column>
<el-table-column
prop=
"Name"
label=
"车辆
"
:label=
"$t('MarketingActi.car')
"
>
</el-table-column>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
2fe389e4
...
...
@@ -341,7 +341,7 @@
</el-form-item>
</td>
<td
colspan=
"2"
>
<el-form-item
label=
"签证
"
>
<el-form-item
:label=
"$t('active.cl_qianzheng')
"
>
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @
2fe389e4
...
...
@@ -248,7 +248,7 @@
</el-form-item>
</td>
<td
colspan=
"2"
>
<el-form-item
label=
"签证
"
>
<el-form-item
:label=
"$t('active.cl_qianzheng')
"
>
{{teamPrice.VisaPrice}}
</el-form-item>
</td>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @
2fe389e4
...
...
@@ -345,7 +345,7 @@
</el-form-item>
</td>
<td
colspan=
"2"
>
<el-form-item
label=
"签证
"
>
<el-form-item
:label=
"$t('active.cl_qianzheng')
"
>
<el-input
type=
"text"
v-model=
'teamPrice.VisaPrice'
class=
"w100"
@
keyup
.
native=
"checkPrice(teamPrice,'VisaPrice'),getchange()"
></el-input>
</el-form-item>
...
...
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @
2fe389e4
...
...
@@ -491,7 +491,7 @@
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"签证
"
prop=
"VisaPrice"
>
<el-form-item
:label=
"$t('active.cl_qianzheng')
"
prop=
"VisaPrice"
>
<el-input
v-model=
"editForm.VisaPrice"
></el-input>
</el-form-item>
</el-col>
...
...
src/components/TravelManager/customizedcar/lineoffer.vue
View file @
2fe389e4
...
...
@@ -132,7 +132,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"车辆
"
>
<el-form-item
:label=
"$t('MarketingActi.car')
"
>
<span>
{{x.CarName!=''?x.CarName:'无'}}
</span>
<input
type=
"button"
value=
"选择"
@
click=
"cartanc(y,2)"
class=
"normalBtn"
/>
</el-form-item>
...
...
@@ -257,7 +257,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"6"
>
<el-form-item
label=
"车辆
"
>
<el-form-item
:label=
"$t('MarketingActi.car')
"
>
<span>
{{x.CarName!=''?x.CarName:'无'}}
</span>
<input
type=
"button"
value=
"选择"
@
click=
"cartanc(y,1)"
class=
"normalBtn"
/>
</el-form-item>
...
...
src/components/activity/CouponList.vue
View file @
2fe389e4
...
...
@@ -440,7 +440,7 @@
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"订单类型
"
prop=
"lineId"
>
<el-form-item
:label=
"$t('OrderList.search.orderType')
"
prop=
"lineId"
>
<el-select
filterable
v-model=
"addMsg.expansionModel.orderType"
>
<el-option
label=
"小包团"
:value=
"2"
></el-option>
</el-select>
...
...
src/components/activity/Rotationchart.vue
View file @
2fe389e4
...
...
@@ -153,7 +153,7 @@
<el-select
v-model=
"form.slideType"
placeholder=
"请选择类型"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
<el-option
label=
"跟团游"
:value=
"1"
></el-option>
<el-option
label=
"签证
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')
"
:value=
"2"
></el-option>
<el-option
label=
"机票"
:value=
"3"
></el-option>
<el-option
label=
"自由行"
:value=
"4"
></el-option>
<el-option
label=
"当地游"
:value=
"5"
></el-option>
...
...
@@ -234,7 +234,7 @@
<el-form-item
label=
"类型"
prop=
"slideType"
>
<el-select
v-model=
"form_div.slideType"
placeholder=
"请选择类型"
>
<el-option
label=
"跟团游"
:value=
"1"
></el-option>
<el-option
label=
"签证
"
:value=
"2"
></el-option>
<el-option
:label=
"$t('active.cl_qianzheng')
"
:value=
"2"
></el-option>
<el-option
label=
"机票"
:value=
"3"
></el-option>
<el-option
label=
"自由行"
:value=
"4"
></el-option>
<el-option
label=
"当地游"
:value=
"5"
></el-option>
...
...
src/components/activity/TravelInfoList.vue
View file @
2fe389e4
...
...
@@ -70,7 +70,7 @@
<el-select
@
change=
"ProvideChange"
multiple
collapse-tags
v-model=
"provideItem"
placeholder=
"请选择内容"
>
<el-option
label=
"线路设计"
value=
"线路设计"
></el-option>
<el-option
label=
"机票"
value=
"机票"
></el-option>
<el-option
label=
"酒店
"
value=
"酒店"
></el-option>
<el-option
:label=
"$t('hotel.hotel')
"
value=
"酒店"
></el-option>
<el-option
label=
"用车"
value=
"用车"
></el-option>
<el-option
label=
"用餐"
value=
"用餐"
></el-option>
</el-select>
...
...
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