Merge branch 'master' of http://gitea.zianxin.com:8418/zianxin/biz-pc-cloud

src/views/admin/system/user/index.vue

@@ -252,7 +252,9 @@ const handleNodeClick = (clickedNode: any) => {
 
 // 树节点勾选改变
 const treeNodeCheckChange = (checkedNodes: any) => {
-	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	state.queryForm.deptIds = checkedNodes.map((item: any) => item.id)
+	state.queryForm.deptId = ""
+	state.queryForm.isDeepDept = false
 	getDataList()
 }
 

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

@@ -348,7 +348,7 @@ const print = async (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hardwareOrder/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardwareOrder.xlsx")
+	downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单.xlsx")
 }
 
 // 多选事件