添加经办人打分说明；去掉编辑按钮

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

@@ -107,6 +107,15 @@ public class TTradeProject extends BaseEntity
     private String queryType;
 
     private String tradeDeptManagerName;
+    private String dealRemark;
+    public String getDealRemark() {
+        return dealRemark;
+    }
+
+    public void setDealRemark(String dealRemark) {
+        this.dealRemark = dealRemark;
+    }
+
 
     public String getTradeTransactorName() {
         return tradeTransactorName;
@@ -366,6 +375,7 @@ public class TTradeProject extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("isDel", getIsDel())
             .append("remark", getRemark())
+            .append("dealRemark", getDealRemark())
             .toString();
     }
 }

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

@@ -120,9 +120,18 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
     public int updateTTradeProject(TTradeProject tTradeProject)
     {
         tTradeProject.setUpdateTime(DateUtils.getNowDate());
+            //如果卖方部门长审批通过，则需要账户资金划拨
+            //暂时未判断账户可用金额等信息，仅第一版演示临时用 lizhichao-0612
+            if ("3".equals(tTradeProject.getTradeStatus())) {
+                tTradeProject.setPendingPayment(tTradeProject.getDealPrice());
+            }
         return tTradeProjectMapper.updateTTradeProject(tTradeProject);
     }
+    //资金划拨
+    private int cumputeAccount(TTradeProject tTradeProject){
 
+        return 1;
+    }
     /**
      * 批量删除交易项目
      * 

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

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTAccountList" parameterType="TAccount" resultMap="TAccountResult">
         select tt.*,(able_amount+incomeAbleTotalAmount- payableTotalAmount) as totalAmount from(
-        select account_id, dept_id AS deptId , able_amount, IFNULL((select sum(pending_payment) from t_trade_project where trade_status=5 and apply_dept_id =t.dept_id ),0)incomeAbleTotalAmount,IFNULL((select sum(pending_payment) from t_trade_project where trade_status=5 and trade_dept_id =t.dept_id ),0)payableTotalAmount, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_account t
+        select account_id, dept_id AS deptId , able_amount, IFNULL((select sum(pending_payment) from t_trade_project where trade_status=3 and apply_dept_id =t.dept_id ),0)incomeAbleTotalAmount,IFNULL((select sum(pending_payment) from t_trade_project where trade_status=3 and trade_dept_id =t.dept_id ),0)payableTotalAmount, create_time, update_time, is_del, remark,(SELECT dept.dept_name FROM sys_dept dept WHERE dept.dept_id = deptId)AS dept_name from t_account t
         <where>
             <if test="deptId != null "> and t.dept_id = #{deptId}</if>
             <if test="ableAmount != null "> and t.able_amount = #{ableAmount}</if>

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
         <result property="remark"    column="remark"    />
+        <result property="dealRemark"    column="deal_remark"    />
         <result property="applyName" column="apply_name"/>
         <result property="tradeTransactorName" column="trade_transactor_name"/>
 
@@ -59,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update_time,
             is_del,
             remark,
+            deal_remark,
             (SELECT nick_name FROM sys_user WHERE user_id = trade_transactor) AS trade_transactor_name,
            (SELECT nick_name FROM sys_user WHERE user_id = apply_id) AS apply_name,
            (SELECT dept_name FROM sys_dept WHERE dept_id = apply_dept_id) AS apply_dept_name,
@@ -111,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tradeStatus != null  and tradeStatus != ''"> and trade_status = #{tradeStatus}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        order by update_time desc
     </select>
     
     <select id="selectTTradeProjectById" parameterType="Long" resultMap="TTradeProjectResult">
@@ -192,6 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="dealRemark != null">deal_remark = #{dealRemark},</if>
+
         </trim>
         where trade_id = #{tradeId}
     </update>

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

@@ -79,7 +79,7 @@
         return false;
       },
       submitSuggestion(){
-        return {tradeId:this.tradeData.tradeId,tradeStatus:this.tradeStatus};
+        return {tradeId:this.tradeData.tradeId,tradeStatus:this.tradeStatus,dealPrice:this.tradeData.dealPrice};
       }
     }
   }

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

@@ -19,13 +19,19 @@
           </div>
         </el-col>
       </el-row>
+      <el-row style="margin-left:95px;padding-top: 5px">
+        <el-col :span="24">
+          <span style="color: #d0d0d0">说明</span> {{tradeData.dealRemark}}
+        </el-col>
+      </el-row>
+
       <el-row style="margin-left:95px">
         <el-col :span="8" style="margin-top: 15px">
           <el-checkbox v-model="checked">我已知晓</el-checkbox>
         </el-col>
         <el-col :span="8" style="margin-top: 10px">
           <span style="margin: 0px 5px;">审批人</span>
-          <el-input :value="$store.state.user.name" style="width: 130px" disabled/>
+          <el-input :value="$store.state.user.nickName" style="width: 130px" disabled/>
         </el-col>
       </el-row>
       <el-divider></el-divider>

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

@@ -24,6 +24,12 @@
           <el-input v-model="dealPrice" disabled style="width: 130px"/>
         </el-col>
       </el-row>
+      <el-row style="margin-left:90px;padding-top: 10px">
+        <el-col :span="24">
+          <span style="margin: 0px 5px">说明</span>
+          <el-input v-model="dealRemark" type="textarea" style="width: 590px"/>
+        </el-col>
+      </el-row>
       <el-divider></el-divider>
     </div>
 </template>
@@ -47,7 +53,8 @@
           socreDisabled: false,
           socre: "",
           price: "",
-          dealPrice: ""
+          dealPrice: "",
+          dealRemark:""
         }
       },
       watch:{
@@ -86,10 +93,10 @@
           return false;
         },
         submitSuggestion(){
-          let param = {tradeId:this.tradeData.tradeId,tradeStatus:"1",dealPrice:this.dealPrice};
-          if(this.socre){
+          let param = {tradeId:this.tradeData.tradeId,tradeStatus:"1",dealPrice:this.dealPrice,dealRemark:this.dealRemark};
+          // if(this.socre){
             param.tradeScore = this.socre;
-          }
+          // }
           return param;
         }
       }

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

@@ -43,15 +43,15 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.tradeStatus == '0' || scope.row.tradeStatus == '4'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:project:edit']"
-            >修改</el-button
-          >
+<!--          <el-button-->
+<!--            v-if="scope.row.tradeStatus == '0' || scope.row.tradeStatus == '4'"-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:project:edit']"-->
+<!--            >修改</el-button-->
+<!--          >-->
           <el-button
             v-if="scope.row.tradeStatus == '0' || scope.row.tradeStatus == '4'"
             size="mini"