Merge branch 'dev-烟台0220需求' into yantai_master

# Conflicts:
#	src/views/modules/base/organization/organization.vue

src/views/modules/base/communityYantai/community.vue

@@ -1,9 +1,8 @@
 <template>
 	<div class="div_main">
 		<div :style="{ height: rowHeight }" class="div_tree">
-			<!-- <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText">
-      </el-input> -->
+			<el-input placeholder="输入关键字进行过滤" v-model="filterText">
+			</el-input>
 			<el-scrollbar
 				ref="leftScrollBar"
 				:style="{ height: treeHeight }"
@@ -285,7 +284,7 @@ export default {
 			return time.getTime() > nowData;
 		};
 		return {
-			// filterText: '',
+			filterText: "",
 			treeLoading: true,
 			treeData: [],
 			openNodes: [],
@@ -381,6 +380,12 @@ export default {
 		...mapGetters(["clientHeight", "iframeHeight"]),
 	},
 
+	watch: {
+		filterText(val) {
+			this.$refs.ref_tree.filter(val);
+		},
+	},
+
 	async mounted() {
 		this.treeLoading = true;
 

src/views/modules/communityService/fuwujilu/fuwuList08.vue

@@ -0,0 +1,34 @@
+<template>
+	<div>
+		<fuwu-list :serviceCategoryKey="serviceCategoryKey"></fuwu-list>
+	</div>
+</template>
+
+<script>
+import fuwuList from "./fuwuList";
+
+export default {
+	components: { fuwuList },
+
+	data() {
+		return {
+			serviceCategoryKey: "08",
+		};
+	},
+	computed: {},
+	watch: {
+		// "formData.serviceTimeEnd": function (val) {
+		//   if (val && val != '') {
+		//     let arrayTemp = val.split(' ')
+		//     this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+		//   }
+		// },
+	},
+	mounted() {},
+	methods: {},
+
+	props: {},
+};
+</script>
+
+<style lang="scss" scoped></style>