买方经办人驳回时不记录“说明”的问题；

交易单导出增加“备注”字段；

precision-effect-system/src/main/java/com/zehong/system/domain/vo/TTradeProjectExportVo.java

@@ -44,6 +44,28 @@ public class TTradeProjectExportVo {
     @Excel(name = "尾款")
     private BigDecimal pendingPayment;
 
+    @Excel(name = "交易说明")
+    private String dealRemark;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getDealRemark() {
+        return dealRemark;
+    }
+
+    public void setDealRemark(String dealRemark) {
+        this.dealRemark = dealRemark;
+    }
+
     public String getRelationTransactionProjectName() {
         return relationTransactionProjectName;
     }

precision-effect-system/src/main/java/com/zehong/system/service/impl/TTradeProjectServiceImpl.java

@@ -193,7 +193,7 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
             changeCount++;
             tTradeProject.setChangeCount(changeCount);
             tTradeProject.setTradeStatus(null);
-            tTradeProject.setDealRemark(null);
+//            tTradeProject.setDealRemark(null);
             tTradeProject.setEvaluateTime(null);
 
             tTradeChangeInfoMapper.insertTTradeChangeInfo(tradeChangeInfo);

precision-effect-web/src/views/trade/components/Evaluate.vue

@@ -221,6 +221,10 @@
             param.tradeScore = -1;
           }
           return param;
+        },
+        reject(){
+          let param = {dealRemark:this.dealRemark};
+          return param;
         }
       }
     }

precision-effect-web/src/views/trade/components/OperatorButton.vue

@@ -187,7 +187,7 @@
       },
       //驳回
       reject(){
-        updateProject({tradeId:this.tradeInfo.tradeId,tradeStatus:"4"}).then(res =>{
+        updateProject({tradeId:this.tradeInfo.tradeId,tradeStatus:"4",dealRemark:this.$refs.currentCom.reject().dealRemark}).then(res =>{
           if(res.code == 200){
             this.open = false;
             this.$emit("getList");