Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
4 changed files
with
46 additions
and
49 deletions
| ... | @@ -196,18 +196,6 @@ export default { | ... | @@ -196,18 +196,6 @@ export default { |
| 196 | this.$refs["ruleForm"].resetFields(); | 196 | this.$refs["ruleForm"].resetFields(); |
| 197 | }, | 197 | }, |
| 198 | submitForm () { | 198 | submitForm () { |
| 199 | // this.$refs['ruleForm'].validate((valid) => { | ||
| 200 | // if (valid) { | ||
| 201 | // this.$message({ | ||
| 202 | // message: '修改成功!', | ||
| 203 | // type: 'success' | ||
| 204 | // }) | ||
| 205 | |||
| 206 | // } else { | ||
| 207 | // this.$message.error('请完善必填项'); | ||
| 208 | // } | ||
| 209 | // }) | ||
| 210 | |||
| 211 | this.$refs.ruleForm.validate((valid) => { | 199 | this.$refs.ruleForm.validate((valid) => { |
| 212 | if (valid) { | 200 | if (valid) { |
| 213 | this.$emit("input", false); | 201 | this.$emit("input", false); | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | <lb-table :column="column" border :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList"> | 3 | <lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList"> |
| 4 | </lb-table> | 4 | </lb-table> |
| 5 | <addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" /> | 5 | <addQlr v-model="dialog" :details="details" @updateDetail="handleupdateDetail" /> |
| 6 | </div> | 6 | </div> |
| 7 | </template> | 7 | </template> |
| 8 | <script> | 8 | <script> |
| ... | @@ -67,15 +67,14 @@ export default { | ... | @@ -67,15 +67,14 @@ export default { |
| 67 | }, | 67 | }, |
| 68 | { | 68 | { |
| 69 | prop: "zjzl", | 69 | prop: "zjzl", |
| 70 | label: "证件种类2", | 70 | label: "证件种类", |
| 71 | render: (h, scope) => { | 71 | render: (h, scope) => { |
| 72 | this.dictData['A30'].forEach(item => { | 72 | return this.dictData['A30'].map(option => { |
| 73 | if (item.dcode == scope.row.zjzl) { | 73 | if (option.dcode == scope.row.zjzl) { |
| 74 | var varName =item.dname | 74 | return <span>{option.dname}</span> |
| 75 | return <div>varName</div> | ||
| 76 | } | 75 | } |
| 77 | }) | 76 | }) |
| 78 | } | 77 | } |
| 79 | }, | 78 | }, |
| 80 | { | 79 | { |
| 81 | prop: "zjh", | 80 | prop: "zjh", |
| ... | @@ -104,25 +103,27 @@ export default { | ... | @@ -104,25 +103,27 @@ export default { |
| 104 | } | 103 | } |
| 105 | } | 104 | } |
| 106 | ], | 105 | ], |
| 107 | column: this.InformationTable | 106 | column: [] |
| 108 | } | 107 | } |
| 109 | }, | 108 | }, |
| 110 | watch: { | 109 | watch: { |
| 111 | tableData: { | 110 | tableData: { |
| 112 | handler: function (val, oldVal) { | 111 | handler: function (val, oldVal) { |
| 113 | let that = this | 112 | let that = this |
| 114 | if (val.length == 0 || !val) { | 113 | this.$nextTick(() => { |
| 115 | that.tableDataList = _.cloneDeep([{ | 114 | if (val.length == 0 || !val) { |
| 116 | sqrmc: '', | 115 | that.tableDataList = _.cloneDeep([{ |
| 117 | dlrzjlx: '', | 116 | sqrmc: '', |
| 118 | dlrzjh: '', | 117 | dlrzjlx: '', |
| 119 | fr: '' | 118 | dlrzjh: '', |
| 120 | }]) | 119 | fr: '' |
| 121 | } else { | 120 | }]) |
| 122 | that.tableDataList = _.cloneDeep(val) | 121 | } else { |
| 123 | } | 122 | that.tableDataList = _.cloneDeep(val) |
| 123 | } | ||
| 124 | this.column = this.InformationTable | ||
| 125 | }) | ||
| 124 | }, | 126 | }, |
| 125 | immediate: true, | ||
| 126 | deep: true | 127 | deep: true |
| 127 | }, | 128 | }, |
| 128 | gyfs: { | 129 | gyfs: { |
| ... | @@ -130,7 +131,7 @@ export default { | ... | @@ -130,7 +131,7 @@ export default { |
| 130 | let dataList = _.cloneDeep(this.InformationTable) | 131 | let dataList = _.cloneDeep(this.InformationTable) |
| 131 | if (newVal == '0') { | 132 | if (newVal == '0') { |
| 132 | this.column = _.cloneDeep(dataList).slice(1, dataList.length) | 133 | this.column = _.cloneDeep(dataList).slice(1, dataList.length) |
| 133 | } else if ((newVal == '1'||newVal == '3')) { | 134 | } else if ((newVal == '1' || newVal == '3')) { |
| 134 | this.column = dataList | 135 | this.column = dataList |
| 135 | } else { | 136 | } else { |
| 136 | this.column = _.cloneDeep(dataList) | 137 | this.column = _.cloneDeep(dataList) |
| ... | @@ -145,13 +146,14 @@ export default { | ... | @@ -145,13 +146,14 @@ export default { |
| 145 | } | 146 | } |
| 146 | }, | 147 | }, |
| 147 | methods: { | 148 | methods: { |
| 148 | updateDetail (value) { | 149 | handleupdateDetail (value) { |
| 149 | this.tableDataList[this.dataIndex] = _.cloneDeep(value); | 150 | if (!_.isEqual(value, this.tableData)) { |
| 150 | console.log(this.tableDataList); | 151 | this.tableDataList[this.dataIndex] = _.cloneDeep(value); |
| 151 | // | 152 | // this.key++ |
| 152 | this.$emit('upDateQlrxxList', _.cloneDeep(this.tableDataList)) | 153 | this.$emit('upDateQlrxxList', this.tableDataList) |
| 154 | } | ||
| 153 | }, | 155 | }, |
| 154 | 156 | ||
| 155 | // 新增 | 157 | // 新增 |
| 156 | addClick () { | 158 | addClick () { |
| 157 | this.dialog = true | 159 | this.dialog = true | ... | ... |
| ... | @@ -20,6 +20,7 @@ export default { | ... | @@ -20,6 +20,7 @@ export default { |
| 20 | }, | 20 | }, |
| 21 | //切换选项卡内容组件 | 21 | //切换选项卡内容组件 |
| 22 | getFromRouter (tabname) { | 22 | getFromRouter (tabname) { |
| 23 | console.log(tabname); | ||
| 23 | this.componentTag = getForm(tabname, this.$route.query.sqywbm); | 24 | this.componentTag = getForm(tabname, this.$route.query.sqywbm); |
| 24 | } | 25 | } |
| 25 | } | 26 | } | ... | ... |
| ... | @@ -81,7 +81,7 @@ | ... | @@ -81,7 +81,7 @@ |
| 81 | </el-form-item> | 81 | </el-form-item> |
| 82 | </el-col> | 82 | </el-col> |
| 83 | </el-row> | 83 | </el-row> |
| 84 | <el-row :gutter="10"> | 84 | <el-row :gutter="10"> |
| 85 | <el-col :span="8"> | 85 | <el-col :span="8"> |
| 86 | <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:"> | 86 | <el-form-item :class="flag ? 'marginBot0' : ''" label="不动产单元号:"> |
| 87 | <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input> | 87 | <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input> |
| ... | @@ -155,7 +155,8 @@ | ... | @@ -155,7 +155,8 @@ |
| 155 | <el-row> | 155 | <el-row> |
| 156 | <el-col :span="24"> | 156 | <el-col :span="24"> |
| 157 | <el-form-item :class="flag ? 'marginBot0' : ''" label="担保范围:"> | 157 | <el-form-item :class="flag ? 'marginBot0' : ''" label="担保范围:"> |
| 158 | <el-input v-model="ruleForm.diyaq.dbfw" :disabled="$route.query.viewtype == 1||ruleForm.slywxx.djlx=='300'"></el-input> | 158 | <el-input v-model="ruleForm.diyaq.dbfw" |
| 159 | :disabled="$route.query.viewtype == 1 || ruleForm.slywxx.djlx == '300'"></el-input> | ||
| 159 | </el-form-item> | 160 | </el-form-item> |
| 160 | </el-col> | 161 | </el-col> |
| 161 | </el-row> | 162 | </el-row> |
| ... | @@ -212,7 +213,7 @@ | ... | @@ -212,7 +213,7 @@ |
| 212 | 抵押人信息 | 213 | 抵押人信息 |
| 213 | <div class="triangle"></div> | 214 | <div class="triangle"></div> |
| 214 | </div> | 215 | </div> |
| 215 | <qlrCommonTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList" | 216 | <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList" |
| 216 | :viewtype="$route.query.viewtype" /> | 217 | :viewtype="$route.query.viewtype" /> |
| 217 | 218 | ||
| 218 | <div class="slxx_title title-block"> | 219 | <div class="slxx_title title-block"> |
| ... | @@ -221,12 +222,13 @@ | ... | @@ -221,12 +222,13 @@ |
| 221 | </div> | 222 | </div> |
| 222 | <el-row :gutter="10"> | 223 | <el-row :gutter="10"> |
| 223 | <el-col> | 224 | <el-col> |
| 224 | <el-form-item v-if="ruleForm.slywxx.djlx=='400'" :class="flag ? 'marginBot0' : ''" label="注销抵押原因:" prop="djyy"> | 225 | <el-form-item v-if="ruleForm.slywxx.djlx == '400'" :class="flag ? 'marginBot0' : ''" label="注销抵押原因:" |
| 226 | prop="djyy"> | ||
| 225 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" | 227 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" |
| 226 | v-model="ruleForm.diyaq.zxdyyy"> | 228 | v-model="ruleForm.diyaq.zxdyyy"> |
| 227 | </el-input> | 229 | </el-input> |
| 228 | </el-form-item> | 230 | </el-form-item> |
| 229 | <el-form-item v-else :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> | 231 | <el-form-item v-else :class="flag ? 'marginBot0' : ''" label="登记原因:" prop="djyy"> |
| 230 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" | 232 | <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" |
| 231 | v-model="ruleForm.diyaq.djyy"> | 233 | v-model="ruleForm.diyaq.djyy"> |
| 232 | </el-input> | 234 | </el-input> |
| ... | @@ -259,7 +261,7 @@ export default { | ... | @@ -259,7 +261,7 @@ export default { |
| 259 | this.ruleForm = res.result; | 261 | this.ruleForm = res.result; |
| 260 | this.ruleForm.diyaq.sfczjzhxz = "0"; | 262 | this.ruleForm.diyaq.sfczjzhxz = "0"; |
| 261 | } | 263 | } |
| 262 | }); | 264 | }) |
| 263 | }, | 265 | }, |
| 264 | components: { qlrCommonTable }, | 266 | components: { qlrCommonTable }, |
| 265 | computed: { | 267 | computed: { |
| ... | @@ -301,13 +303,17 @@ export default { | ... | @@ -301,13 +303,17 @@ export default { |
| 301 | 303 | ||
| 302 | // 更新权利人信息 | 304 | // 更新权利人信息 |
| 303 | upDateQlrxxList (val) { | 305 | upDateQlrxxList (val) { |
| 304 | this.ruleForm.qlrList = _.cloneDeep(val); | 306 | if (!_.isEqual(val, this.ruleForm.qlrList)) { |
| 307 | this.ruleForm.qlrList = _.cloneDeep(val); | ||
| 308 | } | ||
| 305 | }, | 309 | }, |
| 306 | // 更新义务人信息 | 310 | // 更新义务人信息 |
| 307 | upDateYwrxxList (val) { | 311 | upDateYwrxxList (val) { |
| 308 | this.ruleForm.ywrList = _.cloneDeep(val); | 312 | if (!_.isEqual(val, this.ruleForm.ywrList)) { |
| 309 | }, | 313 | this.ruleForm.ywrList = _.cloneDeep(val); |
| 310 | }, | 314 | } |
| 315 | } | ||
| 316 | } | ||
| 311 | }; | 317 | }; |
| 312 | </script> | 318 | </script> |
| 313 | <style scoped lang='scss'> | 319 | <style scoped lang='scss'> | ... | ... |
-
Please register or sign in to post a comment