Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/settle/settleAdd.vue

@@ -103,9 +103,13 @@
           <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
             <div>资方结清费用</div>
             <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
-              <div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
+              <div>贷款保证金:
+                <span v-if="formobj.showHg" style="margin-right: 10px">{{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
+                <el-input v-else style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
+              </div>
               <div>是否抵顶:
-                <el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
+                <span v-if="formobj.showHg">{{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }}</span>
+                <el-radio-group v-else v-model="formobj.loanSettleBankCostVo.topping">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
                 </el-radio-group>

anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue

@@ -102,9 +102,13 @@
           <div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
             <div>资方结清费用</div>
             <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
-              <div>贷款保证金:<el-input style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" /></div>
+              <div>贷款保证金:
+                <span v-if="formobj.showHg" style="margin-right: 10px">{{ formobj.loanSettleBankCostVo.loanDeposit }}</span>
+                <el-input v-else style="width: 60%" @keyup.native="UpNumber" v-model="formobj.loanSettleBankCostVo.loanDeposit" clearable placeholder="" />
+              </div>
               <div>是否抵顶:
-                <el-radio-group v-model="formobj.loanSettleBankCostVo.topping">
+                <span v-if="formobj.showHg">{{ formobj.loanSettleBankCostVo.topping ? '是' : '否' }}</span>
+                <el-radio-group v-else v-model="formobj.loanSettleBankCostVo.topping">
                   <el-radio :label="true">是</el-radio>
                   <el-radio :label="false">否</el-radio>
                 </el-radio-group>