Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
precision-effect
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
耿迪迪
precision-effect
Commits
1aeaa456
Commit
1aeaa456
authored
Sep 27, 2023
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决转移支付自动变为卖方部门长审核bug
parent
88cf7a12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
TTradeProjectServiceImpl.java
.../zehong/system/service/impl/TTradeProjectServiceImpl.java
+1
-1
Evaluate.vue
precision-effect-web/src/views/trade/components/Evaluate.vue
+5
-1
No files found.
precision-effect-system/src/main/java/com/zehong/system/service/impl/TTradeProjectServiceImpl.java
View file @
1aeaa456
...
@@ -166,7 +166,7 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
...
@@ -166,7 +166,7 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
{
{
TTradeProject
trade
=
tTradeProjectMapper
.
selectTTradeProjectById
(
tTradeProject
.
getTradeId
());
TTradeProject
trade
=
tTradeProjectMapper
.
selectTTradeProjectById
(
tTradeProject
.
getTradeId
());
// 转移支付:新增交易转移信息,更新交易单
// 转移支付:新增交易转移信息,更新交易单
if
(
"
myChange"
.
equals
(
tTradeProject
.
getQueryType
())
&&
tTradeProject
.
getTradeDeptId
()!=
null
&&
tTradeProject
.
getTradeTransactor
()!=
null
){
if
(
"
0"
.
equals
(
tTradeProject
.
getTradeStatus
())
&&
tTradeProject
.
getTradeDeptId
()!=
null
&&
tTradeProject
.
getTradeTransactor
()!=
null
){
TTradeChangeInfo
tradeChangeInfo
=
new
TTradeChangeInfo
();
TTradeChangeInfo
tradeChangeInfo
=
new
TTradeChangeInfo
();
tradeChangeInfo
.
setRelationTradeId
(
tTradeProject
.
getTradeId
());
tradeChangeInfo
.
setRelationTradeId
(
tTradeProject
.
getTradeId
());
tradeChangeInfo
.
setOriginalTradeDeptId
(
trade
.
getTradeDeptId
());
tradeChangeInfo
.
setOriginalTradeDeptId
(
trade
.
getTradeDeptId
());
...
...
precision-effect-web/src/views/trade/components/Evaluate.vue
View file @
1aeaa456
...
@@ -103,6 +103,7 @@
...
@@ -103,6 +103,7 @@
dealPrice
:
this
.
tradeData
.
dealPrice
,
dealPrice
:
this
.
tradeData
.
dealPrice
,
dealRemark
:
this
.
tradeData
.
dealRemark
,
dealRemark
:
this
.
tradeData
.
dealRemark
,
tradeDeptId
:
null
,
tradeDeptId
:
null
,
tradeStatus
:
"1"
,
tradeTransactor
:
null
,
tradeTransactor
:
null
,
formDeptOptions
:
[],
formDeptOptions
:
[],
transactorList
:
[],
transactorList
:
[],
...
@@ -118,6 +119,7 @@
...
@@ -118,6 +119,7 @@
this
.
socre
=
""
;
this
.
socre
=
""
;
this
.
dealPrice
=
""
;
this
.
dealPrice
=
""
;
if
(
newVal
==
'1'
){
if
(
newVal
==
'1'
){
this
.
tradeStatus
=
"1"
;
this
.
priceDisabled
=
false
;
this
.
priceDisabled
=
false
;
this
.
socreDisabled
=
true
;
this
.
socreDisabled
=
true
;
this
.
isShow
=
false
;
this
.
isShow
=
false
;
...
@@ -125,6 +127,7 @@
...
@@ -125,6 +127,7 @@
this
.
tradeTransactor
=
null
;
this
.
tradeTransactor
=
null
;
}
}
if
(
newVal
==
'2'
){
if
(
newVal
==
'2'
){
this
.
tradeStatus
=
"1"
;
this
.
priceDisabled
=
true
;
this
.
priceDisabled
=
true
;
this
.
socreDisabled
=
false
;
this
.
socreDisabled
=
false
;
this
.
isShow
=
false
;
this
.
isShow
=
false
;
...
@@ -132,6 +135,7 @@
...
@@ -132,6 +135,7 @@
this
.
tradeTransactor
=
null
;
this
.
tradeTransactor
=
null
;
}
}
if
(
newVal
==
'3'
){
if
(
newVal
==
'3'
){
this
.
tradeStatus
=
"0"
;
this
.
priceDisabled
=
true
;
this
.
priceDisabled
=
true
;
this
.
socreDisabled
=
true
;
this
.
socreDisabled
=
true
;
this
.
isShow
=
true
;
this
.
isShow
=
true
;
...
@@ -209,7 +213,7 @@
...
@@ -209,7 +213,7 @@
return
false
;
return
false
;
},
},
submitSuggestion
(){
submitSuggestion
(){
let
param
=
{
tradeId
:
this
.
tradeData
.
tradeId
,
tradeStatus
:
"1"
,
dealPrice
:
this
.
dealPrice
,
dealRemark
:
this
.
dealRemark
,
evaluateTime
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
let
param
=
{
tradeId
:
this
.
tradeData
.
tradeId
,
tradeStatus
:
this
.
tradeStatus
,
dealPrice
:
this
.
dealPrice
,
dealRemark
:
this
.
dealRemark
,
evaluateTime
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
tradeDeptId
:
this
.
tradeDeptId
,
tradeTransactor
:
this
.
tradeTransactor
};
tradeDeptId
:
this
.
tradeDeptId
,
tradeTransactor
:
this
.
tradeTransactor
};
if
(
this
.
socre
){
if
(
this
.
socre
){
param
.
tradeScore
=
this
.
socre
;
param
.
tradeScore
=
this
.
socre
;
...
...
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