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

front-vue/src/views/home.vue

@@ -1300,7 +1300,7 @@ export default {
         },
         //开立金额 -- 正向保理
         getFinancedNumForward() {
-            return accAdd(accAdd(this.effectBalanceForward, this.availableBalanceForward, 2), this.loanBalanceForward, 2)
+            return accAdd(accAdd(this.effectBalanceForward, this.availableBalanceForward, 2), this.loanBalance, 2)
         },
         //剩余授信额度
         getsubNum() {

front-vue/src/views/service/cost/userCostManage.vue

@@ -297,6 +297,7 @@
     </el-dialog>
 
     <!-- 去缴费 -->
+     <div v-if="accNo">
     <paying
       :payingMoney="payingMoney"
       :accNo="accNo"
@@ -307,6 +308,7 @@
       @cancelHandler="cancelHandler"
       @close="cancelHandler"
     ></paying>
+    </div>
   </div>
 </template>
 
@@ -689,10 +691,11 @@ export default {
         background: "rgba(0, 0, 0, 0.7)"
       });
       // self.paiAccno = '3115730025230000214';
+      console.log(row)
       if (row.accNo) {
         balance(row.accNo)
           .then(response => {
-            if (eval(row.zciAmount) > eval(response.data.list.row.KYAMT)) {
+            if (eval(row.zciAmount) > eval(response.data.kyamt)) {
               self.$message({
                 message:
                   "余额为" +
@@ -714,9 +717,13 @@ export default {
                   .then(response => {
                     loading.close();
                     self.msgSuccess("缴费成功");
+                    this.accNo = false;
+                    this.getList();
                     return changeZfiStatus(zciId);
                   })
                   .catch(() => {
+                    this.accNo = false;
+                    this.getList();
                     loading.close();
                   });
               } else {
@@ -727,14 +734,19 @@ export default {
                   businessId: row.zciId,
                   type: "00"
                 };
+                console.log("缴费")
                 transfer(map)
                   .then(response => {
                     loading.close();
+                    this.accNo = false;
                     self.msgSuccess("缴费成功");
+                    this.getList();
                     return changeZfiStatus(zciId);
                   })
                   .catch(() => {
+                    this.accNo = false;
                     loading.close();
+                    this.getList();
                   });
               }
             }
@@ -793,6 +805,7 @@ export default {
         for (var key in self.formApply) {
           fd.append(key, self.formApply[key]);
         }
+        console.log(valid)
         if (valid) {
           if (this.formApply.scyId != null) {
             const loading = this.$loading({

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

@@ -287,11 +287,14 @@
                 <!--查看内部审批流程-->
                 <el-dialog title="流程进度" :visible.sync="hisTaskForm">
                     <div class="zap-form">
-                        <el-steps direction="vertical" :active="histaskList[histaskList.length-1] && histaskList[histaskList.length-1].activityType == 'endEvent' ? histaskList.length : histaskList.length-1" finish-status="success" space="60px">
+                        <el-steps direction="vertical" :active="histaskList[histaskList.length-1] && histaskList[histaskList.length-1].endTime !=null ? histaskList.length : histaskList.length-1" finish-status="success" space="60px">
                             <el-step :title="item.name" v-for="(item,index) in histaskList" :key="index">
                                 <template slot="description">
                                     <span v-if="item.activityType == 'userTask'">办理人: {{item.displayName}}</span> 节点名称: {{item.activityName}} 任务接收时间 {{parseTime(new Date(item.startTime), '{y}-{m}-{d} {h}:{i}:{s}')}}  {{item.endTime?'任务办结时间' + parseTime(new Date(item.endTime), '{y}-{m}-{d} {h}:{i}:{s}'):''}}
-                                    <div v-for="(comment,index) in item.commentList" class="text item" :key="index">
+                                    <div v-if="item.deleteReason != null" class="text item">
+                                        {{'拒绝原因: ' + item.deleteReason }}
+                                    </div>
+                                    <div v-else v-for="(comment,index) in item.commentList" class="text item" :key="index">
                                         {{'审批意见: ' + comment.message }}
                                     </div>
                                 </template>

front-vue/src/views/service/rel/companyRel.vue

@@ -949,7 +949,8 @@ export default {
             // } else {
             listRel(this.queryParams).then(response => {
                 let list = response.data.records;
-                console.log(list);
+                console.log(response.msg,"msg");
+                console.log(response,"response");
                 this.loginId = response.msg;
                 for (let i = 0; i < list.length; i++) {
                     if (list[i].launchCompanyId == response.msg) {
@@ -961,6 +962,7 @@ export default {
                         list[i].receive = true;
                         list[i].spare = false;
                     } else if (list[i].scpCompanyId == response.msg) {
+                                 console.log(list[i].scpCompanyId,"开始")
                         list[i].launch = false;
                         list[i].receive = false;
                         list[i].spare = true;
@@ -1153,6 +1155,7 @@ export default {
                             loading.close();
                             this.open = false;
                             this.getUser();
+                            this.getList();
                             this.getSpare();
                             this.getCompanyList();
                         })
@@ -1179,6 +1182,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("链属成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     })
@@ -1202,6 +1206,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("链属成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     })
@@ -1231,6 +1236,7 @@ export default {
                         this.msgSuccess("邀请成功");
                         this.getUser();
                         this.getSpare();
+                        this.getList();
                         this.getCompanyList();
                     })
                     .catch(() => {
@@ -1253,6 +1259,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("邀请成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     })
@@ -1281,6 +1288,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("拒绝成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     })
@@ -1304,6 +1312,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("拒绝成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     })
@@ -1331,6 +1340,7 @@ export default {
                     }).then(() => {
                         this.msgSuccess("解绑成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     });
@@ -1348,6 +1358,7 @@ export default {
                     .then(() => {
                         this.msgSuccess("解绑成功");
                         this.getUser();
+                        this.getList();
                         this.getSpare();
                         this.getCompanyList();
                     });
@@ -1370,6 +1381,7 @@ export default {
                        console.log("解绑7")
                     this.msgSuccess("解绑成功");
                     this.getUser();
+                    this.getList();
                     this.getSpare();
                     this.getCompanyList();
                 });
@@ -1389,6 +1401,7 @@ export default {
                     this.msgSuccess("重邀成功");
                     this.getUser();
                     this.getSpare();
+                    this.getList();
                     this.getCompanyList();
                     loading.close();
                 })

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

@@ -16,7 +16,7 @@
         <el-col :span="8">
             <div class="zap-form-text">
                 <span class="zap-form-text__label">最终付款方</span>
-                <div class="zap-form-text__file">{{form.zfrPayNumber}}</div>
+                <div class="zap-form-text__file">{{form.core}}</div>
             </div>
         </el-col>
         <el-col :span="8">

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

@@ -509,7 +509,7 @@
         <statistical-data>
           <span class="label">
             总合计:
-            <span class="value">¥{{allAmount}}</span>
+            <span class="value">¥{{dhkAmount}}</span>
           </span>
           <span class="label">待还款:¥{{dhkAmount}}</span>
         </statistical-data>
@@ -640,7 +640,7 @@
         <statistical-data>
           <span class="label">
             总合计:
-            <span class="value">¥{{allAmount}}</span>
+            <span class="value">¥{{yhkAmount}}</span>
           </span>
           <span class="label">已还款:¥{{yhkAmount}}</span>
         </statistical-data>
@@ -780,7 +780,7 @@
         <statistical-data>
           <span class="label">
             总合计:
-            <span class="value">¥{{allAmount}}</span>
+            <span class="value">¥{{yyqAmount}}</span>
           </span>
           <span class="label">已逾期:¥{{yyqAmount}}</span>
         </statistical-data>