diff --git a/package-lock.json b/package-lock.json
index 316f752..b368751 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3412,6 +3412,11 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
+    "complex.js": {
+      "version": "2.0.15",
+      "resolved": "https://registry.nlark.com/complex.js/download/complex.js-2.0.15.tgz",
+      "integrity": "sha1-et1oSLTB0SqpJi99+SXr56UadAY="
+    },
     "component-classes": {
       "version": "1.2.6",
       "resolved": "https://registry.npm.taobao.org/component-classes/download/component-classes-1.2.6.tgz",
@@ -4448,6 +4453,11 @@
       "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
       "dev": true
     },
+    "decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.nlark.com/decimal.js/download/decimal.js-10.3.1.tgz",
+      "integrity": "sha1-2MOkRKnGd0umDKatcmHDqU/V54M="
+    },
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
@@ -5134,6 +5144,11 @@
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
       "dev": true
     },
+    "escape-latex": {
+      "version": "1.2.0",
+      "resolved": "https://registry.nlark.com/escape-latex/download/escape-latex-1.2.0.tgz",
+      "integrity": "sha1-B8A4GM99rCUMzlF/T9obAB7yvKE="
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
@@ -5680,6 +5695,11 @@
       "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true
     },
+    "fraction.js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.nlark.com/fraction.js/download/fraction.js-4.1.1.tgz",
+      "integrity": "sha1-rE5SBHPa5nAS1hiquR7aCby0AP8="
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz",
@@ -6958,6 +6978,11 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npm.taobao.org/javascript-natural-sort/download/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+    },
     "javascript-stringify": {
       "version": "1.6.0",
       "resolved": "https://registry.npm.taobao.org/javascript-stringify/download/javascript-stringify-1.6.0.tgz",
@@ -7464,6 +7489,37 @@
         "object-visit": "^1.0.0"
       }
     },
+    "mathjs": {
+      "version": "9.4.4",
+      "resolved": "https://registry.nlark.com/mathjs/download/mathjs-9.4.4.tgz",
+      "integrity": "sha1-KazWdWPB5yCRAhMGKCTD+vYbyFg=",
+      "requires": {
+        "@babel/runtime": "^7.14.6",
+        "complex.js": "^2.0.15",
+        "decimal.js": "^10.3.1",
+        "escape-latex": "^1.2.0",
+        "fraction.js": "^4.1.1",
+        "javascript-natural-sort": "^0.7.1",
+        "seedrandom": "^3.0.5",
+        "tiny-emitter": "^2.1.0",
+        "typed-function": "^2.0.0"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.15.4",
+          "resolved": "https://registry.nlark.com/@babel/runtime/download/@babel/runtime-7.15.4.tgz?cache=0&sync_timestamp=1630618785994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.15.4.tgz",
+          "integrity": "sha1-/RfRa/34eObdAtGXU6OfqKjZyEo=",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz",
+          "integrity": "sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I="
+        }
+      }
+    },
     "mavon-editor": {
       "version": "2.9.0",
       "resolved": "https://registry.npm.taobao.org/mavon-editor/download/mavon-editor-2.9.0.tgz",
@@ -12317,6 +12373,11 @@
         }
       }
     },
+    "seedrandom": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npm.taobao.org/seedrandom/download/seedrandom-3.0.5.tgz",
+      "integrity": "sha1-VO3IXJUiJSWwx6b2s1Q9jgs6oKc="
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
@@ -13564,6 +13625,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.nlark.com/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
+    },
     "tinycolor2": {
       "version": "1.4.2",
       "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz",
@@ -13721,6 +13787,11 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npm.taobao.org/typed-function/download/typed-function-2.0.0.tgz",
+      "integrity": "sha1-Fas4JYRROKixETvYnmDNakNXOeg="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz",
diff --git a/package.json b/package.json
index ea01c7b..e378003 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "default-passive-events": "^2.0.0",
     "echarts": "^4.8.0",
     "element-ui": "^2.13.0",
+    "mathjs": "^9.4.4",
     "mavon-editor": "^2.6.17",
     "moment": "^2.21.0",
     "postcss-px2rem": "^0.3.0",
diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 7982f31..1442e49 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -136,6 +136,14 @@ img{
     padding: 0 30px!important;
     border-color: #ccc;
 }
+/* 保后-清收完成统计输入框样式 */
+#app .static .el-input__inner{
+    border-radius: 0!important;
+    border: 0;
+    /* padding: 0 30px!important; */
+    border-color: #ccc;
+}
+
 #app .el-input__icon{
     line-height: 36px;
 }
diff --git a/src/components/common/BindPhone.vue b/src/components/common/BindPhone.vue
index 1c7dec2..4c550b0 100644
--- a/src/components/common/BindPhone.vue
+++ b/src/components/common/BindPhone.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- 绑定手机 -->
     <div>
         <div class="Login_view bindphone_view">
             <div class="flex-between login_title">
diff --git a/src/components/common/applyDesign.vue b/src/components/common/applyDesign.vue
index 43715b4..d784512 100644
--- a/src/components/common/applyDesign.vue
+++ b/src/components/common/applyDesign.vue
@@ -1,5 +1,5 @@
-// 业务申请的设计表单
 <template>
+<!-- 业务申请的设计表单（文件带Design的都属于表单设计文件） -->
     <div class="container_bg">
         <div class="border-b flex-between ht50 self">
             <div></div>
diff --git a/src/components/common/back.vue b/src/components/common/back.vue
index ed142c2..c1d22d4 100644
--- a/src/components/common/back.vue
+++ b/src/components/common/back.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- < 返回  -->
     <div class="flex-center cursor">
         <svg class="icon text-color" aria-hidden="true">
             <use xlink:href="#icon-fanhui"></use>
diff --git a/src/components/common/background-list.vue b/src/components/common/background-list.vue
index 8c588fc..756cae4 100644
--- a/src/components/common/background-list.vue
+++ b/src/components/common/background-list.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- 组件列表 -->
     <div class="pdlr20 wrap self">
         <el-table :row-key="rowkey" ref="multipleTable" :data="tableData" stripe tooltip-effect="dark" style="width: 100%" @selection-change="getCheck" header-align="center">
             <el-table-column v-if="check" type="selection" width="40" class="flex-center"></el-table-column>
diff --git a/src/components/common/businessApplyDepartment.vue b/src/components/common/businessApplyDepartment.vue
index 0becdd3..950c245 100644
--- a/src/components/common/businessApplyDepartment.vue
+++ b/src/components/common/businessApplyDepartment.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- 担保业务-业务申请 -->
     <div>
         <div v-show="loans" class="mgt20 bgw shadow radius10 list-box mgb20">
             <div class="flex-between search-box">
diff --git a/src/components/common/cancel_btn.vue b/src/components/common/cancel_btn.vue
index b68320d..4143b6f 100644
--- a/src/components/common/cancel_btn.vue
+++ b/src/components/common/cancel_btn.vue
@@ -1,4 +1,4 @@
-// 弹框多，统一取消按钮
+// 全局取消按钮--多余
 //<Cancel_btn></Cancel_btn>
 <template>
    <el-button round class="cancel">取消</el-button>
diff --git a/src/components/common/close.vue b/src/components/common/close.vue
index 4331279..95dfdc1 100644
--- a/src/components/common/close.vue
+++ b/src/components/common/close.vue
@@ -1,4 +1,4 @@
-// 这是一个X号图标按钮，关闭的
+// 这是一个X号图标--多余
 <template>
     <button>
         <img src="../../assets/img/close.png" alt="">
diff --git a/src/components/common/complianceDesign.vue b/src/components/common/complianceDesign.vue
index 005ad56..0abd70d 100644
--- a/src/components/common/complianceDesign.vue
+++ b/src/components/common/complianceDesign.vue
@@ -1,5 +1,5 @@
-// 合规调查的设计表单
 <template>
+<!-- 合规调查的设计表单 -->
     <div class="container_bg">
         <div class="border-b flex-between ht50 self">
             <div></div>
