Merge remote-tracking branch 'origin/master'

@@ -198,8 +198,8 @@ export default {
 							"sjytmc": "",
 							"sjytmj": 0,
 							"syqx": "",
-							"tdsyjssj": "2020-10-23",
-							"tdsyqssj": "2020-10-20",
+							"tdsyjssj": "",
+							"tdsyqssj": "",
 							"tdzh": ""
 						}
 					]
@@ -235,8 +235,8 @@ export default {
 						"sjytmc": "",
 						"sjytmj": 0,
 						"syqx": "",
-						"tdsyjssj": "2020-10-23",
-						"tdsyqssj": "2020-10-20",
+						"tdsyjssj": "",
+						"tdsyqssj": "",
 						"tdzh": ""
 					}
 				]
@@ -268,8 +268,8 @@ export default {
 							"sjytmc": "",
 							"sjytmj": 0,
 							"syqx": "",
-							"tdsyjssj": "2020-10-23",
-							"tdsyqssj": "2020-10-20",
+							"tdsyjssj": "",
+							"tdsyqssj": "",
 							"tdzh": ""
 			};
 			if (type === "add") {

+import Vue from "vue";
+//定义key-value过滤方法
+function createFilter(filterName, dataArray) {
+	return Vue.filter(filterName, function(val) {
+		let label = "";
+		let arr = dataArray;
+		arr.forEach((item) => {
+			if (item.value == val) {
+				return (label = item.label);
+			}
+		});
+		return label;
+	});
+}
+//时间格式过滤
+Vue.filter("timeFilter", function(timeStr) {
+	if (timeStr) {
+		return timeStr.substring(0, 10);
+	}
+});
+
+//数据类型过滤
+let bdcLxArray = [
+	{
+		label: "宗地",
+		value: "zd",
+	},
+	{
+		label: "自然幢",
+		value: "zrz",
+	},
+];
+createFilter("bdcLxFilter", bdcLxArray);
\ No newline at end of file

@@ -13,6 +13,7 @@ import 'quill/dist/quill.snow.css'
 import 'quill/dist/quill.bubble.css'
 // 将富文本编译器 注册为全局组件
 Vue.use(VueQuillEditor)
+import "./libs/fliter"; //引入全局过滤器
 // 让IE11支持Vue-router跳转功能
 if (
   '-ms-scroll-limit' in document.documentElement.style && 

@@ -24,12 +24,18 @@
                 </el-table-column>
                 <el-table-column prop="bdcqzh" align="left" label="不动产权证号">
                 </el-table-column>
-                <el-table-column prop="lx" align="left" width="120" label="类型">
+                <el-table-column prop="dylx" align="left" width="120" label="类型">
+                    <template slot-scope="scope">
+                        {{scope.row.dylx | bdcLxFilter}}
+                    </template>
                 </el-table-column>
-                <el-table-column prop="qlr" align="left" width="120" label="权利人">
+                <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
                 </el-table-column>
                 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
-                <el-table-column prop="zrsj" align="left" width="120" label="转入时间">
+                <el-table-column prop="addtime" align="left" width="120" label="转入时间">
+                    <template slot-scope="scope">
+                        {{scope.row.addtime | timeFilter}}
+                    </template>
                 </el-table-column>
                 <el-table-column prop="cjr" align="left" width="120" label="创建人">
                 </el-table-column>

@@ -561,6 +561,9 @@ export default {
 		zddm() {
 			return this.formData.zddm;
 		},
+		zdbsm() {
+			return this.$store.state.zdbsm;
+		},
 	},
 	watch: {
 		zl: function(val) {
@@ -572,6 +575,9 @@ export default {
 		zddm: function(val) {
 			this.$store.state.zddm = val;
 		},
+		zdbsm:function (val) {
+			this.getZdjbxxData()
+		}
 	},
 };
 </script>