@bit-sun/business-component 2.2.0-alpha.2 → 2.2.0-alpha.20

package/dist/utils/LocalstorageUtils.d.ts

@@ -1,2 +1,16 @@
 export declare const setConfigTableColumns: (configvalue: any, tableCode: string) => void;
 export declare const getConfigTableColumns: (tableCode: string) => any;
+export declare const saveTenantList: (data: any) => void;
+export declare const getTenantList: () => any;
+export declare const removeTenantList: () => void;
+export declare const saveCurrentTenantId: (item: string) => void;
+export declare const getCurrentTenantId: () => string | 1;
+export declare const removeCurrentTenantId: () => void;
+export declare function getEmployeeId(): any;
+export declare function getEmployeeCode(): any;
+export declare function getSessionId(): any;
+export declare function getAccountId(): any;
+export declare function getUserId(): any;
+export declare function getAccountID(): any;
+export declare function getUserName(): any;
+export declare function handleUserPhone(): any;

package/dist/utils/enumConfig.d.ts

@@ -6,6 +6,7 @@ declare const _default: {
         USER_INFO: string;
         DICT_CODES: string;
         CHILD_APP_BACK: string;
+        SEARCH_FIELDS_CONDITION: string;
     };
 };
 export default _default;

package/dist/utils/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.2.0-alpha.2",
+  "version": "2.2.0-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -5,14 +5,15 @@ nav:
 group:
   title: 业务组件
   order: 1
-title: 业务档录入器
+title: 商品档案录入器
 order: 1
 ---
 
-# BusinessSearchSelect
+# 商品选择录入器
 
+## AddSkuSelect
 
-## 商品选择录入器
+### SKU选择录入器
 
 ```tsx
 import React, { useState } from 'react';
@@ -61,3 +62,68 @@ export default () => {
   );
 };
 ```
+
+## AddSkcSelect
+
+### SKC选择录入器
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import { AddSkcSelect } from '../../../index.ts';
+
+export default () => {
+  const config = {
+    buttonText: 'context',
+    buttonProps: { disabled: false },
+    beforeShowModal: () => {
+      return Promise.resolve(true);
+      // return Promise.reject('校验有误');
+    },
+    onSaveCallback: (rows) => {
+      console.log('save call', rows);
+      return Promise.resolve(true);
+      // return Promise.reject('FAILE')
+    }
+  }
+  return (
+    <div>
+      <AddSkcSelect {...config}  />
+    </div>
+  );
+};
+```
+
+
+## AddSpuSelect
+
+### SPU选择录入器
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import { AddSpuSelect } from '../../../index.ts';
+
+export default () => {
+  const config = {
+    buttonText: 'context',
+    buttonProps: { disabled: false },
+    exceptColumns: ['count', 'categoryText', 'className'],
+    tableCodeList: [null,'spuSelect-tableSelectedItemPartCode_ItemLabel'],
+    beforeShowModal: () => {
+      return Promise.resolve(true);
+      // return Promise.reject('校验有误');
+    },
+    onSaveCallback: (rows) => {
+      console.log('save call', rows);
+      return Promise.resolve(true);
+      // return Promise.reject('FAILE')
+    }
+  }
+  return (
+    <div>
+      <AddSpuSelect {...config}  />
+    </div>
+  );
+};
+```

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

@@ -5,8 +5,9 @@
  * @LastEditTime: 2022-05-08 21:01:21
  * @LastEditors: rodchen
  */
-import React, { useState } from 'react';
-import { Tooltip, Select } from 'antd';
+import React, { useState, useEffect } from 'react';
+import { Tooltip, Select, message } from 'antd';
+import axios from 'axios';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
@@ -38,6 +39,7 @@ export const AddSkuSelect = (parProps: any) => {
     mode: 'multiple',
   }
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  //注⚠️：自定义过表头的请记得传tableCodeList参数
   const initialSelectColumn = [
     {
       title: 'SKU编码',
@@ -146,7 +148,8 @@ export const AddSkuSelect = (parProps: any) => {
       setValue(value)
     },
     beforeShowModal: parProps?.beforeShowModal,
-    onSaveCallback: parProps.onSaveCallback
+    onSaveCallback: parProps.onSaveCallback,
+    businessType: 'sku'
     // onSaveCallback: (rows) => {
     //   console.log('save call', rows);
     //   // return Promise.resolve(true);
@@ -342,3 +345,491 @@ export const AddSkuSelect = (parProps: any) => {
     </div>
   );
 };
+
+export const AddSkcSelect = (parProps: any) => {
+  const selectProps = {
+    mode: 'multiple',
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const [propertyList, setPropertyList] = useState([]);
+
+  useEffect(() => {
+    // type: 1 尺码组; 2 配码组
+    axios.get(`/items/itemPropertyValueGroup/listNoPage?qp-type-eq=2`).then((result: any) => {
+      result = result.data;
+      if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        message.error(result.msg);
+        return;
+      }
+      const data = result.data || [];
+      setPropertyList(data)
+    }).catch((err) => {});
+  },[])
+
+  //注⚠️：自定义过表头的请记得传tableCodeList参数
+  const initialSelectColumn = [
+    {
+      title: 'SKC编码',
+      width: 150,
+      dataIndex: 'code',
+    },
+    {
+      title: 'SKC名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+      dataIndex: 'name',
+    },
+    {
+      title: '颜色',
+      width: 200,
+      ellipsis: {
+        showTitle: false,
+      },
+      render: (text: any) => (
+        <Tooltip placement="topLeft" title={text}>
+          {text}
+        </Tooltip>
+      ),
+      dataIndex: 'colorName',
+    },
+    {
+      title: '配码',
+      dataIndex: 'selectPropertyGroupCode',
+      width: 160,
+      isSelectItem: true,
+      dataSource: propertyList,
+    },
+    {
+      title: '数量',
+      width: 100,
+      isInputItem: true,
+      dataIndex: 'count',
+    },
+  ]
+  const mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps)
+  const props = {
+    buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
+    tableCodeList: parProps.tableCodeList || ['skcSelect-tableOptionsToChoosePartCode','skcSelect-tableSelectedItemPartCode'],
+    value,
+    // labelInValue: true, // 非必填 默认为false
+    requestConfig: {
+      url: `/items/skc/skcSelect`,
+      filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
+      otherParams: {}, // 默认参数
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      ...parProps.requestConfig
+    },
+    selectProps,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    beforeShowModal: parProps?.beforeShowModal,
+    onSaveCallback: parProps.onSaveCallback,
+    businessType: 'skc',
+    isAllowRepeatedSelect: true
+  };
+  const modalTableProps = {
+    modalTableTitle: '选择商品',
+    tableSearchForm: [
+      { name: 'qp-code-like', label: 'SKC编码' },
+      { name: 'qp-skcName-like', label: 'SKC名称' },
+      { name: 'qp-itemName-like', label: '商品名称' },
+      { name: 'qp-colorName-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,
+          },
+        } },
+      { 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,
+          },
+        } },
+    ],
+    tableColumns: [
+      {
+        title: 'SKC编码',
+        width: 150,
+        dataIndex: 'code',
+      },
+      {
+        title: 'SKC名称',
+        width: 200,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'name',
+      },
+      {
+        title: '商品名称',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemName',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      },
+      {
+        title: '颜色',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'colorName',
+      },
+      {
+        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',
+      },
+      {
+        title: '品牌',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+        dataIndex: 'brandName',
+      },
+    ],
+    selectColumn: mTpSelectColumn,
+  }
+
+  return (
+    <div>
+      <AddSelect
+        {...props}
+        modalTableProps={modalTableProps}
+      />
+    </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">