路由问题-审核时间

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

@@ -126,6 +126,18 @@ public class TTradeProject extends BaseEntity
 
     private String sortType;
 
+    /** 评价时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date evaluateTime;
+
+    /** 确认时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date confirmTime;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date approvalTime;
+
     public String getDealRemark() {
         return dealRemark;
     }
@@ -442,6 +454,30 @@ public class TTradeProject extends BaseEntity
         this.sortType = sortType;
     }
 
+    public Date getEvaluateTime() {
+        return evaluateTime;
+    }
+
+    public void setEvaluateTime(Date evaluateTime) {
+        this.evaluateTime = evaluateTime;
+    }
+
+    public Date getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(Date confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -195,6 +195,7 @@ public class TTradeProjectServiceImpl implements ITTradeProjectService
     public int settlementTrade(TTradeProject tTradeProject){
         TTradeProject tradeInfo = tTradeProjectMapper.selectTTradeProjectById(tTradeProject.getTradeId());
         tradeInfo.setTradeStatus(tTradeProject.getTradeStatus());
+        tradeInfo.setApprovalTime(tTradeProject.getApprovalTime());
         //审核成功结算
         settleByTradeStatus(tTradeProject,tradeInfo);
         if(!"5".equals(tTradeProject.getTradeStatus())){

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

@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pendingPayment"    column="pending_payment"    />
         <result property="attachmentUrl"    column="attachment_url"    />
         <result property="tradeStatus"    column="trade_status"    />
+        <result property="evaluateTime"    column="evaluate_time"    />
+        <result property="confirmTime"    column="confirm_time"    />
+        <result property="approvalTime"    column="approval_time"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
@@ -61,6 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             trade.pending_payment,
             trade.attachment_url,
             trade.trade_status,
+            trade.evaluate_time,
+            trade.confirm_time,
+            trade.approval_time,
             trade.create_time,
             trade.update_time,
             trade.is_del,
@@ -155,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pendingPayment != null">pending_payment,</if>
             <if test="attachmentUrl != null">attachment_url,</if>
             <if test="tradeStatus != null">trade_status,</if>
+            <if test="evaluateTime != null">evaluate_time,</if>
+            <if test="confirmTime != null">confirm_time,</if>
+            <if test="approvalTime != null">approval_time,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
@@ -179,6 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pendingPayment != null">#{pendingPayment},</if>
             <if test="attachmentUrl != null">#{attachmentUrl},</if>
             <if test="tradeStatus != null">#{tradeStatus},</if>
+            <if test="evaluateTime != null">#{evaluateTime},</if>
+            <if test="confirmTime != null">#{confirmTime},</if>
+            <if test="approvalTime != null">#{approvalTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
@@ -208,6 +220,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pendingPayment != null">pending_payment = #{pendingPayment},</if>
             <if test="attachmentUrl != null">attachment_url = #{attachmentUrl},</if>
             <if test="tradeStatus != null">trade_status = #{tradeStatus},</if>
+            <if test="evaluateTime != null">evaluate_time = #{evaluateTime},</if>
+            <if test="confirmTime != null">confirm_time = #{confirmTime},</if>
+            <if test="approvalTime != null">approval_time = #{approvalTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>

precision-effect-web/package.json

@@ -45,6 +45,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

precision-effect-web/src/components/Breadcrumb/index.vue

@@ -37,8 +37,9 @@ export default {
       if (!this.isDashboard(first)) {
         matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
       }
-
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false).filter((item,index)=>{
+        return index !=0;
+      })
     },
     isDashboard(route) {
       const name = route && route.name

precision-effect-web/src/layout/components/Navbar.vue

-<template>
+  <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 

precision-effect-web/src/layout/components/TagsView/index.vue

@@ -44,7 +44,7 @@ export default {
   },
   computed: {
     visitedViews() {
-      return this.$store.state.tagsView.visitedViews
+      return this.$store.state.tagsView.visitedViews.filter((item,index)=>{return index!=0})
     },
     routes() {
       return this.$store.state.permission.routes

precision-effect-web/src/permission.js

@@ -25,16 +25,19 @@ router.beforeEach((to, from, next) => {
             store.dispatch("GenerateRoutes").then((accessRoutes) => {
               // 根据roles权限生成可访问的路由表
               router.addRoutes(accessRoutes); // 动态添加可访问路由表
-              // next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
               const origin = router.options.routes.find((item) => {
                 return item.redirect === "index";
               });
               // 隐藏
               origin.children[0].hidden = true;
+              console.log("from-------------",from)
               // 挑战
+              if(from.path=='/login' || from.path=='/'){
                 if (accessRoutes[0].children) {
                   next({ ...accessRoutes[0].children[0] });
                 }
+              }
               // console.log('accessRoutes[0].children',accessRoutes)
             });
           })

precision-effect-web/src/views/account/index.vue

@@ -220,11 +220,12 @@
             <el-option label="交易支出" value="2" />
             <el-option label="交易尾款扣除项目" value="3" />
             <el-option label="采购（报销）支出" value="4" />
-            <el-option label="借支支出" value="9" />
             <el-option label="出借-支出" value="5" />
             <el-option label="借款-收入" value="6" />
             <el-option label="还款-支出" value="7" />
             <el-option label="还款进账-收入" value="8" />
+            <el-option label="借支支出" value="9" />
+            <el-option label="交易尾款收入项目" value="10"/>
           </el-select>
         </el-form-item>
         <el-form-item label="操作时间" prop="registerTime">

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

@@ -48,6 +48,7 @@
 <script>
   import CommonInfo from "./CommonInfo";
   import { settlementTrade } from "@/api/transaction/tradeProject.js";
+  import moment from "moment";
   export default {
     name: "approval",
     props:{
@@ -83,7 +84,7 @@
         return false;
       },
       submitSuggestion(){
-        return {tradeId:this.tradeData.tradeId,tradeStatus:this.tradeStatus,applyDeptManagerId:this.$store.state.user.userId};
+        return {tradeId:this.tradeData.tradeId,tradeStatus:this.tradeStatus,applyDeptManagerId:this.$store.state.user.userId,approvalTime:moment().format('YYYY-MM-DD HH:mm:ss')};
       }
     }
   }

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

@@ -40,6 +40,7 @@
 
 <script>
   import CommonInfo from "./CommonInfo";
+  import moment from "moment";
   export default {
     name: "confirm",
     props:{
@@ -67,7 +68,7 @@
         return false;
       },
       submitSuggestion(){
-        return {tradeId:this.tradeData.tradeId,tradeStatus:"2",tradeDeptManagerId:this.$store.state.user.userId};
+        return {tradeId:this.tradeData.tradeId,tradeStatus:"2",tradeDeptManagerId:this.$store.state.user.userId,confirmTime:moment().format('YYYY-MM-DD HH:mm:ss')};
       }
     }
   }

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

@@ -36,6 +36,7 @@
 
 <script>
   import CommonInfo from "./CommonInfo";
+  import moment from "moment";
     export default {
       name: "evaluate",
       props:{
@@ -94,7 +95,7 @@
           return false;
         },
         submitSuggestion(){
-          let param = {tradeId:this.tradeData.tradeId,tradeStatus:"1",dealPrice:this.dealPrice,dealRemark:this.dealRemark};
+          let param = {tradeId:this.tradeData.tradeId,tradeStatus:"1",dealPrice:this.dealPrice,dealRemark:this.dealRemark,evaluateTime:moment().format('YYYY-MM-DD HH:mm:ss')};
           if(this.socre){
             param.tradeScore = this.socre;
           }else{

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

@@ -17,6 +17,7 @@
             <el-form-item label="审核人">{{tradeData.tradeTransactorName}}</el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="审核时间">{{tradeData.evaluateTime? tradeData.evaluateTime : "-"}}</el-form-item>
         <el-form-item label="说明">{{tradeData.dealRemark}}</el-form-item>
       </el-form>
       <el-divider></el-divider>
@@ -40,7 +41,9 @@
           <el-col :span="8">
             <el-form-item label="审核人">{{tradeData.tradeDeptManagerName}}</el-form-item>
           </el-col>
-          <el-col :span="8"></el-col>
+          <el-col :span="8">
+            <el-form-item label="审核时间">{{tradeData.confirmTime? tradeData.confirmTime : "-"}}</el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <el-divider></el-divider>
@@ -60,7 +63,9 @@
           <el-col :span="8">
             <el-form-item label="审核人">{{tradeData.applyDeptManagerName}}</el-form-item>
           </el-col>
-          <el-col :span="8"></el-col>
+          <el-col :span="8">
+            <el-form-item label="审核时间">{{tradeData.approvalTime ? tradeData.approvalTime : "-"}}</el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <el-divider></el-divider>