diff --git a/.env.development b/.env.development index 6480b17..06c6a70 100644 --- a/.env.development +++ b/.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/ # 正式环境 # 代码生成服务地址 diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue index 2f7b54c..836451f 100644 --- a/src/views/hard/hard-dept-total/index.vue +++ b/src/views/hard/hard-dept-total/index.vue @@ -1,86 +1,94 @@ @@ -97,6 +105,8 @@ const showSearch = ref(true) // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) +const draggableDepTreeRef = ref() // 树组件ref引用 + // 表格变量 const state: BasicTableProps = reactive({ isPage: false, @@ -105,8 +115,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 导出excel const exportExcel = () => { @@ -115,14 +124,7 @@ const exportExcel = () => { const getSummaries = (param: any) => { const { columns, data } = param - const totalColumns = [ - "walletPrice", - "walletCount", - "orderPayPrice", - "orderPayCount", - "orderRefundPrice", - "orderRefundCont", - ] + const totalColumns = ["walletPrice", "walletCount", "orderPayPrice", "orderPayCount", "orderRefundPrice", "orderRefundCont"] const totalRow = Array.from({ length: columns.length }) columns.forEach((i: any, index: number) => { if (totalColumns.includes(i.property)) { @@ -152,6 +154,17 @@ const resetQuery = () => { queryRef.value?.resetFields() // 清空多选 selectObjs.value = [] + state.queryForm.deptId = "" + state.queryForm.deptIds = [] + 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.isDeepDept = isDeepTree getDataList() } diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue index 05e22cf..368a9da 100644 --- a/src/views/hard/hard-sb/index.vue +++ b/src/views/hard/hard-sb/index.vue @@ -1,75 +1,87 @@ @@ -87,6 +99,7 @@ const showSearch = ref(true) // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) +const draggableDepTreeRef = ref() // 树组件ref引用 // 定义查询字典 const { hard_type } = useDict("hard_type") @@ -131,6 +144,9 @@ const resetQuery = () => { queryRef.value?.resetFields() // 清空多选 selectObjs.value = [] + state.queryForm.deptId = "" + state.queryForm.deptIds = [] + draggableDepTreeRef.value.resetData() getDataList() } @@ -139,4 +155,12 @@ const selectionChangHandle = (objs: { id: string }[]) => { selectObjs.value = objs.map(({ id }) => id) multiple.value = !objs.length } + +// 树节点选择时 +const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => { + state.queryForm.deptId = curClickedNode.id + state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id) + state.queryForm.isDeepDept = isDeepTree + getDataList() +} diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue index 9203213..eb23c48 100644 --- a/src/views/hard/hard-sh/index.vue +++ b/src/views/hard/hard-sh/index.vue @@ -1,67 +1,79 @@ @@ -78,6 +90,7 @@ const showSearch = ref(true) // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) +const draggableDepTreeRef = ref() // 树组件ref引用 const state: BasicTableProps = reactive({ queryForm: {}, @@ -93,6 +106,9 @@ const resetQuery = () => { queryRef.value?.resetFields() // 清空多选 selectObjs.value = [] + state.queryForm.deptId = "" + state.queryForm.deptIds = [] + draggableDepTreeRef.value.resetData() getDataList() } @@ -127,4 +143,12 @@ const selectionChangHandle = (objs: { id: string }[]) => { selectObjs.value = objs.map(({ id }) => id) multiple.value = !objs.length } + +// 树节点选择时 +const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => { + state.queryForm.deptId = curClickedNode.id + state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id) + state.queryForm.isDeepDept = isDeepTree + getDataList() +} diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue index 85570cc..18d99ac 100644 --- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue +++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue @@ -23,11 +23,13 @@ - - - - - + + + + + + + diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue index 379cd25..eaaeb59 100644 --- a/src/views/wallet/wallet-foreign/index.vue +++ b/src/views/wallet/wallet-foreign/index.vue @@ -1,111 +1,86 @@