feat:设备交易记录、商户交易记录查询逻辑修改

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

@@ -167,7 +167,7 @@ const resetQuery = () => {
 	// 清空多选
 	selectObjs.value = []
 	state.queryForm.deptId = ""
-	state.queryForm.deptIds = []
+	state.queryForm.userDeptIds = []
 	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
@@ -181,7 +181,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 // 树节点选择时
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
-	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }

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

@@ -125,18 +125,6 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 //  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
-// 清空搜索条件
-const resetQuery = () => {
-	// 清空搜索条件
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	state.queryForm.deptId = ""
-	state.queryForm.deptIds = []
-	draggableDepTreeRef.value.resetData()
-	getDataList()
-}
-
 // 导出excel
 const exportExcel = () => {
 	downBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
@@ -169,10 +157,22 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	state.queryForm.deptId = ""
+	state.queryForm.userDeptIds = []
+	draggableDepTreeRef.value.resetData()
+	getDataList()
+}
+
 // 树节点选择时
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
-	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
+	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }