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
8fe3778c
Commit
8fe3778c
authored
Sep 11, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
fc702b66
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+6
-2
HotelOrderTotal.vue
src/components/TravelManager/TravelList/HotelOrderTotal.vue
+1
-1
freeTravelOrder.vue
src/components/TravelManager/TravelList/freeTravelOrder.vue
+3
-2
leaderPay2.vue
src/components/leaderPay2.vue
+0
-1
No files found.
src/components/FinancialModule/addFinancialDocuments.vue
View file @
8fe3778c
...
@@ -321,7 +321,7 @@
...
@@ -321,7 +321,7 @@
</td>
-->
</td>
-->
<td
height=
"26px"
><el-input
v-model=
"da.Number"
@
keyup
.
native=
"checkInteger(da,'Number')"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
><el-input
v-model=
"da.Number"
@
keyup
.
native=
"checkInteger(da,'Number')"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
>
<td
height=
"26px"
>
<el-input
v-model=
"da.UnitPrice"
type=
"text"
:disabled=
"
msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53
"
@
keyup
.
native=
"checkPrice(da,'UnitPrice',true)"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 h34 _border_b_1"
></el-input>
<el-input
v-model=
"da.UnitPrice"
type=
"text"
:disabled=
"
(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK
"
@
keyup
.
native=
"checkPrice(da,'UnitPrice',true)"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 h34 _border_b_1"
></el-input>
</td>
</td>
<td
height=
"26px"
>
<td
height=
"26px"
>
<el-select
filterable
:disabled=
"detailCurrDis"
v-model=
'da.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
@
change=
"getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)"
class=
" _border_b_1"
>
<el-select
filterable
:disabled=
"detailCurrDis"
v-model=
'da.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
@
change=
"getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)"
class=
" _border_b_1"
>
...
@@ -360,7 +360,7 @@
...
@@ -360,7 +360,7 @@
<el-input
v-model=
"detailList.Number"
type=
"text"
@
keyup
.
native=
"checkInteger(detailList,'Number')"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input>
<el-input
v-model=
"detailList.Number"
type=
"text"
@
keyup
.
native=
"checkInteger(detailList,'Number')"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input>
</td>
</td>
<td>
<td>
<el-input
v-model=
"detailList.UnitPrice"
type=
"text"
:disabled=
"
msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53
"
@
keyup
.
native=
"checkPrice(detailList,'UnitPrice',true)"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 h34 _border_b_1"
></el-input>
<el-input
v-model=
"detailList.UnitPrice"
type=
"text"
:disabled=
"
(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK
"
@
keyup
.
native=
"checkPrice(detailList,'UnitPrice',true)"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 h34 _border_b_1"
></el-input>
</td>
</td>
<td>
<td>
<el-select
filterable
v-model=
'detailList.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
@
change=
"getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"
class=
" _border_b_1"
>
<el-select
filterable
v-model=
'detailList.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
@
change=
"getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"
class=
" _border_b_1"
>
...
@@ -648,6 +648,7 @@ export default {
...
@@ -648,6 +648,7 @@ export default {
isFrompassenger
:
false
,
isFrompassenger
:
false
,
showDisable
:
false
,
showDisable
:
false
,
editTemplateId
:
-
1
,
editTemplateId
:
-
1
,
ZhuiJiaTK
:
false
,
}
}
},
},
methods
:{
methods
:{
...
@@ -1495,6 +1496,9 @@ export default {
...
@@ -1495,6 +1496,9 @@ export default {
}
}
}
}
if
(
this
.
orderObj
&&
this
.
orderObj
.
OtherType
)
{
this
.
ZhuiJiaTK
=
true
}
},
},
mounted
(){
mounted
(){
...
...
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @
8fe3778c
...
@@ -340,7 +340,7 @@
...
@@ -340,7 +340,7 @@
<el-button
type=
"primary"
icon=
"iconfont icon-fukuan2"
@
click=
"getShouKuan(item)"
></el-button>
<el-button
type=
"primary"
icon=
"iconfont icon-fukuan2"
@
click=
"getShouKuan(item)"
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消订单"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消订单"
placement=
"top-start"
>
<el-button
type=
"info"
v-if=
"item.IsCanOrder"
icon=
"iconfont icon-quxiao1"
@
click=
"cancelHTorder(item.ThirdOrderNo)"
></el-button>
<el-button
type=
"info"
v-if=
"item.IsCanOrder
== 0
"
icon=
"iconfont icon-quxiao1"
@
click=
"cancelHTorder(item.ThirdOrderNo)"
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确定"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确定"
placement=
"top-start"
>
<el-button
type=
"success"
icon=
"iconfont icon-duigou"
v-if=
"item.IsCanClear == 0"
@
click=
"queren(1, item.OrderID)"
></el-button>
<el-button
type=
"success"
icon=
"iconfont icon-duigou"
v-if=
"item.IsCanClear == 0"
@
click=
"queren(1, item.OrderID)"
></el-button>
...
...
src/components/TravelManager/TravelList/freeTravelOrder.vue
View file @
8fe3778c
...
@@ -338,7 +338,7 @@
...
@@ -338,7 +338,7 @@
<el-button
type=
"primary"
icon=
"iconfont icon-fukuan2"
@
click=
"getShouKuan(item)"
></el-button>
<el-button
type=
"primary"
icon=
"iconfont icon-fukuan2"
@
click=
"getShouKuan(item)"
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消订单"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消订单"
placement=
"top-start"
>
<el-button
type=
"info"
v-if=
"item.IsCanOrder"
icon=
"iconfont icon-quxiao1"
@
click=
"Exit(item)"
></el-button>
<el-button
type=
"info"
v-if=
"item.IsCanOrder
== 0
"
icon=
"iconfont icon-quxiao1"
@
click=
"Exit(item)"
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确定"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确定"
placement=
"top-start"
>
<el-button
type=
"success"
icon=
"iconfont icon-duigou"
v-if=
"item.IsCanClear == 0"
@
click=
"queren(1, item.OrderID)"
></el-button>
<el-button
type=
"success"
icon=
"iconfont icon-duigou"
v-if=
"item.IsCanClear == 0"
@
click=
"queren(1, item.OrderID)"
></el-button>
...
@@ -572,7 +572,7 @@ export default {
...
@@ -572,7 +572,7 @@ export default {
this
.
Error
(
"请选择取消类型!"
);
this
.
Error
(
"请选择取消类型!"
);
return
;
return
;
}
}
this
.
dialogFormVisible
=
false
;
this
.
apipost
(
this
.
apipost
(
"dmc_post_Get_KKDayOrderCancel"
,
"dmc_post_Get_KKDayOrderCancel"
,
this
.
exitMsg
,
this
.
exitMsg
,
...
@@ -589,6 +589,7 @@ export default {
...
@@ -589,6 +589,7 @@ export default {
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
this
.
dialogFormVisible
=
false
;
},
},
null
null
);
);
...
...
src/components/leaderPay2.vue
View file @
8fe3778c
...
@@ -716,7 +716,6 @@
...
@@ -716,7 +716,6 @@
<span
v-if=
"item.UserType==2"
@
click=
"godetailAll('dining')"
>
明细
</span>
<span
v-if=
"item.UserType==2"
@
click=
"godetailAll('dining')"
>
明细
</span>
<span
v-if=
"item.UserType==4"
@
click=
"godetailAll('bus')"
>
明细
</span>
<span
v-if=
"item.UserType==4"
@
click=
"godetailAll('bus')"
>
明细
</span>
</td>
</td>
</tr>
</tr>
</table>
</table>
<table
border=
"0"
cellspacing=
"1"
class=
"leaderPayTable"
>
<table
border=
"0"
cellspacing=
"1"
class=
"leaderPayTable"
>
...
...
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