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
6328a999
Commit
6328a999
authored
Oct 22, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合同内容调整
parent
9adabe9b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
856 additions
and
186 deletions
+856
-186
en.js
src/assets/common/lang/en.js
+4
-1
jp.js
src/assets/common/lang/jp.js
+4
-1
zh-tw.js
src/assets/common/lang/zh-tw.js
+4
-1
zh.js
src/assets/common/lang/zh.js
+4
-1
TravelContractDetail.vue
src/components/TravelContractDetail.vue
+360
-54
TravelContractNew.vue
src/components/TravelContractNew.vue
+55
-28
clientConfirm.vue
src/components/clientConfirm.vue
+422
-96
order-form2.vue
src/components/orderCommon/order-form2.vue
+3
-4
No files found.
src/assets/common/lang/en.js
View file @
6328a999
...
...
@@ -2103,7 +2103,10 @@ export const salesModule = {
CustomerStore
:
'CustomerStore'
,
HYLB
:
'Industry Category'
,
IsLianYn
:
'Intermodal or not'
,
LYtime
:
'intermodal time'
,
goUnion
:
"Outbound intermodal transportation"
,
backUnion
:
"Return intermodal transportation"
,
LYtime
:
'Outbound intermodal time'
,
backUnionTime
:
"Return intermodal time"
,
BackCity
:
'Back to the city'
,
TeamPrice
:
'Unit price of the group'
,
StartLY
:
'departure rate'
,
...
...
src/assets/common/lang/jp.js
View file @
6328a999
...
...
@@ -2014,7 +2014,10 @@ export const salesModule={
CustomerStore
:
'得意先店舗'
,
HYLB
:
'業種別'
,
IsLianYn
:
'連絡運輸するかどうか'
,
LYtime
:
'れんうん時間'
,
goUnion
:
"往路連絡輸送"
,
backUnion
:
"バックリンク"
,
LYtime
:
'トリップ接続時間'
,
backUnionTime
:
"バックホール連絡時間"
,
BackCity
:
'都市に戻る'
,
TeamPrice
:
'団単価'
,
StartLY
:
'出発運賃'
,
...
...
src/assets/common/lang/zh-tw.js
View file @
6328a999
...
...
@@ -2088,7 +2088,10 @@ export const salesModule={
CustomerStore
:
'客戶門店'
,
HYLB
:
'行業類別'
,
IsLianYn
:
'是否聯運'
,
LYtime
:
'聯運時間'
,
goUnion
:
"去程聯運"
,
backUnion
:
"回程聯運"
,
LYtime
:
'去程聯運時間'
,
backUnionTime
:
"バックホール連絡時間"
,
BackCity
:
'返回都市'
,
TeamPrice
:
'本團單價'
,
StartLY
:
'出發聯運價'
,
...
...
src/assets/common/lang/zh.js
View file @
6328a999
...
...
@@ -2103,7 +2103,10 @@ export const salesModule={
CustomerStore
:
'客户门店'
,
HYLB
:
'行业类别'
,
IsLianYn
:
'是否联运'
,
LYtime
:
'联运时间'
,
goUnion
:
"去程联运"
,
backUnion
:
"回程联运"
,
LYtime
:
'去程联运时间'
,
backUnionTime
:
"回程联运时间"
,
BackCity
:
'返回城市'
,
TeamPrice
:
'本团单价'
,
StartLY
:
'出发联运价'
,
...
...
src/components/TravelContractDetail.vue
View file @
6328a999
This diff is collapsed.
Click to expand it.
src/components/TravelContractNew.vue
View file @
6328a999
This diff is collapsed.
Click to expand it.
src/components/clientConfirm.vue
View file @
6328a999
This diff is collapsed.
Click to expand it.
src/components/orderCommon/order-form2.vue
View file @
6328a999
...
...
@@ -159,7 +159,7 @@
addMsg.DepartureCityId != priceObj.StartCityID &&
addMsg.DepartureCityId != ''
" -->
<el-form-item
:label=
"$t('salesModule.
IsLianY
n')"
prop=
"IsIntermodal"
>
<el-form-item
:label=
"$t('salesModule.
goUnio
n')"
prop=
"IsIntermodal"
>
<el-switch
v-model=
"addMsg.IsIntermodal"
active-value=
"1"
inactive-value=
"2"
@
change=
"getUnionTravelPrice(priceObj, 1)"
></el-switch>
</el-form-item>
...
...
@@ -192,16 +192,15 @@
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId &&
addMsg.ReturnArriveCityId != ''
"-->
<el-form-item
:label=
"$t('salesModule.
IsLianY
n')"
prop=
"IsReturnIntermodal"
>
<el-form-item
:label=
"$t('salesModule.
backUnio
n')"
prop=
"IsReturnIntermodal"
>
<el-switch
v-model=
"addMsg.IsReturnIntermodal"
active-value=
"1"
inactive-value=
"2"
@
change=
"getUnionTravelPrice(priceObj, 2)"
></el-switch>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<!--返程联运时间 &&
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
<el-form-item
:label=
"$t('salesModule.
LYt
ime')"
prop=
"IsReturnIntermodal"
v-show=
"
<el-form-item
:label=
"$t('salesModule.
backUnionT
ime')"
prop=
"IsReturnIntermodal"
v-show=
"
addMsg.IsReturnIntermodal == 1
"
>
<el-date-picker
:picker-options=
"pickerOptions1"
v-model=
"addMsg.BackCityTime"
value-format=
"yyyy-MM-dd"
...
...
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