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
b99e39b1
Commit
b99e39b1
authored
Oct 31, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
翻译
parent
065ce188
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
34 deletions
+47
-34
fill.js
src/assets/common/lang/zhCN/fill.js
+7
-0
fill.js
src/assets/common/lang/zhTW/fill.js
+7
-0
ClientBankAccount.vue
...mponents/FinancialModule/components/ClientBankAccount.vue
+1
-2
TravelConfig.vue
...ents/newTravelmanager/TravelGroupControl/TravelConfig.vue
+25
-25
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+7
-7
No files found.
src/assets/common/lang/zhCN/fill.js
View file @
b99e39b1
...
...
@@ -5752,6 +5752,13 @@ export const obj = {
zitidaxiao
:
'字体大小'
,
mengcengkz
:
'蒙层靠左'
,
mengcengky
:
'蒙层靠右'
,
bianjixc
:
'编辑行程'
,
xinfzdtqrx
:
'新复制的【团期】,如需单独修改【行程特色】操作步骤: 当团修改=》保存=》团控列表=》当团修改=》编辑行程特色.'
,
dianjcxjzxcts
:
'点击重新加载行程特色'
,
shangczdyxcts
:
'上传自定义行程特色和行程详情'
,
shangcxcts
:
'上传行程特色'
,
hengbsbcc
:
'横版1754*1240,竖版:1240X1754'
,
xitongsc
:
'系统生成'
,
},
}
//#endregion
...
...
src/assets/common/lang/zhTW/fill.js
View file @
b99e39b1
...
...
@@ -5752,6 +5752,13 @@ export const obj = {
zitidaxiao
:
'字體大小'
,
mengcengkz
:
'蒙層靠左'
,
mengcengky
:
'蒙層靠右'
,
bianjixc
:
'編輯行程'
,
xinfzdtqrx
:
'新複製的【團期】,如需單獨修改【行程特色】操作步驟: 當團修改=》保存=》團控列表=》當團修改=》編輯行程特色.'
,
dianjcxjzxcts
:
'點擊重新加載行程特色'
,
shangczdyxcts
:
'上傳自定義行程特色和行程詳情'
,
shangcxcts
:
'上傳行程特色'
,
hengbsbcc
:
'橫版1754*1240,豎版:1240X1754'
,
xitongsc
:
'系統生成'
,
},
}
//#endregion
...
...
src/components/FinancialModule/components/ClientBankAccount.vue
View file @
b99e39b1
...
...
@@ -239,8 +239,7 @@
<div
class=
"OrderReceivablesAccount-title"
>
{{
$t
(
'objFill.v101.LeaderManagement.tanzhangqk'
)
}}
</div>
<div
class=
"OrderReceivablesAccount-center"
>
<el-table
:data=
"tableData"
:height=
"tableData.length>2?196:'146'"
>
:data=
"tableData"
>
<el-table-column
prop=
""
label=
""
width=
"50"
show-overflow-tooltip
>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @
b99e39b1
...
...
@@ -206,12 +206,12 @@
:before-upload=
"beforeUploadVideo"
:show-file-list=
"false"
:file-list=
"VideoStrList"
>
<el-button
size=
"small"
type=
"primary"
>
{{
$t
(
'tips.dianjishanhcuan'
)
}}
</el-button>
</el-upload>
<el-button
size=
"small"
class=
"TC_ChoiceBtn"
@
click=
"checkType=2,addimg=true"
type=
"primary"
>
选择
<el-button
size=
"small"
class=
"TC_ChoiceBtn"
@
click=
"checkType=2,addimg=true"
type=
"primary"
>
{{
$t
(
'fnc.xuanze'
)
}}
</el-button>
</div>
<div
style=
"text-align: center;"
v-if=
"VideoStr"
>
<video
:src=
"VideoStr"
width=
"660"
height=
"320"
controls=
"controls"
>
{{
$t
(
'pub.unlimitedSel'
)
}}
您的浏览器不支持视频播放
</video>
controls=
"controls"
>
{{
$t
(
'pub.unlimitedSel'
)
}}
{{
$t
(
'objFill.ningdellqbzcbf'
)
}}
</video>
</div>
<div
v-if=
"GGMapShow"
>
<GGMap></GGMap>
...
...
@@ -241,7 +241,7 @@
</div>
</div>
<div
class=
"_VideoStr_box _VideoStr_boxColor"
v-if=
"CurrentUserInfo&&CurrentUserInfo.RB_Group_id==2"
>
<el-form-item
label=
"行程主题色
"
>
<el-form-item
:label=
"$t('objFill.xingchengzts')
"
>
<div
class=
"row items-center nowrap"
>
<template
v-for=
"(x,i) in colorArr"
>
<el-tooltip
:key=
"i"
class=
"box-item"
effect=
"dark"
:content=
"x.ColorName"
placement=
"bottom"
>
...
...
@@ -254,7 +254,7 @@
</div>
<!-- <el-color-picker style='vertical-align: middle;' v-model="PostConfig.TripColor"></el-color-picker> -->
<span
style=
"color: red;margin-left: 5px;margin-top: 15px;display: block;"
>
注意,如果你使用行程模板,系统将会强制修改主色
</span>
style=
"color: red;margin-left: 5px;margin-top: 15px;display: block;"
>
{{$t('objFill.zhuyisyxcmbqzxgzs')}}
</span>
</el-form-item>
</div>
</el-form>
...
...
@@ -310,79 +310,79 @@
SelfWLocationList
:
[],
//地区列表
SelfWCityList
:
[],
//城市列表
colorArr
:
[{
ColorName
:
'红色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
0
]
,
ColorValue
:
'#E53935'
},
{
ColorName
:
'玫红'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
1
]
,
ColorValue
:
'#D61159'
},
{
ColorName
:
'紫色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
2
]
,
ColorValue
:
'#8E24AA'
},
{
ColorName
:
'深紫色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
3
]
,
ColorValue
:
'#4C24AB'
},
{
ColorName
:
'深蓝色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
4
]
,
ColorValue
:
'#3949AB'
},
{
ColorName
:
'蓝色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
5
]
,
ColorValue
:
'#1B84F1'
},
{
ColorName
:
'浅蓝色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
6
]
,
ColorValue
:
'#039BE6'
},
{
ColorName
:
'青色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
7
]
,
ColorValue
:
'#00ACC2'
},
{
ColorName
:
'深绿色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
8
]
,
ColorValue
:
'#01887A'
},
{
ColorName
:
'绿色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
9
]
,
ColorValue
:
'#4AAC45'
},
{
ColorName
:
'浅绿'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
10
]
,
ColorValue
:
'#7DB343'
},
{
ColorName
:
'青绿色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
11
]
,
ColorValue
:
'#C0CA35'
},
{
ColorName
:
'黄色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
12
]
,
ColorValue
:
'#FDD734'
},
{
ColorName
:
'深黄色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
13
]
,
ColorValue
:
'#F5BE1B'
},
{
ColorName
:
'橙色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
14
]
,
ColorValue
:
'#FB8C00'
},
{
ColorName
:
'橘红色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
15
]
,
ColorValue
:
'#F5511E'
},
{
ColorName
:
'深灰色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
16
]
,
ColorValue
:
'#767676'
},
{
ColorName
:
'墨绿色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
17
]
,
ColorValue
:
'#546F7A'
},
{
ColorName
:
'深咖色'
,
ColorName
:
this
.
$t
(
'objFill.subjectcolor'
)[
18
]
,
ColorValue
:
'#6E4C43'
},
]
...
...
@@ -415,11 +415,11 @@
const
isLt10M
=
file
.
size
/
1024
/
1024
<
10
;
if
([
'video/mp4'
,
'video/ogg'
,
'video/flv'
,
'video/avi'
,
'video/wmv'
,
'video/rmvb'
].
indexOf
(
file
.
type
)
===
-
1
)
{
this
.
$message
.
error
(
'请上传正确的视频格式'
);
this
.
$message
.
error
(
this
.
$t
(
'objFill.qingsczqdspgs'
)
);
return
false
;
}
if
(
!
isLt10M
)
{
this
.
$message
.
error
(
'上传视频大小不能超过10MB哦!'
);
this
.
$message
.
error
(
this
.
$t
(
'objFill.shngcspbncgs'
)
);
return
false
;
}
},
...
...
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
b99e39b1
...
...
@@ -7,9 +7,9 @@
<span
class=
"foldList"
@
click=
"fold"
v-if=
"isFold==''"
>
{{
$t
(
'sm.djzd'
)
}}
</span>
<span
class=
"foldList"
@
click=
"fold"
v-if=
"isFold==1"
>
{{
$t
(
'sm.djzk'
)
}}
</span>
<span
v-if=
"FeatureData.ConfigId&&dataAll.FeaturePageType&&FeatureData.FeatureType==9"
class=
"foldList"
style=
"margin-right: 5px;"
@
click=
"journeyTemplate()"
>
编辑行程
</span>
style=
"margin-right: 5px;"
@
click=
"journeyTemplate()"
>
{{
$t
(
'objFill.v101.myOrdersAllType.bianjixc'
)
}}
</span>
<span
style=
"color: red;float: right;margin-right: 5px;line-height: 28px;font-weight:bold;"
>
新复制的【团期】,如需单独修改【行程特色】操作步骤: 当团修改=》保存=》团控列表=》当团修改=》编辑行程特色.
</span>
{{
$t
(
'objFill.v101.myOrdersAllType.xinfzdtqrx'
)
}}
</span>
<div
class=
"TrfList clearfix"
>
<template
v-for=
"item in TypeArray"
>
<div
class=
"TFslide"
...
...
@@ -36,7 +36,7 @@
</div>
<div
class=
"TFContent"
>
<div
class=
"TFconTitle"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"点击重新加载行程特色
"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('objFill.v101.myOrdersAllType.dianjcxjzxcts')
"
placement=
"top-start"
>
<span
style=
"cursor:pointer;"
@
click=
"ReLoadFeature()"
>
{{ckTitle}}
</span>
</el-tooltip>
<div
class=
"TFBTline"
></div>
...
...
@@ -79,15 +79,15 @@
</div>
<!--自定义 开始-->
<div
v-if=
"FeatureData.FeatureType==FeatureTypeState.userDefined"
>
<span
class=
"userDeSpan"
>
上传自定义行程特色和行程详情
</span>
<span
class=
"userDeSpan"
>
{{$t('objFill.v101.myOrdersAllType.shangczdyxcts')}}
</span>
<div
class=
"userDefined"
>
<el-row>
<el-col>
<div
class=
"sliderContent clearfix"
style=
"width:1000px;"
>
<el-upload
class=
"upload-demo"
:http-request=
"reUpload"
:multiple=
"true"
accept=
"image/jpeg, image/gif, image/png, image/bmp"
:show-file-list=
"false"
action
>
<el-button
size=
"small"
type=
"primary"
@
click=
"updateTFimg(1)"
>
上传行程特色
</el-button>
<div
slot=
"tip"
class=
"el-upload__tip"
style=
"color:red;"
>
横版1754*1240,竖版:1240X1754
</div>
<el-button
size=
"small"
type=
"primary"
@
click=
"updateTFimg(1)"
>
{{$t('objFill.v101.myOrdersAllType.shangcxcts')}}
</el-button>
<div
slot=
"tip"
class=
"el-upload__tip"
style=
"color:red;"
>
{{$t('objFill.v101.myOrdersAllType.hengbsbcc')}}
</div>
</el-upload>
<div
class=
"TFSelfimgList"
style=
"margin-top:5px;"
v-for=
"(item,index) in FeatureData.TripImageListNew"
:key=
"item.subCode"
>
...
...
@@ -117,7 +117,7 @@
<div
class=
"sliderContent clearfix"
style=
"width:1000px;"
>
<el-form
label-width=
"80px"
>
<el-form-item
label=
"行程详情"
>
<el-radio
v-model=
"FeatureData.IsUploadDetails"
:label=
"0"
>
系统生成
</el-radio>
<el-radio
v-model=
"FeatureData.IsUploadDetails"
:label=
"0"
>
{{$t('objFill.v101.myOrdersAllType.xitongsc')}}
</el-radio>
<el-radio
v-model=
"FeatureData.IsUploadDetails"
:label=
"1"
>
自定义上传
</el-radio>
</el-form-item>
</el-form>
...
...
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