feat:搜索条件

src/views/hard/hard-sh/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+			<DraggableDepMchTree ref="draggableDepMchTreeRef" placeholder="请输入用户部门名称"
+				mch-placeholder="请输入商户部门名称" :show-expand="true"
 				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
 				:defaultTreeWidth="20" :nodeClickable="false" :props="{
 					label: 'name',
@@ -58,7 +59,7 @@
 					<hard-sh-by-day v-if="activeTab === 'MCH'" ref="hardShByDayRef" />
 					<hard-sh-by-month v-if="activeTab === 'MONTH'" ref="hardShByMonthRef" />
 				</template>
-			</DraggableDepTree>
+			</DraggableDepMchTree>
 		</div>
 	</div>
 </template>
@@ -81,7 +82,7 @@ const hardShByMonthRef = ref()
 const queryRef = ref()
 const showSearch = ref(true)
 
-const draggableDepTreeRef = ref()
+const draggableDepMchTreeRef = ref()
 
 // tab变量
 const tabPane = ref([
@@ -179,15 +180,23 @@ const resetQuery = () => {
 	state.queryForm = { ...defaultQueryForm }
 	state.queryForm.deptId = ""
 	state.queryForm.userDeptIds = []
-	draggableDepTreeRef.value.resetData()
+	state.queryForm.merchantDeptIds = []
+	draggableDepMchTreeRef.value.resetData()
 	cancel()
 }
 
 // 树节点选择时
-const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
-	state.queryForm.deptId = curClickedNode.id
-	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
-	state.queryForm.isInclude = !isDeepTree
+const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any, tab?: string) => {
+	if (tab === "MCH_DEPT") {
+		// 商户部门tab：勾选的商户部门ids + 商户部门包含/不包含
+		state.queryForm.merchantDeptIds = checkedTreeNodes.map((item: any) => item.id)
+		state.queryForm.isIncludeMerchantDept = !isDeepTree
+	} else {
+		// 用户部门tab：点击的部门 + 勾选的部门ids + 用户部门包含/不包含
+		state.queryForm.deptId = curClickedNode.id
+		state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
+		state.queryForm.isInclude = !isDeepTree
+	}
 	search()
 }
 </script>