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
3ea00670
Commit
3ea00670
authored
5 years ago
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
旅客名单新增身份证接口,发票增加预计到账时间选择和详情的展示
parent
aba56e77
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
27 deletions
+84
-27
invoicesManagerAdd.vue
src/components/FinancialModule/invoicesManagerAdd.vue
+30
-7
invoicesManagerDetail.vue
src/components/FinancialModule/invoicesManagerDetail.vue
+18
-14
addPassenger.vue
src/components/SalesModule/addPassenger.vue
+36
-6
No files found.
src/components/FinancialModule/invoicesManagerAdd.vue
View file @
3ea00670
...
@@ -146,14 +146,23 @@
...
@@ -146,14 +146,23 @@
<td>
到账日期
</td>
<td>
到账日期
</td>
<td>
{{
orderList
.
TradeDateStr
}}
</td>
<td>
{{
orderList
.
TradeDateStr
}}
</td>
</tr>
</tr>
<tr>
<tr>
<td>
团号
</td>
<td>
团号
</td>
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
TCID
}}
</td>
<td>
{{
msg
.
TCID
}}
</td>
</tr>
<tr>
<td>
订单号
</td>
<td>
订单号
</td>
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
OrderId
}}
</td>
<td>
{{
msg
.
OrderId
}}
</td>
</tr>
</tr>
<!--
<tr>
-->
<!--
<td>
团号
</td>
-->
<!--
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
TCID
}}
</td>
-->
<!--
</tr>
-->
<!--
<tr>
-->
<!--
<td>
订单号
</td>
-->
<!--
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
OrderId
}}
</td>
-->
<!--
</tr>
-->
<tr>
<tr>
<td
rowspan=
"6"
>
开具内容
</td>
<td
rowspan=
"6"
>
开具内容
</td>
<td>
<td>
...
@@ -216,12 +225,25 @@
...
@@ -216,12 +225,25 @@
<el-input
placeholder
type=
"number"
v-model=
"msg.BankNo"
></el-input>
<el-input
placeholder
type=
"number"
v-model=
"msg.BankNo"
></el-input>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
备注
</td>
<td>
备注
</td>
<td
colspan=
"3"
>
<td>
<el-input
type=
"textarea"
placeholder
v-model=
"msg.Remarks"
></el-input>
<el-input
type=
"textarea"
placeholder
v-model=
"msg.Remarks"
></el-input>
</td>
</td>
<td>
预计到账时间
</td>
<td>
<el-date-picker
v-model=
'msg.AccountingDate'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
</td>
</tr>
</tr>
<!-- <tr>-->
<!-- <td>备注</td>-->
<!-- <td colspan="3">-->
<!-- <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
<!-- </td>-->
<!-- </tr>-->
</table>
</table>
<div>
<div>
<div>
<div>
...
@@ -289,6 +311,7 @@ export default {
...
@@ -289,6 +311,7 @@ export default {
IsDefaultInfo
:
1
,
IsDefaultInfo
:
1
,
ApplyPics
:
[],
ApplyPics
:
[],
ID
:
0
,
ID
:
0
,
AccountingDate
:
''
},
},
DepartName
:
""
,
DepartName
:
""
,
emName
:
""
,
emName
:
""
,
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/invoicesManagerDetail.vue
View file @
3ea00670
...
@@ -271,16 +271,16 @@
...
@@ -271,16 +271,16 @@
</tr>
</tr>
<tr>
<tr>
<td>
{{
$t
(
'ios.tuanhao'
)
}}
</td>
<td>
{{
$t
(
'ios.tuanhao'
)
}}
</td>
<td
colspan=
"3"
class=
"w600
text-align-left font-weight cursorpointer"
@
click=
"goUrlT('productQuery', detail.TCNUM, '产品查询')"
>
<td
class=
"
text-align-left font-weight cursorpointer"
@
click=
"goUrlT('productQuery', detail.TCNUM, '产品查询')"
>
{{
detail
.
TCNUM
}}
(
{{
detail
.
TCID
}}
)
{{
detail
.
TCNUM
}}
(
{{
detail
.
TCID
}}
)
</td>
</td>
</tr>
<tr>
<td>
{{
$t
(
'ios.ddanhao'
)
}}
</td>
<td>
{{
$t
(
'ios.ddanhao'
)
}}
</td>
<td
colspan=
"3"
class=
"w600
text-align-left font-weight cursorpointer"
>
<td
class=
"
text-align-left font-weight cursorpointer"
>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
OrderId
}}
</span>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
OrderId
}}
</span>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td>
{{
$t
(
'ios.cwdanju'
)
}}
</td>
<td>
{{
$t
(
'ios.cwdanju'
)
}}
</td>
<td
colspan=
"3"
class=
"w600 text-align-left font-weight cursorpointer"
>
<td
colspan=
"3"
class=
"w600 text-align-left font-weight cursorpointer"
>
...
@@ -329,9 +329,13 @@
...
@@ -329,9 +329,13 @@
</tr>
</tr>
<tr>
<tr>
<td>
{{$t('hotel.hotel_remark')}}
</td>
<td>
{{$t('hotel.hotel_remark')}}
</td>
<td
colspan=
"3"
>
<td>
{{detail.Remarks}}
{{detail.Remarks}}
</td>
</td>
<td>
预计到账时间
</td>
<td
style=
"width: 190px;"
>
{{detail.AccountingDate}}
</td>
</tr>
</tr>
</table>
</table>
<el-dialog
:title=
"$t('pub.hintMsg')"
width=
"400px"
:visible
.
sync=
"dialogFormVisible2"
center
:before-close=
"closeChangeMachie"
>
<el-dialog
:title=
"$t('pub.hintMsg')"
width=
"400px"
:visible
.
sync=
"dialogFormVisible2"
center
:before-close=
"closeChangeMachie"
>
...
...
This diff is collapsed.
Click to expand it.
src/components/SalesModule/addPassenger.vue
View file @
3ea00670
...
@@ -140,6 +140,12 @@
...
@@ -140,6 +140,12 @@
element-loading-background=
"rgba(0, 0, 0, 0.7)"
>
element-loading-background=
"rgba(0, 0, 0, 0.7)"
>
<div
class=
"contForm"
>
<div
class=
"contForm"
>
<el-form
:model=
"addMsg"
ref=
"addMsg"
label-position=
"right"
:rules=
"rules"
label-width=
"100px"
>
<el-form
:model=
"addMsg"
ref=
"addMsg"
label-position=
"right"
:rules=
"rules"
label-width=
"100px"
>
<li>
<el-form-item
label=
"身份证号码"
prop=
"IdCard"
>
<el-input
v-model=
"addMsg.IdCard"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"50"
placeholder=
"请填写"
@
blur
.
prevent=
"authentication()"
>
</el-input>
</el-form-item>
</li>
<li>
<li>
<el-form-item
label=
"中文姓"
prop=
"SurName"
>
<el-form-item
label=
"中文姓"
prop=
"SurName"
>
<el-input
v-model=
'addMsg.SurName'
class=
"w230"
@
input=
"Transformation(addMsg.SurName,'SurName')"
<el-input
v-model=
'addMsg.SurName'
class=
"w230"
@
input=
"Transformation(addMsg.SurName,'SurName')"
...
@@ -235,12 +241,7 @@
...
@@ -235,12 +241,7 @@
</el-input>
</el-input>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<el-form-item
label=
"身份证号码"
prop=
"IdCard"
>
<el-input
v-model=
"addMsg.IdCard"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"50"
placeholder=
"请填写"
>
</el-input>
</el-form-item>
</li>
<li>
<li>
<el-form-item
label=
"家庭详细地址"
prop=
"AddressDetail"
>
<el-form-item
label=
"家庭详细地址"
prop=
"AddressDetail"
>
...
@@ -1904,7 +1905,36 @@
...
@@ -1904,7 +1905,36 @@
err
=>
{}
err
=>
{}
);
);
},
},
authentication
()
{
if
(
this
.
$route
.
query
.
guestId
==
0
)
{
this
.
apipost
(
"sellorder_post_GetGusetByIDCard"
,
{
IdCard
:
this
.
addMsg
.
IdCard
,},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
obj
=
res
.
data
.
data
;
this
.
addMsg
=
obj
;
this
.
addMsg
.
Sex
=
obj
.
Sex
.
toString
();
this
.
addMsg
.
Marriage
=
obj
.
Marriage
.
toString
();
if
(
this
.
addMsg
.
Marriage
==
"0"
)
{
this
.
addMsg
.
Marriage
=
""
;
}
this
.
addMsg
.
IsCriminalRecord
=
obj
.
IsCriminalRecord
===
null
?
''
:
obj
.
IsCriminalRecord
.
toString
();
this
.
addMsg
.
IsDepartureRecord
=
obj
.
IsDepartureRecord
.
toString
();
this
.
addMsg
.
Id
=
this
.
$route
.
query
.
guestId
;
this
.
addMsg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
addMsg
.
OrderId
=
this
.
$route
.
query
.
orderId
;
this
.
Roominformation
()
//调取下房间信息
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{
}
);
}
}
},
},
mounted
()
{
mounted
()
{
this
.
getCountry
();
this
.
getCountry
();
...
...
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