修改首页展示等

front-vue/src/api/common/company.js

@@ -19,6 +19,14 @@ export function getOwnCompany() {
   })
 }
 
+//根据主键获取企业
+export function getCompany(scyId) {
+  return request({
+    url: '/sc-service/company/getCompany/'+scyId,
+    method: 'get',
+  })
+}
+
 // 根据链属企业
 export function companyRelList(query) {
   return request({

front-vue/src/views/home.vue

@@ -674,7 +674,8 @@ import {
     getCompanyReport
 } from '@/api/service/report/company'
 import {
-    getOwnCompany
+    getOwnCompany,
+    getCompany
 } from "@/api/common/company";
 import {
     accAdd,
@@ -1697,22 +1698,43 @@ export default {
         },
         /** 详情按钮操作 */
         handleDetail(row) {
-            if (row.openType == '00') {
-                this.openWork = true
-                this.noticeId = row.noticeId
-                this.workType = row.workType
-                this.tableId = row.tableId
-                readWork(row.noticeId).then(response => {
-                    this.getWorkList()
-                });
-            } else if (row.openType == '01') {
-                this.$router.push({
-                    path: row.openUrl
-                });
-                readWork(row.noticeId).then(response => {
-                    this.getWorkList()
-                });
+            if(row.workType=='09'){
+            //查询企业类型
+            getCompany(row.tableId).then((response) => {
+                this.scyType = response.data.scyType;
+                if(this.scyType=='01'){
+                  readWork(row.noticeId).then(response => {
+                        this.$router.push({
+                            path: "/company/coreCompany"
+                        });
+                 });
+                }else if(this.scyType=='02'){
+                    readWork(row.noticeId).then(response => {
+                        this.$router.push({
+                            path: "/company/supCompany"
+                        });
+                    });
+                }
+            })
+            }else{
+                if (row.openType == '00') {
+                        this.openWork = true
+                        this.noticeId = row.noticeId
+                        this.workType = row.workType
+                        this.tableId = row.tableId
+                        readWork(row.noticeId).then(response => {
+                            this.getWorkList()
+                        });
+                    } else if (row.openType == '01') {
+                        this.$router.push({
+                            path: row.openUrl
+                        });
+                        readWork(row.noticeId).then(response => {
+                            this.getWorkList()
+                    });
+                }
             }
+   
         },
         // 取消按钮
         cancel() {

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

@@ -1649,8 +1649,9 @@ export default {
         getListSign() {
             this.loading = true;
             return listCredit(this.queryParamsSign).then(response => {
+                  console.log(response,"infSignList")
                 this.infSignList = response.data.records;
-                console.log(infSignList)
+              
                 this.totalSign = response.data.total;
                 this.loading = false;
                 listStatisticalAmount(this.queryParams).then(response => {
@@ -2128,7 +2129,7 @@ export default {
             } else if (row.zfiCreateType == '2') { //供应商开立
                 if (row.zfiSupplierStatus != "01") {
                     this.$message({
-                        message: "请内部审批通过后,再点击融信开立",
+                        message: "请内部审批通过后,再点击融证开立",
                         type: 'warning'
                     });
                     return false;
@@ -2502,10 +2503,10 @@ export default {
             const zfiCoreStatus = row.zfiCoreStatus
             const zfiPlatformStatus = row.zfiPlatformStatus
             const zfiSupplierStatus = row.zfiSupplierStatus
-            console.log(zfiStatus)
             var active = 0
             //融资企业
             if (this.companyType == '02') {
+                  console.log(row,"this.row")
                 //审批中||拒绝
                 if (row.zfiSupplierStatus == '00' || row.zfiSupplierStatus == '02') {
                     this.hisTaskForm = true;

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

@@ -128,31 +128,31 @@
         <el-tab-pane label="最终还款明细" v-if="this.companyType == '01'">
             <el-row class="zap-form">
                 <el-col :span="12">
-                    <text-item label="还款明细编号" :value="form.zfrPayNumber"></text-item>
+                    <text-item label="还款明细编号" :value="forms.zfrPayNumber"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="最终付款方" :value="form.core"></text-item>
+                    <text-item label="最终付款方" :value="forms.core"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="还款承诺函编号" :value="form.zfiPaymentNumber"></text-item>
+                    <text-item label="还款承诺函编号" :value="forms.zfiPaymentNumber"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="付款承诺日期" :value="form.zfrRepaymentDate"></text-item>
+                    <text-item label="付款承诺日期" :value="forms.zfrRepaymentDate"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="承诺付款金额" :value="form.zfrLoanAmount"></text-item>
+                    <text-item label="承诺付款金额" :value="forms.zfrLoanAmount"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="融信产品" :value="form.zfpName"></text-item>
+                    <text-item label="融信产品" :value="forms.zfpName"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="承诺付款账户" :value="form.zfpcrAccount"></text-item>
+                    <text-item label="承诺付款账户" :value="forms.zfpcrAccount"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="付款账户开户行" :value="form.zfpcrAccountBank"></text-item>
+                    <text-item label="付款账户开户行" :value="forms.zfpcrAccountBank"></text-item>
                 </el-col>
                 <el-col :span="12">
-                    <text-item label="还款状态" :value="form.zfrApplyStatus"></text-item>
+                    <text-item label="还款状态" :value="forms.zfrApplyStatus"></text-item>
                 </el-col>
             </el-row>
             <el-row class="zap-form">
@@ -276,7 +276,6 @@ export default {
         const zfiId = this.$route.params && this.$route.params.zfiId;
         getCreditDetail(zfiId)
             .then(response => {
-                debugger;
                 if (response.data) {
                     //融信信息
                     this.form = response.data.financeInf;
@@ -432,7 +431,6 @@ export default {
         },
         //详情按钮
         handleDetail(index, rows) {
-            debugger;
             this.zbiId = rows[index].zbiId;
             this.openDetailBill = true;
         },

front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -333,6 +333,7 @@ export default {
         const zfiAmount = this.$route.params && this.$route.params.zfiAmount;
         const usableAmount = this.$route.params && this.$route.params.usableAmount;
         this.companyType = this.$route.params && this.$route.params.companyType;
+        console.log(this.companyType,"this.companyType")
         var self = this;
         getCreditLine(zfpcrId).then((response) => {
             debugger

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

@@ -144,7 +144,7 @@
     </el-dialog>
 
     <!-- 合同预览 -->
-    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="!pdfIsShow">
+    <el-dialog title="预览" :visible.sync="pdfShowDialog" width="60%" append-to-body :show-close="pdfIsShow">
         <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent"></pdf-show>
         <span slot="footer" class="dialog-footer">
             <el-button type="primary" @click="selectType" v-if="pdfIsShow">签署</el-button>
@@ -965,7 +965,7 @@ export default {
                                                                 });
                                                                 loading.close();
                                                             } else {
-                                                                console.log();
+                                                                console.log("缴费查询");
                                                                 var map = {
                                                                     recvAccNo: "",
                                                                     recvAccNm: "",
@@ -975,11 +975,12 @@ export default {
                                                                 };
                                                                 transfer(map)
                                                                     .then((response) => {
+                                                                     console.log(response,"response")
                                                                         loading.close();
                                                                         self.msgSuccess("缴费成功");
                                                                         setTimeout(() => {
-                                                                            if (response.data.status == "AAAAAAA") {
-                                                                                updateChargeStatus(zfrId).then(
+                                                                            if (response.data.status == "1") {
+                                                                                updateChargeStatus(zfrId,"02").then(
                                                                                     (res) => {
                                                                                         console.log("缴费成功")
                                                                                         self.getContractFile();
@@ -1222,6 +1223,7 @@ export default {
                 if (response.data) {
                     //结果
                     var verification = response.data.verification;
+                    console.log(verification,"verification")
                     //匹配
                     if ("60000000" == verification) {
                         var zfrId = this.zfrId;
@@ -1234,7 +1236,7 @@ export default {
                                             type: "warning",
                                         })
                                         .then(function () {
-                                            return updateChargeStatus(zfrId);
+                                            return updateChargeStatus(zfrId,"02");
                                         })
                                         .then(() => {
                                             this.getContractFile();

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

@@ -519,7 +519,7 @@
           :total="total1"
           :page.sync="unRepayment.pageNum"
           :limit.sync="unRepayment.pageSize"
-          @pagination="getList"
+          @pagination="getUnpayList"
         />
       </el-tab-pane>
       <el-tab-pane label="已还款">
@@ -651,7 +651,7 @@
           :total="total2"
           :page.sync="repayment.pageNum"
           :limit.sync="repayment.pageSize"
-          @pagination="getList"
+          @pagination="getRepayList"
         />
       </el-tab-pane>
       <el-tab-pane label="已逾期">
@@ -792,7 +792,7 @@
           :total="total3"
           :page.sync="overdue.pageNum"
           :limit.sync="overdue.pageSize"
-          @pagination="getList"
+          @pagination="getOverdueList"
         />
       </el-tab-pane>