Commit 781cf58a authored by 王晓倩's avatar 王晓倩

Revert "交易单修改时自动转移支付bug"

This reverts commit b3c0ff69
parent b3c0ff69
...@@ -165,8 +165,8 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService ...@@ -165,8 +165,8 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
public int updateTTradeProject(TTradeProject tTradeProject) public int updateTTradeProject(TTradeProject tTradeProject)
{ {
TTradeProject trade = tTradeProjectMapper.selectTTradeProjectById(tTradeProject.getTradeId()); TTradeProject trade = tTradeProjectMapper.selectTTradeProjectById(tTradeProject.getTradeId());
// 转移支付:新增交易转移信息,更新交易单。(交易单新增或修改时状态值为null) // 转移支付:新增交易转移信息,更新交易单
if(tTradeProject.getTradeStatus() != null && 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());
......
...@@ -612,8 +612,6 @@ export default { ...@@ -612,8 +612,6 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
// 为区分转移支付,新增和修改时交易单状态传值设为null,新增时数据库默认‘0’
this.form.tradeStatus = null;
if (this.form.tradeId != null) { if (this.form.tradeId != null) {
updateProject(this.form).then((response) => { updateProject(this.form).then((response) => {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment