买方部门长驳回到买方经办人

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

@@ -143,6 +143,8 @@ public class TTradeProject extends BaseEntity
 
     private String dealRemark;
 
+    private String confirmRemark;
+
     private String applyDeptManagerName;
 
     private Long queryApplyDeptId;
@@ -184,6 +186,13 @@ public class TTradeProject extends BaseEntity
         this.dealRemark = dealRemark;
     }
 
+    public String getConfirmRemark() {
+        return confirmRemark;
+    }
+
+    public void setConfirmRemark(String confirmRemark) {
+        this.confirmRemark = confirmRemark;
+    }
 
     public String getTradeTransactorName() {
         return tradeTransactorName;

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

@@ -10,7 +10,7 @@ public abstract class TradeRolesAbstract implements TradeRoles{
     /**交易状态枚举类*/
     protected enum TradeStatusEnum{
 
-        evaluate("0"),confirm("1"),approval("2"),complete("3"),reject("4"),toPay("5");
+        evaluate("0"),confirm("1"),approval("2"),complete("3"),reject("4"),toPay("5"),rejectEvaluate("6");
 
         private final String tradeStatus;
 

precision-effect-system/src/main/java/com/zehong/system/service/impl/tradeRoles/roles/DoubleRoles.java

@@ -38,7 +38,7 @@ public class DoubleRoles extends TradeRolesAbstract {
         //判断买方还是卖方
         Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
         //买方评价
-        if(deptId.equals(this.tTradeProject.getTradeDeptId()) && (TradeStatusEnum.evaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.reject.getTradeStatus().equals(this.tTradeProject.getTradeStatus()))){
+        if(deptId.equals(this.tTradeProject.getTradeDeptId()) && (TradeStatusEnum.evaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.reject.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.rejectEvaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus()))){
             tTradeProject.getOperators().add("evaluate");
         }
         //卖方部门

precision-effect-system/src/main/java/com/zehong/system/service/impl/tradeRoles/roles/Transactor.java

@@ -37,7 +37,7 @@ public class Transactor extends TradeRolesAbstract {
     public void setOperators() {
         //申请中
         Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
-        if(deptId.equals(this.tTradeProject.getTradeDeptId()) && (TradeStatusEnum.evaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.reject.getTradeStatus().equals(this.tTradeProject.getTradeStatus()))){
+        if(deptId.equals(this.tTradeProject.getTradeDeptId()) && (TradeStatusEnum.evaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.reject.getTradeStatus().equals(this.tTradeProject.getTradeStatus())||TradeStatusEnum.rejectEvaluate.getTradeStatus().equals(this.tTradeProject.getTradeStatus()))){
             tTradeProject.getOperators().add("evaluate");
         }
     }

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

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="remark"    column="remark"    />
         <result property="dealRemark"    column="deal_remark"    />
+        <result property="confirmRemark"    column="confirm_remark"    />
         <result property="applyName" column="apply_name"/>
         <result property="tradeTransactorName" column="trade_transactor_name"/>
         <result property="changeCount" column="change_count"/>
@@ -86,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             trade.is_del,
             trade.remark,
             trade.deal_remark,
+            trade.confirm_remark,
             trade.change_by_1st,
             trade.change_by_2nd,
             trade.change_by_3rd,
@@ -266,6 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="dealRemark != null">deal_remark = #{dealRemark},</if>
+            confirm_remark = #{confirmRemark},
             <if test="changeBy1st != null">change_by_1st = #{changeBy1st},</if>
             <if test="changeBy2nd != null">change_by_2nd = #{changeBy2nd},</if>
             <if test="changeBy3rd != null">change_by_3rd = #{changeBy3rd},</if>

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

@@ -19,21 +19,35 @@
           </div>
         </el-col>
       </el-row>
-      <el-row style="margin-left:95px;padding-top: 5px">
+      <el-row style="margin-left:95px;padding-top: 15px">
         <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-row style="margin-left:95px; padding-top: 10px">
+        <el-col :span="10" style="margin-top: 15px">
+<!--          <el-checkbox v-model="checked">我已知晓</el-checkbox>-->
+          <el-row>
+            <el-col :span="6">
+              <el-radio v-model="radio" label="1">通过</el-radio>
+            </el-col>
+            <el-col :span="6">
+              <el-radio v-model="radio" label="2">不通过</el-radio>
+            </el-col>
+          </el-row>
         </el-col>
-        <el-col :span="8" style="margin-top: 10px">
+        <el-col :span="10" style="margin-top: 5px">
           <span style="margin: 0px 5px;">审批人</span>
           <el-input :value="$store.state.user.nickName" style="width: 130px" disabled/>
         </el-col>
       </el-row>
+      <el-row style="margin-left:90px; padding-top: 5px">
+        <el-col :span="24">
+          <span style="margin: 0px 5px; line-height: 60px">审核意见</span>
+          <el-input v-model="confirmRemark" type="textarea" style="width: 590px"/>
+        </el-col>
+      </el-row>
       <el-divider></el-divider>
     </div>
 </template>
@@ -53,22 +67,37 @@
     },
     data(){
       return{
-        checked: false
+        // checked: false
+        radio: "1",
+        tradeStatus: "2",
+        confirmRemark: null,
+      }
+    },
+    watch:{
+      radio(newVal,oldVal){
+        if(newVal== "1"){
+          this.tradeStatus = "2";
+          this.confirmRemark = "";
+        }
+        if(newVal== "2"){
+          this.tradeStatus = "6";
+        }
       }
     },
     methods:{
       resetSuggestion(){
-        this.checked = false;
+        // this.checked = false;
+        this.radio = "1";
       },
       checkParam(){
-        if(!this.checked){
-          this.$message.error("请勾选须知!");
-          return true;
-        }
+        // if(!this.checked){
+        //   this.$message.error("请勾选须知!");
+        //   return true;
+        // }
         return false;
       },
       submitSuggestion(){
-        return {tradeId:this.tradeData.tradeId,tradeStatus:"2",tradeDeptManagerId:this.$store.state.user.userId,confirmTime:moment().format('YYYY-MM-DD HH:mm:ss')};
+        return {tradeId:this.tradeData.tradeId,tradeStatus:this.tradeStatus,confirmRemark:this.confirmRemark,tradeDeptManagerId:this.$store.state.user.userId,confirmTime:moment().format('YYYY-MM-DD HH:mm:ss')};
       }
     }
   }

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

@@ -2,7 +2,20 @@
     <div class="evaluate">
       <CommonInfo :tradeData="tradeData"/>
       <div style="margin: 11px 30px;color: #1890ff;">买方审核</div>
-      <el-row style="margin-left:95px">
+      <el-row style="margin-left:95px" v-if="tradeData.tradeStatus=='6'">
+        <el-col :span="24">
+          <div >
+            <span style="color: #d0d0d0">部门长审核结果</span> 不通过
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="margin-left:95px;padding-top: 15px" v-if="tradeData.tradeStatus=='6'">
+        <el-col :span="24">
+          <span style="color: #d0d0d0">审核意见</span> {{tradeData.confirmRemark}}
+        </el-col>
+      </el-row>
+
+      <el-row style="margin-left:95px; padding-top: 20px">
         <el-col :span="8">
           <el-radio v-model="radio" label="1">
             <span style="margin: 0px 5px;">议价</span>
@@ -85,10 +98,10 @@
           radio:"2",
           priceDisabled: true,
           socreDisabled: false,
-          socre: "",
-          price: "",
-          dealPrice: "",
-          dealRemark:null,
+          socre: this.tradeData.tradeScore,
+          price: this.tradeData.price,
+          dealPrice: this.tradeData.dealPrice,
+          dealRemark: this.tradeData.dealRemark,
           tradeDeptId: null,
           tradeTransactor: null,
           formDeptOptions: [],

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

@@ -53,7 +53,7 @@
           case "evaluate":
             return "经办人评价";
           case "confirm":
-            return "买方部门长确认";
+            return "买方部门长审核";
           case "approval":
             return "卖方部门长审核";
           case "toPay":