迁移合并

components/IncidentListFilter.vue

@@ -18,7 +18,7 @@
       <view class="category">
         <text class="name">故障现象</text>
         <text class="value flex-1">
-					<uni-data-picker @change="categoryChange" v-model="searchData.category" :localdata="pageData.categoryList" popup-title="请选择故障信息" :map="{text:'category',value:'id'}">
+					<uni-data-picker @change="categoryChange" v-model="searchData.categoryValue" :localdata="pageData.categoryList" popup-title="请选择故障信息" :map="{text:'category',value:'id'}">
 						
 					</uni-data-picker>
 				</text>
@@ -131,6 +131,7 @@
     selected: 'todoingAll',
     area: {id: 0, area: '全部'},
     category: {},
+		categoryValue:{},
     acceptDate: [],
   })
   
@@ -167,8 +168,9 @@
     setHospital();
     searchData.selected = 'todoingAll';
     searchData.area = {id: 0, area: '全部'};
-    searchData.category = {id: 0, category: '全部'};
+    searchData.category = {};
     searchData.acceptDate = [];
+		searchData.categoryValue = {};
     console.log(searchData.acceptDate)
   }
   
@@ -199,6 +201,7 @@
     }
   }
   
+	// 选择故障现象
 	function categoryChange(val){
 		searchData.category = val.detail.value[val.detail.value.length-1]
 	}
@@ -320,6 +323,7 @@
     searchData.selected = evt.selected;
     searchData.area = evt.area;
     searchData.category = evt.category;
+		searchData.categoryValue = evt.categoryValue;
     searchData.acceptDate = evt.acceptDate;
   })
 </script>