shenwu 5 mēneši atpakaļ
vecāks
revīzija
73ca7d750f

+ 5 - 5
src/models/global.tsx

@@ -2,6 +2,7 @@ import { apibookAuthorListAll } from '@/services/book/author';
 import { apiBookContentLabelListAll } from '@/services/book/bookTags';
 import { apibookCategoryListAll } from '@/services/book/classifyList';
 import { enumDictList } from '@/services/global';
+import { Badge } from 'antd';
 import { useReducer } from 'react';
 
 type State = {
@@ -34,7 +35,7 @@ export function reducer(state: State, action: Action) {
 export default (): {
   state: State;
   init: () => void;
-  getEnum: (enumName: string, type: "map" | "arr" | "obj",stateEnum?:{success?:number,error?:number,default?:number,processing?:number,warning:number}) => any;
+  getEnum: (enumName: string, type: "map" | "arr" | "obj" | "stateObj", stateEnum?: any) => any;
   getLabelAndClassList: (params?: { workDirection: number | string }) => Promise<boolean>;
 } => {
   const [state, dispatch] = useReducer(reducer, {});
@@ -110,8 +111,8 @@ export default (): {
    * @param enumName 枚举名称
    * @param type 类型 "map" 通用在列表中选中值输出值会变成number | "arr" 数组类型返回 | "obj" 对象类型返回 再列表中选中输出值为string | "stateObj" 带状态徽标返回的对象
    * @param stateEnum 类型  "stateObj" 时传入映射对象 {success?:number,error?:number,default?:number,processing?:number,warning:number} number为对应值展示什么状态
-   * */ 
-  const getEnum = (enumName: string, type: "map" | "arr" | "obj" | "stateObj",stateEnum?:{success?:number,error?:number,default?:number,processing?:number,warning:number}) => {
+   * */
+  const getEnum = (enumName: string, type: "map" | "arr" | "obj" | "stateObj", stateEnum?: any) => {
     let arr = state?.enumList?.[enumName]?.values
     // console.log("arr",enumName,arr)
     switch (type) {
@@ -131,8 +132,7 @@ export default (): {
         let stateObj: any = {}
         if (arr && stateEnum) {
           for (let item of arr) {
-            let state = stateEnum
-            obj[item?.value] = { text: item?.description, disabled: false }
+            stateObj[item?.value] = { text: <Badge status={stateEnum[item?.value]} text={item.description} />, disabled: false }
           }
         }
         return stateObj

+ 3 - 3
src/pages/distribution/orderLog/short/tableConfig.tsx

@@ -67,7 +67,7 @@ export const columns = (): ProColumns<any>[] => {
       width: 170,
       align: 'center',
       ellipsis: true,
-      valueEnum:getEnum("ORDER_TYPE","map")
+      valueEnum: getEnum("ORDER_TYPE", "map")
     },
     {
       title: '充值金额',
@@ -92,7 +92,7 @@ export const columns = (): ProColumns<any>[] => {
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
-      valueEnum:getEnum("PAY_CHANNEL","map")
+      valueEnum: getEnum("PAY_CHANNEL", "map")
     },
     {
       title: '支付状态',
@@ -100,7 +100,7 @@ export const columns = (): ProColumns<any>[] => {
       width: 170,
       align: 'center',
       ellipsis: true,
-      valueEnum:getEnum("ORDER_STATUS","arr")
+      valueEnum: getEnum("ORDER_STATUS", "stateObj", { "2": "success", "1": "processing", "3": "warning", "-2": "error", " -1": "default" })
     },
     {
       title: '支付场景',