Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/views/service/credit/creditSeal.vue

@@ -812,8 +812,8 @@ export default {
                 this.auth_pro_timer = window.setInterval(() => {
                     this.proShow = false;
                     setTimeout(() => {
-                            this.timer--;
-                            if(this.timer <= 0 ){
+                            this.proTimer--;
+                            if(this.proTimer <= 0 ){
                                 this.proShow = true;
                                 clearInterval(this.auth_pro_timer);
                             }

front-vue/src/views/service/credit/goFinance.vue

@@ -861,7 +861,10 @@ export default {
                 //有融资内部审批
                 if (true == result) {
                     this.msgSuccess("已提交内部审批，请内部审批通过后签署融资协议");
-                    this.cancel();
+                    //不能用这个方法，该方法返回到上一页，如果从首页的待办签收进来的，会返回到签收页
+                    //this.cancel();
+                    this.$store.dispatch( "tagsView/delView",this.$route);
+                    this.$router.push("/Bill/financeRecord");
                 } else {
                     //无融资内部审批,显示融资合同预览页面
                     // this.zfrId = '2c83a92dc238468aabd9cd3261748ae0'

front-vue/src/views/service/repayment/repayment.vue

@@ -542,7 +542,7 @@ export default {
         };
     },
     created() {
-        this.getRepaymentAmount();
+        //this.getRepaymentAmount();
         this.getDicts("zc_zfr_apply_status").then(response => {
             this.applyStatusOptions = response.data;
         });