Merge remote-tracking branch 'origin/master'

src/components/page/afterLoan/afterInsurance.vue

@@ -474,7 +474,7 @@
                         </div>
                     </div>
 
-                    <el-table :data="repaymentData" stripe header-align="center" class="mat20" @selection-change="hisSelectionChange" :row-key="getRowKeys" :key="1">
+                    <el-table ref="repaymentTable" :data="repaymentData" stripe header-align="center" class="mat20" @selection-change="hisSelectionChange" :row-key="getRowKeys" :key="1">
                         <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
                         <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                         <el-table-column prop="repaymentDate" label="应还款日" align="center"></el-table-column>
@@ -562,8 +562,8 @@
                 </div>
                 <div v-for="(item, index) in organizationArrs" :key="index" class="organization-row">
                     <div class="left">{{index+1}}</div>
-                    <input v-focus class="center" style="border:0" @blur="item.groupName=$event.target.value" v-if="!item.edit" :value="item.groupName"></el-input>
+                    <input v-focus class="center" style="border:0" @blur="item.groupName=$event.target.value" v-if="!item.edit" :value="item.groupName"></input>
-                    <input class="center" disabled style="border:0" v-if="item.edit" :value="item.groupName"></el-input>
+                    <input class="center" disabled style="border:0" v-if="item.edit" :value="item.groupName"></input>
                     <div class="handle df">
                         <el-button @click="blurOrganization(item,index)" v-if="!item.edit" type="text">保存</el-button>
                         <el-button @click="editOrangization(item,index)" v-if="item.edit" type="text">编辑</el-button>
@@ -1254,6 +1254,7 @@ export default {
                 // console.log('进入录入环节')
                 // 处于编辑/新增录入，需要判断该业务是否新增的，或是流转的，有不同处理方式
                 // 担保信息
+                let has = false
                 const form1 = new Promise((resolve,reject)=>{
                     this.$refs['refGuaranteeForm'].validate((valid) => {
                         if (valid) {
@@ -1319,7 +1320,7 @@ export default {
                         }
                         that.repaymentForm.totalRepayment = that.totalRepayment
                         that.repaymentForm.overdueDays = that.overdueDays
-                        Promise.all([updateRepayment(that.repaymentForm),editInsurance(param)]).then((res1,res2)=>{
+                        Promise.all([editInsurance(param),updateRepayment(that.repaymentForm)]).then((res1,res2)=>{
                             that.$message.success("编辑成功！");
                             that.loanStatus = 3
                             that.$store.commit("loanStatusData", { loanStatus: 3 });
@@ -1447,6 +1448,7 @@ export default {
                 .then(() => {
                     delRepayment(delIds).then(res=>{
                         this.hisMultipleSelection = [];
+                        this.$refs.repaymentTable.clearSelection();
                         this.$message.success('删除成功');
                         this.statisticsSearch()
                     }).catch(err=>{
@@ -1489,13 +1491,13 @@ export default {
             this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
 
             // 不可编辑
-            type==='编辑'?this.$store.commit('discernEdit',false):this.$store.commit('discernEdit',false)
+            type==='编辑'?this.$store.commit('discernEdit',true):this.$store.commit('discernEdit',false)
             if (type==='查看') {
                 this.$store.commit('disabledAll',true)
             }else{
                 this.$store.commit('disabledAll',false)
             }
-            
+
             this.$store.commit("loanbackStatusData", { loanbackStatus: type });
         },
         // 取得录入页面数据详情