融资产品，合同，还款页面优化

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

@@ -6,7 +6,7 @@
          <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></column-setting>
+            <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId"></column-setting>
          </div>
          <hr  style="margin-top: 16px;">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
@@ -66,12 +66,12 @@
       </el-table-column>     
       <el-table-column label="资金方" align="center" prop="scyName" :show-overflow-tooltip="true" v-if="uncheckList.scyName"/> 
       <el-table-column label="合同模板名称" align="center" prop="zfcName" :show-overflow-tooltip="true" v-if="uncheckList.zfcName"/>
-      <el-table-column label="合同模板状态" align="center" prop="zfcStatus" :formatter="statusFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcStatus"/>
+      <el-table-column label="合同模板状态" align="center" prop="zfcStatus" width = '100px' :formatter="statusFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcStatus"/>
       <el-table-column label="签署节点" align="center" prop="zfcNode"  :formatter="nodeFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcNode"/>
       <!-- <el-table-column label="签署方" align="center" prop="zfcSubject" :formatter="subjectFormat" :show-overflow-tooltip="true" v-if="uncheckList.zfcSubject"/> -->
       <el-table-column label="创建人" align="center" prop="nickName" :show-overflow-tooltip="true" v-if="uncheckList.nickName"/>
       <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true" v-if="uncheckList.createTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='200px'>
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -130,6 +130,7 @@
 import { listContract,changeState,delContract} from "@/api/service/contract/contract";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
 import { columnQuery, columnfilter } from "@/api/common/columnSetting";
