修改还款管理展示等bug

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

@@ -20,7 +20,7 @@
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="还款日期" prop="zfrRepaymentDate" label-width="96px" size="large">
+            <el-form-item label="承诺还款日期" prop="zfrRepaymentDate" label-width="96px" size="large">
                 <el-date-picker v-model="queryParams.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
         </el-form>
@@ -45,7 +45,7 @@
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
+            <el-form-item label="承诺还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsIng.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
         </el-form>
@@ -70,7 +70,7 @@
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
+            <el-form-item label="承诺还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsEnd.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
         </el-form>
@@ -95,7 +95,7 @@
                     <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
+            <el-form-item label="承诺还款日期" prop="zfrRepaymentDate" size="large" label-width="96px">
                 <el-date-picker v-model="queryParamsLose.zfrRepaymentDate" unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
         </el-form>
@@ -121,7 +121,7 @@
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
                         <el-table-column label="经办人" align="center" prop="nickName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
-                        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
+                        <el-table-column label="承诺还款日期" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
@@ -157,7 +157,7 @@
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
                         <el-table-column label="经办人" align="center" prop="nickName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
-                        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
+                        <el-table-column label="承诺还款日期" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
@@ -191,7 +191,7 @@
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
                         <el-table-column label="经办人" align="center" prop="nickName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
-                        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
+                        <el-table-column label="承诺还款日期" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
@@ -223,7 +223,7 @@
                         <el-table-column label="融资金额" :formatter="moneyFormat" align="center" prop="zfrAmount" :show-overflow-tooltip="true" v-if="uncheckList.zfrAmount" />
                         <el-table-column label="融资利率(%)" align="center" prop="zfrRate" width="100" :show-overflow-tooltip="true" v-if="uncheckList.zfrRate" />
                         <el-table-column label="经办人" align="center" prop="nickName" width="100" :show-overflow-tooltip="true" v-if="uncheckList.nickName" />
-                        <el-table-column label="承诺还款时间" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
+                        <el-table-column label="承诺还款日期" align="center" prop="zfrExpireDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrExpireDate" />
                         <el-table-column label="融资申请日期" align="center" prop="zfrApplyDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrApplyDate" />
                         <el-table-column label="实际放款金额" :formatter="moneyFormat" align="center" prop="zfrLoanAmount" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanAmount" />
                         <el-table-column label="融资放款日期" align="center" prop="zfrLoanDate" width="180" :show-overflow-tooltip="true" v-if="uncheckList.zfrLoanDate" />