diff --git a/src/components/common/directives.js b/src/components/common/directives.js
deleted file mode 100644
index b9d1834..0000000
--- a/src/components/common/directives.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import Vue from 'vue';
-
-// v-dialogDrag: 弹窗拖拽属性
-Vue.directive('dialogDrag', {
-    bind(el, binding, vnode, oldVnode) {
-        const dialogHeaderEl = el.querySelector('.el-dialog__header');
-        const dragDom = el.querySelector('.el-dialog');
-
-        dialogHeaderEl.style.cssText += ';cursor:move;'
-        dragDom.style.cssText += ';top:0px;'
-
-        // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-        const sty = (() => {
-            if (window.document.currentStyle) {
-                return (dom, attr) => dom.currentStyle[attr];
-            } else {
-                return (dom, attr) => getComputedStyle(dom, false)[attr];
-            }
-        })()
-
-        dialogHeaderEl.onmousedown = (e) => {
-            // 鼠标按下，计算当前元素距离可视区的距离
-            const disX = e.clientX - dialogHeaderEl.offsetLeft;
-            const disY = e.clientY - dialogHeaderEl.offsetTop;
-
-            const screenWidth = document.body.clientWidth; // body当前宽度
-            const screenHeight = document.documentElement.clientHeight; // 可见区域高度(应为body高度，可某些环境下无法获取) 
-
-            const dragDomWidth = dragDom.offsetWidth; // 对话框宽度
-            const dragDomheight = dragDom.offsetHeight; // 对话框高度
-
-            const minDragDomLeft = dragDom.offsetLeft;
-            const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth;
-
-            const minDragDomTop = dragDom.offsetTop;
-            const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight;
-
-
-            // 获取到的值带px 正则匹配替换
-            let styL = sty(dragDom, 'left');
-            let styT = sty(dragDom, 'top');
-
-            // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
-            if (styL.includes('%')) {
-                styL = +document.body.clientWidth * (+styL.replace(/\%/g, '') / 100);
-                styT = +document.body.clientHeight * (+styT.replace(/\%/g, '') / 100);
-            } else {
-                styL = +styL.replace(/\px/g, '');
-                styT = +styT.replace(/\px/g, '');
-            };
-
-            document.onmousemove = function (e) {
-                // 通过事件委托，计算移动的距离 
-                let left = e.clientX - disX;
-                let top = e.clientY - disY;
-
-                // 边界处理
-                if (-(left) > minDragDomLeft) {
-                    left = -(minDragDomLeft);
-                } else if (left > maxDragDomLeft) {
-                    left = maxDragDomLeft;
-                }
-
-                if (-(top) > minDragDomTop) {
-                    top = -(minDragDomTop);
-                } else if (top > maxDragDomTop) {
-                    top = maxDragDomTop;
-                }
-
-                // 移动当前元素  
-                dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`;
-            };
-
-            document.onmouseup = function (e) {
-                document.onmousemove = null;
-                document.onmouseup = null;
-            };
-        }
-    }
-})
diff --git a/src/components/common/left-sidebar.vue b/src/components/common/left-sidebar.vue
index e9ef650..e75613a 100644
--- a/src/components/common/left-sidebar.vue
+++ b/src/components/common/left-sidebar.vue
@@ -2,12 +2,13 @@
 <!-- 侧边栏组件，传一个title数组，父级定义position：relative达到高度100% -->
 <!-- 取参数进行切换组件，定义getSidebarVal接受参数 -->
     <div class="left-sidebar not-zoom  shadow">
-        <el-menu mode="vertical" :default-active="pitchOn" class="wd100 bd0" :default-openeds="['0']" >
+        <el-menu mode="vertical"  @open="open" :default-active="path" class="wd100 bd0" :default-openeds="['0']" >
             <el-menu-item
                 v-if="title.length>0"
                 v-for="item in title"
                 :key="item.index"
                 :index="item.index"
+                text-color="#fff"
                 background-color="#F3F3F3"
                 @click="setIndex(item.index)"
             >
@@ -21,7 +22,9 @@
                     v-for="(i,ind) in menus.body[item]"
                     :key="ind"
                     :index="i.index"
-                    background-color="#F3F3F3"
+                    background-color="#545c64"
+                    active-text-color="#ffd04b"
+                    text-color="#fff"
                     @click="setIndex(i.index)"
                 >
                     <span slot="title" class="fz-14">&nbsp;&nbsp;{{ i.name }}</span>
@@ -50,9 +53,22 @@ export default {
         pitchOn:String,// 选中
     },
     data() {
-        return {};
+        return {
+            path:'',
+        };
+    },
+    watch:{
+        pitchOn(val,old){
+            console.log(val)
+                this.path = old
+            if(val){
+                this.path = val
+            }
+        }
     },
     created(){
+        console.log(this.pitchOn,'p')
+        this.path = this.pitchOn
         
     },
     methods:{
@@ -60,14 +76,12 @@ export default {
         setIndex(index) {
             this.$emit('getSidebarVal',index)
         },
-        /* 
-
-        head:['',''],
-        body:{
-            head[0]:[],
-
+        open(){
+            console.log('展开',this.menus.body)
+            // for (let key,value in this.menus.body) {
+                // console.log(this.menus.body[key][0],'old',key)
+            // }
         }
-        */
     }
 };
 </script>
@@ -90,6 +104,7 @@ export default {
     border-right: 10px solid transparent;
     height: 40px;
     line-height: 40px;
+    font-weight: 500;
     margin: 20px 0;
 }
 /deep/ .el-menu-item.is-active {
@@ -100,10 +115,13 @@ export default {
 }
 /deep/ .el-submenu .el-menu-item{
     min-width: 0;
-    font-size: 14px;
+    font-size: 8px;
+    font-weight: normal;
+
 }
 /deep/ .el-submenu__title{
     font-size: 16px;
+    font-weight: 500;
 }
 /deep/ .el-submenu__icon-arrow{
     right: 10px;
diff --git a/src/components/page/Workbench-Guarantee.vue b/src/components/page/Workbench-Guarantee.vue
index a32d680..46cb95d 100644
--- a/src/components/page/Workbench-Guarantee.vue
+++ b/src/components/page/Workbench-Guarantee.vue
@@ -326,7 +326,12 @@ export default {
         this.removeSession();
         next();
     },
-    destroyed(){}
+    beforeDestroy() {
+        this.topSidebarVal = '1'
+        this.$store.commit('messageData',{messageData:{modelId:'1'}})
+    },
+    destroyed(){
+    }
 };
 </script>
 <style lang='scss' scoped>
diff --git a/src/components/page/afterLoan/afterInsurance.vue b/src/components/page/afterLoan/afterInsurance.vue
index fada246..e62058e 100644
--- a/src/components/page/afterLoan/afterInsurance.vue
+++ b/src/components/page/afterLoan/afterInsurance.vue
@@ -42,8 +42,8 @@
                         <el-table-column prop="guaranteeAmount" label="担保额度(元)" align="center"></el-table-column>
                         <el-table-column prop="guaranteeTime" label="担保期限" align="center"></el-table-column>
                         <el-table-column prop="applyTime" label="申请日期" align="center"></el-table-column>
-                        <el-table-column prop="repaymentAmount" label="还款额度(元)" align="center"></el-table-column>
-                        <el-table-column prop="remainAmount" label="剩余额度(元)" align="center"></el-table-column>
+                        <el-table-column prop="repaymentAmount" label="已还款金额(元)" align="center"></el-table-column>
+                        <el-table-column prop="remainAmount" label="剩余金额(元)" align="center"></el-table-column>
                         <el-table-column prop="repaymentTime" label="还款期数" align="center"></el-table-column>
                         <!-- <el-table-column prop="department" label="所属部门" align="center"></el-table-column> -->
                         <el-table-column prop="paymentStatus" label="还款状态" align="center"></el-table-column>
@@ -84,23 +84,23 @@
                                             <el-input disabled v-model="guaranteeForm.legalName" placeholder="自动读取"></el-input>
                                         </el-form-item>
                                         <el-form-item label="贷款银行:" prop="bank">
-                                            <div class="df">
+                                            <div class="df" style="font-size:16px">
                                                 <el-input class="dn"  type="text" v-model="guaranteeForm.bank"></el-input>
                                                 <el-autocomplete
                                                     class="dib"
-                                                    :disabled="!wanderEdit"
+                                                    :disabled="!wanderEdit||status=='newRecord'"
                                                     @input="bankgroup($event,'main')"
                                                     v-model="mainbank"
                                                     placeholder="输入银行名称"
                                                     :fetch-suggestions="querySearchAsync"
                                                 ></el-autocomplete>
                                                 <p class="mgl10">-</p>
-                                                <el-input :disabled="!wanderEdit" @change="bankgroup($event,'else')" v-model="elsebank" class="wd45 mgl10 dib" placeholder="分行名称" clearable></el-input>
+                                                <el-input style="font-size:.875rem" :disabled="!wanderEdit||status=='newRecord'" @change="bankgroup($event,'else')" v-model="elsebank" class="wd45 mgl10 dib" placeholder="分行名称" clearable></el-input>
                                             </div>
                                         </el-form-item>
                                         <el-form-item label="贷款起止日期:" prop="loanStartTime">
                                             <el-date-picker
-                                                :disabled="wanderEdit"
+                                                :disabled="wanderEdit&&status=='oldLoansEdit'||status=='newRecord'"
                                                 v-model="starEndDate"
                                                 @change="starEndTimeFn"
                                                 type="daterange"
@@ -111,7 +111,7 @@
                                             </el-date-picker>
                                         </el-form-item>
                                         <el-form-item label="业务类别:" prop="businessType">        
-                                            <el-select :disabled="!wanderEdit" v-model="guaranteeForm.businessType" placeholder="请选择">
+                                            <el-select :disabled="!wanderEdit||status=='newRecord'" v-model="guaranteeForm.businessType" placeholder="请选择">
                                                 <el-option label="融资担保" value="融资担保"></el-option>
                                                 <el-option label="担保" value="担保"></el-option>
                                                 <el-option label="借贷" value="借贷"></el-option>
@@ -126,7 +126,7 @@
                                     <el-col :span="12" >
                                         <el-form-item label="客户名称:" prop="customerName">
                                             <el-select
-                                                :disabled="!wanderEdit"
+                                                :disabled="!wanderEdit||status=='newRecord'"
                                                 v-model="guaranteeForm.customerName"
                                                 @change="searchClientChange($event,'name')"
                                                 filterable
@@ -149,17 +149,22 @@
                                         </el-form-item>
 
                                         <el-form-item label="担保额度/贷款金额(元):" prop="guaranteeAmount">
-                                            <el-input :disabled="!wanderEdit" v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度"></el-input>
+                                            <div class="cashChinese">
+                                                <el-input oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" :disabled="!wanderEdit||status=='newRecord'" v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度"></el-input>
+                                            </div>
                                         </el-form-item>
 
                                         <el-form-item label="担保期限:" prop="guaranteeTime">
                                             <div class="df">
-                                                <el-input :disabled="!wanderEdit" v-model="guaranteeForm.guaranteeTime" placeholder="输入期限" style="width:94%;margin-right:5px"></el-input><p style="white-space: nowrap;">个月</p>
+                                                <!-- <el-input onkeyup="value=this.value.replace(/\D+/g,'')"  v-model="guaranteeForm.guaranteeTime" placeholder="输入期限" style="width:94%;margin-right:5px"></el-input><p style="white-space: nowrap;">个月</p> -->
+                                                <el-select :disabled="!wanderEdit||status=='newRecord'" class="wd100" v-model="guaranteeForm.guaranteeTime" :placeholder="'选择期限'" >
+                                                    <el-option  v-for="item in timeLimit" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                                </el-select>
                                             </div>
                                         </el-form-item>
 
                                         <el-form-item label="贷款用途:" prop="amountWide">
-                                            <el-select :disabled="!wanderEdit" v-model="guaranteeForm.amountWide" placeholder="请选择">
+                                            <el-select :disabled="!wanderEdit||status=='newRecord'" v-model="guaranteeForm.amountWide" placeholder="请选择">
                                                 <el-option v-for="(item, index) in loansUse" :key="index" :label="item.label" :value="item.value"></el-option>
                                             </el-select>
                                         </el-form-item>                                  
@@ -179,11 +184,11 @@
                             <el-form label-width="160px" ref="comp" :disabled="disabledAll" :model="comp" :rules="compRule">
                                 <el-col :span="12" >
                                     <el-form-item label="代偿金额（元）:">
-                                        <el-input :disabled="!wanderEdit" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="comp.compensationAmount"  placeholder="请输入"></el-input>
+                                        <el-input  oninput="value=value.replace(/[^\d.]/g,'')"  v-model="comp.compensationAmount"  placeholder="请输入"></el-input>
                                     </el-form-item>
                                     <el-form-item label="代偿时间 :">
                                         <el-date-picker
-                                            :disabled="!wanderEdit"
+                                            
                                             v-model="comp.compensatoryTime"
                                             @change="compensatoryTimeChange"
                                             type="date"
@@ -194,9 +199,9 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="12">
-                                    <!-- 代偿金额 - 代偿日后续 还款的金额，每一笔还款，都在这里减去 -->
+                                    <!-- 代偿金额 - 代偿日后 还款的金额 - 每一次的利息总额，每一笔还款，都在这里减去 -->
+                                    <!-- TODO 此处的代偿未计算完善，后端缺字段 -->
                                     <el-form-item label="代偿余额（元）:">
-                                        <!-- <el-input disabled  v-model="comp.compensatoryBalance" placeholder="请输入"></el-input> -->
                                         <el-input disabled  v-model="computedCompensatoryBalance" placeholder="请输入"></el-input>
                                     </el-form-item>
                                 </el-col>
@@ -215,18 +220,18 @@
                                 <el-col :span="24" style="margin-right: 120px;">
                                     <div class="df">
                                         <el-form-item label="清收负责人:" style="width:30%" prop="personLiable">
-                                            <el-input :disabled="!entering&&status!=='newLoans'" @focus="principal=true" v-model="liquidate.personLiable" placeholder="请选择"></el-input>
+                                            <el-input :disabled="!entering&&status!=='newLoans'||status=='newRecord'" @focus="principal=true" v-model="liquidate.personLiable" placeholder="请选择"></el-input>
                                         </el-form-item>
                                         <el-form-item label="所属清收组:" style="width:35%" prop="collectionGroupId">
                                             <div class="df">
-                                                <el-select :disabled="!entering&&status!=='newLoans'" v-model="liquidate.collectionGroupId" placeholder="请选择">
+                                                <el-select :disabled="!entering&&status!=='newLoans'||status=='newRecord'" v-model="liquidate.collectionGroupId" placeholder="请选择">
                                                     <el-option v-for="(item, index) in organizationArrs" :key="index" :label="item.groupName" :value="item.id"></el-option>
                                                 </el-select>
                                                 <el-button @click="organization=true" type="text" class="mgl10">自定义</el-button>
                                             </div>
                                         </el-form-item>
                                         <el-form-item label="所在区域:" style="width:30%" prop="area">
-                                            <el-select :disabled="!entering&&status!=='newLoans'"  v-model="liquidate.area" placeholder="请选择">
+                                            <el-select :disabled="!entering&&status!=='newLoans'||status=='newRecord'"  v-model="liquidate.area" placeholder="请选择">
                                                 <el-option v-for="(item, index) in area" :key="index" :label="item.name" :value="item.id"></el-option>
                                             </el-select>
                                         </el-form-item>
@@ -262,13 +267,14 @@
                     </el-card>
                 </el-col>
 
-                <!-- 还款信息在新建的时候不予展示 -->
-                <el-col :span="24" v-if="status!=='newLoans'">
+                <!-- 还款信息在 新建业务 + 编辑业务 的时候不予展示 -->
+                <!-- TODO 编辑业务后出现消失的情况 -->
+                <el-col :span="24" v-if="status!=='newLoans'&&status!='oldLoansEdit'">
                     <el-card shadow="hover" class="mgb20 mat20">
                         <div>
                             <div class="mgb20 left-border fz-16"><p class="c-black mgl10">还款信息</p></div>
                             <div>
-                                <el-form :model="repaymentForm" :rules="rules" ref="repaymentForm" label-width="160px" :disabled="this.loanbackStatus == '查看'"> 
+                                <el-form :model="repaymentForm" :rules="rules" ref="repaymentForm" label-width="160px" :disabled="loanbackStatus == '查看'"> 
                                     <el-col :span="12" >
                                         <el-form-item label="应还款日" prop="repaymentDate" class="date" >
                                             <el-date-picker v-model="repaymentForm.repaymentDate" placeholder="请选择应还款日" 
@@ -280,7 +286,7 @@
                                         </el-form-item>
 
                                         <el-form-item label="本次还款(元)" prop="currentRepayment" >
-                                            <el-input v-model="repaymentForm.currentRepayment" placeholder="请输入本次还款金额" type="text"  maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
+                                            <el-input v-model="repaymentForm.currentRepayment" placeholder="请输入本次还款的本金金额" type="text"  maxlength="10" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"></el-input>
                                         </el-form-item>
 
                                         <el-form-item label="其他费用(元)">
@@ -324,13 +330,13 @@
                                             <div class="df" style="margin-top:23px">
                                                 <span style="margin-right:20px">（2）资产</span>
                                                 <el-input style="width:40%;min-width:250px;" v-model="repaymentForm.repaymentAssetsName" placeholder="请输入资产名称"></el-input>
-                                                <el-input style="width:20%;min-width:250px;margin-left:20px" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="repaymentForm.repaymentAssetsAmount" placeholder="请输入金额"></el-input>
+                                                <el-input style="width:20%;min-width:250px;margin-left:20px" :disabled="!repaymentForm.repaymentAssetsName" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="repaymentForm.repaymentAssetsAmount" placeholder="请输入金额"></el-input>
                                                 <span style="margin-left:15px">元</span>
                                             </div>
                                             <div class="df" style="margin-top:23px">
                                                 <span style="margin-right:20px">（3）其他</span>
                                                 <el-input style="width:40%;min-width:250px;" v-model="repaymentForm.repaymentOtherName" placeholder="请输入其他方式"></el-input>
-                                                <el-input style="width:20%;min-width:250px;margin-left:20px" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="repaymentForm.repaymentOtherAmount" placeholder="请输入金额"></el-input>
+                                                <el-input style="width:20%;min-width:250px;margin-left:20px" :disabled="!repaymentForm.repaymentOtherName" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="repaymentForm.repaymentOtherAmount" placeholder="请输入金额"></el-input>
                                                 <span style="margin-left:15px">元</span>
                                             </div>
                                         </el-form-item>  
@@ -345,7 +351,7 @@
                     </el-card>
                 </el-col>
             </el-row>
-            <div class="mab20 flex-start-around" v-if="this.loanbackStatus != '查看'">
+            <div class="mab20 flex-start-around" v-if="loanbackStatus!='查看'">
                 <el-button v-preventReClick type="primary" round class="mag" @click="saveAdd('repaymentForm')">提交</el-button>
                 <el-button type="primary" plain round class="mag" @click="cancel">取消</el-button>
             </div>
@@ -357,10 +363,10 @@
                 <el-col :span="24">
                     <el-card shadow="hover" class="mgb20 mat20">
                         <div>
-                            <div class="mgb20 left-border fz-16"><p class="c-black mgl10">还款信息</p></div>
+                            <div style="height:35px" class="mgb20 left-border fz-16 flex-align-center"><p class="c-black mgl10">还款信息&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="font-size:14px">企业名称：{{StatisticsData.company}}</span></p></div>
                             <div>
-                                <el-form label-width="100px" class="flex-start-around">
-                                    <el-col :span="8">
+                                <el-form label-width="120px" class="flex-start-around">
+                                    <el-col :span="6">
                                         <el-form-item label="已还款期数:">
                                             <span>{{StatisticsData.repaymentSum}}</span>
                                         </el-form-item>
@@ -370,7 +376,7 @@
                                         </el-form-item>
                                     </el-col>
 
-                                    <el-col :span="8">
+                                    <el-col :span="6">
                                         <el-form-item label="逾期期数:">
                                             <span>{{StatisticsData.overdueSum}}</span>
                                         </el-form-item>
@@ -380,8 +386,8 @@
                                         </el-form-item>
                                     </el-col>
 
-                                    <el-col :span="8">
-                                        <el-form-item label="逾期利息(元):">
+                                    <el-col :span="6">
+                                        <el-form-item label="已缴逾期利息(元):">
                                             <span>{{StatisticsData.overdueInterest}}</span>
                                         </el-form-item>
 
@@ -389,6 +395,15 @@
                                             <span>{{StatisticsData.remainSum}}</span>
                                         </el-form-item>                               
                                     </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="代偿金额(元):">
+                                            <span>{{StatisticsData.compensationAmount}}</span>
+                                        </el-form-item>
+
+                                        <el-form-item label="代偿余额(元):">
+                                            <span>{{StatisticsData.compensatoryBalance}}</span>
+                                        </el-form-item>                               
+                                    </el-col>
                                 </el-form>
                             </div>
                         </div>
@@ -506,12 +521,17 @@
                 <cancel_btn @click.native="principal=false"></cancel_btn>
             </div>
         </el-dialog>
+
         <!-- 清收组 -->
         <el-dialog title="清收组" width="40%" :visible.sync="organization">
             <div class="organization">
+                <div  class="organization-row">
+                    <div class="left">序号</div>
+                    <div class="center" style="border:0">名称</div>
+                    <div class="handle">操作</div>
+                </div>
                 <div v-for="(item, index) in organizationArrs" :key="index" class="organization-row">
                     <div class="left">{{index+1}}</div>
-                    <!--  @blur="blurOrganization($event,item)" -->
                     <input v-focus class="center" style="border:0" @blur="item.groupName=$event.target.value" v-if="!item.edit" :value="item.groupName"></el-input>
                     <input class="center" disabled style="border:0" v-if="item.edit" :value="item.groupName"></el-input>
                     <div class="handle df">
@@ -520,238 +540,274 @@
                         <el-button type="text" @click="delOrganization(item,index)">删除</el-button>
                     </div>
                 </div>
+                <el-button class="addBtn" type="primary" icon="el-icon-plus" circle @click="addOrganizationArrs"></el-button>
+            </div>
+            <div class="fj-center wd100 ">
+                <el-button round type="" @click="organization=false">返回</el-button>
             </div>
-            <el-button class="addBtn" type="primary" icon="el-icon-plus" circle @click="addOrganizationArrs"></el-button>
         </el-dialog>
-
     </div>
 </template>
 
 <script>
 import { mapState } from 'vuex';
 import { allBankName, insuranceList, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, excelHis, delRepayment, repaymentDetail, excelInsurance, updateInsurance, updateRepayment, designateEmpTrees, getAllClient ,saveInsurance,companyInfoBySth,liquidateList,liquidateEdit,liquidateDel,deleteInsurance, editInsurance, compensationSituation,importInsurance , exportFailure} from '../../../utils/api';
-import core from '../../../utils/core';
-    export default {
-        data() {
-            return {     
-                importInsurance:importInsurance,
-                uploadList:[],       
-                importHeaders: { token: sessionStorage.getItem('token') },
-                guaranteeLoading:false,
-                keyword: '',
-                paymentStatus: '',
-                pageNo: 1,
-                pageNumber: 10,
-                totals: 1,
-                insuranceData: [],
-                insMultipleSelection: [],
-                loanStatus: 1,// 切换页面展示 
-                id: '',
-                
-                repaymentForm: {
-                    currentRepayment: '',
-                    interest: '',
-                    otherExpenses: '',
-                    overdueDays: 0
-                },
-                upLoadPop:false,// 导入弹框
-                dataLoading:false,// data加载
-                rules: {
-                    repaymentDate: [
-                        { required: true, message: '请选择应还款日', trigger: 'blur' }
-                    ],
-                    currentRepayment: [
-                        { required: true, message: '请输入本次还款金额', trigger: 'blur' },
-                        { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
-                    ],
-                    interest: [
-                        { required: true, message: '请输入利息', trigger: 'blur' },
-                        { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
-                    ]
-                },
-                logTypeList: [{
-                    label: '还款中',
-                    id: 1
-                },
-                {
-                    label: '已逾期',
-                    id: 2
-                },
-                {
-                    label: '已还清',
-                    id: 3
-                },
-                {
-                    label: '已结项',
-                    id: 4
-                }],
-                //还款记录数据
-                hisidId: '',
-                guaranteeAmount: '',
-                hisPage: 1,
-                histotals: 1,
-                repaymentData: [],
-                StatisticsData: {},
-                TypeList: [{
-                    label: '待还款',
-                    id: 1
-                },
-                {
-                    label: '已还款',
-                    id: 2
-                },
-                {
-                    label: '已逾期',
-                    id: 3
-                },
-                {
-                    label: '未到期',
-                    id: 4
-                }],
-                hisSearchForm: {
-                    actualRepaymentDate: '',  
-                    hisType: ''
-                },
-                hisMultipleSelection: [],
-                repaymentDetailForm: {},
-                RepaymentId: '',
-                loanbackStatus: '',
-                endTimeOptions: {},
-                hispaymentStatus: '',
-                mainbank:'',
-                elsebank:'',
-                fileList:[],
-                starEndDate:[],
-                principal:false,// 组织架构弹框
-                clearNodeArr:false,//清空选择
-                treesData:[],// 组织架构树结构数据
-                threeLoading:false,// 加载中--组织架构
-                value:'',
-                value1:'',
-
-                area:[// 区域
-                    {name:'萨尔图区',id:0},
-                    {name:'高新区',id:1},
-                    {name:'龙凤区',id:2},
-                    {name:'让胡同路区',id:3},
-                    {name:'大同区',id:4},
-                    {name:'肇县区',id:5},
-                ],
-                circumstance:[// 经营情况
-                    {name:'停产',value:'停产'},
-                    {name:'已破产',value:'已破产'},
-                    {name:'经营中',value:'经营中'},
-                    {name:'未正常经营',value:'未正常经营'},
-                ],
-                searchClientOptions:[],
-                serachMessageLoading:false,
-                // 贷款用途
-                loansUse:[
-                    { value: '短期周转', label: '短期周转' },
-                    { value: '购房贷款', label: '购房贷款' },
-                    { value: '装修贷款', label: '装修贷款' },
-                    { value: '购车贷款', label: '购车贷款' },
-                    { value: '教育贷款', label: '教育贷款' },
-                    { value: '投资创业', label: '投资创业' },
-                    { value: '其他', label: '其他' },
+import core from '../../../utils/core';// fMoney3
+// 使用轻量级的、仅限数字的函数实现
+// import { create, all } from 'mathjs/number'
+// const math = create(all)
+let math = require('mathjs');
+export default {
+    data() {
+        return {
+            importInsurance:importInsurance,
+            uploadList:[],       
+            importHeaders: { token: sessionStorage.getItem('token') },
+            guaranteeLoading:false,
+            keyword: '',
+            paymentStatus: '',
+            pageNo: 1,
+            pageNumber: 10,
+            totals: 1,
+            insuranceData: [],
+            insMultipleSelection: [],
+            loanStatus: 1,// 切换页面展示 
+            id: '',
+            
+            repaymentForm: {
+                currentRepayment:0,
+                interest: 0,
+                otherExpenses:0,
+                overdueDays: 0
+            },
+            upLoadPop:false,// 导入弹框
+            dataLoading:false,// data加载
+            rules: {
+                repaymentDate: [
+                    { required: true, message: '请选择应还款日', trigger: 'blur' }
                 ],
-                guaranteeForm: {// 担保信息  
-
-                },
-                guaranteeRule:{
-                    bank: [{ required: true, message: '请选择贷款银行', trigger: 'change' }],
-                    loanStartTime:[{ required: true, message: '请选择贷款起止日期', trigger: 'change' }],
-                    businessType:[{ required: true, message: '请选择业务类别', trigger: 'change' }],
-                    customerName:[{ required: true, message: '请输入系统已有客户名称', trigger: 'change' }],
-                    guaranteeAmount: [{ required: true, message: '请输入担保额度/贷款金额', trigger: 'blur' },],
-                    guaranteeTime: [{ required: true, message: '请输入期限', trigger: 'blur' },],
-                    amountWide:[{ required: true, message: '请选择贷款用途', trigger: 'change' }],
-
-
-                    // businessType: [{ required: true, message: '请选择业务类别', trigger: 'change' }],
-                    // applyAmount: [
-                    //     { required: true,  message: '请输入金额',trigger: 'blur' },
-                    //     { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
-                    // ],
-                    // applyTime: [{ required: true, message: '请选择申请期限', trigger: 'change' }],
-                    // amountWide: [{ required: true, message: '请选择贷款用途', trigger: 'change' }],
-                    // enGuaranteeMeasures: [{ required: true, message: '请选择反担保措施', trigger: 'change' }],
-                    // isExistRelated: [{ required: true, message: '请选择关联人', trigger: 'change' }],
-                },
-                comp:{//代偿情况
-
-                },
-                compRule:{
-
-                }
-                ,
-                liquidate:{// 还款信息
-                    operation:'',
-                },
-                liquidateRule:{
-                    personLiable: [{ required: true, message: '请选择清收负责人', trigger: 'change' }],
-                    collectionGroupId: [{ required: true, message: '请选择所属清收组', trigger: 'change' }],
-                    area: [{ required: true, message: '请选择所在区域', trigger: 'change' }],
-                },
-                // status:'',// 判断是否新建
-                organization:false,// 自定义组织弹框
-                organizationArrs:[// 组织弹框内部的循环数组
-                    {name:'清收组织1',edit:true},
-                    {name:'清收组织2',edit:true}
+                currentRepayment: [
+                    { required: true, message: '请输入本次还款金额', trigger: 'blur' },
+                    { pattern: /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[0-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
                 ],
-                textarea:'',
-                guaranteeEditStatus:false,// 是否进入编辑业务
-                cash:0,// 当前金额
-                btns:{},
-                ids:[],
-            };
-        },
-        computed:{
-            computedCompensatoryBalance(){
-                this.comp.compensatoryBalance = this.comp.compensationAmount||0 - this.cash
-                return this.comp.compensationAmount||0 - this.cash
+                interest: [
+                    { required: true, message: '请输入利息', trigger: 'blur' },
+                    { pattern: /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[0-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
+                ]
             },
-            
-            bankSelect:function(){
-                return this.$store.state.guarantee.bankData
+            logTypeList: [{
+                label: '还款中',
+                id: 1
             },
-            status(){
-                return this.$store.state.loan.newOrOld
+            {
+                label: '已逾期',
+                id: 2
             },
-            discernEdit(){
-                return this.$store.state.loan.discernEdit
+            {
+                label: '已还清',
+                id: 3
             },
-            entering(){
-                return this.$store.state.loan.entering
+            {
+                label: '已结项',
+                id: 4
+            }],
+            //还款记录数据
+            hisidId: '',
+            guaranteeAmount: '',
+            hisPage: 1,
+            histotals: 1,
+            repaymentData: [],
+            StatisticsData: {},
+            TypeList: [{
+                label: '待还款',
+                id: 1
             },
-            wanderEdit(){
-                return this.$store.state.loan.wanderEdit
+            {
+                label: '已还款',
+                id: 2
             },
-            disabledAll(){
-                return this.$store.state.loan.disabledAll
+            {
+                label: '已逾期',
+                id: 3
             },
-            totalRepayment(){
-                if(isNaN(parseFloat(this.repaymentForm.otherExpenses)) || this.repaymentForm.otherExpenses == ''){
-                    // 本次利息加本次还款，如果为NaN
-                    if (isNaN(parseFloat(this.repaymentForm.currentRepayment) + parseFloat(this.repaymentForm.interest))) {
-                        return ''
-                    } else {
-                        return (parseFloat(this.repaymentForm.currentRepayment)*100 + parseFloat(this.repaymentForm.interest)*100)/100
-                    }
+            {
+                label: '未到期',
+                id: 4
+            }],
+            hisSearchForm: {
+                actualRepaymentDate: '',  
+                hisType: ''
+            },
+            hisMultipleSelection: [],
+            repaymentDetailForm: {},
+            RepaymentId: '',
+            loanbackStatus: '',
+            endTimeOptions: {},
+            hispaymentStatus: '',
+            mainbank:'',
+            elsebank:'',
+            fileList:[],
+            starEndDate:[],
+            principal:false,// 组织架构弹框
+            clearNodeArr:false,//清空选择
+            treesData:[],// 组织架构树结构数据
+            threeLoading:false,// 加载中--组织架构
+            value:'',
+            value1:'',
+
+            area:[// 区域
+                {name:'萨尔图区',id:0},
+                {name:'高新区',id:1},
+                {name:'龙凤区',id:2},
+                {name:'让胡同路区',id:3},
+                {name:'大同区',id:4},
+                {name:'肇县区',id:5},
+            ],
+            circumstance:[// 经营情况
+                {name:'停产',value:'停产'},
+                {name:'已破产',value:'已破产'},
+                {name:'经营中',value:'经营中'},
+                {name:'未正常经营',value:'未正常经营'},
+            ],
+            searchClientOptions:[],
+            serachMessageLoading:false,
+            // 贷款用途
+            loansUse:[
+                { value: '短期周转', label: '短期周转' },
+                { value: '购房贷款', label: '购房贷款' },
+                { value: '装修贷款', label: '装修贷款' },
+                { value: '购车贷款', label: '购车贷款' },
+                { value: '教育贷款', label: '教育贷款' },
+                { value: '投资创业', label: '投资创业' },
+                { value: '其他', label: '其他' },
+            ],
+            guaranteeForm: {// 担保信息  
+
+            },
+            // 选择期限
+            timeLimit:[
+                { value: '1个月', label: '1个月' },
+                { value: '3个月', label: '3个月' },
+                { value: '6个月', label: '6个月' },
+                { value: '9个月', label: '9个月' },
+                { value: '12个月', label: '12个月' },
+                { value: '24个月', label: '24个月' },
+            ],
+            guaranteeRule:{
+                bank: [{ required: true, message: '请选择贷款银行', trigger: 'change' }],
+                loanStartTime:[{ required: true, message: '请选择贷款起止日期', trigger: 'change' }],
+                businessType:[{ required: true, message: '请选择业务类别', trigger: 'change' }],
+                customerName:[{ required: true, message: '请输入系统已有客户名称', trigger: 'change' }],
+                guaranteeAmount: [{ required: true, message: '请输入担保额度/贷款金额', trigger: 'blur' },],
+                guaranteeTime: [{ required: true, message: '请输入期限', trigger: 'change' },],
+                amountWide:[{ required: true, message: '请选择贷款用途', trigger: 'change' }],
+
+
+                // businessType: [{ required: true, message: '请选择业务类别', trigger: 'change' }],
+                // applyAmount: [
+                //     { required: true,  message: '请输入金额',trigger: 'blur' },
+                //     { pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/, message: '请输入正确金额格式,可保留两位小数' }
+                // ],
+                // applyTime: [{ required: true, message: '请选择申请期限', trigger: 'change' }],
+                // amountWide: [{ required: true, message: '请选择贷款用途', trigger: 'change' }],
+                // enGuaranteeMeasures: [{ required: true, message: '请选择反担保措施', trigger: 'change' }],
+                // isExistRelated: [{ required: true, message: '请选择关联人', trigger: 'change' }],
+            },
+            comp:{//代偿情况
+
+            },
+            compRule:{
+
+            }
+            ,
+            liquidate:{// 还款信息
+                operation:'',
+            },
+            liquidateRule:{
+                personLiable: [{ required: true, message: '请选择清收负责人', trigger: 'change' }],
+                collectionGroupId: [{ required: true, message: '请选择所属清收组', trigger: 'change' }],
+                area: [{ required: true, message: '请选择所在区域', trigger: 'change' }],
+            },
+            // status:'',// 判断是否新建
+            organization:false,// 自定义组织弹框
+            organizationArrs:[// 组织弹框内部的循环数组
+                {name:'清收组织1',edit:true},
+                {name:'清收组织2',edit:true}
+            ],
+            textarea:'',
+            guaranteeEditStatus:false,// 是否进入编辑业务
+            cash:0,// 当前金额
+            btns:{},
+            ids:[],
+            interest:'',// 代偿后的利息
+        };
+    },
+    computed:{
+        computedCompensatoryBalance:function(){// 代偿余额计算
+            /* TODO 未完成状态判断 */
+            // if(this.status){} // 如果是处于录入状态才减去count
+            console.log(this.repaymentForm,'this.repaymentForm')
+            if(!this.repaymentForm.currentRepayment)this.repaymentForm.currentRepayment = 0
+            if(!this.repaymentForm.otherExpenses)this.repaymentForm.otherExpenses = 0
+            if(!this.repaymentForm.interest)this.repaymentForm.interest = 0
+            let a = this.repaymentForm.currentRepayment , b = this.repaymentForm.otherExpenses , c = this.repaymentForm.interest
+            
+            let count = math.format(math.chain(math.bignumber(a)).add(math.bignumber(b)).add(math.bignumber(c)).done())
+            console.log(count,'当前的计算')
+            // 余额 = 代偿总额 - 代偿日后还款总额
+            this.comp.compensatoryBalance = (this.comp.compensationAmount - this.cash - count)||0
+            // 当前代偿余额 = 额外减去 本次还款，利息，其他费用 
+
+            return (this.comp.compensationAmount?this.comp.compensationAmount - this.cash - count:0)||0
+        },
+        source(){// 在点击录入时，判断系统流转的是否进行过编辑
+            return this.$store.state.loan.source
+        },
+        bankSelect:function(){
+            return this.$store.state.guarantee.bankData
+        },
+        status(){
+            return this.$store.state.loan.newOrOld
+        },
+        discernEdit(){
+            return this.$store.state.loan.discernEdit
+        },
+        entering(){
+            return this.$store.state.loan.entering
+        },
+        wanderEdit(){
+            return this.$store.state.loan.wanderEdit
+        },
+        disabledAll(){
+            return this.$store.state.loan.disabledAll
+        },
+        totalRepayment(){// 本次还款总额
+            // 本次还款 + 利息 + 其他费用 - 还款总额
+            // 本次还款 currentRepayment  利息 interest 其他费用 otherExpenses 减免金额 deductionAmount
+            let data = this.repaymentForm
+            return ((data.currentRepayment||0)*100 + (data.interest||0)*100 + (data.otherExpenses||0)*100 - (data.deductionAmount||0)*100)/100
+        },
+        overdueDays(){
+            if(this.repaymentForm.repaymentDate && !this.repaymentForm.actualRepaymentDate){
+                //date1结束时间
+                let date1 = new Date(this.repaymentForm.repaymentDate);
+                //date2当前时间
+                let date2 = new Date();
+                if(date1.getTime() < date2.getTime()){
+                    date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+                    date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+                    const diff = date2.getTime() - date1.getTime(); //目标时间减去当前时间
+                    const diffDate = diff / (24 * 60 * 60 * 1000);  //计算当前时间与结束时间之间相差天数
+                    return diffDate
                 }else{
-                    if (isNaN(parseFloat(this.repaymentForm.currentRepayment) + parseFloat(this.repaymentForm.interest) + parseFloat(this.repaymentForm.otherExpenses))) {
-                        return ''
-                    } else {
-                        return (parseFloat(this.repaymentForm.currentRepayment)*100 + parseFloat(this.repaymentForm.interest)*100 + parseFloat(this.repaymentForm.otherExpenses)*100)/100
-                    }
+                    return 0
                 }
-            },
-            overdueDays(){
-                if(this.repaymentForm.repaymentDate && !this.repaymentForm.actualRepaymentDate){
+            }else{
+                if(this.repaymentForm.repaymentDate && this.repaymentForm.actualRepaymentDate){
                     //date1结束时间
                     let date1 = new Date(this.repaymentForm.repaymentDate);
                     //date2当前时间
-                    let date2 = new Date();
+                    let date2 = new Date(this.repaymentForm.actualRepaymentDate);
                     if(date1.getTime() < date2.getTime()){
                         date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
                         date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
@@ -762,91 +818,39 @@ import core from '../../../utils/core';
                         return 0
                     }
                 }else{
-                    if(this.repaymentForm.repaymentDate && this.repaymentForm.actualRepaymentDate){
-                        //date1结束时间
-                        let date1 = new Date(this.repaymentForm.repaymentDate);
-                        //date2当前时间
-                        let date2 = new Date(this.repaymentForm.actualRepaymentDate);
-                        if(date1.getTime() < date2.getTime()){
-                            date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
-                            date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
-                            const diff = date2.getTime() - date1.getTime(); //目标时间减去当前时间
-                            const diffDate = diff / (24 * 60 * 60 * 1000);  //计算当前时间与结束时间之间相差天数
-                            return diffDate
-                        }else{
-                            return 0
-                        }
-                    }else{
-                        return 0
-                    }
-                }
-            }
-        },
-        watch: {
-            "$store.state.loan.loanStatus":function(val){
-                this.loanStatus = val
-                if(val == 1){
-                    this.insuranceData = []
-                    this.guaranteeForm = {}
-                    this.comp = {}
-                    this.liquidate ={}
-                    this.$store.commit('discernEdit',false)
-                    this.$forceUpdate();
-                    this.getData()
-                }
-                if(val == 2){
-                    this.id = this.$store.state.loan.id
-                    this.RepaymentId = this.$store.state.loan.RepaymentId
-                    this.loanbackStatus = this.$store.state.loan.loanbackStatus
-                    this.guaranteeForm = {}
-                    this.repaymentForm = {
-                        currentRepayment: '',
-                        interest: '',
-                        otherExpenses: '',
-                        overdueDays: 0
-                    }
-                    // 处于编辑状态，额外添加一个编辑中的状态判断
-                    if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
-                    if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
-                        this.getRepaymentDetail()
-                    }
+                    return 0
                 }
-                if(val == 3){
-                    this.hisidId = this.$store.state.loan.hisidId
-                    this.guaranteeAmount = this.$store.state.loan.guaranteeAmount
-                    this.statistics()
-                    this.repaymentList()
-                }
-                 this.$store.commit("loanStatusData", { loanStatus: this.loanStatus });
-            },
-            principal:function(val){// 处理组织架构选人是否清空
-                this.designateEmpTrees()
-                this.clearNodeArr = true
-                this.$nextTick(()=>{
-                    this.clearNodeArr = false
-                })
-            },
-            status:function (params) {
-                
             }
         },
-        created(){
-            this.liquidateList()
-            if(this.bankSelect.length===0){
-                allBankName().then(res=>{
-                    let arr = res.data.map(item=>{
-                        return {value:item.bankName}
-                    });
-                    this.$store.commit('getBanks',arr)
-                })
+        // 计算本次还款的清偿方式总额
+        reimbursement(){
+            return this.repaymentForm.repaymentCash||0+this.repaymentForm.repaymentAssetsAmount||0+this.repaymentForm.repaymentOtherAmount||0
+        }
+    },
+    watch: {
+        "$store.state.loan.loanStatus":function(val){
+            if(val!=2){
+                this.comp.compensatoryBalance = 0
+                this.cash = 0
             }
-
-            this.loanStatus = this.$store.state.loan.loanStatus
-            if(this.loanStatus == 1){
+            this.loanStatus = val
+            if(val == 1){
+                this.insuranceData = []
+                this.guaranteeForm = {}
+                this.comp = {}
+                this.liquidate ={}
+                this.$store.commit('discernEdit',false)
+                this.$forceUpdate();
                 this.getData()
+                this.loanbackStatus = ''
             }
-            if(this.loanStatus == 2){
-                this.id = this.$store.state.loan.id
+            if(val == 2){
+                console.log(this.souce,'判断是否系统流转--0')
+                if(this.source === 0&&this.status==="oldLoans"){// 判断系统流转是否进行过编辑
+
+                }
+                console.log(this.RepaymentId,this.id,'RepaymentId，进入2页面')
+                this.id = this.$store.state.loan.id || this.$store.state.loan.RepaymentId
                 this.RepaymentId = this.$store.state.loan.RepaymentId
                 this.loanbackStatus = this.$store.state.loan.loanbackStatus
                 this.guaranteeForm = {}
@@ -856,564 +860,713 @@ import core from '../../../utils/core';
                     otherExpenses: '',
                     overdueDays: 0
                 }
-                // 处于编辑状态
+                // 处于编辑状态，额外添加一个编辑中的状态判断
                 if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
                 if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
+                    console.log(this.loanbackStatus,'什么状态')
                     this.getRepaymentDetail()
                 }
             }
-
-            if(this.loanStatus == 3){
+            if(val == 3){
                 this.hisidId = this.$store.state.loan.hisidId
                 this.guaranteeAmount = this.$store.state.loan.guaranteeAmount
                 this.statistics()
                 this.repaymentList()
             }
+                this.$store.commit("loanStatusData", { loanStatus: this.loanStatus });
+            
         },
-        methods:{
-            // 查询担保列表
-            async getData() {
-                this.dataLoading = true
-                try {
-                    let res = await insuranceList({
-                        page: this.pageNo,
-                        size: this.pageNumber,
-                        CustomerNumberOrName: this.keyword,
-                        paymentStatus: this.paymentStatus
-                    });
-                    res.data.list.map(e =>{
-                        e.paymentStatus = this.core.paymentStatus(e.paymentStatus)
-                        e.sourceStr = e.source==0?'系统流转':'手动录入'
-                    })
-                    this.insuranceData = res.data.list;
-
-                    this.totals = res.data.totalCount;
-                    this.dataLoading = false
-                } catch (error) {
-                    this.dataLoading = false
-                }
-                
-
-            },
-            search() {
-                this.pageNo = 1;
-                this.getData();
-            },
-            currentChange(val) {
-                this.pageNo = val;
-                this.getData();
-            },
-            getSize(val){
-                this.pageNo = 1
-                this.pageNumber = val
-                this.getData()
-            },
-            insSelectionChange(val){
-                this.insMultipleSelection = val;
-            },
-            // 导出还款列表
-            insExport(){
-                // if(this.insMultipleSelection.length != ''){
-                    let exportIds = this.insMultipleSelection.map(e => e.id).join()
-                    let url = `${excelInsurance}?ids=${exportIds}`
-                    window.location.href = url
-                // }else{
-                //     this.$message.error('请先选择担保列表数据 ！');
-                // }
-            }, 
-
-            //还款录入/新建业务
-            edit(row,val){
-                this.$store.commit('disabledAll',false)// 取消禁用全部，
-                if(!row){// 进入新建业务界面
-                    this.loanStatus = 2
-                    this.$store.commit("loanStatusData", { loanStatus: 2 });
-                    this.$store.commit('setNewOrOld','newLoans')
-                    this.$store.commit('entering',false)
-                    this.$store.commit('wanderEdit',true)
-
-                    if(val){// 编辑业务阶段
-                        this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
-                        // 编辑手动添加的业务
-                        this.$store.commit('entering',true)
-                        this.id = val.id
-                        this.$store.commit("idData", { id: val.id });// 存业务id用于刷新复现
-                        if(val.source==0){// 编辑流转的业务
-                            this.$store.commit('wanderEdit',false)
-                            // console.log(this.status,'status')
-                        }else{
-                            this.$store.commit('wanderEdit',true)
-                        }
-                    }
-                    val?this.$store.commit('discernEdit',true):this.$store.commit('discernEdit',false)
-                }else{// 进入还款录入,添加个额外判断进入编辑界面
-                    this.$store.commit('wanderEdit',true)
-                    this.$store.commit('entering',false) // 不可编辑-业务编辑区域
-                    this.$store.commit('discernEdit',true)// 区分是否可编辑业务
-                    this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
-                    this.loanStatus = 2
-                    this.$store.commit("loanStatusData", { loanStatus: 2 });// 切换页面状态
-                    this.id = row.id
-                    this.$store.commit("idData", { id: row.id });// 存业务id用于刷新复现
-
-                    this.RepaymentId = ''
-                    this.$store.commit("RepaymentIdData", { RepaymentId: '' });// 查还款记录详情用
-                    this.loanbackStatus = '录入'
-                    this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });// 判断按钮状态
-                }
-            },
-            //记录
-            history(row){
-                this.loanStatus = 3
-                this.$store.commit("loanStatusData", { loanStatus: 3 });
-                this.hisId = row.id
-                this.$store.commit("hisidIdData", { hisidId: row.id, guaranteeAmount: row.guaranteeAmount });
-                this.hispaymentStatus = row.paymentStatus
-                this.$store.commit("hispaymentStatusData", { hispaymentStatus: row.paymentStatus });
-            },
-            //办理结项
-            conclusion(row){
-                this.$confirm('此还款确定要办理结项吗？', '提示', {
-                    type: 'warning'
-                })
-                .then(() => {
-                    updateInsurance({id: row.id}).then(res=>{
-                        this.$message.success('结项成功');
-                        this.getData()
-                    }).catch(err=>{
-                    })
-                }).catch(() => {});
-            },
-
-            //录入部分*******
-
-            //查询业务详情
-            async getDetail(){
-                this.guaranteeLoading = true
-                try {
-                    let res = await insuranceDetail({
-                        id: this.id
-                    });
-                    this.guaranteeLoading = false
-                    this.guaranteeForm = res.data.insuranceList
-                    this.starEndDate = [this.guaranteeForm.loanStartTime||'',this.guaranteeForm.loanEndTime||""]
-                    // 处理银行字符串
-                    let across = this.guaranteeForm.bank.indexOf('-')
-                    if(across!==-1){
-                        this.mainbank = this.guaranteeForm.bank.substring(0,across)
-                        let len = this.guaranteeForm.bank.length
-                        this.elsebank = this.guaranteeForm.bank.substring(across+1,len)
-                    }else{
-                        this.mainbank = this.guaranteeForm.bank
-                    }
-                    this.$set(this.guaranteeForm,'amountWide',this.guaranteeForm.amountWide)
-
-                    let reimbursement = res.data.reimbursement||{} 
-                    // 代偿
-                    this.comp = {
-                        compensationAmount:reimbursement.compensationAmount,
-                        compensatoryTime:reimbursement.compensatoryTime,
-                        compensatoryBalance:reimbursement.compensatoryBalance,
-                    }
-                    // 清收
-                    this.liquidate = {
-                        personLiable:reimbursement.personLiable,
-                        collectionGroupId:reimbursement.collectionGroupId,
-                        area:+reimbursement.area,
-                        operation:reimbursement.operation,
-                        litigation:reimbursement.litigation,
-                        mortgage:reimbursement.mortgage,
-                    } 
-
-                } catch (error) {
-                    this.guaranteeLoading = false
-                }
-            },
-            //计算逾期天数
-            overdueChange(val){
-                if(val){
-                    //date1结束时间
-                    let date1 = new Date(val);
-                    //date2当前时间
-                    let date2 = new Date();
-                    if(date1.getTime() < date2.getTime()){
-                        date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
-                        date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
-                        const diff = date2.getTime() - date1.getTime(); //目标时间减去当前时间
-                        const diffDate = diff / (24 * 60 * 60 * 1000);  //计算当前时间与结束时间之间相差天数
-                        this.repaymentForm.overdueDays = diffDate
-                    }else{
-                        this.repaymentForm.overdueDays = 0
-                    }
-                }else{
-                    this.repaymentForm.overdueDays = 0
-                }
-            },
-            //录入提交
-            saveAdd(repaymentForm){
-                // 判断是否新增业务
-                if(this.status==='newLoans'){
-                    this.saveInsurance()
-                }else{// 处于编辑/新增录入，需要判断该业务是否新增的，或是流转的，有不同处理方式
-                    let form2 = new Promise((resolve,reject)=>{
-                        this.$refs[repaymentForm].validate((valid) => {
-                            if (valid) {
-                                resolve()
-                            }else{
-                                this.$message.error('请输入必填信息！')
-                            }
-                        })
-                    })
-                    Promise.all([this.saveInsurance(),form2]).then(()=>{
-                        if(this.RepaymentId == ''){
-                            this.repaymentForm.insuranceId = this.id
-                            this.repaymentForm.totalRepayment = this.totalRepayment
-                            this.repaymentForm.overdueDays = this.overdueDays
-                            repaymentEntry(this.repaymentForm).then(res=>{
-                                this.$message.success("录入成功！");
-                                this.loanStatus = 1
-                                this.$store.commit("loanStatusData", { loanStatus: 1 });
-                            }).catch(err=>{
-                            })
-                        }else{
-                            this.repaymentForm.totalRepayment = this.totalRepayment
-                            this.repaymentForm.overdueDays = this.overdueDays
-                            updateRepayment(this.repaymentForm).then(res=>{
-                                this.$message.success("编辑成功！");
-                                this.loanStatus = 3
-                                this.$store.commit("loanStatusData", { loanStatus: 3 });
-                            }).catch(err=>{
-                            })
-                        }
-                    }).catch(err=>{
-                        this.$message.error('请输入必填信息！')
-                    })
-
-
-                }
-            },
-            //取消录入
-            cancel(){
-                this.loanStatus = 1
-                this.$store.commit("loanStatusData", { loanStatus: 1 });
-            },
-            //选择实际还款日日期
-            clickEndTime(){
-                this.endTimeOptions.disabledDate = time => {
-                    if (new Date()) {
-                        if (time.getTime() > new Date().getTime()) {
-                            return true
-                        }
-                    } else {
-                        if (time.getTime() < Date.now() - 8.64e7) {
-                            return true
-                        }
-                    }
-                }
-            },
-            //还款记录部分*******
-            // 记录详情统计
-            async statistics(){
-                let res = await repaymentStatistics({
-                    insuranceId: this.hisidId,
-                    // guaranteeAmount: this.guaranteeAmount
+        principal:function(val){// 处理组织架构选人是否清空
+            this.designateEmpTrees()
+            this.clearNodeArr = true
+            this.$nextTick(()=>{
+                this.clearNodeArr = false
+            })
+        },
+        // status:function (params) {
+            
+        // },
+        loanStatus(val){
+            if(val==1){
+                this.starEndDate = []
+                this.guaranteeForm = {}
+                this.mainbank = ''
+            }
+        }
+    },
+    created(){
+        console.log(math.format(math.chain(math.bignumber(0.1)).add(math.bignumber(0.2)).done()),'计算数据')
+        console.log(this.loanbackStatus,'this.loanbackStatus')
+        this.liquidateList()
+        if(this.bankSelect.length===0){// 请求银行数据
+            allBankName().then(res=>{
+                let arr = res.data.map(item=>{
+                    return {value:item.bankName}
                 });
-                this.StatisticsData = res.data
-            },
-            // 还款记录列表
-            async repaymentList(){
-                let res = await repaymentList({
-                    page: this.hisPage,
+                this.$store.commit('getBanks',arr)
+            })
+        }
+        // 判断当前处于哪个页面
+        this.loanStatus = this.$store.state.loan.loanStatus
+        if(this.loanStatus == 1){
+            this.getData()
+        }
+        // 处于录入或新增时
+        if(this.loanStatus == 2){
+            this.id = this.$store.state.loan.id
+            this.RepaymentId = this.$store.state.loan.RepaymentId
+            this.loanbackStatus = this.$store.state.loan.loanbackStatus
+            this.guaranteeForm = {}
+            this.repaymentForm = {
+                currentRepayment: '',
+                interest: '',
+                otherExpenses: '',
+                overdueDays: 0
+            }
+            // 处于编辑状态
+            console.log(this.status,'处于什么状态')
+            if(this.status!=='newLoans'||this.discernEdit) this.getDetail()
+            if(this.loanbackStatus == '查看' || this.loanbackStatus == '编辑'){
+                this.getRepaymentDetail()
+            }
+        }
+
+        if(this.loanStatus == 3){
+            this.hisidId = this.$store.state.loan.hisidId
+            this.guaranteeAmount = this.$store.state.loan.guaranteeAmount
+            this.statistics()
+            this.repaymentList()
+        }
+    },
+    methods:{
+        init(val){
+            this.$math.bignumber(val)
+        },
+        // 查询担保列表
+        async getData() {
+            this.dataLoading = true
+            try {
+                let res = await insuranceList({
+                    page: this.pageNo,
                     size: this.pageNumber,
-                    insuranceId: this.hisidId,
-                    CustomerNumberOrName: this.hisSearchForm.actualRepaymentDate,
-                    status: this.hisSearchForm.hisType
+                    CustomerNumberOrName: this.keyword,
+                    paymentStatus: this.paymentStatus
                 });
                 res.data.list.map(e =>{
-                    e.repaymentStatus = this.core.stcStatus(e.repaymentStatus)
+                    e.paymentStatus = this.core.paymentStatus(e.paymentStatus)
+                    e.sourceStr = e.source==0?'系统流转':'手动录入'
                 })
-                this.repaymentData = res.data.list
-                this.histotals = res.data.totalCount
-            },
-            // 还款记录列表搜索
-            statisticsSearch(){
-                this.hisPage = 1;
-                this.repaymentList()
-            },
-            hiscurrentChange(val){
-                this.hisPage = val;
-                this.repaymentList()
-            },
-            getRowKeys(row) {
-                return row.id;
-            },
-            hisSelectionChange(val) {
-                this.hisMultipleSelection = val;
-            },
-            // 导出还款记录列表
-            hisExport(){
-                this.hisId
-                // if(this.hisMultipleSelection.length != ''){
-                    let exportIds = this.hisMultipleSelection.map(e => e.id).join()
-                    let url = `${excelHis}?ids=${exportIds}&insuranceId=`+this.hisId
-                    window.location.href = url
-                // }else{
-                //     this.$message.error('请先选择还款记录列表数据 ！');
-                // }
-            },
-            // 批量删除还款记录列表
-            delAllHis(){
-                if(this.hisMultipleSelection.length != ''){
-                    let delIds = this.hisMultipleSelection.map(e => e.id)
-                    this.$confirm('确定要删除选中数据吗？', '提示', {
-                        type: 'warning'
-                    })
-                    .then(() => {
-                        delRepayment(delIds).then(res=>{
-                            this.hisMultipleSelection = [];
-                            this.$message.success('删除成功');
-                            this.statisticsSearch()
-                        }).catch(err=>{
-                        })
-                    }).catch(() => {});
-                }else{
-                    this.$message.error('请先选择还款记录列表数据 ！');
-                }
-            },
-            //查询还款记录列表详情
-            addRepayment(){
-                this.loanStatus = 2
-                this.$store.commit("loanStatusData", { loanStatus: 2 });
-                this.RepaymentId = ''
-                this.$store.commit("RepaymentIdData", { RepaymentId: '' });
-                this.loanbackStatus = '新增'
-                this.$store.commit("loanbackStatusData", { loanbackStatus: '新增' });
-                this.$store.commit('setNewOrOld','newRecord')
-                this.$store.commit('disabledAll',false)
-            },
-            // 还款记录：查看/编辑
-            goRepaymentDetail(row,type){
+                this.insuranceData = res.data.list;
+
+                this.totals = res.data.totalCount;
+                this.dataLoading = false
+            } catch (error) {
+                this.dataLoading = false
+            }
+            
+
+        },
+        search() {
+            this.pageNo = 1;
+            this.getData();
+        },
+        currentChange(val) {
+            this.pageNo = val;
+            this.getData();
+        },
+        getSize(val){
+            this.pageNo = 1
+            this.pageNumber = val
+            this.getData()
+        },
+        insSelectionChange(val){
+            this.insMultipleSelection = val;
+        },
+        // 导出还款列表
+        insExport(){
+            // if(this.insMultipleSelection.length != ''){
+                let exportIds = this.insMultipleSelection.map(e => e.id).join()
+                let url = `${excelInsurance}?ids=${exportIds}`
+                window.location.href = url
+            // }else{
+            //     this.$message.error('请先选择担保列表数据 ！');
+            // }
+        }, 
+        /* TODO 如果处于流转且没有编辑过的情况下，加个提示 */
+        //还款录入/新建业务
+        edit(row,val){
+            this.$store.commit('disabledAll',false)// 取消禁用全部，
+            if(!row){// 没有row传值，进入新建业务界面--录入无关
+                console.log('进入新建业务')
                 this.loanStatus = 2
+                this.$store.commit("loanbackStatusData", { loanbackStatus: '' });// 判断按钮状态
                 this.$store.commit("loanStatusData", { loanStatus: 2 });
-                this.RepaymentId = row.id
-                this.$store.commit("RepaymentIdData", { RepaymentId: row.id });
-                this.id = row.insuranceId
-                this.$store.commit("idData", { id: row.insuranceId });
-                this.loanbackStatus = type
-                // 不可编辑
-                type==='编辑'?this.$store.commit('discernEdit',false):this.$store.commit('discernEdit',false)
-                if (type==='查看') {
-                    this.$store.commit('disabledAll',true)
-                }else{
-                    this.$store.commit('disabledAll',false)
-                }
-                
-                this.$store.commit("loanbackStatusData", { loanbackStatus: type });
-            },
-            async getRepaymentDetail(){
-                let res = await repaymentDetail({
-                    id: this.RepaymentId
-                });
-                // this.totalRepayment = res.data.totalRepayment
-                // this.overdueDays = res.data.overdueDays
-                this.repaymentForm = res.data
-            },
-
-            // 2021-8-10 新需求
-            bankgroup($event,val){//拼接银行
-                if(val==='else'){   
-                    if(this.mainbank){
-                        //  this.businessApply.bank = this.mainbank + '-' + this.elsebank
-                        this.$set(this.guaranteeForm,'bank',this.mainbank + '-' + this.elsebank)
+                this.$store.commit('setNewOrOld','newLoans')
+                this.$store.commit('entering',false)
+                this.$store.commit('wanderEdit',true)
+                if(val){// --编辑业务阶段
+                    this.$store.commit('setNewOrOld','oldLoansEdit')// 进入业务编辑
+                    // 编辑手动添加的业务
+                    this.$store.commit('entering',true)
+                    this.id = val.id
+                    this.$store.commit("idData", { id: val.id });// 存业务id用于刷新复现
+                    if(val.source==0){// 编辑流转的业务--区分流转手动录入
+                        this.$store.commit('wanderEdit',false)
+                    }else{
+                        this.$store.commit('wanderEdit',true)
                     }
-                }else{
-                    this.$set(this.guaranteeForm,'bank',this.mainbank)
                 }
-            },
-            createStateFilter(queryString) {
-                return (state) => {
-                    return (state.value.indexOf(queryString) === 0);
-                };
-            },
-            // 银行部分的搜索
-            async querySearchAsync(queryString, cb) {
-                // 需要进行银行数据的变更
-                // if(this.elsebank){
-                //     this.$set(this.businessApply,'bank',this.mainbank + '-' + this.elsebank)
-                // }else{
-                //     this.$set(this.businessApply,'bank',queryString)
-                // }
-
-                
+                val?this.$store.commit('discernEdit',true):this.$store.commit('discernEdit',false)
 
-                var results = queryString ? this.bankSelect.filter(this.createStateFilter(queryString)) : this.bankSelect;
-                cb(results);
-            },
-            // 导入文件--上传变更
-            handleChange(){
-
-            },
-            designateEmpTrees(){//调查的树结构接口
-                this.threeLoading = true
-                designateEmpTrees().then(res=>{
-                    this.treesData = res.data
-                    this.threeLoading = false
-                    // this.drawTrees = res.data
-                    // this.disposeData(this.drawTrees)
+                this.loanbackStatus = '录入' // 新增判断，用于后退
+                this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });
+            }else{
+                console.log('进入录入界面')
+                // 进入还款录入,添加个额外判断进入编辑界面
+                this.$store.commit('wanderEdit',true)
+                this.$store.commit('entering',false) // 不可编辑-业务编辑区域
+                this.$store.commit('discernEdit',true)// 区分是否可编辑业务
+                this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
+                this.loanStatus = 2
+                this.$store.commit("loanStatusData", { loanStatus: 2 });// 切换页面状态
+                this.id = row.id
+                this.$store.commit("idData", { id: row.id });// 存业务id用于刷新复现
+                this.$store.commit("source",this.row.source);// 存来源，用于判断是否编辑过系统流转的业务
+                this.RepaymentId = ''
+                this.$store.commit("RepaymentIdData", { RepaymentId: '' });// 查还款记录详情用
+                this.loanbackStatus = '录入'
+                this.$store.commit("loanbackStatusData", { loanbackStatus: '录入' });// 判断按钮状态
+            }               
+        },
+        //记录
+        history(row){
+            this.loanStatus = 3
+            this.$store.commit("loanStatusData", { loanStatus: 3 });
+            this.hisId = row.id
+            this.$store.commit("hisidIdData", { hisidId: row.id, guaranteeAmount: row.guaranteeAmount });
+            this.hispaymentStatus = row.paymentStatus
+            this.$store.commit("hispaymentStatusData", { hispaymentStatus: row.paymentStatus });
+        },
+        //办理结项
+        conclusion(row){
+            this.$confirm('此还款确定要办理结项吗？', '提示', {
+                type: 'warning'
+            })
+            .then(() => {
+                updateInsurance({id: row.id}).then(res=>{
+                    this.$message.success('结项成功');
+                    this.getData()
                 }).catch(err=>{
-                    this.threeLoading = false
                 })
-            },
-            principalNode(val){// 组织架构选择人员
-                this.$set(this.liquidate,'personLiable',val[0].name)
-                this.liquidate.personLiableId = val[0].id
+            }).catch(() => {});
+        },
 
-            },
-            principalSeleted(){// 选择清收负责人
-                this.principal = false
-            },
-            searchClientChange(val,state){// 实时搜索客户详细信息
-                companyInfoBySth({name:val}).then(res=>{
-                    let data = res.data
-                    this.$set(this.guaranteeForm,'phone',data.legalPhone)
-                    this.$set(this.guaranteeForm,'legalName',data.legalName)
-                }).catch(err=>{
-                    this.clientMessageFrom = []
-                })
-            },
-            async getClient(query,val){// 搜索客户匹配code、name信息
-                if (query !== '') {
-                    this.serachMessageLoading = true;
-                    // if(this.clientDataSave.length===0){
-                        let res = await getAllClient({type:1})
-                        this.clientDataSave = res.data
-                    // }
-                    this.serachMessageLoading = false;
-                    if(val==='name'){
-                        this.searchClientOptions = this.clientDataSave.filter(item => {
-                            if(item.name){
-                                return item.name.indexOf(query) > -1;
-                            }else{
-                                this.searchClientOptions = [];
-                            }
-                        });
-                    }else{
-                        this.searchClientOptions = this.clientDataSave.filter(item => {
-                        return item.code.indexOf(query) > -1;
-                        });
-                    }
-                } else {
-                    this.searchClientOptions = [];
+        //录入部分*******
+
+        //查询业务详情
+        async getDetail(){
+            this.guaranteeLoading = true
+            try {
+                let res = await insuranceDetail({
+                    id: this.id
+                });
+                this.guaranteeLoading = false
+                this.guaranteeForm = res.data.insuranceList
+                this.starEndDate = [this.guaranteeForm.loanStartTime||'',this.guaranteeForm.loanEndTime||""]
+                // 处理银行字符串
+                let across = this.guaranteeForm.bank.indexOf('-')
+                if(across!==-1){
+                    this.mainbank = this.guaranteeForm.bank.substring(0,across)
+                    let len = this.guaranteeForm.bank.length
+                    this.elsebank = this.guaranteeForm.bank.substring(across+1,len)
+                }else{
+                    this.mainbank = this.guaranteeForm.bank
                 }
-            },
-            addOrganizationArrs(){// 添加组织按钮
-                let obj = {groupName:'新增清收组'+(this.organizationArrs.length+1).toString(),edit:true}
-                this.liquidateEdit('new',obj)
-            },
-            editOrangization(item,index){// 清收组织编辑
-                this.organizationArrs.map(e=>{
-                    e.edit = true
-                })
-                item.edit = false
-                this.$set(this.organizationArrs,index,item)
-            },
-            delOrganization(item,index){// 清收组织删除
-                this.$confirm('确定要删除吗？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    closeOnClickModal: false,
-                    type: 'warning',
-                    center: true
-                }).then(async () => {
-                    liquidateDel(item.id)
-                    this.liquidateList()
-                })
-            },
-            blurOrganization(item,index){// 清收组织保存
-                item.edit = true
-                this.liquidateEdit('',item)
-            },
-            starEndTimeFn(val){// 贷款起止日期的处理
-                if(val.length>0){
-                    this.guaranteeForm.loanStartTime = val[0]
-                    this.guaranteeForm.loanEndTime  = val[1]
+                this.$set(this.guaranteeForm,'amountWide',this.guaranteeForm.amountWide)
+
+                let reimbursement = res.data.reimbursement||{} 
+                // 代偿
+                this.comp = {
+                    compensationAmount:reimbursement.compensationAmount,
+                    compensatoryTime:reimbursement.compensatoryTime,
+                    compensatoryBalance:reimbursement.compensatoryBalance,
                 }
-            },
-            liquidateList(){// 取得清收组列表数据
-                liquidateList().then(res=>{
-                    this.organizationArrs = res.data.groupList
-                    this.organizationArrs.map(e=>{
-                        e.edit=true
-                    })
-                })
-            },
-            liquidateEdit(val,item){// 清收组编辑活新增
-                let param = {
-                    groupName:item.groupName,// 清收组名称
+                if(this.comp.compensatoryTime){// 详情读取一次代偿信息
+                    this.compensatoryTimeChange(this.comp.compensatoryTime)
                 }
-                if(val!=='new'){
-                    param.id = item.id
+
+                // 清收
+                this.liquidate = {
+                    personLiable:reimbursement.personLiable,
+                    collectionGroupId:reimbursement.collectionGroupId,
+                    area:+reimbursement.area,
+                    operation:reimbursement.operation,
+                    litigation:reimbursement.litigation,
+                    mortgage:reimbursement.mortgage,
+                } 
+
+            } catch (error) {
+                this.guaranteeLoading = false
+            }
+        },
+        //计算逾期天数
+        overdueChange(val){
+            if(val){
+                //date1结束时间
+                let date1 = new Date(val);
+                //date2当前时间
+                let date2 = new Date();
+                if(date1.getTime() < date2.getTime()){
+                    date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+                    date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+                    const diff = date2.getTime() - date1.getTime(); //目标时间减去当前时间
+                    const diffDate = diff / (24 * 60 * 60 * 1000);  //计算当前时间与结束时间之间相差天数
+                    this.repaymentForm.overdueDays = diffDate
+                }else{
+                    this.repaymentForm.overdueDays = 0
                 }
-                liquidateEdit(param).then(res=>{
-                    this.liquidateList()
-                })
-            },
-            saveInsurance(){// 新增保后业务 或编辑
-                let has = false
+            }else{
+                this.repaymentForm.overdueDays = 0
+            }
+        },
+        // 判断是否清偿方式总额不等于还款额度
+        /* TODO 待处理，未完成判断
+            *       else 系统流转编辑有问题，
+            *       else 还款记录添加代偿金额和代偿余额
+            *       else 代偿余额还需要减掉总利息
+            *
+        */
+        isReimbursement(){
+            if(this.reimbursement&&this.reimbursement!==this.repaymentForm.currentRepayment){
+                return false
+            }else return true
+        },
+        //录入提交
+        saveAdd(repaymentForm){
+            // if(!this.isReimbursement()){
+            //     return this.$message.warning('清偿总额需等于本次还款！')
+            // }
+            console.log(this.status,'newL为新增业务')
+            // 判断是否新增业务
+            if(this.status==='newLoans'||this.status=="oldLoansEdit"){
+                console.log('进入新增业务')
+                this.saveInsurance()
+            }else{
+                console.log('进入录入环节')
+                // 处于编辑/新增录入，需要判断该业务是否新增的，或是流转的，有不同处理方式
+                // 担保信息
                 const form1 = new Promise((resolve,reject)=>{
                     this.$refs['refGuaranteeForm'].validate((valid) => {
                         if (valid) {
                             resolve()
                         }else{
                             has = true
-                            return this.$message.error('请输入必填信息！')
-
+                            reject()
+                            // return this.$message.error('请输入必填信息！')
                         }
                     })
                 })
+                console.log(this.$refs["repaymentForm"],'值')
+                // 清收信息
                 const form3 = new Promise((resolve,reject)=>{
                     this.$refs['liquidate'].validate((valid) => {
                         if (valid) {
                             resolve()
                         }else{
-                            if(!has) return this.$message.error('请输入必填信息！')
+                            reject()
+                            // if(!has) return this.$message.error('请输入必填信息！')
                         }
                     })
                 })
-                   
-                // 同时处理多个表单的验证
-                return  Promise.all([form1,form3]).then(()=>{
-                    if(this.status==='newLoans'){// 新增需要提示
-                        this.$confirm('确定保存该记录？', '提示', {type:"info"}).then(()=>{
-                            let obj ={} 
-                            // 如果处于编辑业务状态 或者是还款录入状态
-                            if(this.discernEdit) obj.insuranceId = this.id
-                            Object.assign(obj,this.comp,this.liquidate)
-                            let param = {
-                                alInsuranceList:this.guaranteeForm,// 担保信息
-                                alReimbursement:obj// 代偿清收相关
-                            }
-                            if(this.discernEdit){// 处于编辑状态下，且
-                                editInsurance(param).then(res=>{
-                                    if(this.entering){
-                                        this.$message.success('编辑业务成功！')
-                                        this.$store.commit("loanStatusData", { loanStatus: 1 });
-                                    }
-                                })
-                            }else{// 处于新增状态下
-                                param.source = 1
-                                saveInsurance(param).then(res=>{
-                                    // 新增业务，返回上一页
-                                    if(this.status==='newLoans'){
-                                        this.$message.success('新增业务成功！')
-                                        this.$store.commit("loanStatusData", { loanStatus: 1 });
-                                    }
-                                }).catch(err=>{
-                                })
-                            }
-                        }).catch(e=>{
+                let form2 = new Promise((resolve,reject)=>{
+                    this.$refs["repaymentForm"].validate((valid) => {
+                        if (valid) {
+                            resolve()
+                        }else{
+                            reject()
+                        }
+                    })
+                })
+                let that = this
+                function fn (){
+                    if(that.RepaymentId == ''){// 新增录入
+                        console.log('新增录入')
+                        that.repaymentForm.insuranceId = that.id
+                        console.log(that.id,'id')
+                        that.repaymentForm.totalRepayment = that.totalRepayment
+                        that.repaymentForm.overdueDays = that.overdueDays
+                        let obj ={} 
+                        // 如果处于编辑业务状态 或者是还款录入状态
+                        if(that.discernEdit) obj.insuranceId = that.id
+                        Object.assign(obj,that.comp,that.liquidate)
+                        let param = {
+                            alInsuranceList:that.guaranteeForm,// 担保信息
+                            alReimbursement:obj// 代偿清收相关
+                        }
+                        Promise.all([repaymentEntry(that.repaymentForm),editInsurance(param)]).then((res1,res2)=>{
+                            that.$message.success("录入成功！");
+                            that.loanStatus = 3
+                            that.$store.commit("loanStatusData", { loanStatus: 3 });
+                        })
+                    }else{// 编辑录入
+                        let obj ={} 
+                        // 如果处于编辑业务状态 或者是还款录入状态
+                        if(that.discernEdit) obj.insuranceId = that.id
+                        Object.assign(obj,that.comp,that.liquidate)
+                        let param = {
+                            alInsuranceList:that.guaranteeForm,// 担保信息
+                            alReimbursement:obj// 代偿清收相关
+                        }
+                        that.repaymentForm.totalRepayment = that.totalRepayment
+                        that.repaymentForm.overdueDays = that.overdueDays
+                        Promise.all([updateRepayment(that.repaymentForm),editInsurance(param)]).then((res1,res2)=>{
+                            that.$message.success("编辑成功！");
+                            that.loanStatus = 3
+                            that.$store.commit("loanStatusData", { loanStatus: 3 });
+                        })
+                        // updateRepayment(that.repaymentForm).then(res=>{
+                        //     that.$message.success("编辑成功！");
+                        //     that.loanStatus = 3
+                        //     that.$store.commit("loanStatusData", { loanStatus: 3 });
+                        // }).catch(err=>{
+                        // })
+                    }
+                }
+                console.log('正在执行录入')
+                Promise.all([form1,form3,form2]).then(()=>{
+                    if(!this.totalSame()){
+                        return this.$confirm('清偿方式的金额之和与本次还款总额不符，可能会导致数据统计错误，是否继续？', '提示', {
+                            type: 'warning'
+                        }).then(()=>{
+                            fn()
+                        }).catch(err=>{
+                            console.log('此处报错')
+                            return '我是错误信息'
                         })
-                    }else{// 编辑不需要提示
+                    } else{
+                        fn()
+                    }
+                }).catch(err=>{
+                    console.log(err,'err')
+                    this.$message.error('请输入必填信息！')
+                })
+            }
+        },
+        //取消录入
+        cancel(){
+            
+            
+            if(this.status=="newLoans"||this.status=="oldLoansEdit"){
+                this.loanStatus = 1
+                this.$store.commit("loanStatusData", { loanStatus: 1 });
+            }else{
+                this.loanStatus = 3
+                this.$store.commit("loanStatusData", { loanStatus: 3 });
+            }
+        },
+        //选择实际还款日日期
+        clickEndTime(){
+            this.endTimeOptions.disabledDate = time => {
+                if (new Date()) {
+                    if (time.getTime() > new Date().getTime()) {
+                        return true
+                    }
+                } else {
+                    if (time.getTime() < Date.now() - 8.64e7) {
+                        return true
+                    }
+                }
+            }
+        },
+        //还款记录部分*******
+        // 记录详情统计
+        async statistics(){
+            let res = await repaymentStatistics({
+                insuranceId: this.hisidId,
+                // guaranteeAmount: this.guaranteeAmount
+            });
+            this.StatisticsData = res.data
+        },
+        // 还款记录列表
+        async repaymentList(){
+            let res = await repaymentList({
+                page: this.hisPage,
+                size: this.pageNumber,
+                insuranceId: this.hisidId,
+                CustomerNumberOrName: this.hisSearchForm.actualRepaymentDate,
+                status: this.hisSearchForm.hisType
+            });
+            res.data.list.map(e =>{
+                e.repaymentStatus = this.core.stcStatus(e.repaymentStatus)
+            })
+            this.repaymentData = res.data.list
+            this.histotals = res.data.totalCount
+        },
+        // 还款记录列表搜索
+        statisticsSearch(){
+            this.hisPage = 1;
+            this.repaymentList()
+        },
+        hiscurrentChange(val){
+            this.hisPage = val;
+            this.repaymentList()
+        },
+        getRowKeys(row) {
+            return row.id;
+        },
+        hisSelectionChange(val) {
+            this.hisMultipleSelection = val;
+        },
+        // 导出还款记录列表
+        hisExport(){
+            this.hisId
+            // if(this.hisMultipleSelection.length != ''){
+                let exportIds = this.hisMultipleSelection.map(e => e.id).join()
+                let url = `${excelHis}?ids=${exportIds}&insuranceId=`+this.hisId
+                window.location.href = url
+            // }else{
+            //     this.$message.error('请先选择还款记录列表数据 ！');
+            // }
+        },
+        // 批量删除还款记录列表
+        delAllHis(){
+            if(this.hisMultipleSelection.length != ''){
+                let delIds = this.hisMultipleSelection.map(e => e.id)
+                this.$confirm('确定要删除选中数据吗？', '提示', {
+                    type: 'warning'
+                })
+                .then(() => {
+                    delRepayment(delIds).then(res=>{
+                        this.hisMultipleSelection = [];
+                        this.$message.success('删除成功');
+                        this.statisticsSearch()
+                    }).catch(err=>{
+                    })
+                }).catch(() => {});
+            }else{
+                this.$message.error('请先选择还款记录列表数据 ！');
+            }
+        },
+        //进入新增还款记录
+        addRepayment(){
+            this.loanStatus = 2 // 切页面，保存
+            this.$store.commit("loanStatusData", { loanStatus: 2 });
+            console.log(this.$store.state.loan.hisidId)
+            // 新增判断
+            this.RepaymentId = ''
+            this.$store.commit("RepaymentIdData", { RepaymentId: this.RepaymentId });
+
+            this.loanbackStatus = '新增' // 新增判断，用于后退
+            this.$store.commit("loanbackStatusData", { loanbackStatus: '新增' });
+
+            this.$store.commit('setNewOrOld','newRecord') // 判断新增还款记录
+
+            console.log(this.status,'是否是新增数据')
+            this.$store.commit('disabledAll',false)
+        },
+        // 还款记录：查看/编辑
+        goRepaymentDetail(row,type){
+            this.loanStatus = 2
+            this.$store.commit("loanStatusData", { loanStatus: 2 });
+            this.RepaymentId = row.id
+            this.$store.commit("RepaymentIdData", { RepaymentId: row.id });
+            this.id = row.insuranceId
+            this.$store.commit("idData", { id: row.insuranceId });
+            this.loanbackStatus = type
+
+
+            this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
+
+            // 不可编辑
+            type==='编辑'?this.$store.commit('discernEdit',false):this.$store.commit('discernEdit',false)
+            if (type==='查看') {
+                this.$store.commit('disabledAll',true)
+            }else{
+                this.$store.commit('disabledAll',false)
+            }
+            
+            this.$store.commit("loanbackStatusData", { loanbackStatus: type });
+        },
+        // 取得录入页面数据详情
+        async getRepaymentDetail(){
+            console.log(this.RepaymentId,'调用详情接口')
+            let res = await repaymentDetail({
+                id: this.RepaymentId
+            });
+            // this.totalRepayment = res.data.totalRepayment
+            // this.overdueDays = res.data.overdueDays
+            this.repaymentForm = res.data
+        },
+
+        // 2021-8-10 新需求
+        bankgroup($event,val){//拼接银行
+            if(val==='else'){   
+                if(this.mainbank){
+                    //  this.businessApply.bank = this.mainbank + '-' + this.elsebank
+                    this.$set(this.guaranteeForm,'bank',this.mainbank + '-' + this.elsebank)
+                }
+            }else{
+                this.$set(this.guaranteeForm,'bank',this.mainbank)
+            }
+        },
+        createStateFilter(queryString) {
+            return (state) => {
+                return (state.value.indexOf(queryString) === 0);
+            };
+        },
+        // 银行部分的搜索
+        async querySearchAsync(queryString, cb) {
+            // 需要进行银行数据的变更
+            // if(this.elsebank){
+            //     this.$set(this.businessApply,'bank',this.mainbank + '-' + this.elsebank)
+            // }else{
+            //     this.$set(this.businessApply,'bank',queryString)
+            // }
+
+            
+
+            var results = queryString ? this.bankSelect.filter(this.createStateFilter(queryString)) : this.bankSelect;
+            cb(results);
+        },
+        // 导入文件--上传变更
+        handleChange(){
+
+        },
+        designateEmpTrees(){//调查的树结构接口
+            this.threeLoading = true
+            designateEmpTrees().then(res=>{
+                this.treesData = res.data
+                this.threeLoading = false
+                // this.drawTrees = res.data
+                // this.disposeData(this.drawTrees)
+            }).catch(err=>{
+                this.threeLoading = false
+            })
+        },
+        principalNode(val){// 组织架构选择人员
+            this.$set(this.liquidate,'personLiable',val[0].name)
+            this.liquidate.personLiableId = val[0].id
+
+        },
+        principalSeleted(){// 选择清收负责人
+            this.principal = false
+        },
+        searchClientChange(val,state){// 实时搜索客户详细信息
+            companyInfoBySth({name:val}).then(res=>{
+                let data = res.data
+                this.$set(this.guaranteeForm,'phone',data.legalPhone)
+                this.$set(this.guaranteeForm,'legalName',data.legalName)
+            }).catch(err=>{
+                this.clientMessageFrom = []
+            })
+        },
+        async getClient(query,val){// 搜索客户匹配code、name信息
+            if (query !== '') {
+                this.serachMessageLoading = true;
+                // if(this.clientDataSave.length===0){
+                    let res = await getAllClient({type:1})
+                    this.clientDataSave = res.data
+                // }
+                this.serachMessageLoading = false;
+                if(val==='name'){
+                    this.searchClientOptions = this.clientDataSave.filter(item => {
+                        if(item.name){
+                            return item.name.indexOf(query) > -1;
+                        }else{
+                            this.searchClientOptions = [];
+                        }
+                    });
+                }else{
+                    this.searchClientOptions = this.clientDataSave.filter(item => {
+                    return item.code.indexOf(query) > -1;
+                    });
+                }
+            } else {
+                this.searchClientOptions = [];
+            }
+        },
+        addOrganizationArrs(){// 添加组织按钮
+            let obj = {groupName:'新增清收组'+(this.organizationArrs.length+1).toString(),edit:true}
+            this.liquidateEdit('new',obj)
+        },
+        editOrangization(item,index){// 清收组织编辑
+            this.organizationArrs.map(e=>{
+                e.edit = true
+            })
+            item.edit = false
+            this.$set(this.organizationArrs,index,item)
+        },
+        delOrganization(item,index){// 清收组织删除
+            this.$confirm('确定要删除吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning',
+                center: true
+            }).then(async () => {
+                liquidateDel(item.id)
+                this.liquidateList()
+            })
+        },
+        blurOrganization(item,index){// 清收组织保存
+            item.edit = true
+            this.liquidateEdit('',item)
+        },
+        starEndTimeFn(val){// 贷款起止日期的处理
+            if(val.length>0){
+                this.guaranteeForm.loanStartTime = val[0]
+                this.guaranteeForm.loanEndTime  = val[1]
+            }
+        },
+        liquidateList(){// 取得清收组列表数据
+            liquidateList().then(res=>{
+                this.organizationArrs = res.data.groupList
+                this.organizationArrs.map(e=>{
+                    e.edit=true
+                })
+            })
+        },
+        liquidateEdit(val,item){// 清收组编辑活新增
+            let param = {
+                groupName:item.groupName,// 清收组名称
+            }
+            if(val!=='new'){
+                param.id = item.id
+            }
+            liquidateEdit(param).then(res=>{
+                this.liquidateList()
+            })
+        },
+        saveInsurance(){// 新增保后业务 或编辑业务
+            /* TODO 需要处理没有还款信息的编辑 */
+            let has = false
+            // 担保信息
+            const form1 = new Promise((resolve,reject)=>{
+                this.$refs['refGuaranteeForm'].validate((valid) => {
+                    if (valid) {
+                        resolve()
+                    }else{
+                        has = true
+                        // return this.$message.error('请输入必填信息！')
+
+                    }
+                })
+            })
+            // 清收信息
+            const form3 = new Promise((resolve,reject)=>{
+                this.$refs['liquidate'].validate((valid) => {
+                    if (valid) {
+                        resolve()
+                    }else{
+                        // if(!has) return this.$message.error('请输入必填信息！')
+                    }
+                })
+            })
+                
+            // 同时处理多个表单的验证
+            return  Promise.all([form1,form3]).then(()=>{
+                if(this.status==='newLoans'){// 新增需要提示
+                    this.$confirm('确定保存该记录？', '提示', {type:"info"}).then(()=>{
                         let obj ={} 
                         // 如果处于编辑业务状态 或者是还款录入状态
                         if(this.discernEdit) obj.insuranceId = this.id
@@ -1422,7 +1575,7 @@ import core from '../../../utils/core';
                             alInsuranceList:this.guaranteeForm,// 担保信息
                             alReimbursement:obj// 代偿清收相关
                         }
-                        if(this.discernEdit){// 处于编辑状态下，且
+                        if(this.discernEdit){// 处于编辑状态下--
                             editInsurance(param).then(res=>{
                                 if(this.entering){
                                     this.$message.success('编辑业务成功！')
@@ -1430,7 +1583,7 @@ import core from '../../../utils/core';
                                 }
                             })
                         }else{// 处于新增状态下
-                            param.source = 1
+                            // param.source = 1
                             saveInsurance(param).then(res=>{
                                 // 新增业务，返回上一页
                                 if(this.status==='newLoans'){
@@ -1440,50 +1593,95 @@ import core from '../../../utils/core';
                             }).catch(err=>{
                             })
                         }
-                    }    
-                }).catch(()=>{
-                    // alert('验证错误')
-                    return false
-                })
-            },
-            deleteInsurance(row){// 删除保后业务--仅新建可删
-
-                this.$confirm('此操作无法还原，确定要删除该业务？', '提示', {
-                    type: 'error'
-                }).then(() => {
-                    deleteInsurance(row.id).then(res=>{
-                        this.getData()
+                    }).catch(e=>{
                     })
+                }else{// 编辑不需要提示
+                    let obj ={} 
+                    // 如果处于编辑业务状态 或者是还款录入状态
+                    if(this.discernEdit) obj.insuranceId = this.id
+                    Object.assign(obj,this.comp,this.liquidate)
+                    let param = {
+                        alInsuranceList:this.guaranteeForm,// 担保信息
+                        alReimbursement:obj// 代偿清收相关
+                    }
+                    console.log(param,'编辑传值')
+                    if(this.discernEdit){// 处于编辑状态下，且
+                        editInsurance(param).then(res=>{
+                            if(this.entering){
+                                this.$message.success('编辑业务成功！')
+                                this.$store.commit("loanStatusData", { loanStatus: 1 });
+                            }
+                        })
+                    }else{// 处于新增状态下
+                        param.source = 1
+                        saveInsurance(param).then(res=>{
+                            // 新增业务，返回上一页
+                            if(this.status==='newLoans'){
+                                this.$message.success('新增业务成功！')
+                                this.$store.commit("loanStatusData", { loanStatus: 1 });
+                            }
+                        }).catch(err=>{
+                        })
+                    }
+                }    
+            }).catch(()=>{
+                // alert('验证错误')
+                return this.$message.error('请输入必填信息！')
+            })
+        },
+        deleteInsurance(row){// 删除保后业务--仅新建可删
+
+            this.$confirm('此操作无法还原，确定要删除该业务？', '提示', {
+                type: 'error'
+            }).then(() => {
+                deleteInsurance(row.id).then(res=>{
+                    this.getData()
                 })
-            },
-            compensatoryTimeChange(val){// 代偿时间处理，取得已偿还金额
-                compensationSituation({data:val,insuranceId:this.id}).then(res=>{
-                    this.cash = res.data.amount
-                })
-            },
-            uploadSuccess(response, file, fileList) { // 上传成功
-                this.upLoadPop = false
-                this.uploadList = []
-                // 判断，调第二个接口，取得错误文件
-                let data = response.data
-                if(data.import.exportCode){
-                    core.exportFile(exportFailure(data.import.exportCode))
-                }
-                this.getData()
-                // if (response.code == 10000) {
-                //     this.$message.success('上传成功');
-                //     this.importVisible = false;
-                //     this.getData();
-                // } else {
-                //     this.$message.error(response.message);
-                // }
-                // this.uploadList.push({ name: file.name, url: response.message.fileUrl });
-            },
-            
-            
+            })
+        },
+        compensatoryTimeChange(val){// 代偿时间处理，取得已偿还金额
+            compensationSituation({data:val,insuranceId:this.id}).then(res=>{
+                this.cash = res.data.amount
+                console.log('取得当前的cash',this.cash)
+                /* TODO  利息，其他，本次还款*/
+                // 利息
+                // this.interest = res.data.xx
 
+            })
+        },
+        uploadSuccess(response, file, fileList) { // 上传成功
+            this.upLoadPop = false
+            this.uploadList = []
+            // 判断，调第二个接口，取得错误文件
+            let data = response.data
+            if(data.import.exportCode){
+                core.exportFile(exportFailure(data.import.exportCode))
+            }
+            this.getData()
+            // if (response.code == 10000) {
+            //     this.$message.success('上传成功');
+            //     this.importVisible = false;
+            //     this.getData();
+            // } else {
+            //     this.$message.error(response.message);
+            // }
+            // this.uploadList.push({ name: file.name, url: response.message.fileUrl });
+        },
+        // 判断本次总额是否和清偿方式相同
+        totalSame(){
+            // 总额
+            let count = (+this.repaymentForm.repaymentCash||0) + (+this.repaymentForm.repaymentAssetsAmount||0) + (+this.repaymentForm.repaymentOtherAmount||0)
+            if(this.totalRepayment!=count){
+                return false                                                         
+            }else{
+                return true
+            }
         }
+        
+        
+
     }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -1522,6 +1720,8 @@ import core from '../../../utils/core';
         .handle{
             display: flex;
             justify-content: center;
+            align-items: center;
+            
             width: 25%;
             background: #00b9ff54;
         }
@@ -1530,7 +1730,7 @@ import core from '../../../utils/core';
 .addBtn{
     position: relative;
     left: 50%;        
-    top: 10px;
+    top: 0;
     transform:translate(-50%,0);
 }
 .download_tips {
diff --git a/src/components/page/afterLoan/afterLoan.vue b/src/components/page/afterLoan/afterLoan.vue
index 6c0b9fd..48e73fe 100644
--- a/src/components/page/afterLoan/afterLoan.vue
+++ b/src/components/page/afterLoan/afterLoan.vue
@@ -16,7 +16,7 @@
                 <afterInsurance  v-if="showValue == '0'" ref="afterInsuranceRef"></afterInsurance>
                 <!-- 催收管理 -->
                 <collection v-if="showValue == '1'" ref="systemLogRef"></collection>
-                <!-- 清收完成统计 -->
+                <!-- 清收年度统计 -->
                 <liquidateComplete v-if="showValue ==='2'" ref="complete"></liquidateComplete>
                 <!-- 请收进度查询 -->
                 <liquidateProgress v-if="showValue==='3'"></liquidateProgress>
@@ -85,11 +85,11 @@ export default {
         //     }
         // }
         // console.log(this.$router.currentRoute,'陆游信息')
-        if(meta.includes('清收完成统计')||meta.includes('清收进度查询')){
+        if(meta.includes('清收年度统计')||meta.includes('清收进度查询')){
             this.menus.head.push('数据统计与查询')
             this.menus.body['数据统计与查询'] = []
-            if(meta.includes('清收完成统计')){
-                this.menus.body['数据统计与查询'].push({ name: '清收完成统计', index: '2' })
+            if(meta.includes('清收年度统计')||meta.includes('清收完成统计')){
+                this.menus.body['数据统计与查询'].push({ name: '清收年度统计', index: '2' })
             }
             if(meta.includes('清收进度查询')){
                 this.menus.body['数据统计与查询'].push({ name: '清收进度查询', index: '3' })
@@ -105,15 +105,18 @@ export default {
     computed: {
         liquidate(){
             return this.$store.state.loan.liquidate
+        },
+        schedule(){
+            return this.$store.state.loan.schedule
         }
     },
     methods:{
         goto(path) {
             this.$router.push('/' + path);
         },
-        backTo(){
+        backTo(){// 后退
             switch (this.showValue) {
-                case '0':
+                case '0':// 保后
                     switch (this.loanStatusHome) {
                         case 1:
                             this.goto('workbench')
@@ -136,7 +139,7 @@ export default {
                     }
                     break;
 
-                case '1':
+                case '1':// 催收
                     switch (this.logStatusHome) {
                         case 1:
                             this.goto('workbench')
@@ -166,7 +169,7 @@ export default {
                             break;
                     }
                     break;
-                case '2':
+                case '2':// 清收年度统计
                     switch (this.liquidate) {
                         case '1':
                             this.goto('workbench')
@@ -178,10 +181,14 @@ export default {
                             break;
                     }
                     break;
-                case '3':
-
-                    break;
-                default:
+                case '3':// 清收进度查询
+                    switch (this.schedule) {
+                        case '1':
+                            this.goto('workbench')
+                            break;
+                        default:
+                            break;
+                    }
                     break;
             }
             if(this.showValue == '0'){
@@ -190,6 +197,7 @@ export default {
                 
             }
             
+            
         },
         // 侧边栏切换组件状态保存
         getIndex(index) {
diff --git a/src/components/page/afterLoan/collection.vue b/src/components/page/afterLoan/collection.vue
index 83f6bd3..5a17e52 100644
--- a/src/components/page/afterLoan/collection.vue
+++ b/src/components/page/afterLoan/collection.vue
@@ -942,7 +942,12 @@
                     endTime: this.collectionHisEndTime
                 });
                 res.data.list.map(e =>{
-                    e.collectionMethod = e.collectionMethod == '1' ? '电话催收' : '上门/外访'
+                    let obj ={
+                        "1":'电话催收',
+                        "2":'上门/外访',
+                        "3":"其他"
+                    }
+                    e.collectionMethod = obj[e.collectionMethod]||'未知状态'
                 })
                 this.collectionHisData = res.data.list
                 this.collectionHisTotals = res.data.totalCount
@@ -1000,7 +1005,8 @@
                     visitor:data.visitor,
                     situationDescription:data.situationDescription,
                     collectionFeedback: res.data.collectionFeedback,
-                    enclosureFiles: res.data.enclosureFiles
+                    enclosureFiles: res.data.enclosureFiles,
+                    other:res.data.other
                 }
                 this.uploadList = []
                 if(res.data.enclosureFiles.length>0&&res.data.enclosureFiles[0]){
diff --git a/src/components/page/afterLoan/complete.vue b/src/components/page/afterLoan/complete.vue
index ba708b0..9debfe6 100644
--- a/src/components/page/afterLoan/complete.vue
+++ b/src/components/page/afterLoan/complete.vue
@@ -1,9 +1,9 @@
-// 清收完成统计
+// 清收年度统计
 <template>
     <div>
         <!-- 清收工作完成统计 -->
         <div v-if="liquidate === '1'">
-            <div class="mgt20 left-border fz-16"><p class="c-black mgl10">清收工作完成情况统计</p></div>
+            <div class="mgt20 left-border fz-16"><p class="c-black mgl10">清收工作年度情况统计</p></div>
             <div class="mgt20 pdb20">
                 <div class="mgtb20">
                     <div class="flex-center">
@@ -22,7 +22,7 @@
                             <template slot-scope="scope">
                                 <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('人员选择')" @click="createList(scope.row)">人员选择</el-button>
                                 <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('统计查看')" @click="[(liquidate = '2'), edit(scope.row, 'watch')]">查看</el-button>
-                                <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('统计编辑')"  @click="edit(scope.row)">编辑</el-button>
+                                <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('统计编辑')"  @click="edit(scope.row)">管理</el-button>
                                 <el-button type="text" v-if="$router.currentRoute.meta.btn.includes('统计删除')"  @click="del(scope.row)">删除</el-button>
                             </template>
                         </el-table-column>
@@ -46,7 +46,7 @@
                             <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
                         </el-select>
                         <el-input
-                            placeholder="请输入整数"
+                            placeholder="请输入金额（元）"
                             class="wd20 mglr10"
                             style="min-width: 200px"
                             :disabled="!searchStr.proportionSymbol"
@@ -58,7 +58,7 @@
                         <el-select v-model="searchStr.allAoumntSymbol" placeholder="请选择" clearable @change="search">
                             <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
                         </el-select>
-                        <el-input :disabled="!searchStr.allAoumntSymbol" class="wd20 mglr10" placeholder="清收总额" style="min-width: 200px" v-model="searchStr.allAoumnt" clearable></el-input>
+                        <el-input :disabled="!searchStr.allAoumntSymbol" class="wd20 mglr10" placeholder="请输入金额（元）" style="min-width: 200px" v-model="searchStr.allAoumnt" clearable></el-input>
                     </div>
                     <div class="flex-center">
                         <el-button v-preventReClick type="primary" size="small" round @click="clearOption">清空选项</el-button>
@@ -75,7 +75,7 @@
 
                     <div class="flex-between">
                         <div class="flex-center">
-                            <el-button class="mgl20"  v-if="$router.currentRoute.meta.btn.includes('统计导出')"  v-preventReClick type="primary" size="small" round @click="statisticsSelection">导出列表</el-button>
+                            <el-button class="mgl20"  v-if="$router.currentRoute.meta.btn.includes('统计导出列表')"  v-preventReClick type="primary" size="small" round @click="statisticsSelection">导出列表</el-button>
                             <el-radio-group v-model="radio" class="mgl30" @change="radioChange">
                                 <el-radio-button class="ht40" label="依据公司排名"></el-radio-button>
                                 <el-radio-button class="ht40" label="依据小组排名"></el-radio-button>
@@ -87,7 +87,7 @@
                                 class="ht40 mgl10 mgr10"
                                 @keyup.enter.native="annualStatisticsList('search')"
                                 v-model="searchStr.queryCondition"
-                                placeholder="工号/清收负责人/清收企业"
+                                placeholder="工号/清收负责人"
                                 clearable
                             ></el-input>
                         </div>
@@ -119,23 +119,23 @@
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="cash" label="清收现金（万元）" align="center" width="150px">
+                            <el-table-column prop="cash" label="清收现金（元）" align="center" width="150px">
                                 <template slot-scope="scope">
                                     <div class="multi-box" v-for="(item, index) in scope.row.cash" :key="index">
                                         {{ item.cash }}
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="asset" label="清收资产（万元）" align="center" width="150px">
+                            <el-table-column prop="asset" label="清收资产（元）" align="center" width="150px">
                                 <template slot-scope="scope">
                                     <div class="multi-box" v-for="(item, index) in scope.row.assets" :key="index">
-                                        {{ item.asset }}
+                                        {{ item.assets }}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="collectionTime" label="回款时间" align="center" width="200px">
                                 <template slot-scope="scope">
-                                    <div class="backTime" v-for="(item, index) in scope.row.collectionTime" :key="index">
+                                    <div class="backTime static multi-box" v-for="(item, index) in scope.row.collectionTime" :key="index">
                                         <el-date-picker
                                             style="width:180px"
                                             v-model="item.collectionTime"
@@ -158,7 +158,7 @@
                                 <template slot-scope="scope">
                                     <div class="ratio" v-show="scope.row.edit">
                                         <div class="top">{{scope.row.totalAmount}}</div>
-                                        <el-input :disabled="!scope.row.edit" v-model="scope.row.proportion"></el-input>
+                                        <el-input :disabled="!scope.row.edit" placeholder="输入年度金额指标" v-model="scope.row.proportion"></el-input>
                                     </div>
                                     <div v-if="!scope.row.edit">
                                         {{scope.row.percent}}%
@@ -167,7 +167,7 @@
                             </el-table-column>
                             <el-table-column prop="remark" label="备注" align="center"  width="200px">
                                 <template slot-scope="scope">
-                                    <div class="backTime" v-for="(item, index) in scope.row.description" :key="index">
+                                    <div class="backTime static multi-box" v-for="(item, index) in scope.row.description" :key="index">
                                         <el-input :disabled="!scope.row.edit" v-model="item.description"></el-input>
                                     </div>
                                 </template>
@@ -176,6 +176,7 @@
                             <el-table-column v-if="!liquidWatch" label="操作" width="300" align="center">
                                 <template slot-scope="scope">
                                     <el-button type="text" @click="yearEdit(scope.row)">{{scope.row.editStr}}</el-button>
+                                    <el-button type="text" v-show="scope.row.edit" @click="[scope.row.edit = false,annualStatisticsList()]">取消</el-button>
                                     <!-- <el-button type="text" @click="history(scope.row)">查看</el-button> -->
                                 </template>
                             </el-table-column>
@@ -193,7 +194,7 @@
                     <div class="left-border fz-16"><p class="c-black mgl10">年份</p></div>
                     <el-date-picker
                         :disabled="changeStaffDisabled"
-                        class="mgt10 mgl80"
+                        class="mgt10 mgl80 year"
                         v-model="chooisYear"
                         value-format="yyyy"
                         :picker-options="pickerOptions"
@@ -205,6 +206,7 @@
                 <div class="tree">
                     <div class="left-border fz-16 mgt20"><p class="c-black mgl10">参与本年度清收排名的人员</p></div>
                     <div class="mgl80 mgt20 mgr80" style="border: 1px solid #e6e6e6; border-radius: 15px; overflow: auto; padding: 15px">
+                        <el-checkbox @change="allCheck" v-model="checked" class="mgl20" style="margin-left:23px">全选</el-checkbox>
                         <el-tree
                             :data="tree"
                             show-checkbox
@@ -288,6 +290,7 @@ export default {
             recordArr:[],// 记录用数组,加载更多
             changeStaffYear:'',
             changeStaffDisabled:false,
+            checked:false,
         };
     },
     watch: {
@@ -296,6 +299,15 @@ export default {
                 this.getTree()
             }
         },
+        liquidate(val){
+            if(val==2){
+                console.log('判断为2')
+                this.liquidateList()
+                this.annualStatisticsList()
+            }else{
+                this.annualList()
+            }
+        }
     },
     computed: {
         liquidate:{
@@ -323,10 +335,8 @@ export default {
     created() {
         this.searchStr = this.$store.state.loan.liquidateSearch
         this.annualList()
-        console.log(this.liquidate,'li')
+        console.log(this.liquidate,this.searchStr,'li')
         if(this.liquidate=='2'){
-            console.log('判断为2')
-            this.liquidateList()
             this.annualStatisticsList()
         }
     },
@@ -376,6 +386,9 @@ export default {
                 this.loading = false
             })
         },
+        /* TODO 按照有多组进行区分，再按组分人，后端传来按组区分的数组，进行切割区分。
+         * 
+         */
         annualStatisticsList(){
             if(this.searchStr.proportionSymbol&&!this.searchStr.proportion) return this.$message('请输入完成比例整数！')
             if(this.searchStr.allAoumntSymbol&&!this.searchStr.allAoumnt) return this.$message('请输入已清收总额！')
@@ -399,19 +412,22 @@ export default {
                     if(arr.has(e.jobNumber)){
                         let obj = arr.get(e.jobNumber)
                         obj.enterprise.push({enterprise:e.enterprise,id:e.id})
+                        obj.totalAmount += ((+e.cash||0)+(+e.assets))
                         obj.cash.push({cash:e.cash,id:e.id})
                         obj.assets.push({assets:e.assets,id:e.id})
                         obj.collectionTime.push({collectionTime:e.collectionTime,id:e.id})
                         obj.description.push({description:e.description,id:e.id})
-                        obj.totalAmount += e.totalAmount
                         arr.set(e.jobNumber,obj)
+                        // console.log(e.totalAmount,`再次处理加入的${e.personLiable}`)
+
                     }else{
                         e.enterprise = [{enterprise:e.enterprise,id:e.id}]
+                        e.totalAmount = (+e.cash||0)+(+e.assets)
                         e.cash = [{cash:e.cash,id:e.id}]
                         e.assets = [{assets:e.assets,id:e.id}]
                         e.collectionTime = [{collectionTime:e.collectionTime,id:e.id}]
                         e.description = [{description:e.description,id:e.id}]
-                        e.totalAmount += e.totalAmount
+                        // console.log(e.totalAmount,`首次加入的${e.personLiable}`)
                         arr.set(e.jobNumber,e)
                     }
                 })
@@ -421,7 +437,7 @@ export default {
                     if(value.totalAmount&&value.proportion){
                         value.percent = ((value.totalAmount/value.proportion)*100).toFixed(2)
                     }else{
-                        value.percent = '未填写任务额度'
+                        value.percent = '未填写年度指标'
                     }
                     this.originalData.push(value)
                 }
@@ -439,7 +455,7 @@ export default {
                     case ">":
                         if(this.searchStr.proportion){
                             this.statisticsData = this.statisticsData.filter(e=>{
-                                if(e.percent!=='未填写任务额度')
+                                if(e.percent!=='未填写年度指标')
                                 return +e.percent > this.searchStr.proportion
                             })
                         }
@@ -447,7 +463,7 @@ export default {
                     case "<":
                         if(this.searchStr.proportion){
                             this.statisticsData = this.statisticsData.filter(e=>{
-                                if(e.percent!=='未填写任务额度')
+                                if(e.percent!=='未填写年度指标')
                                 return +e.percent < this.searchStr.proportion
                             })
                         }
@@ -455,7 +471,7 @@ export default {
                     case ">=":
                         if(this.searchStr.proportion){
                             this.statisticsData = this.statisticsData.filter(e=>{
-                                if(e.percent!=='未填写任务额度')
+                                if(e.percent!=='未填写年度指标')
                                 return +e.percent >= this.searchStr.proportion
                             })
                         }
@@ -463,7 +479,7 @@ export default {
                     case "<=":
                         if(this.searchStr.proportion){
                             this.statisticsData = this.statisticsData.filter(e=>{
-                                if(e.percent!=='未填写任务额度')
+                                if(e.percent!=='未填写年度指标')
                                 return +e.percent <= this.searchStr.proportion
                             })
                         }
@@ -471,7 +487,7 @@ export default {
                     case "=":
                         if(this.searchStr.proportion){
                             this.statisticsData = this.statisticsData.filter(e=>{
-                                if(e.percent!=='未填写任务额度')
+                                if(e.percent!=='未填写年度指标')
                                 return +e.percent == this.searchStr.proportion
                             })
                         }
@@ -685,7 +701,7 @@ export default {
             // 判断进入查看
             this.$store.commit('liquidWatch',val)
             console.log(val,this.liquidWatch,'liquidWatch')
-            this.annualStatisticsList()
+            // this.annualStatisticsList()
         },
         yearEdit(row, val){// 编辑功能
             if(row.edit != false){
@@ -716,6 +732,7 @@ export default {
         personnelSelection(val){// 人员选择
             return personnelSelection({year:val}).then(res=>{
                 this.treeIds = res.data.list
+                console.log(this.treeIds,'treeids')
                 this.ids = res.data.list
             })
         },
@@ -726,6 +743,30 @@ export default {
                     
                 })
             })
+        },
+        allCheck(val){
+            console.log(this.tree,'tree')
+            if(this.tree.length==0) return
+            let that = this
+            function recursion(arr){
+                if(arr&&arr.length>0){
+                    arr.forEach(e=>{
+                        that.treeIds.push(e.id)
+                        if(e.personnel&&e.personnel.length>0){
+                            recursion(e.personnel)
+                        }
+                    })
+                }
+            }
+            if(val){
+                recursion(this.tree)
+                // this.ids = this.treeIds
+            }else{
+                this.treeIds = []
+            }
+            this.$refs.tree.setCheckedKeys([this.treeIds]);
+            // console.log(this.treeIds,'ids')
+            // this.$forceUpdate();
         }
     }
 };
@@ -736,12 +777,15 @@ export default {
     padding-bottom: 9px;
 }
 .multi-box {
-    border: 1px solid #e6e6e6;
+    // border: 1px solid #e6e6e6;
+    
     min-height: 50px;
     text-align: center;
     line-height: 50px;
     &:nth-child(2n) {
         background: #e6e6e6;
+        border-left: 1px solid #fff;
+        border-right: 1px solid #fff;
     }
 }
 .backTime{
@@ -761,8 +805,8 @@ export default {
     }
 }
 .dataList{
-    height: 550px;
-    overflow: auto;
+    min-height: 550px;
+    // overflow: auto;
     position: relative;
 }
 /deep/ .el-table::before{
@@ -777,4 +821,24 @@ export default {
 /deep/ .el-input.is-disabled .el-input__inner{
     text-align: center;
 }
+/deep/ .el-table--enable-row-transition .el-table__body td{
+    border: 0.0625rem solid #e6e6e6;
+    border-top: 0;
+}
+/deep/ .el-table .cell{
+    padding-left: 0;
+    padding-right: 0;
+}
+/deep/ .el-date-editor.el-input{
+    width: 100%!important;
+    background: transparent;
+}
+/deep/ .top .el-date-editor.el-input{
+    width: 180px!important;
+    background: transparent;
+}
+/deep/ .el-input.is-disabled .el-input__inner{
+    color:#606266;
+    background: transparent;
+}
 </style>
diff --git a/src/components/page/afterLoan/progress.vue b/src/components/page/afterLoan/progress.vue
index eb1e646..7885848 100644
--- a/src/components/page/afterLoan/progress.vue
+++ b/src/components/page/afterLoan/progress.vue
@@ -5,41 +5,41 @@
         <div class="mgt20 pdb20">
             <div class="flex-between mgtb20">
                 <p class="fz-16 mgr10 font-blue mgl20 nowrap">所在区域</p>
-                <el-select v-model="searchStr.area" placeholder="请选择" clearable @change="search">
+                <el-select style="width:200px" v-model="searchStr.area" placeholder="请选择" clearable @change="search">
                     <el-option v-for="item in area" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
                 <p class="fz-16 mgr10 font-blue mgl20 nowrap">经营情况</p>
-                <el-select v-model="searchStr.operation" placeholder="请选择" clearable @change="search">
+                <el-select style="width:200px" v-model="searchStr.operation" placeholder="请选择" clearable @change="search">
                     <el-option v-for="item in circumstance" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
                 <p class="fz-16 mgr10 font-blue mgl20 nowrap">贷款银行</p>
-                <el-select v-model="searchStr.bank" placeholder="请选择" clearable @change="search">
+                <el-select style="width:200px"  v-model="searchStr.bank" placeholder="请选择" clearable @change="search">
                     <el-option v-for="(item,index) in bankData" :key="item.index" :label="item.value" :value="item.value"></el-option>
                 </el-select>
                 <p class="fz-16 mgr10 font-blue mgl20 nowrap">代偿金额</p>
-                <el-select v-model="searchStr.amountSymbol" placeholder="请选择" clearable @change="search">
+                <el-select style="width:200px"  v-model="searchStr.amountSymbol" placeholder="请选择" clearable @change="search">
                     <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
                 </el-select>
                 <el-input
                     :disabled="!searchStr.amountSymbol"
                     placeholder="请输入金额（万）"
                     class="wd20 mglr10"
-                    style="max-width: 200px"
+                    style="width: 200px"
                     v-model="searchStr.compensationAmount"
                     clearable
                 ></el-input>
             </div>
             <div class="flex-between mgtb20">
                 <div class="flex-center">
-                    <p class="fz-16 mgr10 font-blue mgl20 nowrap">代偿余额</p>
-                    <el-select v-model="searchStr.balanceSymbol" placeholder="请选择" clearable @change="search">
+                    <p style="margin-right:15px" class="fz-16 font-blue mgl20 nowrap">代偿余额</p>
+                    <el-select  style="width:200px;margin-right:15px" v-model="searchStr.balanceSymbol" placeholder="请选择" clearable @change="search">
                         <el-option v-for="item in proportion" :key="item.id" :label="item.label" :value="item.id"></el-option>
                     </el-select>
                     <el-input
                         :disabled="!searchStr.balanceSymbol"
-                        placeholder="请输入整数"
-                        class="wd20 mglr10"
-                        style="min-width: 200px"
+                        placeholder="请输入金额（万）"
+                        class="mglr10"
+                        style="width:200px"
                         v-model="searchStr.compensatoryBalance"
                         clearable
                     ></el-input>
@@ -59,7 +59,7 @@
                 </div>
 
                 <div class="flex-center mgr10">
-                    <el-button v-preventReClick type="primary" round @click="clearOption">清空选项</el-button>
+                    <el-button v-preventReClick type="" round @click="clearOption">清空选项</el-button>
                     <el-button v-preventReClick type="primary" round @click="quryCollectionProgress">搜索</el-button>
                 </div>
             </div>
@@ -84,6 +84,7 @@
                             placeholder="企业名称/清收负责人/业务编号"
                             clearable
                         ></el-input>
+                        <el-button v-preventReClick type="primary" round @click="quryCollectionProgress">搜索</el-button>
                     </div>
                 </div>
     
@@ -104,7 +105,7 @@
                     <el-table-column prop="phone" label="联系电话" align="center" min-width="100px"></el-table-column>
                     <el-table-column prop="bank" label="贷款银行" align="center"></el-table-column>
                     <el-table-column prop="guaranteeAmount" label="贷款金额(元)" align="center" min-width="100px"></el-table-column>
-                    <el-table-column prop="guaranteeTime" label="贷款期限" align="center" min-width="100px"></el-table-column>
+                    <el-table-column prop="guaranteeTime" label="贷款期限(月)" align="center" min-width="100px"></el-table-column>
                     <el-table-column prop="compensatoryTime" label="代偿时间" align="center" min-width="100px"></el-table-column>
                     <el-table-column prop="compensationAmount" label="代偿金额(元)" align="center" min-width="100px"></el-table-column>
                     <el-table-column prop="compensatoryBalance" label="代偿余额(元)" align="center" min-width="100px"></el-table-column>
diff --git a/src/main.js b/src/main.js
index b61bfa0..308ee16 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,8 +12,7 @@ import '../theme/index.css'
 import './assets/css/icon.css';
 import './assets/icon/iconfont.css';
 import './assets/css/font_iiho0e2wbc/iconfont.css'
-import './components/common/directives';
-import './components/common/global.js';
+import './components/common/global.js';// 批量注册全局组件
 import 'babel-polyfill';
 import './util/rem'
 import store from './store'
@@ -25,6 +24,15 @@ import { Tree } from 'view-design';// --系统管理-权限管理的树状结构
 import preventReClick from './utils/preventReClick.js' // 三秒内禁止再次点击
 import roleBtn from '../src/util/buttonRole.js' // 验证按钮权限
 import {Popover,Icon} from 'ant-design-vue' // ant流程图插件
+// 使用轻量级的、仅限数字的函数实现
+/**
+ * this.$math.add（a,b）加
+ * this.$math.subtract(a,b) 减
+ * this.$math.multiply（a,b）乘
+ * this.$math.divide（a,b）除
+ * a和b需要使用this.$math.bignumber();格式化一下数据类型
+ */
+
 // import 'ant-design-vue/lib/popover/style';
 // import 'ant-design-vue/lib/icon/style';
 // import { AntdComponent } from 'ant-design-vue/types/component';
diff --git a/src/router/index.js b/src/router/index.js
index 59dfc37..ad56230 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -109,6 +109,7 @@ router.addRoutes(constantRouterMap)
 function createdRouter(item,val) {// 处理成路由接受对象的方法
     if(item.menuOrNot===1){
         let len,com,obj
+        // 匹配路由名称对应的component
         switch (item.name) {
             case '待办事项': com = Dashboard
                 break;
@@ -139,16 +140,18 @@ function createdRouter(item,val) {// 处理成路由接受对象的方法
             default:console.log('未匹配到文件地址');
                 break;
         } 
+        // 每个路由对应的数据形式
         obj = {
             path:item.menuUrl,
             component:com,
             meta:{title:item.name,btn:[]},
             children:[]
         }
+        // 判断是否为主路由文件，进行递归匹配
         if(item.children&&item.children.length!==0){
             len = item.children.length
             for(let i=0;i<len;i++){
-                obj.meta.btn.push(item.children[i].name)// 权限判断
+                obj.meta.btn.push(item.children[i].name)// 权限判断，把非主路由name作为鉴权信息
                 if(item.children[i].menuOrNot!==0){
                     // 是页面的话，生成新的obj，赛进父级
                     obj.children.push(createdRouter(item.children[i]))
@@ -248,7 +251,7 @@ router.beforeEach(function(to,from,next){
         sessionStorage.removeItem('token')
     }
     if(sessionStorage.getItem('token')){
-        if(!sessionStorage.getItem('success')){
+        if(!sessionStorage.getItem('success')){// 记录路由是否处理过
             getPermission().then(res=>{
                 if(res.success){
                     sessionStorage.setItem('getRouter','true')
@@ -284,6 +287,8 @@ router.beforeEach(function(to,from,next){
                     len = res.data.length,
                     homeMenu = []
                     // console.log(res.data,'路由处理，工作台和非工作台路由匹配')
+
+                    // 此处为主路由页面的操作，通过对应的 createdRouter 函数进行路由数据处理，文件地址分配
                     for(let i=0;i<len;i++){
                         //匹配非工作台的路由
                         if(res.data[i].name!=='客户资源管理系统'&&res.data[i].name!=='担保业务管理系统'&&res.data[i].name!=='保后业务管理系统'){
@@ -294,6 +299,7 @@ router.beforeEach(function(to,from,next){
                             permissions.children[1].children.push(createdRouter(res.data[i]))
                         }
                     }
+                    // 记录主页顶部大按钮的值（路由主页面权限）
                     router.app.$options.store.commit("homeMenuData", { homeMenu: homeMenu });
                     let errPage =  [
                         {
@@ -309,7 +315,7 @@ router.beforeEach(function(to,from,next){
                     router.addRoutes([permissions])
                     router.addRoutes(errPage)
                     sessionStorage.setItem('routerData',JSON.stringify([permissions]))
-                    // 测试处理过路由否
+                    // 处理过路由否
                     sessionStorage.setItem('success',true)
                 }
             }).catch(err=>{
diff --git a/src/router/permission.js b/src/router/permission.js
index aa97088..f3bfec7 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -11,12 +11,10 @@ export default function(){
             }else{
                 e.component = () => import(`@/pages/${e.path}.vue`)
             }
-            
             e.children && e.children.forEach(n => {
                 n.path && (n.component = () => import(`@/pages/${n.path}.vue`))
             })
         })
-        
         routes.push({
             path: '*',
             redirect: '404'
diff --git a/src/router/resetRouter.js b/src/router/resetRouter.js
index c352320..90b33b0 100644
--- a/src/router/resetRouter.js
+++ b/src/router/resetRouter.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import router from './index'
 Vue.use(Router);
-
+/* 重置路由 */
 const staticRouter = [
     {
         path: '/',
diff --git a/src/store/modules/guarantee.js b/src/store/modules/guarantee.js
index e1f4018..7020709 100644
--- a/src/store/modules/guarantee.js
+++ b/src/store/modules/guarantee.js
@@ -35,26 +35,26 @@ const state = {
 }
 
 const getters = {
-    // clear(state){
-    //     return state.letterValue ={
-    //         businessId: '',//业务id
-    //         bank: '',//银行
-    //         name: '',//客户名称
-    //         passingTime: '',//贷审会日期
-    //         loanMoney: '',//担保金额
-    //         guaranteeMoney: '',//担保金额转格式
-    //         file: '',//会议纪要
-    //         loanTern: '',//担保期限
-    //         auditOpinion: '',//审核意见
-    //         // 上面伟哥定义的
+    clear(state){
+        return state.letterValue ={
+            businessId: '',//业务id
+            bank: '',//银行
+            name: '',//客户名称
+            passingTime: '',//贷审会日期
+            loanMoney: '',//担保金额
+            guaranteeMoney: '',//担保金额转格式
+            file: '',//会议纪要
+            loanTern: '',//担保期限
+            auditOpinion: '',//审核意见
+            // 上面伟哥定义的
             
-    //         id:'',//行内rowID
-    //         status:'',//行内状态
+            id:'',//行内rowID
+            status:'',//行内状态
             
-    //     }
-    //      ,state.headerImg =''
-    //      ,state.headerImg =''
-    // }
+        }
+         ,state.headerImg =''
+         ,state.headerImg =''
+    }
 }
 
 const mutations = {
diff --git a/src/store/modules/loan.js b/src/store/modules/loan.js
index 696f29f..634e0b7 100644
--- a/src/store/modules/loan.js
+++ b/src/store/modules/loan.js
@@ -27,9 +27,10 @@ const state = {
     entering:false,// 是否为录入业务
     disabledAll:false,//禁用全部
     liquidate:'1',// 控制清收统计页面切换
+    schedule:'1',// 控制清收进度查询后退
     liquidateSearch:{},
     liquidWatch:false,// 清收统计是否进入查看界面
-
+    source:'',// 判断是否为系统流转，且需要判断是否已编辑
 }
 
 const getters = {
@@ -106,6 +107,9 @@ const mutations = {
     liquidWatch(s,val){
         s.liquidWatch = val==='watch'
     },
+    source(s,val){
+        s.source = val
+    },
     
 }
 
diff --git a/src/util/buttonRole.js b/src/util/buttonRole.js
index 0825718..dd8c527 100644
--- a/src/util/buttonRole.js
+++ b/src/util/buttonRole.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 /**
  * 权限指令--与行内指令V-IF有冲突，不要同时用
- * 使用：v-roleBtn = "'角色值'"
+ * 使用：v-roleBtn = "'角色值'"，详情前往担保业务查看
 **/
 const roleBtn = Vue.directive('roleBtn', {
     inserted: function (el, binding, vnode) {  
diff --git a/src/util/wxLogin.js b/src/util/wxLogin.js
index d86321a..533b593 100644
--- a/src/util/wxLogin.js
+++ b/src/util/wxLogin.js
@@ -1,3 +1,4 @@
+/* 微信扫码登录 */
 !(function(a, b, c) {
     function d(a) {
         var c = 'default';
diff --git a/src/utils/api.js b/src/utils/api.js
index db6c42e..cee8617 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,10 +1,4 @@
-import {
-    get,
-    post,
-    put,
-    del,
-    Url
-} from './http';
+import {get,post,put,del,Url} from './http';
 let host = Url;
 export const login = p => post('/apiHrmsAuth/hrms/auth/userlogin/login', p);
 export const phoneCode = p => get('/apiHrmsAuth/hrms/auth/userlogin/sendCode', p);
diff --git a/src/utils/core.js b/src/utils/core.js
index cc645d6..7decab9 100644
--- a/src/utils/core.js
+++ b/src/utils/core.js
@@ -297,7 +297,38 @@ export default {
         document.body.appendChild(downloadElement);
         downloadElement.click(); 
         document.body.removeChild(downloadElement);
-    }
+    },
+
+    /**
+     * @description 格式化金额
+     * @param number：要格式化的数字
+     * @param decimals：保留几位小数 默认0位
+     * @param decPoint：小数点符号 默认.
+     * @param thousandsSep：千分位符号 默认为,
+     */
+    formatMoney: (number, decimals = 0, decPoint = '.', thousandsSep = ',') => {
+        number = (number + '').replace(/[^0-9+-Ee.]/g, '')
+        let n = !isFinite(+number) ? 0 : +number
+        let prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
+        let sep = (typeof thousandsSep === 'undefined') ? ',' : thousandsSep
+        let dec = (typeof decPoint === 'undefined') ? '.' : decPoint
+        let s = ''
+        let toFixedFix = function (n, prec) {
+        let k = Math.pow(10, prec)
+        return '' + Math.ceil(n * k) / k
+        }
+        s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.')
+        let re = /(-?\d+)(\d{3})/
+        while (re.test(s[0])) {
+        s[0] = s[0].replace(re, '$1' + sep + '$2')
+        }
+        if ((s[1] || '').length < prec) {
+        s[1] = s[1] || ''
+        s[1] += new Array(prec - s[1].length + 1).join('0')
+        }
+        return s.join(dec)
+    },
 
+   
     
 };
diff --git a/src/utils/http.js b/src/utils/http.js
index 9341d2d..6cc089e 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -4,8 +4,9 @@ import axios from 'axios';
 import { Message } from 'element-ui'
 import router from '../router/index'
  
+// 服务器的切换
 export const Url = 'https://test.feifanhitech.com'// 测试服务器地址
-// export const Url = 'https://www.feifanhitech.com';// 非凡
+// export const Url = 'https://www.feifanhitech.com';// 非凡(正式服)
 // export const Url = 'http://192.168.31.137:8080';//陈赓
 axios.defaults.baseURL = Url;
 const baseurl = Url