@bit-sun/business-component 2.2.14 → 2.2.16

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -39,6 +39,7 @@ export const AddSkuSelect = (parProps: any) => {
     mode: 'multiple',
   }
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  //注⚠️：自定义过表头的请记得传tableCodeList参数
   const initialSelectColumn = [
     {
       title: 'SKU编码',
@@ -365,6 +366,7 @@ export const AddSkcSelect = (parProps: any) => {
     }).catch((err) => {});
   },[])
 
+  //注⚠️：自定义过表头的请记得传tableCodeList参数
   const initialSelectColumn = [
     {
       title: 'SKC编码',
@@ -600,3 +602,234 @@ export const AddSkcSelect = (parProps: any) => {
     </div>
   );
 };
+
+export const AddSpuSelect = (parProps: any) => {
+  const selectProps = {
+    mode: 'multiple',
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  //注⚠️：自定义过表头的请记得传tableCodeList参数
+  const initialSelectColumn = [
+    {
+      title: '商品编码',
+      width: 150,
+      dataIndex: 'itemCode',
+    },
+    {
+      title: '商品名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+      dataIndex: 'name',
+    },
+    {
+      title: '数量',
+      width: 100,
+      isInputItem: true,
+      dataIndex: 'count',
+    },
+    {
+      title: '所属组织',
+      dataIndex: 'ownOrgSignName',
+    },
+    {
+      title: '品牌',
+      dataIndex: 'brandName',
+    },
+    {
+      title: '类目',
+      dataIndex: 'categoryText',
+    },
+    {
+      title: '品类',
+      dataIndex: 'className',
+    },
+  ]
+  const mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps)
+  const props = {
+    buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
+    tableCodeList: parProps.tableCodeList || [],
+    value,
+    // labelInValue: true, // 非必填 默认为false
+    requestConfig: {
+      url: `/items/item`,
+      filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
+      otherParams: {
+        'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
+        sorter: 'desc-id'
+      }, // 默认参数
+      mappingTextField: 'name',
+      mappingValueField: 'itemCode',
+      ...parProps.requestConfig
+    },
+    selectProps,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    beforeShowModal: parProps?.beforeShowModal,
+    onSaveCallback: parProps.onSaveCallback,
+    businessType: 'spu',
+    // onSaveCallback: (rows) => {
+    //   console.log('save call', rows);
+    //   // return Promise.resolve(true);
+    //   // return Promise.reject('FAILE')
+    // }
+  };
+  const modalTableProps = {
+    modalTableTitle: '选择商品',
+    tableSearchForm: [
+      { name: 'qp-itemCode-like', label: '商品编码' },
+      { name: 'qp-name-like', label: '商品名称' },
+      { name: 'qp-ownOrgSign-in', type: 'select', label: '所属组织', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } },
+      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+    ],
+    tableColumns: [
+      {
+        title: '商品编码',
+        width: 150,
+        dataIndex: 'itemCode',
+      },
+      {
+        title: '商品名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '所属组织',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'ownOrgSignName',
+      },
+      {
+        title: '品牌',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'brandName',
+      },
+      {
+        title: '类目',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'categoryName',
+      },
+      {
+        title: '品类',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'className',
+      },
+    ],
+    selectColumn: mTpSelectColumn
+  }
+
+  return (
+    <div>
+      <AddSelect
+        {...props}
+        modalTableProps={modalTableProps}
+      />
+    </div>
+  );
+};

package/src/components/Business/BsLayouts/Components/RightContent/LoginModal.tsx

@@ -1,7 +1,7 @@
 // @ts-ignore
 import React from 'react';
 import { Form, Input, Button, Modal } from 'antd';
