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
695ec1ec
Commit
695ec1ec
authored
Oct 31, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
d0c9db60
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
6 deletions
+22
-6
Ground.js
src/assets/common/lang/Japan/Ground.js
+1
-0
Ground.js
src/assets/common/lang/zhCN/Ground.js
+1
-0
Ground.js
src/assets/common/lang/zhTW/Ground.js
+1
-0
ShoppingReimbursement.vue
src/components/ShoppingStore/ShoppingReimbursement.vue
+4
-0
ShoppingReimbursementDetails.vue
...components/ShoppingStore/ShoppingReimbursementDetails.vue
+6
-1
ShoppingStore.vue
src/components/ShoppingStore/ShoppingStore.vue
+9
-5
No files found.
src/assets/common/lang/Japan/Ground.js
View file @
695ec1ec
...
...
@@ -355,6 +355,7 @@ export const obj = {
jdrs
:
'入店人数'
,
ldyj
:
'引率コミッション'
,
dyyj
:
'ガイドコミッション'
,
picyj
:
'こみっしょん '
,
gsyj
:
'会社のマージン'
,
fyye
:
'返上残高'
,
fyzj
:
'返用合計'
,
...
...
src/assets/common/lang/zhCN/Ground.js
View file @
695ec1ec
...
...
@@ -341,6 +341,7 @@ export const obj = {
jdrs
:
'进店人数'
,
ldyj
:
'领队佣金'
,
dyyj
:
'导游佣金'
,
picyj
:
'PIC佣金'
,
gsyj
:
'公司佣金'
,
fyye
:
'返佣余额'
,
fyzj
:
'返佣总计'
,
...
...
src/assets/common/lang/zhTW/Ground.js
View file @
695ec1ec
...
...
@@ -342,6 +342,7 @@ export const obj = {
jdrs
:
'進店人數'
,
ldyj
:
'領隊傭金'
,
dyyj
:
'導遊傭金'
,
picyj
:
'PIC傭金'
,
gsyj
:
'公司傭金'
,
fyye
:
'返傭餘額'
,
fyzj
:
'返傭總計'
,
...
...
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @
695ec1ec
...
...
@@ -61,6 +61,7 @@
<th
width=
"70"
>
{{
$t
(
'fnc.a_zongjine'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.ldyj'
)
}}
<br
/>
(
{{
$t
(
'fnc.yingfu'
)
}}
)
</th>
<th
width=
"80"
>
{{
$t
(
'ground.dyyj'
)
}}
<br
/>
(
{{
$t
(
'fnc.yingfu'
)
}}
)
</th>
<th
width=
"80"
>
{{
$t
(
'ground.picyj'
)
}}
<br
/>
(
{{
$t
(
'fnc.yingfu'
)
}}
)
</th>
<th
width=
"80"
>
{{
$t
(
'ground.gsyj'
)
}}
<br
/>
(
{{
$t
(
'fnc.yingshou'
)
}}
)
</th>
<th
width=
"80"
>
{{
$t
(
'ground.fyye'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.fyzj'
)
}}
</th>
...
...
@@ -130,6 +131,9 @@
<td
width=
"80"
>
{{subItem.GuideCommission}}
</td>
<td
width=
"80"
>
{{subItem.PICCommission}}
</td>
<td
width=
"80"
>
{{subItem.CompanyCommission}}
</td>
...
...
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @
695ec1ec
...
...
@@ -11,7 +11,7 @@
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"roomReservationsTalbe"
style=
"width:100%"
v-loading=
"loading"
>
<tr>
<th
colspan=
"5"
>
{{
$t
(
'ground.dycaozuo'
)
}}
</th>
<th
colspan=
"
8
"
>
{{
$t
(
'ground.dijieop'
)
}}
</th>
<th
colspan=
"
9
"
>
{{
$t
(
'ground.dijieop'
)
}}
</th>
</tr>
<tr>
<th
width=
"120"
style=
"display:none;"
>
{{
$t
(
'ground.jindianNum'
)
}}
</th>
...
...
@@ -24,6 +24,7 @@
<th
width=
"120"
style=
"display:none;"
>
{{
$t
(
'ground.pzUpload'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.ldyj'
)
}}
<br
/>
{{
$t
(
'fnc.yingfu'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.dyyj'
)
}}
<br
/>
{{
$t
(
'fnc.yingfu'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.picyj'
)
}}
<br
/>
{{
$t
(
'fnc.yingfu'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.gsyj'
)
}}
<br
/>
{{
$t
(
'fnc.yingshou'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.fyye'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.fyzj'
)
}}
</th>
...
...
@@ -92,6 +93,10 @@
<el-input
type=
"number"
v-model=
"item.ShopDetailsList[0].GuideCommission"
></el-input>
<!--GuideCommission 导游佣金应付-->
</td>
<td
class=
"more_td"
>
<el-input
type=
"number"
v-model=
"subItem.PICCommission"
></el-input>
<!--PICCommission PIC佣金应付-->
</td>
<td
class=
"more_td _height_45"
>
<el-input
type=
"number"
v-model=
"subItem.CompanyCommission"
></el-input>
<!--CompanyCommission 公司佣金应收-->
...
...
src/components/ShoppingStore/ShoppingStore.vue
View file @
695ec1ec
...
...
@@ -718,10 +718,11 @@
<th
width=
"80"
>
{{
$t
(
'ground.dymc'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'fnc.ldmingcheng'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.gwze'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.ztstc'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.ldtc'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.dytc'
)
}}
</th>
<th
width=
"80"
style=
"display:none;"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"100"
>
{{
$t
(
'ground.gsyj'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.ldyj'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.dyyj'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'ground.picyj'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'pub.pubRemark'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'system.table_operation'
)
}}
</th>
...
...
@@ -744,7 +745,8 @@
<td>
{{
item
.
GroupExtract
}}
</td>
<td>
{{
item
.
LeaderExtract
}}
</td>
<td>
{{
item
.
GuideExtract
}}
</td>
<td
style=
"display:none;"
>
{{
item
.
Rate
}}
</td>
<td>
{{
item
.
PICExtract
}}
</td>
<td>
{{
item
.
Rate
}}
</td>
<td
:class=
"
{'redType':item.CurrencyExist==-1}">
<span>
{{
item
.
Currency
}}
</span></td>
<td>
{{
item
.
Remarks
}}
</td>
<td><span
class=
"delInfo"
@
click=
"delInfo(index)"
>
{{
$t
(
'system.table_delete'
)
}}
</span></td>
...
...
@@ -794,6 +796,7 @@
TotalPrice
:
""
,
GroupExtract
:
""
,
GuideExtract
:
""
,
PICExtract
:
""
,
LeaderExtract
:
""
,
getShoppType
:
""
,
isShow
:
false
,
...
...
@@ -1035,6 +1038,7 @@
TotalPrice
:
item
.
TotalPrice
,
GroupExtract
:
item
.
GroupExtract
,
GuideExtract
:
item
.
GuideExtract
,
PICExtract
:
item
.
PICExtract
,
LeaderExtract
:
item
.
LeaderExtract
,
blank
:
'y'
,
tab
:
'购物店明细'
...
...
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