融资管理 授信管理

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

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询融信
+export function listFinanceInf() {
+  return request({
+    url: '/sc-service/financeInf/list',
+    method: 'get'
+  })
+}

front-vue/src/api/service/creditLine/quota.js

@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+// 查询供应商授信额度列表
+export function listQuota(query) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供应商授信额度详细
+export function getQuota(zfsqId) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine/' + zfsqId,
+    method: 'get'
+  })
+}
+
+// 新增供应商授信额度
+export function addQuota(data) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供应商授信额度
+export function updateQuota(data) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供应商授信额度
+export function delQuota(zfsqId) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine/' + zfsqId,
+    method: 'delete'
+  })
+}
+
+// 授信状态修改
+export function changeStatus(zfsqId ,zfsqStatus) {
+  const data = {
+    zfsqId,
+    zfsqStatus
+  }
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询核心企业下的链属企业
+export function listCompanyRel(zfpcrCompanyId) {
+  return request({
+    url: '/sc-service_pxh/supplierCreditLine/listCompanyRel/' + zfpcrCompanyId,
+    method: 'get'
+  })
+}

front-vue/src/api/service/finaceRecord/record.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询融资记录列表
+export function listRecord(query) {
+  return request({
+    url: '/sc-service_pxh/financeRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询融资记录详细
+export function getRecord(zfrId) {
+  return request({
+    url: '/sc-service_pxh/financeRecord/' + zfrId,
+    method: 'get'
+  })
+}
+
+// 新增融资记录
+export function addRecord(data) {
+  return request({
+    url: '/sc-service_pxh/financeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改融资记录
+export function updateRecord(data) {
+  return request({
+    url: '/sc-service_pxh/financeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除融资记录
+export function delRecord(zfrId) {
+  return request({
+    url: '/sc-service_pxh/financeRecord/' + zfrId,
+    method: 'delete'
+  })
+}

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

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="资金方:" prop="zfpcrFundSide">
-            <el-select v-model="form.zfpcrFundSide" style="width : 284px" clearable>
+            <el-select v-model="form.zfpcrFundSide" style="width : 284px" clearable @change ="change">
               <el-option
                 v-for="(item,index) in zfCompanyList"
                 :key="index"
@@ -145,9 +145,13 @@
         <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
         <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
         <el-table :data="ticketList" style="width: 1100px">
-          <el-table-column label="合同模板编号"  align="center"  prop="zfcNumber" show-overflow-tooltip />
+          <el-table-column label="序号" type="index" width="50" align="center">
+            <template slot-scope="scope">
+              <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"    />
+          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
           <el-table-column label="合同id"  align="center"  prop="zfcId" v-if="false"  />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
@@ -166,16 +170,7 @@
     <!-- 合同信息 -->
     <el-dialog :title="title" :visible.sync="open" width="1120px" append-to-body>
       <el-form :model="queryParamsContract"  ref="formQuery"  :inline="true"  label-width="68px"  style="margin-bottom: -21px">
-        <el-form-item label="合同模板编号" prop="zfcNumber">
-          <el-input
-            v-model="queryParamsContract.zfcNumber"
-            placeholder="请输入合同模板编号"
-            clearable
-            size="small"
-            maxlength="11"
-            @keyup.enter.native="handleQuerys"/>
-        </el-form-item>
-        <el-form-item label="合同模板名称" prop="zfcName">
+        <el-form-item label="合同模板名称" prop="zfcName" label-width="90px">
           <el-input
             v-model="queryParamsContract.zfcName"
             placeholder="请输入合同模板名称"
@@ -210,9 +205,13 @@
             <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="合同模板编号"  align="center"  prop="zfcNumber" show-overflow-tooltip />
-          <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"    />
+        <el-table-column label="资金方" align="center" prop="scyName" :show-overflow-tooltip="true" /> 
+        <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" />
+        <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true"/>
+        <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" />
+        <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       </el-table>
       <pagination
         v-show="total > 0"
@@ -234,9 +233,10 @@
 
 <script>
 import { listCreditLine, getCreditLine, delCreditLine, addCreditLine, updateCreditLine} from "@/api/service/creditLine/creditLine";
-import { listFinanceProduct } from "@/api/common/financeProduct"
-import { listCompany } from "@/api/common/company"
-import { listCompanyAcc } from "@/api/common/companyAcc"
+import { listFinanceProduct } from "@/api/common/financeProduct";
+import { listCompany } from "@/api/common/company";
+import { listCompanyAcc } from "@/api/common/companyAcc";
+import { listContract  } from "@/api/common/contract";
 export default {
   name: "addCreditLine",
   components: {},
@@ -281,6 +281,12 @@ export default {
       loanTypeOptions: [],
       //记账簿托管方式数据字典
       bookkeepingTypeOptions: [],
+      //合同状态数据字典
+      statusOptions: [],
+      //签署节点数据字典
+      nodeOptions: [],
+      //签署主体数据字典
+      subjectOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -395,6 +401,15 @@ export default {
     this.getDicts("zc_zfpcr_bookkeeping_type").then(response => {
       this.bookkeepingTypeOptions = response.data;
     });
+    this.getDicts("zc_zfc_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("zc_zfc_node").then((response) => {
+      this.nodeOptions = response.data;
+    });
+    this.getDicts("zc_zfc_subject").then((response) => {
+      this.subjectOptions = response.data;
+    });
   },
   methods: {
     /* 资方公司 */
@@ -438,7 +453,7 @@ export default {
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
       };
     },
-    /* 合同相关 */
+    /* ----------------合同相关---------------------------- */
     //合同列表
     getContractList() {
       this.queryParamsContract.zfcManagementId = this.form.zfpcrFundSide
@@ -478,7 +493,6 @@ export default {
         if(this.chooseTicket.length > 0){
           this.ticketList = this.chooseTicket
           this.$set(this.form, "zfcName", this.ticketList[0].zfcName);
-          this.$set(this.form, "zfcNumber", this.ticketList[0].zfcNumber);
           this.$set(this.form, "zfcSubject", this.ticketList[0].zfcSubject);
           this.$set(this.form, "zfcId", this.ticketList[0].zfcId);
           this.open = false
@@ -525,15 +539,21 @@ export default {
       this.resetForm("formQuery");
       this.handleQuerys();
     },
+    /* 清空 */
+    change() {
+     this.ticketList = [];
+     this.$refs.tableContract.clearSelection()
+    },
+    /* -------------------------------------------------------------------------------- */
     /** 提交按钮 */
     submitForm() {
-      // if(this.ticketList == undefined || this.ticketList.length == 0){
-      //   this.$message({
-      //       message: '请选择合同',
-      //       type: 'warning'
-      //     });
-      //     return;
-      // }
+      if(this.ticketList == undefined || this.ticketList.length == 0){
+        this.$message({
+            message: '请选择合同',
+            type: 'warning'
+          });
+          return;
+      }
       this.$refs["form"].validate(valid => {
         this.form.ticketList = this.ticketList;
         if (valid) {
@@ -554,6 +574,18 @@ export default {
         }
       });
     },
+     //合同模板状态字典反显
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.zfcStatus);
+    },
+    //签署节点字典反显
+    nodeFormat(row, column) {
+      return this.selectDictLabel(this.nodeOptions, row.zfcNode);
+    },
+     //签署主体字典反显
+    subjectFormat(row, column) {
+      return this.selectDictLabel(this.subjectOptions, row.zfcSubject);
+    },
     /* 金额展示 */
     handleInput(str) {
         this.zfpcrAmountFormat = amtformat(str,2, ".", ",");

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

@@ -118,7 +118,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleEdit(scope.row)"
-            v-if="scope.row.pafState != '01' && scope.row.pafState != '02'"
+            v-if="scope.row.zfpcrStatus == '01'"
             v-hasPermi="['credit:line:edit']"
           >修改</el-button>
           <el-button
@@ -144,6 +144,13 @@
             v-if="scope.row.zfpcrStatus == '01'"
             v-hasPermi="['credit:line:update']"
           >解冻</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleSupplier(scope.row)"
+            v-hasPermi="['credit:line:supplier']"
+          >融资方列表</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -480,6 +487,13 @@ export default {
       })
       
     },
+    /* 融资方列表 */
+    handleSupplier(row){
+      const zfpcrId = row.zfpcrId || this.ids;
+      const zfpcrCompanyId = row.zfpcrCompanyId;
+      Cookies.set("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId, this.$route.fullPath)
+      this.$router.push("/creditLine/supplierCreditLine/" + zfpcrId + '/' + zfpcrCompanyId);
+    },
     /** 提交按钮 */
     submitForm(state) {
       this.$refs["form"].validate(valid => {

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

@@ -168,9 +168,13 @@
         <!-- <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
         <el-button size="mini" @click="deleteTicekt">清空全部</el-button> -->
         <el-table :data="ticketList" style="width: 1100px">
-          <el-table-column label="合同模板编号"  align="center"  prop="zfcNumber" show-overflow-tooltip />
+          <el-table-column label="序号" type="index" width="50" align="center">
+            <template slot-scope="scope">
+              <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"    />
+          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
           <el-table-column label="合同id"  align="center"  prop="zfcId" v-if="false"  />
           <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">

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

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="资金方:" prop="zfpcrFundSide">
-            <el-select v-model="form.zfpcrFundSide" style="width : 284px" clearable>
+            <el-select v-model="form.zfpcrFundSide" style="width : 284px" clearable @change ="change">
               <el-option
                 v-for="(item,index) in zfCompanyList"
                 :key="index"
@@ -168,9 +168,13 @@
         <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
         <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
         <el-table :data="ticketList" style="width: 1100px">
-          <el-table-column label="合同模板编号"  align="center"  prop="zfcNumber" show-overflow-tooltip />
+          <el-table-column label="序号" type="index" width="50" align="center">
+            <template slot-scope="scope">
+              <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"    />
+          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"  :formatter="subjectFormat"  />
           <el-table-column label="合同id"  align="center"  prop="zfcId" v-if="false"  />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
@@ -189,15 +193,6 @@
     <!-- 合同信息 -->
     <el-dialog :title="title" :visible.sync="open" width="1120px" append-to-body>
       <el-form :model="queryParamsContract"  ref="formQuery"  :inline="true"  label-width="68px"  style="margin-bottom: -21px">
-        <el-form-item label="合同模板编号" prop="zfcNumber">
-          <el-input
-            v-model="queryParamsContract.zfcNumber"
-            placeholder="请输入合同模板编号"
-            clearable
-            size="small"
-            maxlength="11"
-            @keyup.enter.native="handleQuerys"/>
-        </el-form-item>
         <el-form-item label="合同模板名称" prop="zfcName">
           <el-input
             v-model="queryParamsContract.zfcName"
@@ -233,9 +228,13 @@
             <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="合同模板编号"  align="center"  prop="zfcNumber" show-overflow-tooltip />
-          <el-table-column label="合同模板名称"  align="center"  prop="zfcName"   />
-          <el-table-column label="签署主体"  align="center"  prop="zfcSubject"    />
+        <el-table-column label="资金方" align="center" prop="scyName" :show-overflow-tooltip="true" /> 
+        <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" />
+        <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true"/>
+        <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" />
+        <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       </el-table>
       <pagination
         v-show="total > 0"
@@ -306,6 +305,12 @@ export default {
       loanTypeOptions: [],
       //记账簿托管方式数据字典
       bookkeepingTypeOptions: [],
+      //合同状态数据字典
+      statusOptions: [],
+      //签署节点数据字典
+      nodeOptions: [],
+      //签署主体数据字典
+      subjectOptions:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -462,6 +467,15 @@ export default {
     this.getDicts("zc_zfpcr_bookkeeping_type").then(response => {
       this.bookkeepingTypeOptions = response.data;
     });
+    this.getDicts("zc_zfc_status").then((response) => {
+      this.statusOptions = response.data;
+    });
+    this.getDicts("zc_zfc_node").then((response) => {
+      this.nodeOptions = response.data;
+    });
+    this.getDicts("zc_zfc_subject").then((response) => {
+      this.subjectOptions = response.data;
+    });
   },
   methods: {
     /* 资方公司 */
@@ -505,7 +519,7 @@ export default {
         return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
       };
     },
-    /* 合同相关 */
+    /* ----------------合同相关---------------------------- */
     //合同列表
     getContractList() {
       this.queryParamsContract.zfcManagementId = this.form.zfpcrFundSide
@@ -592,6 +606,12 @@ export default {
       this.resetForm("formQuery");
       this.handleQuerys();
     },
+    /* 清空 */
+    change() {
+     this.ticketList = [];
+     this.$refs.tableContract.clearSelection()
+    },
+    /* -------------------------------------------------------------------------------- */
     /** 提交按钮 */
     submitForm() {
       // if(this.ticketList == undefined || this.ticketList.length == 0){
@@ -621,6 +641,18 @@ export default {
         }
       });
     },
+     //合同模板状态字典反显
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.zfcStatus);
+    },
+    //签署节点字典反显
+    nodeFormat(row, column) {
+      return this.selectDictLabel(this.nodeOptions, row.zfcNode);
+    },
+     //签署主体字典反显
+    subjectFormat(row, column) {
+      return this.selectDictLabel(this.subjectOptions, row.zfcSubject);
+    },
     /* 金额展示 */
     handleInput(str) {
         this.zfpcrAmountFormat = amtformat(str,2, ".", ",");

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

@@ -1,184 +1,60 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)" prop="zfsqCoreQuotaId">
-        <el-input
-          v-model="queryParams.zfsqCoreQuotaId"
-          placeholder="请输入核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商ID(sys_company.scy_id)" prop="zfsqCompanyId">
-        <el-input
-          v-model="queryParams.zfsqCompanyId"
-          placeholder="请输入供应商ID(sys_company.scy_id)"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="授信额度" prop="zfsqAmount">
-        <el-input
-          v-model="queryParams.zfsqAmount"
-          placeholder="请输入授信额度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="原授信额度" prop="zfsqOldAmount">
-        <el-input
-          v-model="queryParams.zfsqOldAmount"
-          placeholder="请输入原授信额度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="利率" prop="zfsqRate">
-        <el-input
-          v-model="queryParams.zfsqRate"
-          placeholder="请输入利率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="已使用额度" prop="zfsqUsedAmount">
-        <el-input
-          v-model="queryParams.zfsqUsedAmount"
-          placeholder="请输入已使用额度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="可用额度" prop="zfsqAvailableAmount">
-        <el-input
-          v-model="queryParams.zfsqAvailableAmount"
-          placeholder="请输入可用额度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="有效期(0:长期, 1:定期)" prop="zfsqDateType">
-        <el-select v-model="queryParams.zfsqDateType" placeholder="请选择有效期(0:长期, 1:定期)" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="开始日期" prop="zfsqStartDate">
-        <el-input
-          v-model="queryParams.zfsqStartDate"
-          placeholder="请输入开始日期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="到期日期" prop="zfsqEndDate">
-        <el-input
-          v-model="queryParams.zfsqEndDate"
-          placeholder="请输入到期日期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态(00:有效 01:失效)" prop="zfsqStatus">
-        <el-select v-model="queryParams.zfsqStatus" placeholder="请选择状态(00:有效 01:失效)" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备用字段1" prop="zfsqProfitSpare1">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare1"
-          placeholder="请输入备用字段1"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段2" prop="zfsqProfitSpare2">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare2"
-          placeholder="请输入备用字段2"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段3" prop="zfsqProfitSpare3">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare3"
-          placeholder="请输入备用字段3"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段4" prop="zfsqProfitSpare4">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare4"
-          placeholder="请输入备用字段4"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段5" prop="zfsqProfitSpare5">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare5"
-          placeholder="请输入备用字段5"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段6" prop="zfsqProfitSpare6">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare6"
-          placeholder="请输入备用字段6"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段7" prop="zfsqProfitSpare7">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare7"
-          placeholder="请输入备用字段7"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段8" prop="zfsqProfitSpare8">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare8"
-          placeholder="请输入备用字段8"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段9" prop="zfsqProfitSpare9">
-        <el-input
-          v-model="queryParams.zfsqProfitSpare9"
-          placeholder="请输入备用字段9"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
+    <el-card class="fiche">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
+      <span style="margin-bottom: 10px;color:#333333;font:14px Helvetica Neue, Helvetica, PingFang SC, Tahoma, Arial,sans-serif">所选条件:</span>
+      <div  style="float: right;margin-right:1%">
+        <el-button type="cyan"  icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"  style="float: ;">重置</el-button>
+        <!-- <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px"></column-setting> -->
+      </div>
+      <hr  style="margin-top: 16px;">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item prop="scyName" label="企业名称">
+          <el-input
+            v-model="queryParams.scyName"
+            placeholder="请输入企业名称"
+            clearable
+            size="small"
+            maxlength="25"
+            style="width: 190px"
+          />
+        </el-form-item>
+        <el-form-item prop="AmountA"  label="授信额度范围" label-width="90px">
+          <el-input
+            v-model="queryParams.AmountA"
+            placeholder="请输授信额度"
+            clearable
+            size="small"
+            maxlength="25"
+            style="width: 190px"
+          /> 
+        </el-form-item>
+        <el-form-item>
+          -
+        </el-form-item>
+        <el-form-item prop="AmountB">
+          <el-input
+            v-model="queryParams.AmountB"
+            placeholder="请输授信额度"
+            clearable
+            size="small"
+            maxlength="25"
+            style="width: 190px"
+          />
+        </el-form-item>
+        <el-form-item label="授信状态" prop="zfsqStatus">
+          <el-select v-model="queryParams.zfsqStatus" placeholder="请选择状态" clearable size="small">
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </el-card>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -191,74 +67,61 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:quota:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:quota:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
           type="warning"
-          icon="el-icon-download"
+          icon="el-icon-upload2"
           size="mini"
-          @click="handleExport"
+          @click="handleImport"
           v-hasPermi="['system:quota:export']"
-        >导出</el-button>
+          style="background-color: #23C6C8;
+                border-color:#23C6C8"
+        >导入</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="quotaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="zfsqId" />
-      <el-table-column label="核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)" align="center" prop="zfsqCoreQuotaId" />
-      <el-table-column label="供应商ID(sys_company.scy_id)" align="center" prop="zfsqCompanyId" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="序号" type="index" width="50" align="center">
+        <template slot-scope="scope">
+          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="企业名称" align="center" prop="scyName"  show-overflow-tooltip/>
+      <el-table-column label="企业代码" align="center" prop="scySocialCode"  show-overflow-tooltip/>
       <el-table-column label="授信额度" align="center" prop="zfsqAmount" />
-      <el-table-column label="原授信额度" align="center" prop="zfsqOldAmount" />
-      <el-table-column label="利率" align="center" prop="zfsqRate" />
-      <el-table-column label="已使用额度" align="center" prop="zfsqUsedAmount" />
-      <el-table-column label="可用额度" align="center" prop="zfsqAvailableAmount" />
-      <el-table-column label="有效期(0:长期, 1:定期)" align="center" prop="zfsqDateType" />
-      <el-table-column label="开始日期" align="center" prop="zfsqStartDate" />
-      <el-table-column label="到期日期" align="center" prop="zfsqEndDate" />
-      <el-table-column label="状态(00:有效 01:失效)" align="center" prop="zfsqStatus" />
-      <el-table-column label="备用字段1" align="center" prop="zfsqProfitSpare1" />
-      <el-table-column label="备用字段2" align="center" prop="zfsqProfitSpare2" />
-      <el-table-column label="备用字段3" align="center" prop="zfsqProfitSpare3" />
-      <el-table-column label="备用字段4" align="center" prop="zfsqProfitSpare4" />
-      <el-table-column label="备用字段5" align="center" prop="zfsqProfitSpare5" />
-      <el-table-column label="备用字段6" align="center" prop="zfsqProfitSpare6" />
-      <el-table-column label="备用字段7" align="center" prop="zfsqProfitSpare7" />
-      <el-table-column label="备用字段8" align="center" prop="zfsqProfitSpare8" />
-      <el-table-column label="备用字段9" align="center" prop="zfsqProfitSpare9" />
+      <el-table-column label="授信状态" :formatter="statusFormat" align="center" prop="zfsqStatus" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:quota:edit']"
+            @click="handleEdit(scope.row)"
+            v-if="scope.row.zfsqStatus == '01'"
+            v-hasPermi="['supplierCredit:line:edit']"
           >修改</el-button>
           <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-s-check"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['supplierCredit:line:update']"
+            v-if="scope.row.zfsqStatus == '00'"
+          >冻结</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.zfsqStatus == '01'"
+            v-hasPermi="['supplierCredit:line:update']"
+          >解冻</el-button>
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:quota:remove']"
+            v-if="scope.row.zfsqStatus == '01'"
+            v-hasPermi="['supplierCredit:line:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -274,70 +137,25 @@
 
     <!-- 添加或修改供应商授信额度对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)" prop="zfsqCoreQuotaId">
-          <el-input v-model="form.zfsqCoreQuotaId" placeholder="请输入核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)" />
-        </el-form-item>
-        <el-form-item label="供应商ID(sys_company.scy_id)" prop="zfsqCompanyId">
-          <el-input v-model="form.zfsqCompanyId" placeholder="请输入供应商ID(sys_company.scy_id)" />
-        </el-form-item>
-        <el-form-item label="授信额度" prop="zfsqAmount">
-          <el-input v-model="form.zfsqAmount" placeholder="请输入授信额度" />
-        </el-form-item>
-        <el-form-item label="原授信额度" prop="zfsqOldAmount">
-          <el-input v-model="form.zfsqOldAmount" placeholder="请输入原授信额度" />
-        </el-form-item>
-        <el-form-item label="利率" prop="zfsqRate">
-          <el-input v-model="form.zfsqRate" placeholder="请输入利率" />
-        </el-form-item>
-        <el-form-item label="已使用额度" prop="zfsqUsedAmount">
-          <el-input v-model="form.zfsqUsedAmount" placeholder="请输入已使用额度" />
-        </el-form-item>
-        <el-form-item label="可用额度" prop="zfsqAvailableAmount">
-          <el-input v-model="form.zfsqAvailableAmount" placeholder="请输入可用额度" />
-        </el-form-item>
-        <el-form-item label="有效期(0:长期, 1:定期)" prop="zfsqDateType">
-          <el-select v-model="form.zfsqDateType" placeholder="请选择有效期(0:长期, 1:定期)">
-            <el-option label="请选择字典生成" value="" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition">
+        <el-form-item label="企业名称:" prop="zfsqCompanyId">
+          <el-select v-model="form.zfsqCompanyId" style="width : 300px" clearable :disabled="isDisabled">
+            <el-option
+              v-for="(item,index) in gysCompanyList"
+              :key="index"
+              :label="item.scyName" 
+              :value="item.scyId"
+              @click.native="code(item)"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="开始日期" prop="zfsqStartDate">
-          <el-input v-model="form.zfsqStartDate" placeholder="请输入开始日期" />
-        </el-form-item>
-        <el-form-item label="到期日期" prop="zfsqEndDate">
-          <el-input v-model="form.zfsqEndDate" placeholder="请输入到期日期" />
-        </el-form-item>
-        <el-form-item label="状态(00:有效 01:失效)">
-          <el-radio-group v-model="form.zfsqStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备用字段1" prop="zfsqProfitSpare1">
-          <el-input v-model="form.zfsqProfitSpare1" placeholder="请输入备用字段1" />
-        </el-form-item>
-        <el-form-item label="备用字段2" prop="zfsqProfitSpare2">
-          <el-input v-model="form.zfsqProfitSpare2" placeholder="请输入备用字段2" />
-        </el-form-item>
-        <el-form-item label="备用字段3" prop="zfsqProfitSpare3">
-          <el-input v-model="form.zfsqProfitSpare3" placeholder="请输入备用字段3" />
-        </el-form-item>
-        <el-form-item label="备用字段4" prop="zfsqProfitSpare4">
-          <el-input v-model="form.zfsqProfitSpare4" placeholder="请输入备用字段4" />
-        </el-form-item>
-        <el-form-item label="备用字段5" prop="zfsqProfitSpare5">
-          <el-input v-model="form.zfsqProfitSpare5" placeholder="请输入备用字段5" />
+        <el-form-item label="企业统一代码:" prop="scySocialCode">
+          <el-input v-model="form.scySocialCode" :disabled="true" placeholder="请输入企业统一代码" style="width:300px"/>
         </el-form-item>
-        <el-form-item label="备用字段6" prop="zfsqProfitSpare6">
-          <el-input v-model="form.zfsqProfitSpare6" placeholder="请输入备用字段6" />
-        </el-form-item>
-        <el-form-item label="备用字段7" prop="zfsqProfitSpare7">
-          <el-input v-model="form.zfsqProfitSpare7" placeholder="请输入备用字段7" />
-        </el-form-item>
-        <el-form-item label="备用字段8" prop="zfsqProfitSpare8">
-          <el-input v-model="form.zfsqProfitSpare8" placeholder="请输入备用字段8" />
-        </el-form-item>
-        <el-form-item label="备用字段9" prop="zfsqProfitSpare9">
-          <el-input v-model="form.zfsqProfitSpare9" placeholder="请输入备用字段9" />
+        <el-form-item label="授信额度:" prop="zfsqAmount">
+            <el-input v-model="form.zfsqAmount" placeholder="请输入授信额度"  style="width:300px">
+              <template slot="append">元</template>
+            </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -345,18 +163,59 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 导入 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" :rules="rules" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <!-- <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据 -->
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCreditLine, getCreditLine, delCreditLine, addCreditLine, updateCreditLine,changeStatus} from "@/api/service/creditLine/creditLine";
-
+import { listQuota, getQuota, delQuota, addQuota, updateQuota ,changeStatus,listCompanyRel} from "@/api/service/creditLine/quota";
+import { listCompany } from "@/api/common/company";
+import { getToken } from "@/utils/auth";
 export default {
   name: "Quota",
   components: {
   },
   data() {
+    var self = this;
     return {
+      //核心企业授信id
+      zfpcrId: '',
+      //核心企业id
+      zfpcrCompanyId: '',
+      //导入限制数量
+      uploadNum: 0,
+      //是否禁用
+      isDisabled: false,
+      labelPosition: 'top',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -371,10 +230,29 @@ export default {
       total: 0,
       // 供应商授信额度表格数据
       quotaList: [],
+      //供应商数据
+      gysCompanyList: [],
+      //授信状态数据字典
+      statusOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 导入参数
+      upload: {
+        // 是否显示弹出层（导入）
+        open: false,
+        // 弹出层标题（导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/sc-service_pxh/supplierCreditLine/importData/" + self.zfpcrId + '/' + self.zfpcrCompanyId,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -399,39 +277,61 @@ export default {
         zfsqProfitSpare7: null,
         zfsqProfitSpare8: null,
         zfsqProfitSpare9: null,
+        sysName: null,
+        AmountA: null,
+        AmountB: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        zfsqCoreQuotaId: [
-          { required: true, message: "核心企业授信额度ID(zc_finance_pro_com_rel.zfpcr_id)不能为空", trigger: "blur" }
-        ],
         zfsqCompanyId: [
-          { required: true, message: "供应商ID(sys_company.scy_id)不能为空", trigger: "blur" }
+          { required: true, message: "企业名称不能为空", trigger: "blur" }
         ],
-        zfsqAmount: [
-          { required: true, message: "授信额度不能为空", trigger: "blur" }
+        scySocialCode: [
+          { required: true, message: "企业统一代码不能为空", trigger: "blur" }
         ],
-        zfsqRate: [
-          { required: true, message: "利率不能为空", trigger: "blur" }
+        zfsqAmount: [
+          { required: true, message: "授信额度不能为空", trigger: ["blur", "change"] },
+          {
+            pattern: /^[0-9][0-9]{0,7}$|^[1-9][0-9]{0,7}[.]\d{1,2}$/,
+            message: "请输入正确的额度",
+            trigger: "change",
+          },
         ],
       }
     };
   },
   created() {
+    this.zfpcrId = this.$route.params && this.$route.params.zfpcrId;
+    this.zfpcrCompanyId = this.$route.params && this.$route.params.zfpcrCompanyId;
+    this.upload.url = process.env.VUE_APP_BASE_API + "/sc-service_pxh/supplierCreditLine/importData/" + this.zfpcrId + '/' + this.zfpcrCompanyId,
+    this.getDicts("zc_zfpcr_status").then(response => {
+      this.statusOptions = response.data;
+    });
     this.getList();
   },
   methods: {
     /** 查询供应商授信额度列表 */
     getList() {
       this.loading = true;
+      this.queryParams.zfsqId = this.zfpcrId;
       listQuota(this.queryParams).then(response => {
-        this.quotaList = response.rows;
-        this.total = response.total;
+        this.quotaList = response.data.records;
+         this.total = response.data.total;
         this.loading = false;
       });
     },
+    /* 供应商公司 */
+    getGysCompany(){
+      listCompanyRel(this.zfpcrCompanyId).then((response) =>{
+        this.gysCompanyList  = response.data;
+      })
+    },
+    /* 选择企业带出企业统一代码 */
+    code(item) {
+      this.$set(this.form, "scySocialCode", item.scySocialCode);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -451,7 +351,7 @@ export default {
         zfsqDateType: null,
         zfsqStartDate: null,
         zfsqEndDate: null,
-        zfsqStatus: "0",
+        zfsqStatus: "00",
         zfsqProfitSpare1: null,
         zfsqProfitSpare2: null,
         zfsqProfitSpare3: null,
@@ -484,26 +384,55 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /** 字典翻译 */
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.statusOptions, row.zfsqStatus);
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getGysCompany();
+      this.isDisabled = false;
       this.open = true;
       this.title = "添加供应商授信额度";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleEdit(row) {
       this.reset();
       const zfsqId = row.zfsqId || this.ids
+      this.getGysCompany();
       getQuota(zfsqId).then(response => {
-        this.form = response.data;
+        this.form = response.data[0];
+        this.isDisabled = true;
         this.open = true;
         this.title = "修改供应商授信额度";
       });
     },
+    /** 冻结/解冻按钮操作 */
+    handleUpdate(row) {
+      let text = row.zfsqStatus === "0" ? "解冻" : "冻结";
+      this.$confirm(
+        "确认要" + text + '此数据项吗?',
+        "警告",
+        {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+        }
+      )
+      .then(function() {
+        return changeStatus(row.zfsqId,row.zfsqStatus);
+      })
+      .then(() => {
+        this.getList();
+        this.msgSuccess(text + "成功");
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.zfsqCoreQuotaId = this.zfpcrId;
           if (this.form.zfsqId != null) {
             updateQuota(this.form).then(response => {
               this.msgSuccess("修改成功");
@@ -523,7 +452,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const zfsqIds = row.zfsqId || this.ids;
-      this.$confirm('是否确认删除供应商授信额度编号为"' + zfsqIds + '"的数据项?', "警告", {
+      const scyName = row.scyName;
+      this.$confirm('是否确认删除企业名称为"' + scyName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -534,6 +464,36 @@ export default {
           this.msgSuccess("删除成功");
         })
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.reset();
+      this.upload.title = "授信导入";
+      this.upload.open = true;
+    },
+     /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/sc-service_pxh/supplierCreditLine/importTemplate/",
+        {},
+        `融资方授信模版${new Date().getTime()}.xls`
+      );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/quota/export', {