Merge remote-tracking branch 'origin/master'
Showing
5 changed files
with
55 additions
and
9 deletions
| ... | @@ -198,8 +198,8 @@ export default { | ... | @@ -198,8 +198,8 @@ export default { |
| 198 | "sjytmc": "", | 198 | "sjytmc": "", |
| 199 | "sjytmj": 0, | 199 | "sjytmj": 0, |
| 200 | "syqx": "", | 200 | "syqx": "", |
| 201 | "tdsyjssj": "2020-10-23", | 201 | "tdsyjssj": "", |
| 202 | "tdsyqssj": "2020-10-20", | 202 | "tdsyqssj": "", |
| 203 | "tdzh": "" | 203 | "tdzh": "" |
| 204 | } | 204 | } |
| 205 | ] | 205 | ] |
| ... | @@ -235,8 +235,8 @@ export default { | ... | @@ -235,8 +235,8 @@ export default { |
| 235 | "sjytmc": "", | 235 | "sjytmc": "", |
| 236 | "sjytmj": 0, | 236 | "sjytmj": 0, |
| 237 | "syqx": "", | 237 | "syqx": "", |
| 238 | "tdsyjssj": "2020-10-23", | 238 | "tdsyjssj": "", |
| 239 | "tdsyqssj": "2020-10-20", | 239 | "tdsyqssj": "", |
| 240 | "tdzh": "" | 240 | "tdzh": "" |
| 241 | } | 241 | } |
| 242 | ] | 242 | ] |
| ... | @@ -268,8 +268,8 @@ export default { | ... | @@ -268,8 +268,8 @@ export default { |
| 268 | "sjytmc": "", | 268 | "sjytmc": "", |
| 269 | "sjytmj": 0, | 269 | "sjytmj": 0, |
| 270 | "syqx": "", | 270 | "syqx": "", |
| 271 | "tdsyjssj": "2020-10-23", | 271 | "tdsyjssj": "", |
| 272 | "tdsyqssj": "2020-10-20", | 272 | "tdsyqssj": "", |
| 273 | "tdzh": "" | 273 | "tdzh": "" |
| 274 | }; | 274 | }; |
| 275 | if (type === "add") { | 275 | if (type === "add") { | ... | ... |
src/libs/fliter.js
0 → 100644
| 1 | import Vue from "vue"; | ||
| 2 | //定义key-value过滤方法 | ||
| 3 | function createFilter(filterName, dataArray) { | ||
| 4 | return Vue.filter(filterName, function(val) { | ||
| 5 | let label = ""; | ||
| 6 | let arr = dataArray; | ||
| 7 | arr.forEach((item) => { | ||
| 8 | if (item.value == val) { | ||
| 9 | return (label = item.label); | ||
| 10 | } | ||
| 11 | }); | ||
| 12 | return label; | ||
| 13 | }); | ||
| 14 | } | ||
| 15 | //时间格式过滤 | ||
| 16 | Vue.filter("timeFilter", function(timeStr) { | ||
| 17 | if (timeStr) { | ||
| 18 | return timeStr.substring(0, 10); | ||
| 19 | } | ||
| 20 | }); | ||
| 21 | |||
| 22 | //数据类型过滤 | ||
| 23 | let bdcLxArray = [ | ||
| 24 | { | ||
| 25 | label: "宗地", | ||
| 26 | value: "zd", | ||
| 27 | }, | ||
| 28 | { | ||
| 29 | label: "自然幢", | ||
| 30 | value: "zrz", | ||
| 31 | }, | ||
| 32 | ]; | ||
| 33 | createFilter("bdcLxFilter", bdcLxArray); | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| ... | @@ -13,6 +13,7 @@ import 'quill/dist/quill.snow.css' | ... | @@ -13,6 +13,7 @@ import 'quill/dist/quill.snow.css' |
| 13 | import 'quill/dist/quill.bubble.css' | 13 | import 'quill/dist/quill.bubble.css' |
| 14 | // 将富文本编译器 注册为全局组件 | 14 | // 将富文本编译器 注册为全局组件 |
| 15 | Vue.use(VueQuillEditor) | 15 | Vue.use(VueQuillEditor) |
| 16 | import "./libs/fliter"; //引入全局过滤器 | ||
| 16 | // 让IE11支持Vue-router跳转功能 | 17 | // 让IE11支持Vue-router跳转功能 |
| 17 | if ( | 18 | if ( |
| 18 | '-ms-scroll-limit' in document.documentElement.style && | 19 | '-ms-scroll-limit' in document.documentElement.style && | ... | ... |
| ... | @@ -24,12 +24,18 @@ | ... | @@ -24,12 +24,18 @@ |
| 24 | </el-table-column> | 24 | </el-table-column> |
| 25 | <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> | 25 | <el-table-column prop="bdcqzh" align="left" label="不动产权证号"> |
| 26 | </el-table-column> | 26 | </el-table-column> |
| 27 | <el-table-column prop="lx" align="left" width="120" label="类型"> | 27 | <el-table-column prop="dylx" align="left" width="120" label="类型"> |
| 28 | <template slot-scope="scope"> | ||
| 29 | {{scope.row.dylx | bdcLxFilter}} | ||
| 30 | </template> | ||
| 28 | </el-table-column> | 31 | </el-table-column> |
| 29 | <el-table-column prop="qlr" align="left" width="120" label="权利人"> | 32 | <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> |
| 30 | </el-table-column> | 33 | </el-table-column> |
| 31 | <el-table-column prop="zl" align="left" label="坐落"></el-table-column> | 34 | <el-table-column prop="zl" align="left" label="坐落"></el-table-column> |
| 32 | <el-table-column prop="zrsj" align="left" width="120" label="转入时间"> | 35 | <el-table-column prop="addtime" align="left" width="120" label="转入时间"> |
| 36 | <template slot-scope="scope"> | ||
| 37 | {{scope.row.addtime | timeFilter}} | ||
| 38 | </template> | ||
| 33 | </el-table-column> | 39 | </el-table-column> |
| 34 | <el-table-column prop="cjr" align="left" width="120" label="创建人"> | 40 | <el-table-column prop="cjr" align="left" width="120" label="创建人"> |
| 35 | </el-table-column> | 41 | </el-table-column> | ... | ... |
| ... | @@ -561,6 +561,9 @@ export default { | ... | @@ -561,6 +561,9 @@ export default { |
| 561 | zddm() { | 561 | zddm() { |
| 562 | return this.formData.zddm; | 562 | return this.formData.zddm; |
| 563 | }, | 563 | }, |
| 564 | zdbsm() { | ||
| 565 | return this.$store.state.zdbsm; | ||
| 566 | }, | ||
| 564 | }, | 567 | }, |
| 565 | watch: { | 568 | watch: { |
| 566 | zl: function(val) { | 569 | zl: function(val) { |
| ... | @@ -572,6 +575,9 @@ export default { | ... | @@ -572,6 +575,9 @@ export default { |
| 572 | zddm: function(val) { | 575 | zddm: function(val) { |
| 573 | this.$store.state.zddm = val; | 576 | this.$store.state.zddm = val; |
| 574 | }, | 577 | }, |
| 578 | zdbsm:function (val) { | ||
| 579 | this.getZdjbxxData() | ||
| 580 | } | ||
| 575 | }, | 581 | }, |
| 576 | }; | 582 | }; |
| 577 | </script> | 583 | </script> | ... | ... |
-
Please register or sign in to post a comment