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
11dd56c7
Commit
11dd56c7
authored
Jan 31, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'修改缓存丢失,页面无法操作。销售新需求@@@@'
parent
c481f4d4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
9 deletions
+17
-9
App.vue
src/App.vue
+5
-0
SalesFinancialDetail.vue
src/components/SalesModule/SalesFinancialDetail.vue
+4
-3
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+4
-2
productQuery.vue
src/components/SalesModule/productQuery.vue
+2
-2
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+2
-2
No files found.
src/App.vue
View file @
11dd56c7
...
...
@@ -68,6 +68,11 @@ export default {
}
},
mounted
()
{
if
(
!
this
.
getLocalStorage
())
{
this
.
$router
.
push
({
path
:
'/login'
})
}
this
.
haveOpenMode
=!
localStorage
.
openMode
this
.
MsgBus
.
$on
(
'imgpreviewoverflow'
,
content
=>
{
this
.
show
(
content
)
...
...
src/components/SalesModule/SalesFinancialDetail.vue
View file @
11dd56c7
...
...
@@ -101,7 +101,6 @@
<li><span>
实付金额:
</span>
{{
moneyFormat
(
shiMoneyP
)
}}
</li>
<li><span>
待付金额:
</span><span
:class=
"
{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">
{{
moneyFormat
(
allMoneyP
-
shiMoneyP
)
}}
</span></li>
</ul>
<input
v-if=
"item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'"
type=
"button"
:value=
"`新增$
{activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
</div>
<p
class=
"sfd_tit clearfix"
>
收款单
<input
type=
"button"
v-if=
"item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'"
value=
"新增收款"
class=
"normalBtn"
@
click=
"addFinancialOrder(1)"
></p>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"teamRevenueExpenditureTable"
>
...
...
@@ -352,9 +351,9 @@ export default {
this
.
apipost
(
'Financial_post_GetALLPageList'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
.
pageData
;
this
.
allMoney
=
0
;
this
.
shiMoney
=
0
;
if
(
type
===
1
)
{
this
.
allMoney
=
0
;
this
.
shiMoney
=
0
;
data
.
forEach
(
x
=>
{
this
.
allMoney
+=
x
.
Money
this
.
shiMoney
+=
x
.
PayMoney
...
...
@@ -362,6 +361,8 @@ export default {
this
.
dataList
=
data
;
this
.
getList
(
2
)
}
else
{
this
.
allMoneyP
=
0
;
this
.
shiMoneyP
=
0
;
data
.
forEach
(
x
=>
{
this
.
allMoneyP
+=
x
.
Money
this
.
shiMoneyP
+=
x
.
PayMoney
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
11dd56c7
...
...
@@ -1414,9 +1414,11 @@
<p>
下单时间:
{{
item
.
createDate
}}
</p>
</td>
<td>
<p
v-if=
'item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'
class=
"fz12 over_ellipsis"
style=
"width: 120px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
<
!--
<
p
v-if=
'item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'
class=
"fz12 over_ellipsis"
style=
"width: 120px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
<p
v-if=
'item.isOwn==1||userId==1||userId==5||positionId==168'
class=
"fz12"
>
{{
item
.
contactMobile
}}
</p>
<p
v-if=
'item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'
>
*****
</p>
<p
v-if=
'item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'
>
*****
</p>
-->
<p
class=
"fz12 over_ellipsis"
style=
"width: 120px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
<p
class=
"fz12"
>
{{
item
.
contactMobile
}}
</p>
</td>
<td>
<el-popover
style=
'padding: 0;'
width=
"470"
trigger=
"click"
>
...
...
src/components/SalesModule/productQuery.vue
View file @
11dd56c7
...
...
@@ -322,11 +322,11 @@
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"true"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<
!--
<
el-col
:span=
"4"
>
<el-form-item
label=
"预计提成"
prop=
"Commission"
>
<el-input
v-model=
'addMsg.Commission'
:disabled=
"true"
></el-input>
</el-form-item>
</el-col>
</el-col>
-->
<el-col
:span=
"4"
v-show=
"addMsg.CustomerType==1||addMsg.CustomerType==2"
>
<el-form-item
label=
"分摊人"
prop=
"CommissionSharePeople"
>
<el-select
:disabled=
"isUpdateSharePeople"
filterable
clearable
@
change=
'getTotalPrice'
v-model=
'addMsg.CommissionSharePeople'
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
11dd56c7
...
...
@@ -1163,11 +1163,11 @@
:disabled=
"!this.OrderDataList.IsUpdateOrderMoney"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<
!--
<
el-col
:span=
"4"
>
<el-form-item
label=
"预计提成"
prop=
"Commission"
>
<el-input
v-model=
'addMsg.Commission'
:disabled=
"true"
></el-input>
</el-form-item>
</el-col>
</el-col>
-->
<el-col
:span=
"4"
v-show=
"addMsg.CustomerType==1||addMsg.CustomerType==2"
>
<el-form-item
label=
"分摊人"
prop=
"CommissionSharePeople"
>
<el-select
:disabled=
"isUpdateSharePeople"
filterable
clearable
@
change=
'getTicheng'
v-model=
'addMsg.CommissionSharePeople'
...
...
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