+import Cookies from 'js-cookie'
 export default {
   name: "contract",
   components: {
@@ -266,17 +267,21 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push("/contract/addContract/");
+      this.reset();
+      Cookies.set("/contract/addContract/", this.$route.fullPath);
+      this.$router.push({path:"/contract/addContract/"});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const zfcId = row.zfcId
-      this.$router.push("/contract/editContract/"+ zfcId);
+      Cookies.set("/contract/editContract/"+zfcId+"/", this.$route.fullPath);
+      this.$router.push({path:"/contract/editContract/"+zfcId+"/"});
     },
     /** 详情按钮操作 */
     handleInfo(row) {
       const zfcId = row.zfcId
-      this.$router.push("/contract/detailContract/"+ zfcId);
+      Cookies.set("/contract/detailContract/"+zfcId+"/", this.$route.fullPath);
+      this.$router.push({path:"/contract/detailContract/"+zfcId+"/"});
     },
     /** 删除按钮操作 */
     handleDel(row) {

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

@@ -6,7 +6,7 @@
          <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></column-setting>
+            <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId"></column-setting>
          </div>
          <hr  style="margin-top: 16px;">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
@@ -137,6 +137,7 @@
 import { listFinanceProduct,changeState } from "@/api/service/financeProduct/financeProduct";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
 import { columnQuery, columnfilter } from "@/api/common/columnSetting";
+import Cookies from 'js-cookie'
 export default {
   name: "financeProduct",
   components: {
@@ -263,6 +264,7 @@ export default {
     getList() {
       this.loading = true;
       listFinanceProduct(this.queryParams).then(response => {
+        debugger
         this.financeProductList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
@@ -300,16 +302,20 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push("/financeProduct/addFinanceProduct/");
+      this.reset();
+      Cookies.set("/financeProduct/addFinanceProduct/", this.$route.fullPath);
+      this.$router.push({path:"/financeProduct/addFinanceProduct/"});
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       const zfpId = row.zfpId
-      this.$router.push("/financeProduct/editFinanceProduct/"+ zfpId);
+      Cookies.set("/financeProduct/editFinanceProduct/"+zfpId+"/", this.$route.fullPath);
+      this.$router.push({path:"/financeProduct/editFinanceProduct/"+zfpId+"/"});
     },/** 修改按钮操作 */
     handleInfo(row) {
       const zfpId = row.zfpId
-      this.$router.push("/financeProduct/detailFinanceProduct/"+ zfpId);
+      Cookies.set("/financeProduct/detailFinanceProduct/"+zfpId+"/", this.$route.fullPath);
+      this.$router.push({path:"/financeProduct/detailFinanceProduct/"+zfpId+"/"});
     },
     /** 启用按钮操作 */
      handleChange(row) {

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

@@ -7,7 +7,7 @@
                 <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></column-setting>
+                    <column-setting :checkList="checkList":tableList="tableList":selfDom="selfDom":tableId="tableId"></column-setting>
                 </div>
                 <hr style="margin-top: 16px;">
                 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
@@ -24,24 +24,24 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-form>
-            </el-card>         
-            <!-- <div style="width:20%;height:135px;background:#f2f2f2;float:left;border-radius: 5%; ">
-               <span>总待还款金额:</span><span>11111111</span>
-            </div>
-                <div style="width:20%;height:135px;background:#f2f2f2;float:left;margin-left:10px;border-radius: 5%;">
-                    <span>
-                        待还款金额:</span>
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                    <div>
-                        12312312</div>
-                </div> -->
-            <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
+            </el-card>  
+            <el-form :model="amountQueryParams" ref="amountQueryForm" :inline="true" v-show="showSearch" label-width="100px">       
+                <div style="width:20%;height:135px;background:#f2f2f2;float:left;border-radius: 5%; ">
+                    <span>总待还款金额:</span><span>{{sumAmount}}</span>
+                </div>
+                <div style="width:20%;height:135px;background:#f2f2f2;float:left;margin-left:10px;border-radius: 5%;">
+                    <el-form-item prop="day">
+                        <el-select v-model="amountQueryParams.day"  size="small" @change="change(amountQueryParams.day)">
+                            <el-option v-for="dict in dayOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+                        </el-select>
+                    </el-form-item>
+                    <span>待还款金额:</span></span><span>{{amount}}</span>
+                </div>
+            </el-form>
+                <div>
                     <el-button type="primary" icon="el-icon-export" size="mini" @click="handleExport" v-hasPermi="['service:repayment:export']">导出待还款数据</el-button>
-                </el-col>
-            </el-row>
+                </div>
+            
             <el-table v-loading="loading" :data="allRepaymentList" @selection-change="handleSelectionChange" border>
                 <el-table-column label="序号" type="index" width="50" align="center">
                     <template slot-scope="scope">
@@ -59,7 +59,7 @@
                     <template slot-scope="scope">
                         <el-button size="mini" type="text" icon="el-icon-view" @click="handleInfo(scope.row)" v-hasPermi="['service:repayment:query']">详情</el-button>
                         <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDown(scope.row)" v-hasPermi="['service:repayment:down']">下载</el-button>
-                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleUp(scope.row)" v-hasPermi="['service:repayment:up']" v-if="scope.row.zfrApplyStatus != '01'">还款登记</el-button>
+                        <el-button size="mini" type="text" icon="el-icon-delete" @click="handleUp(scope.row)" v-hasPermi="['service:repayment:edit']" v-if="scope.row.zfrApplyStatus != '01'">还款登记</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -225,7 +225,7 @@
             </el-table>
             <pagination v-show="total>0" :total="total3" :page.sync="overdue.pageNum" :limit.sync="overdue.pageSize" @pagination="getList" />
         </el-tab-pane>
-        <!-- 添加或修改融资记录对话框 -->
+
     <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="上传附件">
@@ -267,9 +267,10 @@
     </el-tabs>
 </template>
 <script>
-import { listRepayment,RepaymentRegistration } from "@/api/service/repayment/repayment";
+import { listRepayment,RepaymentRegistration,repaymentAmount } from "@/api/service/repayment/repayment";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
 import { columnQuery, columnfilter } from "@/api/common/columnSetting";
+import Cookies from 'js-cookie'
 import { uploadFileNew } from "@/api/common/file";
 import { getToken } from "@/utils/auth";
 export default {
@@ -279,6 +280,11 @@ export default {
     },
     data() {
         return {
+            //总代还款金额
+            sumAmount:0.00,
+            //带还款金额
+            amount:0.00,
+            dayOptions:[],
             // 遮罩层
             loading: true,
             // 选中数组
@@ -349,8 +355,16 @@ export default {
                 repaymentDate: [],
                 status: null,
             },
+            amountQueryParams:{
+                day:"00",
+            },
             // 表单参数
-            form: {},
+            form: {
+                
+            },
+            amountQueryForm:{
+                day:"00"
+            },
             // 表单校验
             rules: {
                 //  pptName:[
@@ -398,12 +412,20 @@ export default {
         this.getUnpayList();
         this.getRepayList();
         this.getOverdueList();
+        this.getRepaymentAmount();
         this.getDicts("zc_zfr_apply_status").then((response) => {
             this.applyStatusOptions = response.data;
         });
         this.getDicts("zc_zfr_type").then((response) => {
             this.typeOptions = response.data;
         });
+        this.getDicts("zc_repanyment_day").then((response) => {
+            this.dayOptions = response.data;
+        });
+        this.amountQueryParams.day = null;
+        repaymentAmount(this.amountQueryParams).then((response)=>{
+                this.sumAmount = response.data;
+            })
     },
     activated() {
         this.getList();
@@ -451,6 +473,12 @@ export default {
                 this.loading = false;
             });
         },
+        /** 查询带还款金额 */
+        getRepaymentAmount(){
+            repaymentAmount(this.amountQueryParams).then((response)=>{
+                this.amount = response.data;
+            })
+        },
         // 取消按钮
         cancel() {
             this.open = false;
@@ -496,6 +524,12 @@ export default {
             this.resetForm("queryForm3");
             this.fouthQuery();
         },
+        change(val){
+            this.amountQueryParams.day = val;
+            repaymentAmount(this.amountQueryParams).then((response)=>{
+                this.amount = response.data;
+            })
+        },
         // 多选框选中数据
         handleSelectionChange(selection) {
             /*  this.ids = selection.map(item => item.ptcId)
@@ -505,7 +539,8 @@ export default {
         /** 详情按钮操作 */
         handleInfo(row) {
             const zfrId = row.zfrId;
-            this.$router.push("/repayment/detailRepayment/" + zfrId);
+            Cookies.set("/repayment/detailRepayment/"+zfrId+"/", this.$route.fullPath);
+            this.$router.push({path:"/repayment/detailRepayment/"+zfrId+"/"});
         },
         /** 下载按钮操作 */
         handleDown(row) {