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

front-vue/src/views/home.vue

@@ -285,7 +285,7 @@
                 <!-- 第二行 -->
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card">
-                        <div class="zap-card__title">我的代办</div>
+                        <div class="zap-card__title">我的待办</div>
                         <div class="zap-card__wrap zap-card__blue">
                             <span class="zap-card__num">{{workTotal}}</span>
                             <span class="zap-card__unit">个</span>
@@ -1005,7 +1005,7 @@ export default {
                     this.getCompanyReport()
                     //核心企业额度比例 -- 柱状图
                     this.getFinanceAmountAll()
-                    //查询代办
+                    //查询待办
                     this.getWorkList()
                     //查询消息
                     this.getNoticeList()
@@ -1043,7 +1043,7 @@ export default {
                     this.getExpiredBalance()
                     //即将到期额度（30天）-- 列表
                     this.getExpiredList()
-                    //查询代办
+                    //查询待办
                     this.getWorkList()
                     //查询消息
                     this.getNoticeList()
@@ -1063,7 +1063,7 @@ export default {
                     this.getExpiredBalance()
                     //即将到期额度（30天）-- 列表
                     this.getExpiredList()
-                    //查询代办
+                    //查询待办
                     this.getWorkList()
                     //查询消息
                     this.getNoticeList()
@@ -1428,7 +1428,7 @@ export default {
                 this.iniEcharBar('echarBarBusiness', response.data.dataList, response.data.dateList)
             });
         },
-        //查询代办
+        //查询待办
         getWorkList(){
             listNotice(this.queryParamsWork).then((response) => {
                 this.workList = response.rows

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

@@ -265,7 +265,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      ththis.resetForm("queryForm");
+      this.resetForm("queryForm");
       Cookies.set("/contract/addContract/", this.$route.fullPath);
       this.$router.push({path:"/contract/addContract/"});
     },

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

@@ -1150,6 +1150,17 @@ export default {
                 loading.close();
             });
     },
+    //返回到列表页
+    goParent(){
+         var self = this
+        this.pdfShowDialog = false;
+        self.$store.dispatch(
+            "tagsView/delView",
+            self.$route
+            );
+         //self.$router.push("/Bill/credit")
+         self.$router.push("/Bill/finance/credit")
+    }
 
     }
 };

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

@@ -465,9 +465,11 @@ export default {
              
         }).then(() =>{
             getRepayment(this.zfrId).then((response)=>{
-            this.forms = response.data[0];
-            this.forms.zfrApplyStatus = this.selectDictLabel(this.applyStatusOptions,this.forms.zfrApplyStatus)
-            this.list = response.data;
+                if(response.data &&response.data.length> 0){
+                    this.forms = response.data[0];
+                    this.forms.zfrApplyStatus = this.selectDictLabel(this.applyStatusOptions,this.forms.zfrApplyStatus)
+                    this.list = response.data;
+                }
             })
             this.getDicts("zc_zfr_apply_status").then((response) => {
                 this.applyStatusOptions = response.data;