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

.env.development

@@ -8,18 +8,18 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-# VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
+VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
 
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-# VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址

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")
 }
 
 // 多选事件