gx

src/pages/Cledger/C2routing/index.tsx

@@ -5,7 +5,7 @@ import { openLink } from '@/utils/history'
 import TableList from '@/pages/Zother/TableList'
 import { useSelector } from 'react-redux'
 import { RootState } from '@/store'
-import { API_getGoodsList } from '@/store/action/Cledger/C1ledger'
+import { API_getGoodsList } from '@/store/action/Cledger/C2routing'
 import { baseFormData } from '@/pages/Zother/data'
 import { goodsSonTableC } from '@/utils/tableData'
 import { Button, Tree, Input, TreeDataNode } from 'antd'
@@ -182,20 +182,20 @@ const C2siderLeftTree = ({ setExtraParams }: { setExtraParams: (params: any) =>
   // 根据勾选 key 列表解析为后端需要的分类参数字符串（逗号隔开）
   const getExtraParamsFromKeys = useCallback((keyList: string[]) => {
     const subTagIds = keyList.filter(k => k.startsWith('type-')).map(k => k.slice(5))
-    const subAgeDictId = keyList.filter(k => k.startsWith('age-')).map(k => k.slice(4))
+    const subAgeDictId = keyList.filter(k => k.startsWith('age-')).map(k => Number(k.slice(4)))
     const subArtDictIds = keyList.filter(k => k.startsWith('tag-')).map(k => k.slice(4))
     const subLevel = keyList.filter(k => k.startsWith('level-')).map(k => k.slice(6))
     return { subTagIds, subAgeDictId, subArtDictIds, subLevel }
   }, [])
 
-  // 首次有树数据时默认全部选中
+  // 首次有树数据时默认全部不选中
   useEffect(() => {
     if (!hasSetDefaultChecked.current && treeData?.length) {
       const allKeys = getAllTreeKeys(treeData)
       if (allKeys.length) {
-        setCheckedKeys(allKeys)
-        // 全选树的筛选条件按理等于查询全部，所以先不设置参数，避免多余请求，还是有差别，那还是多请求一次吧
-        setExtraParams(getExtraParamsFromKeys(allKeys))
+        setCheckedKeys([])
+        // 全选树的筛选条件按理等于查询全部，所以先不设置参数，避免多余请求，还是有差别，那还是多请求一次吧 // 不请求
+        // setExtraParams(getExtraParamsFromKeys(allKeys))
         hasSetDefaultChecked.current = true
       }
     }
@@ -206,6 +206,7 @@ const C2siderLeftTree = ({ setExtraParams }: { setExtraParams: (params: any) =>
     const keyList = (next as string[]).filter((k): k is string => typeof k === 'string')
     setCheckedKeys(keyList)
     setExtraParams(getExtraParamsFromKeys(keyList))
+    console.log('keyList', getExtraParamsFromKeys(keyList))
   }
 
   return (
@@ -241,7 +242,7 @@ const C2siderLeftTree = ({ setExtraParams }: { setExtraParams: (params: any) =>
 }
 
 function C2routing() {
-  const tableInfo = useSelector((state: RootState) => state.C1ledger.tableInfo)
+  const tableInfo = useSelector((state: RootState) => state.C2routing.tableInfo)
   const [extraParams, setExtraParams] = useState<any>({})
   // 故事管理/藏品总账定制右侧内容
   const storyTableListToprr = ({

src/pages/Zother/TableList/index.tsx

@@ -104,15 +104,19 @@ const TableList = forwardRef<any, Props>(function TableList(props, ref) {
       ...formDataRef.current,
       ...(extraParams || {})
     }
+    console.log('params1', formDataRef.current, extraParams || {})
+    console.log('params2', params)
     _searchDom.current.forEach((item: any) => {
       if (item.type === 'cascader' && item.key && Array.isArray(params[item.key])) {
         params[item.key] = params[item.key][params[item.key].length - 1]
       }
     })
+
     // 针对 多个标签的数据处理
     tagApiArr.forEach(v => {
       if (params[v] && params[v].length) {
         params[v] = params[v].map((c: any) => {
+          if (typeof c === 'string') return Number(c)
           return Number(c[c.length - 1])
         })
       }

src/store/action/Cledger/C2routing.ts

@@ -0,0 +1,19 @@
+import { AppDispatch } from '@/store'
+import http from '@/utils/http'
+
+/**
+ * 藏品总账-获取藏品分页列表
+ */
+export const API_getGoodsList = (data: any): any => {
+  return async (dispatch: AppDispatch) => {
+    const res = await http.post(`cms/good/ledgerSub/page`, data)
+    if (res.code === 0) {
+      const obj = {
+        list: res.data.records,
+        total: res.data.total
+      }
+
+      dispatch({ type: 'C2/getList', payload: obj })
+    }
+  }
+}

src/store/reducer/Cledger/C2routing.ts

@@ -0,0 +1,27 @@
+import { Typetable } from '@/pages/Zother/data'
+// 初始化状态
+const initState = {
+  // 列表数据
+  tableInfo: {
+    list: [] as Typetable[],
+    total: 0
+  }
+}
+
+// 定义 action 类型
+type Props = {
+  type: 'C2/getList'
+  payload: { list: Typetable[]; total: number }
+}
+
+// reducer
+export default function Reducer(state = initState, action: Props) {
+  switch (action.type) {
+    // 获取列表数据
+    case 'C2/getList':
+      return { ...state, tableInfo: action.payload }
+
+    default:
+      return state
+  }
+}

src/store/reducer/index.ts

@@ -10,6 +10,7 @@ import B2enterGuan from './Benter/B2enterGuan'
 import B3auth from './Benter/B3auth'
 import B4enterCang from './Benter/B4enterCang'
 import C1ledger from './Cledger/C1ledger'
+import C2routing from './Cledger/C2routing'
 import C4file from './Cledger/C4file'
 import D1register from './Dmanage/D1register'
 import D2edit from './Dmanage/D2edit'
@@ -48,6 +49,7 @@ const rootReducer = combineReducers({
   B3auth,
   B4enterCang,
   C1ledger,
+  C2routing,
   C4file,
   D1register,
   D2edit,

src/utils/http.ts

@@ -10,8 +10,8 @@ export const defaultPassWord = 'Aa147852'
 
 export const envFlag = process.env.NODE_ENV === 'development'
 
-const baseUrlTemp = 'https://sit-qingdaobeer.4dage.com' // 测试环境
-// const baseUrlTemp = 'http://192.168.20.61:8112' // 线下环境
+// const baseUrlTemp = 'https://sit-qingdaobeer.4dage.com' // 测试环境
+const baseUrlTemp = 'http://192.168.20.61:8112' // 线下环境
 
 const baseFlag = baseUrlTemp.includes('https://')