فهرست منبع

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

zhanglb 3 سال پیش
والد
کامیت
4fa6eb3af6

+ 36 - 0
front-vue/src/api/service/report/credit.js

@@ -124,4 +124,40 @@ export function financeRecordMonth(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询核心企业总授信额度
+export function listCreditLineAll(query) {
+  return request({
+    url: '/sc-service/report/credit/listCreditLineAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询核心企业总授信额度
+export function listCreditAll(query) {
+  return request({
+    url: '/sc-service/report/credit/listCreditAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询核心企业已融资金额
+export function listHasRaised(query) {
+  return request({
+    url: '/sc-service/report/credit/listHasRaised',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询核心企业已放款金额
+export function listRepayment(query) {
+  return request({
+    url: '/sc-service/report/credit/listRepayment',
+    method: 'get',
+    params: query
+  })
 }

+ 1 - 1
front-vue/src/utils/amtCommon.js

@@ -9,7 +9,7 @@ export function amtformat(number, decimals, dec_point, thousands_sep) {
         s = '',
         toFixedFix = function (n, prec) {
             var k = Math.pow(10, prec);
-            return '' + Math.ceil(n * k) / k;
+            return '' + Math.round(n * k) / k;
         };
 
     s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.');

+ 121 - 16
front-vue/src/views/home.vue

@@ -259,27 +259,64 @@
         
         <!-- 核心企业 -->
         <div v-if="company.scyType == '01'" class="zap-margin">
+            <el-button v-for="(item,index) in hxDateTypeList" :key="index" @click="changeHxDateType(item.value)">{{item.label}}</el-button>
             <el-row :gutter="20">
                 <!-- 第一行 -->
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
-                    <div class="zap-card" @click="toCredit()">
-                        <div class="zap-card__title">我开立的融信</div>
-                        <div class="zap-card__wrap zap-card__blue">
-                            <span class="zap-card__num">{{handleInput(getFinancedNum())}}</span>
+                    <div class="zap-card" @click="toCreditLine()">
+                        <div class="zap-card__title">总授信额度</div>
+                        <div class="zap-card__wrap zap-card__gold">
+                            <span class="zap-card__num">{{handleInput(hxCreditLineAll)}}</span>
                             <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card" @click="toCreditLine()">
-                        <div class="zap-card__title">可用授额度</div>
+                        <div class="zap-card__title">可用授额度</div>
                         <div class="zap-card__wrap zap-card__gold">
-                            <span class="zap-card__num">{{handleInput(getsubNum())}}</span>
+                            <span class="zap-card__num">{{handleInput(usableAmount)}}</span>
                             <span class="zap-card__unit">元</span>
                         </div>
                     </div>
                 </el-col>
                 <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card" @click="toCredit()">
+                        <div class="zap-card__title">我开立的融信</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(hxCreditAll)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="hxDateType == '00'">
+                    <div class="zap-card">
+                        <div class="zap-card__title">30天的待还款</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(expiredList.allAmount)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8" v-if="hxDateType != '00'">
+                    <div class="zap-card">
+                        <div class="zap-card__title">还款金额</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(hxRepayment)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                    <div class="zap-card">
+                        <div class="zap-card__title">已融资金额</div>
+                        <div class="zap-card__wrap zap-card__blue">
+                            <span class="zap-card__num">{{handleInput(hxHasRaised)}}</span>
+                            <span class="zap-card__unit">元</span>
+                        </div>
+                    </div>
+                </el-col>
+                <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card" @click="toRepayment()">
                         <div class="zap-card__title">即将到期付款</div>
                         <div class="zap-card__wrap zap-card__pink">
@@ -287,9 +324,9 @@
                             <span class="zap-card__unit">元</span>
                         </div>
                     </div>
-                </el-col>
+                </el-col> -->
                 <!-- 第二行 -->
-                <el-col :xs="24" :sm="12" :md="8" :lg="8">
+                <!-- <el-col :xs="24" :sm="12" :md="8" :lg="8">
                     <div class="zap-card">
                         <div class="zap-card__title">我的待办</div>
                         <div class="zap-card__wrap zap-card__blue">
@@ -315,7 +352,7 @@
                             <span class="zap-card__unit">元</span>
                         </div>
                     </div>
-                </el-col>
+                </el-col> -->
             </el-row>
             <!-- 我的待办、消息 -->
             <el-row class="zap-list">
@@ -400,7 +437,7 @@
                         <el-tab-pane label="30天内待还款汇总" name="fourth" style="height:400px">
                             <el-table :data="expiredList" :show-header="true">
                                 <el-table-column label="融资编号" align="center" prop="zfiNumber" :show-overflow-tooltip="true"/>
-                                <el-table-column label="金额" align="center" prop="afiAmount" :show-overflow-tooltip="true"/>
+                                <el-table-column label="金额" align="center" prop="zfrAmount" :show-overflow-tooltip="true"/>
                                 <el-table-column label="到期时间" align="center" prop="afiExpireDate" :show-overflow-tooltip="true">
                                     <template slot-scope="scope">
                                         <span>{{ parseTime(new Date(scope.row.afiExpireDate), '{y}-{m}-{d}') }}</span>
@@ -724,7 +761,10 @@
 </template>
 <script>
 import * as echarts from 'echarts';
-import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getLoseEffectBalance, getReturnBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, getCreditLineList, getCreditLineNumList, financeRecordMonth, getExpiredList } from '@/api/service/report/credit'
+import { getCreditLineAll, getAvailableBalance, getEffectBalance, getLoanBalance, getLoseEffectBalance,
+ getReturnBalance, getFinanceAmount, getFinanceAmountAll, getExpiredBalance, getCoreCreditLine, 
+ getCreditLineList, getCreditLineNumList, financeRecordMonth, getExpiredList, 
+ listCreditLineAll,listCreditAll,listHasRaised,listRepayment} from '@/api/service/report/credit'
 import { getCompanyNum, getFinanceSupplier, getFinanceNum, getCompanyReport } from '@/api/service/report/company'
 import { getOwnCompany } from "@/api/common/company";
 import { accAdd, accSub } from "@/utils/calculation";
@@ -768,6 +808,12 @@ export default {
                 {label:"周",value:"00"},
                 {label:"年",value:"01"}
             ],
+            hxDateType:"00",
+            hxDateTypeList: [
+                {label:"实时",value:"00"},
+                {label:"年度",value:"01"},
+                {label:"历史",value:"02"}
+            ],
             companyExtraOption:{
               xAxis: [
                   {
@@ -892,7 +938,15 @@ export default {
             companyData:true,
             companyWork:true,
             companyChart:true,
-            input1: ''
+            input1: '',
+            //核心企业
+            hxCreditLineAll: 0,        //授信总额度反向 
+            hxCreditLineAllForward: 0,   // 授信总额度正向
+            usableAmount: 0 ,            //可用授信额度
+            hxCreditAll: 0,                 //我开立的融信
+            hxHasRaised: 0,             //已融资金额
+            hxRepayment: 0,             //已放款金额
+
         }
     },
     created: function () {
@@ -1030,10 +1084,7 @@ export default {
                     this.getOldWorkList()
                 //核心企业
                 }else if(this.company.scyType == '01'){
-                    //授信总额度
-                    this.getCreditLineAll()
-                    //授信总额度 -- 正向保理
-                    this.getCreditLineAllForward()
+                    this.changeHxDateType("00")
                     //融资中金额
                     this.getAvailableBalance()
                     //融资中金额 -- 正向保理
@@ -1102,6 +1153,19 @@ export default {
                 
             });
         },
+        changeHxDateType(hxDateType){
+            this.hxDateType = hxDateType;
+            //授信总额度
+            this.listCreditLineAll()
+            //授信总额度 -- 正向保理
+            this.listCreditLineAllForward()
+            //我开立的融信
+            this.listCreditAll()
+            //已融资金额
+            this.listHasRaised()
+            //已放款
+            this.listRepayment()
+        },
         //入驻企业数量
         getCompanyNum(){
             getCompanyNum().then((response) => {
@@ -1204,6 +1268,47 @@ export default {
                 this.creditLineAllForward = res.data.allAmount
             })
         },
+        //核心企业授信总额度 -- 反向
+        listCreditLineAll(){
+            let queryParams = {}
+            listCreditLineAll(queryParams).then(res => {
+                this.hxCreditLineAll = res.data.allAmount;
+                this.usableAmount = res.data.usableAmount;
+            })
+        },
+        //核心企业授信总额度 -- 正向保理
+        listCreditLineAllForward(){
+            let queryParams = {}
+            queryParams.zfpType = '0'
+            listCreditLineAll(queryParams).then(res => {
+                this.hxCreditLineAllForward = res.data.allAmount
+            })
+        },
+        //核心企业我开立的融信
+        listCreditAll(){
+            let queryParams = {}
+            queryParams.hxDateType = this.hxDateType
+            listCreditAll(queryParams).then(res => {
+                debugger
+                this.hxCreditAll = res.data.allAmount;
+            })
+        },
+        //核心企业已融资金额
+        listHasRaised(){
+            let queryParams = {}
+            queryParams.hxDateType = this.hxDateType
+            listHasRaised(queryParams).then(res => {
+                this.hxHasRaised = res.data.allAmount;
+            })
+        },
+        //核心企业已放款金额
+        listRepayment(){
+            let queryParams = {}
+            queryParams.hxDateType = this.hxDateType
+            listRepayment(queryParams).then(res => {
+                this.hxRepayment = res.data.allAmount;
+            })
+        },
         //平台放款金额
         getAllLoanBalance(){
             return accAdd(this.loanBalance, this.returnBalance, 2)

+ 3 - 3
front-vue/src/views/service/bill/billDetail.vue

@@ -318,13 +318,13 @@ export default {
         },
         //发票合计
         allAmount() {
-            var strarr = [0.0];
+            var strarr = [0.00];
             for (let i in this.fileList) {
                 // if (this.fileList[i]["ziiCheckStt"] == "1") {
-                //     strarr.push(this.fileList[i]["ziiAmount"]);
+                    strarr.push(this.fileList[i]["ziiAmount"]);
                 // }
             }
-            return (Math.floor(eval(strarr.join("+")) * 100) / 100).toFixed(2); //结果
+            return (Math.round(eval(strarr.join("+")) * 100) / 100); //结果
             // return this.handleInput(eval(strarr.join("+"))); //结果
         },
         // 结束

+ 34 - 3
front-vue/src/views/service/cost/userCostManage.vue

@@ -28,7 +28,7 @@
           v-show="showSearch"
           label-width="auto"
         >
-          <el-form-item label="融资编号" prop="zfrNumber" size="large">
+          <!-- <el-form-item label="融资编号" prop="zfrNumber" size="large">
             <el-input
               maxlength="30"
               v-model="queryParams.zfrNumber"
@@ -45,7 +45,28 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="类型" prop="zciQuery" size="large">
+            <el-select v-model="queryParams.zciQuery" clearable>
+              <el-option
+              v-for="dict in queryOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+              v-if="dict.dictValue == '02' && companyType  != '02'"
+              />
+              <el-option
+              v-for="dict in queryOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+              v-if="dict.dictValue != '02'"
+              />
+            </el-select>
+        </el-form-item>
+        <el-form-item prop="zciValue" v-if="this.queryParams.zciQuery"  size="large">
+          <el-input v-model="queryParams.zciValue" placeholder="请输入关键字模糊查询" clearable maxlength="25"/>
+        </el-form-item>
           <el-form-item label="融资状态" prop="zfrStatus" size="large">
             <el-select v-model="queryParams.zfrStatus" placeholder="融资状态" clearable>
               <el-option
@@ -319,6 +340,8 @@ export default {
   },
   data() {
     return {
+      //企业类型
+      companyType: null,
       //费用列表
       costList: [],
       //创建时间范围
@@ -329,6 +352,8 @@ export default {
       zciInvoiceStatusOptions: [],
       //融资状态
       zfrStatusOptions: [],
+      //筛选条件
+      queryOptions: [],
       //操作员Id
       userId: "",
       // 遮罩层
@@ -357,7 +382,9 @@ export default {
         coreScyName: null,
         zciStatus: null,
         zfrStatus: null,
-        zciInvoiceStatus: null
+        zciInvoiceStatus: null,
+        zciQuery: null,
+        zciValue: null
       },
       //筛选按钮的数据列表,与table表头的数据一致 --显示隐藏列用
       tableList: [
@@ -464,6 +491,9 @@ export default {
     this.getDicts("	ser_zfr_status").then(response => {
       this.zfrStatusOptions = response.data;
     });
+    this.getDicts("	zc_zci_query").then(response => {
+      this.queryOptions = response.data;
+    });
     this.getUser();
     this.getList();
   },
@@ -753,6 +783,7 @@ export default {
     getUser() {
       getUser().then(response => {
         this.userId = response.data.userId;
+        this.companyType = response.data.scyType
       });
     }
   }

+ 3 - 1
front-vue/src/views/service/credit/addCredit.vue

@@ -557,7 +557,9 @@ export default {
                     this.getFile(this.ticketList);
                     if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
                         // this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
-                        this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
+                        if(!this.form.zfiExpireDate){
+                            this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
+                        }
                     }
                     this.open = false;
                 }

+ 4 - 1
front-vue/src/views/service/credit/financeOpen.vue

@@ -484,7 +484,10 @@ export default {
                     this.$set(this.form, "openName", this.chooseTicket[0].payName);
                     if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
                         // this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
-                        this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
+                        //承诺还款日为空
+                        if(!this.form.zfiExpireDate){
+                            this.$set(this.form, "zfiExpireDate", this.ticketList[0].zbiPayDate);
+                        }
                     }
                     this.open = false;
                 }

+ 5 - 5
front-vue/src/views/service/credit/signFor.vue

@@ -970,8 +970,8 @@ export default {
                     text: 'Loading',
                     background: 'rgba(0, 0, 0,0)'
                 });
-            //如果签发金额小于合计金额
-            if((parseFloat(this.form.zfiAmount)) < (parseFloat(this.moneyDelete(this.checkTotalAmt)))){
+            //如果签发金额小于合计金额(通过需判断)
+            if(((parseFloat(this.form.zfiAmount)) < (parseFloat(this.moneyDelete(this.checkTotalAmt)))) && "00" == param){
                         var _this = this;
                         this.$confirm('签发金额小于应收金额合计,是否确认提交', "警告", {
                             confirmButtonText: "确定",
@@ -984,15 +984,15 @@ export default {
                             signFor(_this.form).then(response => {
                                  loading.close();
                                 //通过
-                                if("00" == param){
+                              /*   if("00" == param){ */
                                     _this.msgSuccess("融信资料已提交内部审核");
                                     _this.$store.dispatch("tagsView/delView", _this.$route);
                                     _this.$router.go(-1);
-                                }else if ("01" == param){//拒绝
+                                /* }else if ("01" == param){//拒绝
                                     _this.msgSuccess("该笔融信将作废");
                                     _this.$store.dispatch("tagsView/delView", _this.$route);
                                     _this.$router.go(-1);
-                                }
+                                } */
                             }).catch((response)=>{
                                 loading.close();
                             });

+ 2 - 3
front-vue/src/views/service/financeRecord/detailFinanceRecord.vue

@@ -388,7 +388,6 @@
 import {
   getRecord,
   listBillInf,
-  listAccInf,
   getRecordSealFile
 } from "@/api/service/financeRecord/record";
 import { listFinanceInf } from "@/api/common/financeInf";
@@ -684,11 +683,11 @@ export default {
                 this.otherFileList = response.data.otherFileList;
               }
             });
-            if (item.zfpcrLoanType == "0") {
+          /*   if (item.zfpcrLoanType == "0") {
               listAccInf(item.zfiProductId).then(response => {
                 this.$set(this.form, "zfrCollectionAccount", response.msg);
               });
-            }
+            } */
           });
           getCreditDetail(item.zfiId).then((response) => {
             if(response.data){

+ 0 - 2
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -1714,7 +1714,6 @@ export default {
     },
     cancelRefuse(){
       this.openRefuse = false;
-      this.reset();
     },
     // 表单重置
     reset() {
@@ -1917,7 +1916,6 @@ export default {
     /**拒绝放款 */
     submitRefuse(zfrId,zfrFinanceId) {
       debugger
-      this.reset();
       this.formRefuse.zfrId = zfrId;
       this.formRefuse.zfrFinanceId = zfrFinanceId;
       this.openRefuse = true;

+ 2 - 0
front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -1571,6 +1571,8 @@ export default {
             self.faceIsShow = false;
           }
           self.cancel();
+          //关闭预览合同
+          self.closePdfShow();
         })
         .catch((response) => {
           loading.close();

+ 55 - 38
front-vue/src/views/service/rel/companyRel.vue

@@ -40,7 +40,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item> -->
-        <el-form-item label="类型" prop="scrQuery" size="large">
+      <el-form-item label="类型" prop="scrQuery" size="large">
           <el-select v-model="queryParams.scrQuery" clearable>
             <el-option
             v-for="dict in queryOptions"
@@ -105,7 +105,20 @@
         v-show="showSearch"
         label-width="auto"
       >
-        <el-form-item label="企业名称" prop="companyName" size="large">
+      <el-form-item label="类型" prop="scpQuery" size="large">
+          <el-select v-model="spareParams.scpQuery" clearable>
+            <el-option
+            v-for="dict in queryOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+            />
+          </el-select>
+      </el-form-item>
+      <el-form-item prop="scrValue" v-if="this.spareParams.scpQuery"  size="large">
+        <el-input v-model="spareParams.scpValue" placeholder="请输入关键字模糊查询" clearable maxlength="25"/>
+      </el-form-item>
+        <!-- <el-form-item label="企业名称" prop="companyName" size="large">
           <el-input
             maxlength="30"
             v-model="spareParams.companyName"
@@ -122,7 +135,7 @@
             clearable
             @keyup.enter.native="handleSpareQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="链属关系" prop="scrType" size="large">
           <el-select v-model="spareParams.scrType" placeholder="请选择链属关系" clearable>
             <el-option
@@ -659,9 +672,9 @@ export default {
         pageSize: 10,
         companyName: null,
         scySocialCode: null,
-        scrStatus: null,
-        scrType: null,
-        scpStatus: null,
+        scrStatus: "03",
+        scrType: "02",
+        scpStatus: "02",
         scrQuery: null,
         scrValue: null,
       },
@@ -671,7 +684,9 @@ export default {
         pageSize: 10,
         scySocialCode: null,
         companyName: null,
-        scrType: null
+        scrType: "02",
+        scpQuery: null,
+        scpValue: null,
       },
       //企业列表查询参数
       companyQueryParams: {
@@ -812,7 +827,9 @@ export default {
     this.getUser().then(() => {
       this.queryParams.scrQuery = "00";
     });
-    this.getSpare();
+    this.getSpare().then(() => {
+      this.spareParams.scpQuery = "00";
+    });
     this.getCompanyList();
   },
   mounted() {
@@ -921,34 +938,35 @@ export default {
     /** 查询链属列表 */
     getList() {
       this.loading = true;
-      if (this.companyId == "000000") {
-        getListRel(this.queryParams).then(response => {
-          let list = response.data.records;
-          this.loginId = response.msg;
-          for (let i = 0; i < list.length; i++) {
-            if (list[i].launchCompanyId == response.msg) {
-              list[i].receive = false;
-              list[i].launch = true;
-              list[i].spare = false;
-            } else if (list[i].launchReceiveScrCompanyId == response.msg) {
-              list[i].launch = false;
-              list[i].receive = true;
-              list[i].spare = false;
-            } else if (list[i].scpCompanyId == response.msg) {
-              list[i].launch = false;
-              list[i].receive = false;
-              list[i].spare = true;
-            }
-          }
-          this.companyRelList = list;
-          console.log(12312313123);
-          console.log(this.companyRelList);
-          this.total = response.data.total;
-          this.loading = false;
-        });
-      } else {
+      // if (this.companyId == "000000") {
+      //   getListRel(this.queryParams).then(response => {
+      //     let list = response.data.records;
+      //     this.loginId = response.msg;
+      //     for (let i = 0; i < list.length; i++) {
+      //       if (list[i].launchCompanyId == response.msg) {
+      //         list[i].receive = false;
+      //         list[i].launch = true;
+      //         list[i].spare = false;
+      //       } else if (list[i].launchReceiveScrCompanyId == response.msg) {
+      //         list[i].launch = false;
+      //         list[i].receive = true;
+      //         list[i].spare = false;
+      //       } else if (list[i].scpCompanyId == response.msg) {
+      //         list[i].launch = false;
+      //         list[i].receive = false;
+      //         list[i].spare = true;
+      //       }
+      //     }
+      //     this.companyRelList = list;
+      //     console.log(12312313123);
+      //     console.log(this.companyRelList);
+      //     this.total = response.data.total;
+      //     this.loading = false;
+      //   });
+      // } else {
         listRel(this.queryParams).then(response => {
           let list = response.data.records;
+            console.log(list);
           this.loginId = response.msg;
           for (let i = 0; i < list.length; i++) {
             if (list[i].launchCompanyId == response.msg) {
@@ -966,12 +984,10 @@ export default {
             }
           }
           this.companyRelList = list;
-          console.log(12312313123);
-          console.log(this.companyRelList);
           this.total = response.data.total;
           this.loading = false;
         });
-      }
+      // }
     },
 
     // 未认证列表
@@ -980,6 +996,7 @@ export default {
       sparelist(this.spareParams).then(response => {
         this.spareOwnlist = response.data.records;
         this.spareTitol = response.data.total;
+        this.spareParams.scpQuery = "00";
         this.loading = false;
       });
     },
@@ -1420,8 +1437,8 @@ export default {
         } else {
           this.handleRel = false;
         }
-        return Promise.resolve(response);
         this.getList();
+        return Promise.resolve(response);
       }).catch(response => {
         this.loading = false;
         return Promise.reject("error");

+ 2 - 1
front-vue/src/views/service/rel/companyRelManage.vue

@@ -437,6 +437,7 @@
 <script>
 import {
   listRel,
+  getListRel,
   sparelist,
   listCompany,
   addRel,
@@ -759,7 +760,7 @@ export default {
     /** 查询链属列表 */
     getList() {
       this.loading = true;
-      listRel(this.queryParams).then(response => {
+      getListRel(this.queryParams).then(response => {
         let list = response.data.records;
         for (let i = 0; i < list.length; i++) {
           if (list[i].scpRelId != "" && list[i].scpRelId != null) {