@@ -512,7 +512,7 @@ export default {
                 },
                 {
                     label: "zfrExpireDate",
-                    value: "承诺还款时间"
+                    value: "承诺还款日期"
                 },
                 {
                     label: "zfrApplyDate",
@@ -570,7 +570,7 @@ export default {
                 },
                 {
                     label: "zfrExpireDate",
-                    value: "承诺还款时间"
+                    value: "承诺还款日期"
                 },
                 {
                     label: "zfrApplyDate",
@@ -628,7 +628,7 @@ export default {
                 },
                 {
                     label: "zfrExpireDate",
-                    value: "承诺还款时间"
+                    value: "承诺还款日期"
                 },
                 {
                     label: "zfrApplyDate",
@@ -686,7 +686,7 @@ export default {
                 },
                 {
                     label: "zfrExpireDate",
-                    value: "承诺还款时间"
+                    value: "承诺还款日期"
                 },
                 {
                     label: "zfrApplyDate",

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

@@ -27,21 +27,21 @@
           v-show="showSearch"
           label-width="auto"
         >
-          <el-form-item label="企业名称" prop="scpName" size="large">
+          <el-form-item label="发起方" prop="scpName" size="large">
             <el-input
               maxlength="30"
               v-model="queryParams.scpName"
-              placeholder="请输入企业名称"
+              placeholder="请输入发起方"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="联系人" prop="scpContarct" size="large">
+          <el-form-item label="接收方" prop="scpContarct" size="large">
             <el-input
               maxlength="30"
               v-model="queryParams.scpContarct"
-              placeholder="请输入联系人"
+              placeholder="请输入接收方"
               clearable
               @keyup.enter.native="handleQuery"
             />

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

@@ -283,7 +283,7 @@
               v-if="uncheckList.zfrPayDate"
             />
             <el-table-column
-              label="承诺付款日期"
+              label="承诺还款日期"
               align="center"
               prop="zfrRepaymentDate"
               :show-overflow-tooltip="true"
@@ -319,7 +319,7 @@
                   type="text"
                   @click="handleUp(scope.row)"
                   v-hasPermi="['service:repayment:edit']"
-                  v-if="scope.row.zfrApplyStatus != '01'"
+                  v-if="scope.row.zfrApplyStatus != '01'&&company.scyType == '00'||company.scyType == '03'"
                 >还款登记</el-button>
               </template>
             </el-table-column>
@@ -410,7 +410,7 @@
             v-if="uncheckList.zfrPayDate"
           />
           <el-table-column
-            label="承诺付款日期"
+            label="承诺还款日期"
             align="center"
             prop="zfrRepaymentDate"
             :show-overflow-tooltip="true"
@@ -446,7 +446,7 @@
                 type="text"
                 @click="handleUp(scope.row)"
                 v-hasPermi="['service:repayment:up']"
-                v-if="scope.row.zfrApplyStatus != '01'"
+                v-if="scope.row.zfrApplyStatus != '01'&&company.scyType == '00'||company.scyType == '03'"
               >还款登记</el-button>
             </template>
           </el-table-column>
@@ -536,7 +536,7 @@
             v-if="uncheckList.zfrPayDate"
           />
           <el-table-column
-            label="承诺付款日期"
+            label="承诺还款日期"
             align="center"
             prop="zfrRepaymentDate"
             :show-overflow-tooltip="true"
@@ -572,7 +572,7 @@
                 type="text"
                 @click="handleUp(scope.row)"
                 v-hasPermi="['service:repayment:up']"
-                v-if="scope.row.zfrApplyStatus != '01'"
+                v-if="scope.row.zfrApplyStatus != '01'&&company.scyType == '00'||company.scyType == '03'"
               >还款登记</el-button>
             </template>
           </el-table-column>
@@ -663,7 +663,7 @@
             v-if="uncheckList.zfrPayDate"
           />
           <el-table-column
-            label="承诺付款日期"
+            label="承诺还款日期"
             align="center"
             prop="zfrRepaymentDate"
             :show-overflow-tooltip="true"
@@ -699,7 +699,8 @@
                 type="text"
                 @click="handleUp(scope.row)"
                 v-hasPermi="['service:repayment:up']"
-                v-if="scope.row.zfrApplyStatus != '01'"
+                v-if="scope.row.zfrApplyStatus != '01'&&
+                  company.scyType == '00'||company.scyType == '03'"
               >还款登记</el-button>
             </template>
           </el-table-column>
@@ -766,6 +767,9 @@ import {
 } from "@/api/service/repayment/repayment";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
 import { columnQuery, columnfilter } from "@/api/common/columnSetting";
+import {
+    getOwnCompany
+} from "@/api/common/company";
 import Cookies from "js-cookie";
 import { uploadFileNew } from "@/api/common/file";
 import { getToken } from "@/utils/auth";
@@ -903,7 +907,7 @@ export default {
         },
         {
           label: "zfrRepaymentDate",
-          value: "承诺付款日期"
+          value: "承诺还款日期"
         },
         {
           label: "zfrApplyStatus",
@@ -972,6 +976,10 @@ export default {
       return listRepayment(this.queryParams).then(response => {
         this.allRepaymentList = response.data.records;
         this.total = response.data.total;
+           getOwnCompany().then((response) => {
+                console.log(response,"企业数据")
+                this.company = response.data;
+            });
         this.loading = false;
         return Promise.resolve(response);
       }).catch(response => {

front-vue/src/views/system/accInf/accInf.vue

@@ -32,7 +32,7 @@
             placeholder="请输入账户卡号"
             clearable
             @keyup.enter.native="handleQuery"
-            maxlength="15"
+            maxlength="25"
           />
         </el-form-item>
       </el-form>

front-vue/src/views/system/fundSide/fundSide.vue

@@ -112,7 +112,7 @@
         </el-form>
         <el-row style="height: 109px;" type="flex" align="middle" justify="center">
             <el-button type="primary" plain @click="cancel">取 消</el-button>
-            <el-button type="primary" v-if="disabled==disableds" @click="submitForm">确 定</el-button>
+            <el-button type="primary" v-show="!disableds" @click="submitForm">确 定</el-button>
         </el-row>
     </el-dialog>
     <el-dialog :visible.sync="sfzVisible">