-import { handleAccountID, handleUserID } from '../../utils';
+import { getAccountID, getUserId } from '@/utils/LocalstorageUtils';
 import axios from 'axios';
 
 export default (props: any) => {
@@ -21,7 +21,7 @@ export default (props: any) => {
             onClick={() => {
               form.validateFields().then((res) => {
                 axios({
-                  url: `/bop/api/account/changePassWord/${handleAccountID()}`,
+                  url: `/bop/api/account/changePassWord/${getAccountID()}`,
                   method: 'patch',
                   params: res,
                 }).then(res => {
@@ -41,7 +41,7 @@ export default (props: any) => {
           labelCol={{ span: 4 }}
           wrapperCol={{ span: 20 }}
           initialValues={{
-            username: handleUserID(),
+            username: getUserId(),
           }}
         >
           <Form.Item label="账号" name="username">

package/src/components/Business/BsLayouts/Components/RightContent/index.tsx

@@ -9,9 +9,9 @@ import Morentouxiang32 from '../../../../../assets/32.svg';
 import Out from '../../../../../assets/xinglan-icon-out.png';
 import { outLogin } from '../../service';
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { handleUserName, handleUserPhone, setLoginOutPath } from '../../utils';
+import { setLoginOutPath } from '../../utils';
 import LoginModal from './LoginModal';
-import ENUM from '@/utils/enumConfig';
+import { getSessionId, getUserName, handleUserPhone } from '@/utils/LocalstorageUtils';
 
 export type SiderTheme = 'light' | 'dark';
 export type GlobalHeaderRightProps = {
@@ -58,8 +58,7 @@ const GlobalHeaderRight: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
   };
 
   const loginOut = async () => {
-    const resposne = await JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
-    const sessionId = resposne?.sessionId || '';
+    const sessionId = await getSessionId();
     await outLogin({ sessionId: sessionId });
     // @ts-ignore
     if (BUILD_TYPE) {
@@ -78,7 +77,7 @@ const GlobalHeaderRight: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
         <div className={'userDownTopT'}>
           <img style={{ width: 68, height: 68 }} src={Morentouxiang32} />
         </div>
-        <div className={'userDownTopC'}>{handleUserName()}</div>
+        <div className={'userDownTopC'}>{getUserName()}</div>
         <div className={'userDownTopB'}>{handleUserPhone()}</div>
       </div>
       <div className={'userDownB'}>
@@ -136,7 +135,7 @@ const GlobalHeaderRight: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
               <img src={Morentouxiang} />
             </div>
             <div className={'rcom_c'}>
-              <div className={'rcom_ct'}>{handleUserName()}</div>
+              <div className={'rcom_ct'}>{getUserName()}</div>
               <div className={'rcom_cb'}>{handleUserPhone()}</div>
             </div>
             <div className={'rcom_r'}>

package/src/components/Business/BsLayouts/utils.tsx

@@ -136,29 +136,6 @@ export const setMenuTreeData = (routesData: Array<any>) => {
   }
 };
 
-export function handleUserID() {
-  return JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')
-    ?.accountPersonDetail?.username;
-}
-
-export function handleAccountID() {
-  return JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')
-    ?.accountPersonDetail?.id;
-}
-
-export function handleUserName() {
-  return JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')
-    ?.accountPersonDetail?.employeeName;
-}
-
-export function handleUserPhone() {
-  const str =
-    JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')?.accountPersonDetail
-      ?.person?.phone || '';
-  const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
-  return enStr;
-}
-
 export const setLoginOutPath = () => {
   if (window.__POWERED_BY_WUJIE__) {
     window.$wujie?.props.goToLogin();
@@ -223,4 +200,4 @@ export const encodeUrlQuery = (pathStr: any) => {
     newPathStr = pathStr;
   }
   return newPathStr;
-}
+}

package/src/components/Business/JsonQueryTable/index.tsx

@@ -8,6 +8,7 @@ import axios from 'axios';
 import FieldsSettingsTable from './components/FieldsSettingsTable';
 import { isEmpty } from "lodash"
 import './index.less';
+import { getUserId } from '@/utils/LocalstorageUtils';
 
 function iterFileds (fields) {
   let filedsValue = [];
@@ -101,7 +102,7 @@ function convertFileds (fields, falltValue, faltFieldRange, containerName) {
 
 function faltColumns(columns) {
   let columnsValue = {}
-  
+
   columns.forEach(item => {
     columnsValue[item.key] = {...item}
   })
@@ -111,7 +112,7 @@ function faltColumns(columns) {
 
 function faltCustomerFieldRange(fileds) {
   let columnsValue = {}
-  
+
   fileds.forEach(item => {
     columnsValue[item.name] = {...item}
   })
@@ -163,15 +164,14 @@ function hanleCallbackValue(codeProps, value, customerFields) {
       }
       return item;
     });
-      
+
   }
-  
+
   return newCodeProps;
 }
 
 function isAdmin() {
-  const username = JSON.parse(localStorage.getItem('userInfo') || '{}')
-    ?.accountPersonDetail?.username;
+  const username = getUserId();
 
   return username === 'admin' || username === 'uiuiui'
 }
@@ -254,7 +254,7 @@ const JsonQueryTable = React.memo(props => {
             moduleRelationId
           });
         }
-      } 
+      }
     })
   },[]);
 
@@ -272,7 +272,7 @@ const JsonQueryTable = React.memo(props => {
   React.useEffect(() => {
     localStorage.setItem('jsonEditorVal',JSON.stringify(jsonEditorVal||{}))
   }, [jsonEditorVal]);
-  
+
   React.useEffect(() => {
     if (initialSetting) {
       onClickRun(initialSetting);
@@ -282,18 +282,18 @@ const JsonQueryTable = React.memo(props => {
 
   const height =
     styleRef?.current?.clientHeight || styleRef?.current?.offsetHeight;
-  
+
   const tableParams = {
     ...moduleParams,
     jsonEditorVal,
     codeProps,
   };
-  
+
   return (
     <div>
       <Drawer visible={visible} width={800} onClose={() => setVisible(false)} className={'customFieldsDrawer'}>
         <div ref={styleRef}>
-        
+
         </div>
         {
           isEmpty(moduleParams)?(

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -2,9 +2,9 @@
 // @ts-nocheck
 import { shopFileType, arrivalPaySupportList, sharingType, shopFile2Type } from './common';
 import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from './utils';
-import ENUM from '@/utils/enumConfig';
 import { handleTextOverflow, tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
+import { getEmployeeCode } from '@/utils/LocalstorageUtils';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -1324,7 +1324,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     ]
     Promise.all([
       loadSelectSource(`${prefixUrl.formSelectFix}/orgView/getTree/sales-organizational-view`, {
-        'qp-employeeCode-eq': JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}')?.employeeResVo?.employeeNumber,
+        'qp-employeeCode-eq': getEmployeeCode(),
         'qp-realOrg-eq': true,
         'qp-status-eq': 10
       }),

package/src/components/Functional/AddSelect/index.tsx

@@ -14,6 +14,7 @@ import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
 import { handleAntdColumnsSpecialParams, uuid } from '@/utils/utils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
+import { getEmployeeId } from '@/utils/LocalstorageUtils';
 
 const loadSelectSource = (url: string, params?: any) => {
   return new Promise((resolve, reject) => {
@@ -81,6 +82,12 @@ const formatTreeDataSource = (reData: any, position: number, changePosition: num
   changeSearchForm[changePosition].field.props.treeData = formatData;
 }
 
+const initTableCode = {
+  'sku': ['skuSelect-tableOptionsToChoosePartCode','skuSelect-tableSelectedItemPartCode'],
+  'skc': ['skcSelect-tableOptionsToChoosePartCode','skcSelect-tableSelectedItemPartCode'],
+  'spu': [['spuSelect-tableOptionsToChoosePartCode','spuSelect-tableSelectedItemPartCode']]
+}
+
 const { Option } = Select;
 
 const AddSelect = (props: any) => {
@@ -170,8 +177,8 @@ const AddSelect = (props: any) => {
   const [showColumns, setShowColumns] = useState([]);
   const [tableColumns, setTableColumns] = useState([]);
   const [showToChooseColumns, setShowToChooseColumns] = useState([]);
-  const codeToChoose = tableCodeList[0] || 'skuSelect-tableOptionsToChoosePartCode';
-  const codeSelected = tableCodeList[1] || 'skuSelect-tableSelectedItemPartCode';
+  const codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
+  const codeSelected = tableCodeList[1] || initTableCode[businessType][1];
 
   useEffect(() => {
     setTableColumns(modalTableProps?.tableColumns)
@@ -637,6 +644,33 @@ const AddSelect = (props: any) => {
         formatSource(x,3, 6, tableSearchForm,['id','name'])
       })
     }
+    if(businessType == 'spu') {
+      Promise.all([
+        loadSelectSource(`/user/orgViewNode/listNoPage`, {
+          'qp-employeeId-eq': getEmployeeId(),
+          'qp-orgViewCode-eq': 'business-organizational-view',
+          'ctl-withDefaultOrg': true,
+        }),
+        loadSelectSource(`/items/brand/queryBrandList`, {
+          pageSize: 5000,
+          currentPage: 1,
+          'ctl-withAuth': true
+        }),
+        loadSelectSource(`/items/category/queryCategoryTree`, {
+          pageSize: 5000,
+          currentPage: 1,
+        }),
+        loadSelectSource(`/items/class/withProperty`, {
+          pageSize: 5000,
+          currentPage: 1,
+        }),
+      ]).then((x: any)=>{
+        formatSource(x,0, 2, tableSearchForm,['targetId','name'])
+        formatSource(x,1, 3, tableSearchForm,['id','name'])
+        formatTreeDataSource(x,2, 4, tableSearchForm)
+        formatSource(x,3, 5, tableSearchForm,['id','name'])
+      })
+    }
   }, [businessType])
 
   useEffect(() => {
@@ -718,7 +752,11 @@ const AddSelect = (props: any) => {
         }
         handleLoading(isContinue,false)
       }).catch(Error => {
-        message.error(Error);
+        if(typeof Error === 'object') {
+          !Error.needThrowError ? null : message.error(Error.message)
+        } else {
+          message.error(Error);
+        }
         handleLoading(isContinue,false)
       })
     } else {

package/src/utils/LocalstorageUtils.ts

@@ -1,5 +1,7 @@
 import ENUM from '@/utils/enumConfig';
 
+const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
+
 // 存储表头
 export const setConfigTableColumns = (configvalue: any, tableCode:string) => {
   let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
@@ -50,9 +52,39 @@ export const saveCurrentTenantId = (item: string) => {
   localStorage.setItem('current_tenant_id', String(item));
 }
 export const getCurrentTenantId = () => {
-  return localStorage.getItem('current_tenant_id') || '';
+  return localStorage.getItem('current_tenant_id') || 1;
 }
 export const removeCurrentTenantId = () => {
   localStorage.removeItem('current_tenant_id');
 }
 
+
+export function getEmployeeId() {
+  return resposne?.employeeResVo?.id || 2;
+}
+export function getEmployeeCode() {
+  return resposne?.employeeResVo?.employeeNumber;
+}
+export function getSessionId() {
+  return resposne?.sessionId || '';
+}
+export function getAccountId() {
+  return resposne?.accountPersonDetail?.accountId || -1;
+}
+export function getUserId() {
+  return resposne.accountPersonDetail?.username;
+}
+
+export function getAccountID() {
+  return resposne?.accountPersonDetail?.id;
+}
+
+export function getUserName() {
+  return resposne?.accountPersonDetail?.employeeName;
+}
+
+export function handleUserPhone() {
+  const str = resposne?.person?.phone || '';
+  const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
+  return enStr;
+}

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 import './requestUtils';
 import './checkUtils';
+import './LocalstorageUtils';

package/src/utils/requestUtils.ts

@@ -1,8 +1,6 @@
 import axios from 'axios';
 import ENUM from './enumConfig';
-import { getCurrentTenantId } from './LocalstorageUtils';
-
-const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
+import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
 
 export function handleRequestAuthHeader(config?: any) {
   // https://www.kdocs.cn/l/coNbPpjamr5v这个表格里面涉及的接口，接口请求头里需要添加参数：x-biz-code 值就是列表里的code
@@ -19,10 +17,10 @@ export function handleRequestAuthHeader(config?: any) {
 
 // 处理请求头
 const handleRequestHeader = (config: any) => {
-  config.headers['sso-sessionid']  = resposne?.sessionId || ''
-  config.headers['x-account-id']  = resposne?.accountPersonDetail?.accountId || -1
-  config.headers['x-employee-id']  = resposne?.employeeResVo?.id || 2
-  config.headers['x-tenant-id']  =  getCurrentTenantId() || 1
+  config.headers['sso-sessionid']  = getSessionId()
+  config.headers['x-account-id']  = getAccountId()
+  config.headers['x-employee-id']  = getEmployeeId()
+  config.headers['x-tenant-id']  =  getCurrentTenantId()
   if (localStorage.getItem('x-user-auth-context')) {
     config.headers['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
   }