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
28a360c0
You need to sign in or sign up before continuing.
Commit
28a360c0
authored
5 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
b8ad11f5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
19 deletions
+11
-19
check-versions.js
build/check-versions.js
+0
-5
HotelContract.vue
src/components/Hotel/HotelContract.vue
+0
-1
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+9
-11
team.js
src/store/actions/team.js
+2
-2
No files found.
build/check-versions.js
View file @
28a360c0
...
...
@@ -39,16 +39,11 @@ module.exports = function () {
}
if
(
warnings
.
length
)
{
console
.
log
(
''
)
console
.
log
(
chalk
.
yellow
(
'To use this template, you must update following to modules:'
))
console
.
log
()
for
(
let
i
=
0
;
i
<
warnings
.
length
;
i
++
)
{
const
warning
=
warnings
[
i
]
console
.
log
(
' '
+
warning
)
}
console
.
log
()
process
.
exit
(
1
)
}
}
This diff is collapsed.
Click to expand it.
src/components/Hotel/HotelContract.vue
View file @
28a360c0
...
...
@@ -350,7 +350,6 @@
})
});
this
.
list
=
list
;
console
.
log
(
this
.
list
,
'list'
);
this
.
$forceUpdate
();
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/components/dmc/manager/dmcTotalTable.vue
View file @
28a360c0
...
...
@@ -406,7 +406,7 @@
{{
$t
(
'ground.cituanhuidai'
)
}}
</td>
</tr>
<tr>
<tr
style=
"display:none;"
>
<td
style=
"text-align:right;width:80px;"
>
{{
$t
(
'ground.dingfangstatus'
)
}}
:
</td>
<td>
<el-select
v-model=
"NumObj.IsBookTeam"
>
...
...
@@ -416,7 +416,6 @@
</el-select>
</td>
</tr>
<tr>
<td
style=
"text-align:right;"
>
{{
$t
(
'pub.pubRemark'
)
}}
:
</td>
<td>
...
...
@@ -428,13 +427,13 @@
{{
$t
(
'ground.cibeizhu'
)
}}
.
</td>
</tr>
<tr>
<tr
style=
"display:none;"
>
<td
style=
"text-align:right;"
>
{{
$t
(
'ground.gysbeizhu'
)
}}
:
</td>
<td>
<el-input
class=
'mt10'
v-model=
'NumObj.SupplierRemarks'
type=
'textarea'
></el-input>
</td>
</tr>
<tr>
<tr
style=
"display:none;"
>
<td
colspan=
"2"
>
{{
$t
(
'ground.cibeizhuchaxun'
)
}}
.
</td>
...
...
@@ -504,22 +503,21 @@
<div
class=
"link"
>
<p
@
click=
"getJourney(item)"
style=
"padding-top:4px;"
>
{{
item
.
Title
}}
</p>
<div
v-if=
"outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'op.DJBZTH'
)
}}
:
<span
style=
"font-weight:bold"
>
{{
outItem
.
PriceCommonList
[
index
].
DMCNum
}}
</span>
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;font-size:13px;"
>
{{
$t
(
'op.DJBZTH'
)
}}
:
<span
style=
"font-weight:bold"
>
{{
outItem
.
PriceCommonList
[
index
].
DMCNum
}}
</span>
</div>
<div
v-show=
"outItem.PriceCommonList[index].OPInnerRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_remark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPInnerRemark
}}
</div>
style=
"padding-top:5px;padding-bottom:4px;
font-size:13px;
"
>
{{
$t
(
'Operation.Op_remark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPInnerRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[index].OPRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_duiwaiRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPRemark
}}
</div>
style=
"padding-top:5px;padding-bottom:4px;
font-size:13px;
"
>
{{
$t
(
'Operation.Op_duiwaiRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
OPRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[index].DMCRemark!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
{{
$t
(
'Operation.Op_dijieRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
DMCRemark
}}
style=
"padding-top:5px;padding-bottom:4px;
font-size:13px;
"
>
{{
$t
(
'Operation.Op_dijieRemark'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
DMCRemark
}}
</div>
<div
v-show=
"outItem.PriceCommonList[index].SupplierRemarks!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
style=
"padding-top:5px;padding-bottom:4px;
font-size:13px;
"
>
{{
$t
(
'ground.gysbeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierRemarks
}}
</div>
<div
v-show=
"outItem.PriceCommonList[index].SupplierToDmcRemarks!=''"
class=
"colorE95252"
style=
"padding-top:5px;padding-bottom:4px;"
>
style=
"padding-top:5px;padding-bottom:4px;
font-size:13px;
"
>
{{
$t
(
'ground.gysduindibeizhu'
)
}}
:
{{
outItem
.
PriceCommonList
[
index
].
SupplierToDmcRemarks
}}
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
src/store/actions/team.js
View file @
28a360c0
...
...
@@ -209,7 +209,7 @@ export function addTeamMembers({ state }, teamId, accounts) {
teamId
:
teamId
,
accounts
:
accounts
,
done
:
(
err
,
obj
)
=>
{
console
.
log
(
obj
)
}
})
}
...
...
@@ -227,7 +227,7 @@ export function removeTeamMembers({ state }, teamId, accounts) {
teamId
:
teamId
,
accounts
:
accounts
,
done
:
(
err
,
obj
)
=>
{
console
.
log
(
obj
)
}
})
}
...
...
This diff is collapsed.
Click to expand it.
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