Merge branch 'master' of http://111.61.77.35:9999/gengdidi/precision-effect

precision-effect-system/src/main/resources/mapper/business/TTradeProjectMapper.xml

@@ -186,7 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tradePrice != null">trade_price = #{tradePrice},</if>
             <if test="tradeCount != null">trade_count = #{tradeCount},</if>
             <if test="tradeTotal != null">trade_total = #{tradeTotal},</if>
-            <if test="tradeScore != null">trade_score = #{tradeScore},</if>
+            <if test="tradeScore != null and tradeScore!=-1">trade_score = #{tradeScore},</if>
+            <if test="tradeScore == -1">trade_score = null,</if>
             <if test="tradeDeptManagerId != null">trade_dept_manager_id = #{tradeDeptManagerId},</if>
             <if test="settlementTime != null">settlement_time = #{settlementTime},</if>
             <if test="dealPrice != null">deal_price = #{dealPrice},</if>

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

@@ -94,9 +94,11 @@
         },
         submitSuggestion(){
           let param = {tradeId:this.tradeData.tradeId,tradeStatus:"1",dealPrice:this.dealPrice,dealRemark:this.dealRemark};
-          // if(this.socre){
+          if(this.socre){
             param.tradeScore = this.socre;
-          // }
+          }else{
+            param.tradeScore = -1;
+          }
           return param;
         }
       }

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

@@ -15,13 +15,14 @@
         :formatter="getTradeStatus"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="申请人" align="center" prop="applyName" />
       <el-table-column
         label="卖方"
         align="center"
         prop="applyDeptName"
         :show-overflow-tooltip="true"
       />
+      <el-table-column label="申请人" align="center" prop="applyName" />
+      <el-table-column label="申请时间" align="center" prop="createTime" width="150px"/>
       <el-table-column label="申报总价" align="center" prop="tradeTotal" />
       <el-table-column
         label="买方"