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
16e06d54
Commit
16e06d54
authored
Apr 12, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Plain Diff
修改表单验证
parents
3d56bcce
81ed1a11
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3011 additions
and
2999 deletions
+3011
-2999
Details.vue
src/components/Details.vue
+1
-1
VisaFinancialDocuments.vue
src/components/SalesModule/VisaFinancialDocuments.vue
+0
-1
ModifyVisaProduct.vue
src/components/SalesVisa/ModifyVisaProduct.vue
+8
-11
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+3
-3
config.js
src/router/config.js
+2999
-2983
No files found.
src/components/Details.vue
View file @
16e06d54
...
@@ -820,7 +820,7 @@ export default {
...
@@ -820,7 +820,7 @@ export default {
filterRouter
(){
filterRouter
(){
let
that
=
this
let
that
=
this
this
.
$router
.
beforeEach
((
to
,
from
,
next
)
=>
{
this
.
$router
.
beforeEach
((
to
,
from
,
next
)
=>
{
console
.
log
(
"to.query.blank && to.query.blank=='y'"
,
to
.
query
)
// console.log("to.query.blank && to.query.blank=='y'",to.query,"666"
)
if
(
to
.
path
==
"/ModifyVisaProduct"
){
if
(
to
.
path
==
"/ModifyVisaProduct"
){
this
.
reloadpage
();
this
.
reloadpage
();
}
}
...
...
src/components/SalesModule/VisaFinancialDocuments.vue
View file @
16e06d54
...
@@ -531,7 +531,6 @@ export default {
...
@@ -531,7 +531,6 @@ export default {
this
.
Error
(
"至少选择一人!"
);
this
.
Error
(
"至少选择一人!"
);
return
;
return
;
}
}
sessionStorage
.
setItem
(
"saveGuestInfo"
,
JSON
.
stringify
(
userInfo
))
sessionStorage
.
setItem
(
"saveGuestInfo"
,
JSON
.
stringify
(
userInfo
))
// this.$store.commit('saveGuestInfo',userInfo)
// this.$store.commit('saveGuestInfo',userInfo)
// console.log("getGuestInfo",this.$store.getters.getGuestInfo)
// console.log("getGuestInfo",this.$store.getters.getGuestInfo)
...
...
src/components/SalesVisa/ModifyVisaProduct.vue
View file @
16e06d54
...
@@ -404,19 +404,19 @@
...
@@ -404,19 +404,19 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"成本价"
prop=
"CostPrice"
>
<el-form-item
label=
"成本价"
prop=
"CostPrice"
>
<el-input
v-model
.
number=
"addMsg.CostPrice"
@
keyup
.
native=
"checkInteger
(addMsg,'CostPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
<el-input
v-model
=
"addMsg.CostPrice"
@
keyup
.
native=
"checkPrice
(addMsg,'CostPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"同业价"
prop=
"VisaPrice"
>
<el-form-item
label=
"同业价"
prop=
"VisaPrice"
>
<el-input
v-model
.
number=
"addMsg.VisaPrice"
@
keyup
.
native=
"check
Integer
(addMsg,'VisaPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
<el-input
v-model
.
number=
"addMsg.VisaPrice"
@
keyup
.
native=
"check
Price
(addMsg,'VisaPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"直客价"
prop=
"VisaB2CPrice"
>
<el-form-item
label=
"直客价"
prop=
"VisaB2CPrice"
>
<el-input
v-model
.
number=
"addMsg.VisaB2CPrice"
@
keyup
.
native=
"check
Integer
(addMsg,'VisaB2CPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
<el-input
v-model
.
number=
"addMsg.VisaB2CPrice"
@
keyup
.
native=
"check
Price
(addMsg,'VisaB2CPrice')"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"提成金额"
prop=
"CommissionPrice"
>
<el-form-item
label=
"提成金额"
prop=
"CommissionPrice"
>
<el-input
v-model=
"addMsg.CommissionPrice"
placeholder=
"请输入"
@
keyup
.
native=
"check
Integer
(addMsg,'CommissionPrice')"
></el-input>
<el-input
v-model=
"addMsg.CommissionPrice"
placeholder=
"请输入"
@
keyup
.
native=
"check
Price
(addMsg,'CommissionPrice')"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"提前预定天数"
prop=
"BookAdvance"
>
<el-form-item
label=
"提前预定天数"
prop=
"BookAdvance"
>
...
@@ -764,7 +764,7 @@ export default {
...
@@ -764,7 +764,7 @@ export default {
VisaType
:
1
,
VisaType
:
1
,
SendVisaDate
:
""
,
SendVisaDate
:
""
,
VisaPrice
:
""
,
VisaPrice
:
""
,
PeopleNum
:
0
,
PeopleNum
:
"0"
,
CostPrice
:
""
,
CostPrice
:
""
,
EntryType
:
0
,
EntryType
:
0
,
CommissionPrice
:
""
,
CommissionPrice
:
""
,
...
@@ -779,8 +779,6 @@ export default {
...
@@ -779,8 +779,6 @@ export default {
rules
:
{
rules
:
{
Name
:
[{
required
:
true
,
message
:
"请输入产品名称"
,
trigger
:
"blur"
}],
Name
:
[{
required
:
true
,
message
:
"请输入产品名称"
,
trigger
:
"blur"
}],
// ManageDuration:[{ type: 'number', message: '必须为数字值'}],
customerName
:
[
customerName
:
[
{
required
:
true
,
message
:
"请输入客户名"
,
trigger
:
"blur"
}
{
required
:
true
,
message
:
"请输入客户名"
,
trigger
:
"blur"
}
],
],
...
@@ -795,14 +793,14 @@ export default {
...
@@ -795,14 +793,14 @@ export default {
{
required
:
true
,
message
:
"请输入直客价"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入直客价"
,
trigger
:
"blur"
},
{
{
pattern
:
this
.
$commonUtils
.
Regex
.
el_Isdecimal
,
pattern
:
this
.
$commonUtils
.
Regex
.
el_Isdecimal
,
message
:
"请输入
数字
"
message
:
"请输入
直客价
"
}
}
],
],
CostPrice
:
[
CostPrice
:
[
{
required
:
true
,
message
:
"请输入成本价"
,
trigger
:
"blur"
},
{
required
:
true
,
message
:
"请输入成本价"
,
trigger
:
"blur"
},
{
{
pattern
:
this
.
$commonUtils
.
Regex
.
el_Isdecimal
,
pattern
:
this
.
$commonUtils
.
Regex
.
el_Isdecimal
,
message
:
"请输入
数字
"
message
:
"请输入
成本价
"
}
}
],
],
VisaType
:
[
VisaType
:
[
...
@@ -895,7 +893,7 @@ export default {
...
@@ -895,7 +893,7 @@ export default {
"dmc_get_visa_GetVisaProductInfo_V1"
,
"dmc_get_visa_GetVisaProductInfo_V1"
,
{
Pid
:
Pid
},
{
Pid
:
Pid
},
res
=>
{
res
=>
{
//
console.log(res);
console
.
log
(
res
);
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
this
.
addMsg
=
res
.
data
.
data
;
this
.
addMsg
=
res
.
data
.
data
;
...
@@ -975,7 +973,6 @@ export default {
...
@@ -975,7 +973,6 @@ export default {
"YYYY-MM-DD"
"YYYY-MM-DD"
);
);
// console.log("this.addMsg", this.addMsg);
// console.log("this.addMsg", this.addMsg);
this
.
loading
=
true
;
this
.
apipost
(
this
.
apipost
(
"dmc_post_visa_SetVisaProduct_V1"
,
"dmc_post_visa_SetVisaProduct_V1"
,
this
.
addMsg
,
this
.
addMsg
,
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
16e06d54
...
@@ -1573,8 +1573,8 @@
...
@@ -1573,8 +1573,8 @@
// 车资
// 车资
if
(
that
.
isExists
(
item
.
CostTypeList
,
'车资'
)){
if
(
that
.
isExists
(
item
.
CostTypeList
,
'车资'
)){
this
.
moneyAll
.
z
heziyf
+=
item
.
Money
;
this
.
moneyAll
.
c
heziyf
+=
item
.
Money
;
this
.
moneyAll
.
z
hezisf
+=
item
.
PayMoney
;
this
.
moneyAll
.
c
hezisf
+=
item
.
PayMoney
;
}
}
// 机票款
// 机票款
if
(
that
.
isExists
(
item
.
CostTypeList
,
'国际段机票'
)
||
item
.
OrderSource
===
4
||
that
.
isExists
(
item
.
CostTypeList
,
'机票退税'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票罚金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票税金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'国内联运段机票'
)){
if
(
that
.
isExists
(
item
.
CostTypeList
,
'国际段机票'
)
||
item
.
OrderSource
===
4
||
that
.
isExists
(
item
.
CostTypeList
,
'机票退税'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票罚金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票税金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'国内联运段机票'
)){
...
...
src/router/config.js
View file @
16e06d54
...
@@ -1763,6 +1763,22 @@ export default {
...
@@ -1763,6 +1763,22 @@ export default {
title
:
'签证产品'
title
:
'签证产品'
},
},
},
},
{
//配置签证产品
path
:
'/ModifyVisaProduct'
,
name
:
'ModifyVisaProduct'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/ModifyVisaProduct'
],
resolve
),
meta
:
{
title
:
'配置签证产品'
},
},
{
// 签证产品国家
path
:
'/VisaProductCountryManager'
,
name
:
'VisaProductCountryManager'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/VisaProductCountryManager'
],
resolve
),
meta
:
{
title
:
'签证产品国家'
},
},
{
// 销售 送签管理
{
// 销售 送签管理
path
:
'/signature'
,
path
:
'/signature'
,
name
:
'signature'
,
name
:
'signature'
,
...
...
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