Merge branch 'dev'
Showing
4 changed files
with
43 additions
and
45 deletions
| ... | @@ -49,20 +49,20 @@ | ... | @@ -49,20 +49,20 @@ |
| 49 | </el-form-item> | 49 | </el-form-item> |
| 50 | </el-col> | 50 | </el-col> |
| 51 | </el-row> | 51 | </el-row> |
| 52 | 52 | ||
| 53 | <div | 53 | <div |
| 54 | class="slxx_title title-block" | 54 | class="slxx_title title-block" |
| 55 | v-if="ruleForm.slsq.djywbm.includes('400')"> | 55 | v-if="ruleForm.slsq.djywbm.includes('400')"> |
| 56 | 在建工程抵押信息列表({{ ruleForm.qlxxList.length }} 户) | 56 | 在建工程抵押信息列表({{ ruleForm.qlxxList.length }} 户) |
| 57 | <div class="triangle"></div> | 57 | <div class="triangle"></div> |
| 58 | </div> | 58 | </div> |
| 59 | <div | 59 | <div |
| 60 | class="slxx_title title-block" | 60 | class="slxx_title title-block" |
| 61 | v-else> | 61 | v-else> |
| 62 | 抵押户信息列表信息({{ ruleForm.hlist.length }} 户) | 62 | 抵押户信息列表信息({{ ruleForm.hlist.length }} 户) |
| 63 | <div class="triangle"></div> | 63 | <div class="triangle"></div> |
| 64 | </div> | 64 | </div> |
| 65 | <cfBdcdyTable :tableData="ruleForm.qlxxList" v-if="ruleForm.slsq.djywbm.includes('400')"/> | 65 | <cfBdcdyTable :tableData="ruleForm.qlxxList" v-if="ruleForm.slsq.djywbm.includes('400')" /> |
| 66 | <qjhTable v-else :tableData="ruleForm.hlist" /> | 66 | <qjhTable v-else :tableData="ruleForm.hlist" /> |
| 67 | <div class="slxx_title title-block"> | 67 | <div class="slxx_title title-block"> |
| 68 | 抵押信息 | 68 | 抵押信息 |
| ... | @@ -83,7 +83,7 @@ | ... | @@ -83,7 +83,7 @@ |
| 83 | <el-form-item label="抵押金额类型:"> | 83 | <el-form-item label="抵押金额类型:"> |
| 84 | <el-radio-group | 84 | <el-radio-group |
| 85 | v-model="ruleForm.diyaqList[0].dyjelx" | 85 | v-model="ruleForm.diyaqList[0].dyjelx" |
| 86 | :disabled="!viewEdit"> | 86 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> |
| 87 | <el-radio label="0">独立抵押</el-radio> | 87 | <el-radio label="0">独立抵押</el-radio> |
| 88 | <el-radio label="1">整体抵押</el-radio> | 88 | <el-radio label="1">整体抵押</el-radio> |
| 89 | </el-radio-group> | 89 | </el-radio-group> |
| ... | @@ -92,35 +92,37 @@ | ... | @@ -92,35 +92,37 @@ |
| 92 | <el-col :span="8"> | 92 | <el-col :span="8"> |
| 93 | <el-form-item | 93 | <el-form-item |
| 94 | label="是否存在禁止或者限制转让抵押不动产的约定:" | 94 | label="是否存在禁止或者限制转让抵押不动产的约定:" |
| 95 | label-width="350px"> | 95 | label-width="300px"> |
| 96 | <el-radio-group | 96 | <el-radio-group |
| 97 | v-model="ruleForm.diyaqList[0].sfczjzhxz" | 97 | v-model="ruleForm.diyaqList[0].sfczjzhxz" |
| 98 | :disabled="!viewEdit"> | 98 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> |
| 99 | <el-radio label="1">启用</el-radio> | 99 | <el-radio label="1">启用</el-radio> |
| 100 | <el-radio label="0">禁用</el-radio> | 100 | <el-radio label="0">禁用</el-radio> |
| 101 | </el-radio-group> | 101 | </el-radio-group> |
| 102 | </el-form-item> | 102 | </el-form-item> |
| 103 | </el-col> | 103 | </el-col> |
| 104 | </el-row> | 104 | </el-row> |
| 105 | |||
| 106 | <el-row | 105 | <el-row |
| 107 | :gutter="10" | 106 | :gutter="10" |
| 108 | v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0"> | 107 | v-if="ruleForm.diyaqList && ruleForm.diyaqList.length > 0"> |
| 109 | <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1"> | 108 | <el-col :span="8" v-show="ruleForm.diyaqList[0].dyfs == 1"> |
| 110 | <el-form-item label="被担保主债权数额:"> | 109 | <el-form-item label="被担保主债权数额:"> |
| 111 | <el-input | 110 | <div style="display: flex"> |
| 112 | v-model="ruleForm.diyaqList[0].bdbzzqse" | 111 | <el-input |
| 113 | :disabled="!viewEdit"></el-input> | 112 | v-model="ruleForm.diyaqList[0].bdbzzqse" |
| 114 | <el-select | 113 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> |
| 115 | v-model="ruleForm.diyaqList[0].jedw" | 114 | <el-select |
| 116 | :disabled="!viewEdit"> | 115 | style="width: 68px" |
| 117 | <el-option | 116 | v-model="ruleForm.diyaqList[0].jedw" |
| 118 | v-for="item in dictData['A57']" | 117 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> |
| 119 | :key="item.dcode" | 118 | <el-option |
| 120 | :label="item.dname" | 119 | v-for="item in dictData['A57']" |
| 121 | :value="item.dcode"> | 120 | :key="item.dcode" |
| 122 | </el-option> | 121 | :label="item.dname" |
| 123 | </el-select> | 122 | :value="item.dcode"> |
| 123 | </el-option> | ||
| 124 | </el-select> | ||
| 125 | </div> | ||
| 124 | </el-form-item> | 126 | </el-form-item> |
| 125 | </el-col> | 127 | </el-col> |
| 126 | 128 | ||
| ... | @@ -128,10 +130,10 @@ | ... | @@ -128,10 +130,10 @@ |
| 128 | <el-form-item label="最高债权额:"> | 130 | <el-form-item label="最高债权额:"> |
| 129 | <el-input | 131 | <el-input |
| 130 | v-model="ruleForm.diyaqList[0].zgzqse" | 132 | v-model="ruleForm.diyaqList[0].zgzqse" |
| 131 | :disabled="!viewEdit"></el-input> | 133 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> |
| 132 | <el-select | 134 | <el-select |
| 133 | v-model="ruleForm.diyaqList[0].jedw" | 135 | v-model="ruleForm.diyaqList[0].jedw" |
| 134 | :disabled="!viewEdit"> | 136 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"> |
| 135 | <el-option | 137 | <el-option |
| 136 | v-for="item in dictData['A57']" | 138 | v-for="item in dictData['A57']" |
| 137 | :key="item.dcode" | 139 | :key="item.dcode" |
| ... | @@ -146,7 +148,7 @@ | ... | @@ -146,7 +148,7 @@ |
| 146 | <el-form-item label="债务履行起始时间:"> | 148 | <el-form-item label="债务履行起始时间:"> |
| 147 | <el-date-picker | 149 | <el-date-picker |
| 148 | v-model="ruleForm.diyaqList[0].zwlxqssj" | 150 | v-model="ruleForm.diyaqList[0].zwlxqssj" |
| 149 | :disabled="!viewEdit" | 151 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" |
| 150 | type="date"> | 152 | type="date"> |
| 151 | </el-date-picker> | 153 | </el-date-picker> |
| 152 | </el-form-item> | 154 | </el-form-item> |
| ... | @@ -155,7 +157,7 @@ | ... | @@ -155,7 +157,7 @@ |
| 155 | <el-form-item label="债务履行结束时间:"> | 157 | <el-form-item label="债务履行结束时间:"> |
| 156 | <el-date-picker | 158 | <el-date-picker |
| 157 | v-model="ruleForm.diyaqList[0].zwlxjssj" | 159 | v-model="ruleForm.diyaqList[0].zwlxjssj" |
| 158 | :disabled="!viewEdit" | 160 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')" |
| 159 | type="date"> | 161 | type="date"> |
| 160 | </el-date-picker> | 162 | </el-date-picker> |
| 161 | </el-form-item> | 163 | </el-form-item> |
| ... | @@ -167,7 +169,7 @@ | ... | @@ -167,7 +169,7 @@ |
| 167 | <el-form-item label="担保范围:"> | 169 | <el-form-item label="担保范围:"> |
| 168 | <el-input | 170 | <el-input |
| 169 | v-model="ruleForm.diyaqList[0].dbfw" | 171 | v-model="ruleForm.diyaqList[0].dbfw" |
| 170 | :disabled="ruleForm.sldyList[0].djlx == '300' && !viewEdit"></el-input> | 172 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> |
| 171 | </el-form-item> | 173 | </el-form-item> |
| 172 | </el-col> | 174 | </el-col> |
| 173 | </el-row> | 175 | </el-row> |
| ... | @@ -176,7 +178,7 @@ | ... | @@ -176,7 +178,7 @@ |
| 176 | <el-form-item label="最高债权确定事实和数额:"> | 178 | <el-form-item label="最高债权确定事实和数额:"> |
| 177 | <el-input | 179 | <el-input |
| 178 | v-model="ruleForm.diyaqList[0].zgzqqdss" | 180 | v-model="ruleForm.diyaqList[0].zgzqqdss" |
| 179 | :disabled="!viewEdit"></el-input> | 181 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> |
| 180 | </el-form-item> | 182 | </el-form-item> |
| 181 | </el-col> | 183 | </el-col> |
| 182 | </el-row> | 184 | </el-row> |
| ... | @@ -188,7 +190,7 @@ | ... | @@ -188,7 +190,7 @@ |
| 188 | maxlength="500" | 190 | maxlength="500" |
| 189 | show-word-limit | 191 | show-word-limit |
| 190 | v-model="ruleForm.diyaqList[0].fj" | 192 | v-model="ruleForm.diyaqList[0].fj" |
| 191 | :disabled="!viewEdit"></el-input> | 193 | :disabled="!viewEdit || ruleForm.slsq.djywbm.includes('400')"></el-input> |
| 192 | </el-form-item> | 194 | </el-form-item> |
| 193 | </el-col> | 195 | </el-col> |
| 194 | </el-row> | 196 | </el-row> |
| ... | @@ -342,7 +344,7 @@ | ... | @@ -342,7 +344,7 @@ |
| 342 | this.loading = false | 344 | this.loading = false |
| 343 | }) | 345 | }) |
| 344 | }, | 346 | }, |
| 345 | components: { qlrCommonTable, qjhTable,cfBdcdyTable }, | 347 | components: { qlrCommonTable, qjhTable, cfBdcdyTable }, |
| 346 | computed: { | 348 | computed: { |
| 347 | ...mapGetters(["dictData", "flag"]), | 349 | ...mapGetters(["dictData", "flag"]), |
| 348 | }, | 350 | }, | ... | ... |
| ... | @@ -132,7 +132,7 @@ | ... | @@ -132,7 +132,7 @@ |
| 132 | label-width="350px"> | 132 | label-width="350px"> |
| 133 | <el-radio-group | 133 | <el-radio-group |
| 134 | v-model="ruleForm.diyaq.sfczjzhxz" | 134 | v-model="ruleForm.diyaq.sfczjzhxz" |
| 135 | :disabled="!viewEdit"> | 135 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"> |
| 136 | <el-radio label="1">启用</el-radio> | 136 | <el-radio label="1">启用</el-radio> |
| 137 | <el-radio label="0">禁用</el-radio> | 137 | <el-radio label="0">禁用</el-radio> |
| 138 | </el-radio-group> | 138 | </el-radio-group> |
| ... | @@ -146,8 +146,9 @@ | ... | @@ -146,8 +146,9 @@ |
| 146 | <div style="display:flex"> | 146 | <div style="display:flex"> |
| 147 | <el-input | 147 | <el-input |
| 148 | v-model="ruleForm.diyaq.bdbzzqse" | 148 | v-model="ruleForm.diyaq.bdbzzqse" |
| 149 | :disabled="!viewEdit"></el-input> | 149 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input> |
| 150 | <el-select style="width: 68px" v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit"> | 150 | <el-select style="width: 68px" v-model="ruleForm.diyaq.jedw" |
| 151 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"> | ||
| 151 | <el-option | 152 | <el-option |
| 152 | v-for="item in dictData['A57']" | 153 | v-for="item in dictData['A57']" |
| 153 | :key="item.dcode" | 154 | :key="item.dcode" |
| ... | @@ -163,8 +164,8 @@ | ... | @@ -163,8 +164,8 @@ |
| 163 | <el-form-item label="最高债权额:"> | 164 | <el-form-item label="最高债权额:"> |
| 164 | <el-input | 165 | <el-input |
| 165 | v-model="ruleForm.diyaq.zgzqse" | 166 | v-model="ruleForm.diyaq.zgzqse" |
| 166 | :disabled="!viewEdit"></el-input> | 167 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input> |
| 167 | <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit"> | 168 | <el-select v-model="ruleForm.diyaq.jedw" :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"> |
| 168 | <el-option | 169 | <el-option |
| 169 | v-for="item in dictData['A57']" | 170 | v-for="item in dictData['A57']" |
| 170 | :key="item.dcode" | 171 | :key="item.dcode" |
| ... | @@ -179,7 +180,7 @@ | ... | @@ -179,7 +180,7 @@ |
| 179 | <el-form-item label="债务履行起始时间:"> | 180 | <el-form-item label="债务履行起始时间:"> |
| 180 | <el-date-picker | 181 | <el-date-picker |
| 181 | v-model="ruleForm.diyaq.zwlxqssj" | 182 | v-model="ruleForm.diyaq.zwlxqssj" |
| 182 | :disabled="!viewEdit" | 183 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'" |
| 183 | type="date"> | 184 | type="date"> |
| 184 | </el-date-picker> | 185 | </el-date-picker> |
| 185 | </el-form-item> | 186 | </el-form-item> |
| ... | @@ -188,7 +189,7 @@ | ... | @@ -188,7 +189,7 @@ |
| 188 | <el-form-item label="债务履行结束时间:"> | 189 | <el-form-item label="债务履行结束时间:"> |
| 189 | <el-date-picker | 190 | <el-date-picker |
| 190 | v-model="ruleForm.diyaq.zwlxjssj" | 191 | v-model="ruleForm.diyaq.zwlxjssj" |
| 191 | :disabled="!viewEdit" | 192 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'" |
| 192 | type="date"> | 193 | type="date"> |
| 193 | </el-date-picker> | 194 | </el-date-picker> |
| 194 | </el-form-item> | 195 | </el-form-item> |
| ... | @@ -200,7 +201,7 @@ | ... | @@ -200,7 +201,7 @@ |
| 200 | <el-form-item label="担保范围:"> | 201 | <el-form-item label="担保范围:"> |
| 201 | <el-input | 202 | <el-input |
| 202 | v-model="ruleForm.diyaq.dbfw" | 203 | v-model="ruleForm.diyaq.dbfw" |
| 203 | :disabled="ruleForm.sldy.djlx == '300' && !viewEdit"></el-input> | 204 | :disabled="(ruleForm.sldy.djlx == '300' && !viewEdit) || ruleForm.sldy.djlx == '400'"></el-input> |
| 204 | </el-form-item> | 205 | </el-form-item> |
| 205 | </el-col> | 206 | </el-col> |
| 206 | </el-row> | 207 | </el-row> |
| ... | @@ -209,7 +210,7 @@ | ... | @@ -209,7 +210,7 @@ |
| 209 | <el-form-item label="最高债权确定事实和数额:"> | 210 | <el-form-item label="最高债权确定事实和数额:"> |
| 210 | <el-input | 211 | <el-input |
| 211 | v-model="ruleForm.diyaq.zgzqqdss" | 212 | v-model="ruleForm.diyaq.zgzqqdss" |
| 212 | :disabled="!viewEdit"></el-input> | 213 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input> |
| 213 | </el-form-item> | 214 | </el-form-item> |
| 214 | </el-col> | 215 | </el-col> |
| 215 | </el-row> | 216 | </el-row> |
| ... | @@ -221,7 +222,7 @@ | ... | @@ -221,7 +222,7 @@ |
| 221 | maxlength="500" | 222 | maxlength="500" |
| 222 | show-word-limit | 223 | show-word-limit |
| 223 | v-model="ruleForm.diyaq.fj" | 224 | v-model="ruleForm.diyaq.fj" |
| 224 | :disabled="!viewEdit"></el-input> | 225 | :disabled="!viewEdit || ruleForm.sldy.djlx == '400'"></el-input> |
| 225 | </el-form-item> | 226 | </el-form-item> |
| 226 | </el-col> | 227 | </el-col> |
| 227 | </el-row> | 228 | </el-row> | ... | ... |
| ... | @@ -16,11 +16,6 @@ class data extends filter { | ... | @@ -16,11 +16,6 @@ class data extends filter { |
| 16 | columns () { | 16 | columns () { |
| 17 | return [ | 17 | return [ |
| 18 | { | 18 | { |
| 19 | type: 'selection', | ||
| 20 | label: '全选', | ||
| 21 | selectable: this.selected | ||
| 22 | }, | ||
| 23 | { | ||
| 24 | label: '序号', | 19 | label: '序号', |
| 25 | type: 'index', | 20 | type: 'index', |
| 26 | width: '50', | 21 | width: '50', | ... | ... |
-
Please register or sign in to post a comment