@bit-sun/business-component 4.2.1-alpha.8-aiwei → 4.2.1-alpha.8

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

@@ -317,7 +317,7 @@ export default () => {
     },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    selectBusinessType: 'skuCommodity',
+    selectBusinessType: 'spuCommodity',
   };
 
   const onTabChange = (key) => {

package/src/components/Business/TrialCalculation/PathDisplay.less

@@ -0,0 +1,93 @@
+.wrap_pathContentBox {
+  padding: 30px;
+  border: 1px solid #eee;
+  overflow: auto;
+}
+
+.wrap_pathContentBoxTitle {
+  height: 20px;
+  margin-bottom: 20px
+}
+
+.wrap_pathContentBox::-webkit-scrollbar {
+  display: none;
+}
+
+.pathItem_content {
+  display: flex;
+  align-items: center;
+}
+
+.pathItem_block {
+  width: 210px;
+  height: 104px;
+  padding: 10px 20px;
+  background: rgba(24, 144, 255);
+  color: #fff;
+  font-weight: bolder;
+  text-align: center;
+  border-radius: 12px;
+  box-shadow: 1px 1px 10px rgba(200,201,204,.4);
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  line-height: 1.4;
+}
+
+.record_info {
+  text-align: center;
+}
+
+.pathItem_line {
+  margin: 0px 16px;
+}
+
+.pathItem_line_withRightArrow, .pathItem_line_withLeftArrow {
+  position: relative;
+  height: 10px; /* 根据需要调整高度 */
+  display: flex;
+  width: 130px;
+  align-items: center;
+}
+
+.pathItem_line_withRightArrow {
+  margin-top: 10px;
+}
+
+.pathItem_line_withLeftArrow {
+  margin-bottom: 10px;
+}
+
+.pathItem_line_withRightArrow::before, .pathItem_line_withLeftArrow::before {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 100%;
+  height: 4px; /* 直线的粗细 */
+  background-color: rgba(24, 144, 255);
+  z-index: 1;
+}
+
+.pathItem_line_rightArrow, .pathItem_line_leftArrow {
+  position: relative;
+  width: 0;
+  height: 0;
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-left: 10px solid rgba(24, 144, 255); /* 向右的蓝色箭头 */
+  margin-left: 94%; /* 根据需要调整间距 */
+  z-index: 2;
+}
+
+.pathItem_line_withLeftArrow {
+  margin-top: 6px;
+}
+
+.pathItem_line_leftArrow {
+  margin-left: -2px;
+  transform: rotate(180deg);
+}

package/src/components/Business/TrialCalculation/PathDisplay_README.md

@@ -0,0 +1,77 @@
+# PathDisplay 组件说明文档
+
+`PathDisplay` 是一个用于展示跨组织结算链路的图形化组件。它主要用于“试算”场景，根据输入的单据信息，调用后端接口获取预测的结算路径，并以“节点（组织）+ 连线（单据/业务流）”的形式直观展示。
+
+## 1. 组件引入
+
+```typescript
+import PathDisplay from '@/components/Business/TrialCalculation/PathDisplay';
+```
+
+## 2. Props 参数说明
+
+| 参数名 | 类型 | 必填 | 默认值 | 说明 |
+| --- | --- | --- | --- | --- |
+| `recordType` | `string` | 否 | - | 单据类型（如：1007-跨组织调拨） |
+| `businessType` | `string` | 否 | - | 业务类型 |
+| `sendOrgCode` | `string` | 否 | - | 发货组织/调出组织编码 |
+| `receiverOrgCode` | `string` | 否 | - | 收货组织/调入组织编码 |
+| `orderNo` | `string` | 否 | - | 业务单号 |
+| `autoCallApi` | `boolean` | 否 | `true` | 是否在参数变化时自动调用接口 |
+
+## 3. Ref 方法暴露
+
+组件通过 `forwardRef` 暴露了以下方法，可通过 `ref` 调用：
+
+| 方法名 | 类型 | 说明 |
+| --- | --- | --- |
+| `fetchData` | `() => Promise<void>` | 手动触发接口调用，重新获取链路数据 |
+
+## 4. 使用示例
+
+### 4.1 基本使用（自动触发）
+
+只要传入必要的 props，组件会自动调用接口并展示结果。
+
+```tsx
+import React from 'react';
+import PathDisplay from '@/components/Business/TrialCalculation';
+
+const Demo = () => {
+  return (
+    <PathDisplay
+      recordType="1007"
+      businessType="1"
+      sendOrgCode="KDX0001"
+      receiverOrgCode="KD0002"
+      orderNo="DBCK25121700000014"
+    />
+  );
+};
+
+export default Demo;
+```
+
+### 4.2 手动触发（配合表单查询）
+
+如果需要点击“查询”按钮后再触发试算，可以将 `autoCallApi` 设置为 `false`，并通过 `ref` 调用 `fetchData`。
+
+
+```
+
+## 5. 业务逻辑说明
+
+### 5.1 接口请求
+组件内部调用 `/settle/crossOrgSettlementRoute/trialCalculation` 接口。
+*   **Method**: POST
+*   **请求参数**: 取自 Props 中的 `recordType`, `businessType`, `sendOrgCode`, `receiverOrgCode`, `orderNo`。
+
+### 5.2 页面跳转
+组件中包含物资凭证号和结算取价单号的跳转逻辑，依赖微前端环境：
+*   **物资凭证跳转**: `/settle/end-term-management/material_asset_voucher/view/:id/:no`
+*   **取价单跳转**: `/pay/pay-management/credit-management/credit-settle/view/:id`
+
+> 注意：跳转功能依赖 `window.$wujie.props.jump` 方法。如果在非微前端环境（无 wujie 注入）下使用，跳转点击将无效（但不会报错，有空值判断）。
+
+### 5.3 字典依赖
+组件展示业务类型名称时，依赖全局工具函数 `getDictionaryTextByValue` 和内置的 `getRecordBusinessType` 映射逻辑。确保项目中已加载相关数据字典（如 `BUSINESS_ORG_CLASSIFICATION` 等）。

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

@@ -0,0 +1,322 @@
+import React, { useState, useEffect } from 'react';
+import { Tooltip, message, Spin } from 'antd';
+import request from '@/utils/request';
+import { getDictionaryTextByValue, handleError } from '@/utils';
+import './PathDisplay.less';
+
+const formatPaths = (list: any) => {
+    const result = list.map((l: any, index: number) => {
+        const Item = l;
+        if (l?.nodes?.length) {
+            Item.nodes = l?.nodes.map((s: any) => ({
+                ...s,
+                kCode: `${index}_${s.code}`,
+            }));
+        }
+        return Item;
+    });
+    return result;
+};
+
+const getRecordBusinessType = (recordType: any) => {
+    let businessTypeDictCode = "";
+    const list = [
+        { recordType: "502", businessTypeDictCode: "SRM00001" }, // 采购单
+        { recordType: "503", businessTypeDictCode: "SRM00002" }, // 采购退单
+        { recordType: "504", businessTypeDictCode: "TCbusinessType" }, // 销售单
+        { recordType: "505", businessTypeDictCode: "TCRbusinessType" }, // 销售退单
+        { recordType: "1001", businessTypeDictCode: "ALLOCATE00002" }, // 调拨出
+        { recordType: "1002", businessTypeDictCode: "ALLOCATE00002" }, // 调拨入
+        { recordType: "50", businessTypeDictCode: "SC00022" }, // 其他出入库单
+        { recordType: "30", businessTypeDictCode: "BUSINESS_Stock_Adjus" }, // 库存调整
+        { recordType: "130", businessTypeDictCode: "" }, // 逻辑移位单
+        {
+            recordType: "516",
+            businessTypeDictCode: "BUSINESS_ticket_sale_type",
+        }, // pos订单
+        { recordType: "1003", businessTypeDictCode: "BUSINESS_DBCK001" }, // 跨组织调拨出库单
+        { recordType: "1004", businessTypeDictCode: "BUSINESS_DBCK001" }, // 跨组织调拨入库单
+        { recordType: "1007", businessTypeDictCode: "BUSINESS_DBCK" }, // 跨组织调拨
+        { recordType: "517", businessTypeDictCode: "BUSINESS_AssReceiptType" }, // 拆装箱出
+        { recordType: "518", businessTypeDictCode: "BUSINESS_AssReceiptType" }, // 拆装箱入
+    ];
+    const match = list.find((item) => item.recordType == recordType);
+    businessTypeDictCode = match?.businessTypeDictCode || '';
+    return businessTypeDictCode;
+};
+
+interface NodeItem {
+  name: string;
+  code?: string;
+  orgClassification?: string;
+  targetOrgCode?: string;
+  targetRecordName?: string;
+  targetRecordType?: string;
+  targetBusinessType?: string;
+  targetOtherLineInfo?: string;
+  targetRecordNo?: string;
+  targetOccupyType?: number;
+  targetCreditSettleNo?: string;
+  targetRecordId?: string;
+  targetCreditSettleId?: string;
+  sourceOrgCode?: string;
+  sourceRecordName?: string;
+  sourceRecordType?: string;
+  sourceBusinessType?: string;
+  sourceOtherLineInfo?: string;
+  sourceRecordNo?: string;
+  sourceOccupyType?: number;
+  sourceCreditSettleNo?: string;
+  sourceRecordId?: string;
+  sourceCreditSettleId?: string;
+}
+
+interface PathDisplayProps {
+  recordType?: string;
+  businessType?: string;
+  sendOrgCode?: string;
+  receiverOrgCode?: string;
+  orderNo?: string;
+  autoCallApi?: boolean;
+}
+
+interface PathDisplayRef {
+  fetchData: () => Promise<void>;
+}
+
+const PathDisplay = React.forwardRef<PathDisplayRef, PathDisplayProps>(({ 
+  recordType, 
+  businessType, 
+  sendOrgCode, 
+  receiverOrgCode, 
+  orderNo,
+  autoCallApi = true 
+}, ref) => {
+  // 组件内部状态管理
+  const [pathList, setPathList] = useState<NodeItem[]>([]);
+  const [routeCode, setRouteCode] = useState<string>('');
+  const [routeCodeName, setRouteCodeName] = useState<string>('');
+  const [loading, setLoading] = useState<boolean>(false);
+
+  // 暴露方法给父组件
+  React.useImperativeHandle(ref, () => ({
+    fetchData
+  }));
+
+  const boock = (nodeItem: NodeItem) => (
+    <div className="pathItem_block">
+      <div>【{nodeItem.code}】{nodeItem.name}</div>
+      <div>组织分类：{getDictionaryTextByValue('BUSINESS_ORG_CLASSIFICATION', nodeItem.orgClassification || '')}</div>
+    </div>
+  );
+  
+  // 调用接口获取数据
+  const fetchData = async () => {
+    // 检查必要参数
+    if (!recordType || !sendOrgCode || !receiverOrgCode) {
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const params = {
+        recordType,
+        businessType,
+        sendOrgCode,
+        receiverOrgCode,
+        orderNo,
+      };
+      console.log('params', params);
+      let res = await request({
+        url: `/settle/crossOrgSettlementRoute/trialCalculation`,
+        method: 'POST',
+        data: params,
+      });
+      debugger
+      if (handleError(res.data)) {
+        res = res.data;
+        if (res.data?.match) {
+          setRouteCodeName(res?.data?.routeCodeName || '');
+          setRouteCode(res?.data?.routeCode || '');
+          
+          const pList = res?.data?.fontDetails || [];
+          const formattedPaths = formatPaths(pList);
+          setPathList(formattedPaths);
+        } else {
+          // 清空历史结果
+          setRouteCodeName('');
+          setRouteCode('');
+          setPathList([]);
+          message.warning('匹配不到跨组织链路');
+        }
+      } else {
+        // 清空历史结果
+        setRouteCodeName('');
+        setRouteCode('');
+        setPathList([]);
+        message.error('获取数据失败');
+      }
+    } catch (error) {
+      console.error('调用接口失败:', error);
+      setRouteCodeName('');
+      setRouteCode('');
+      setPathList([]);
+      message.error('调用接口失败');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 监听props变化，自动调用接口
+  useEffect(() => {
+    if (autoCallApi) {
+      fetchData();
+    }
+  }, [recordType, businessType, sendOrgCode, receiverOrgCode, orderNo, autoCallApi]);
+
+  const line = (nodeItem: NodeItem) => {
+    // 物资凭证跳转处理
+    const handleMaterialAssetVoucherJump = (recordId: string, recordNo: string) => {
+      if ((window as any).$wujie?.props.jump) {
+        (window as any).$wujie.props.jump({
+          pathname: `/settle/end-term-management/material_asset_voucher/view/${recordId}/${recordNo}`,
+        });
+      }
+    };
+
+    // 取价单跳转处理
+    const handleCreditSettleJump = (creditSettleId: string) => {
+      if ((window as any).$wujie?.props.jump) {
+        (window as any).$wujie.props.jump({
+          pathname: `/pay/pay-management/credit-management/credit-settle/view/${creditSettleId}`,
+        });
+      }
+    };
+
+    return (
+      <div className="pathItem_line">
+        {nodeItem.targetOrgCode && (
+          <>
+            <Tooltip
+              title={
+                <div style={{ fontSize: '12px', lineHeight: '1.5' }}>
+                  <div>结算单据：{nodeItem.targetRecordName}</div>
+                  <div>业务类型：{getDictionaryTextByValue(getRecordBusinessType(nodeItem.targetRecordType || ''), nodeItem.targetBusinessType || '')}</div>
+                  <div>价格来源：{nodeItem.targetOtherLineInfo}</div>
+                  <div>物资凭证：{nodeItem.targetRecordNo || ' '}</div>
+                  <div>{nodeItem.targetOccupyType === 1 ? '信贷占用单' : '结算取价单' }：{nodeItem.targetCreditSettleNo || ' '}</div>
+                </div>
+              }
+              placement="top"
+            >
+              <div className="record_info">
+                <div style={{ fontSize: '12px', lineHeight: '1.5' }}>
+                  <div>{nodeItem.targetRecordName}</div>
+                  <div>{getDictionaryTextByValue(getRecordBusinessType(nodeItem.targetRecordType || ''), nodeItem.targetBusinessType || '')}</div>
+                  <div>{nodeItem.targetOtherLineInfo}</div>
+                  <div>
+                    {nodeItem.targetRecordId && nodeItem.targetRecordNo ? (
+                      <span 
+                        style={{ cursor: 'pointer', color: '#1890ff', textDecoration: 'underline' }}
+                        onClick={() => handleMaterialAssetVoucherJump(nodeItem.targetRecordId || '', nodeItem.targetRecordNo || '')}
+                      >
+                        {nodeItem.targetRecordNo}
+                      </span>
+                    ) : (
+                      nodeItem.targetRecordNo
+                    )}
+                  </div>
+                  <div>
+                    {nodeItem.targetCreditSettleId ? (
+                      <span 
+                        style={{ cursor: 'pointer', color: '#1890ff', textDecoration: 'underline' }}
+                        onClick={() => handleCreditSettleJump(nodeItem.targetCreditSettleId || '')}
+                      >
+                        {nodeItem.targetCreditSettleNo}
+                      </span>
+                    ) : (
+                      nodeItem.targetCreditSettleNo
+                    )}
+                  </div>
+                </div>
+              </div>
+            </Tooltip>
+            <div className="pathItem_line_withRightArrow">
+               <div className="pathItem_line_rightArrow"></div>
+            </div>
+          </>
+        ) || null}
+          {nodeItem.sourceOrgCode && (
+          <>
+            <div className="pathItem_line_withLeftArrow">
+              <div className="pathItem_line_leftArrow"></div>
+            </div>
+            <Tooltip
+              title={
+                <div style={{ fontSize: '12px', lineHeight: '1.5' }}>
+                  <div>结算单据：{nodeItem.sourceRecordName}</div>
+                  <div>业务类型：{getDictionaryTextByValue(getRecordBusinessType(nodeItem.sourceRecordType || ''), nodeItem.sourceBusinessType || '')}</div>
+                  <div>价格来源：{nodeItem.sourceOtherLineInfo}</div>
+                  <div>物资凭证：{nodeItem.sourceRecordNo || ' '}</div>
+                  <div>{nodeItem.sourceOccupyType === 1 ? '信贷占用单' : '结算取价单' }：{nodeItem.sourceCreditSettleNo || ' '}</div>
+                </div>
+              }
+              placement="top"
+            >
+              <div className="record_info">
+                <div style={{ fontSize: '12px', lineHeight: '1.5' }}>
+                  <div>{nodeItem.sourceRecordName}</div>
+                  <div>{getDictionaryTextByValue(getRecordBusinessType(nodeItem.sourceRecordType || ''), nodeItem.sourceBusinessType || '')}</div>
+                  <div>{nodeItem.sourceOtherLineInfo}</div>
+                  <div>
+                    {nodeItem.sourceRecordId && nodeItem.sourceRecordNo ? (
+                      <span 
+                        style={{ cursor: 'pointer', color: '#1890ff', textDecoration: 'underline' }}
+                        onClick={() => handleMaterialAssetVoucherJump(nodeItem.sourceRecordId || '', nodeItem.sourceRecordNo || '')}
+                      >
+                        {nodeItem.sourceRecordNo || ' '}
+                      </span>
+                    ) : (
+                      nodeItem.sourceRecordNo || ' '
+                    )}
+                  </div>
+                  <div>
+                    {nodeItem.sourceCreditSettleId ? (
+                      <span 
+                        style={{ cursor: 'pointer', color: '#1890ff', textDecoration: 'underline' }}
+                        onClick={() => handleCreditSettleJump(nodeItem.sourceCreditSettleId || '')}
+                      >
+                        {nodeItem.sourceCreditSettleNo || ' '}
+                      </span>
+                    ) : (
+                      nodeItem.sourceCreditSettleNo || ' '
+                    )}
+                  </div>
+                </div>
+              </div>
+            </Tooltip>
+          </>
+        ) || null}
+      </div>
+    );
+  };
+
+  return (
+    <div className="wrap_pathContentBox">
+      <Spin spinning={loading} tip="加载中...">
+        {routeCode && <div className="wrap_pathContentBoxTitle">跨组织链路名称：【{routeCode}】{routeCodeName}</div> }
+
+        <div className="pathItem_content">
+          {pathList.map((nodeItem, index) => (
+            <React.Fragment key={`node_${index}`}>
+              {boock(nodeItem)}
+              {line(nodeItem)}
+            </React.Fragment>
+          ))}
+        </div>
+      </Spin>
+    </div>
+  );
+});
+
+export default PathDisplay;

package/src/components/Business/columnSettingTable/sulaSettingTable.tsx

@@ -57,6 +57,21 @@ export default class ColumnSettingSulaTable extends React.Component {
     }, callback);
   }
 
+  /**
+   * 清除自定义列设置后，恢复全部原始列及其定义顺序。
+   */
+  reSetInitialShowColumn = () => {
+    const { columns = [] }: any = this.props;
+    const showColumns = columns.map((item: any) => ({
+      ...item,
+      hidden: false,
+    }));
+
+    this.setState({
+      showColumns,
+    });
+  }
+
   setShowColumns = (newColumns: Array<any>) => {
     this.setState({
       showColumns: [...newColumns]
@@ -445,6 +460,7 @@ export default class ColumnSettingSulaTable extends React.Component {
               setShowColumns={this.setShowColumns}
               showColumns={this.state.showColumns}
               datasource={columns || []}
+              reSetInitialShowColumn={this.reSetInitialShowColumn}
               tableCode={tableCode}
               appRequestConfig={appRequestConfig}
             />
@@ -469,4 +485,4 @@ export default class ColumnSettingSulaTable extends React.Component {
     )
   }
 
-}
+}

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

@@ -669,7 +669,7 @@ const AddSelect = (props: any) => {
         }
         // 数据源 不可以有重复key
         source = Array.isArray(source) ? _.uniqBy(source, 'value') : [];
-     
+
         setTableData(source)
         setTablePagination({ ...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage)) })
       })
@@ -807,6 +807,8 @@ const AddSelect = (props: any) => {
   }
 
   const handleTableChange = (pagination) => {
+    // 设置分页tablePagination
+    setTablePagination({ ...tablePagination, ...pagination })
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 

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

@@ -242,11 +242,9 @@ class DataValidation extends React.Component {
               cell.v = cell.m
             }
           }
-          // console.log(postion);
         },
         cellAllRenderBefore: function (data, sheetFile, ctx) {
           sheetFile.config.borderInfo = [];
-          // console.info(data,sheetFile,ctx)
         },
       },
       showtoolbarConfig: {
@@ -411,7 +409,8 @@ class DataValidation extends React.Component {
   };
 
   getData = () => {
-    console.time();
+    // 是否使用字符串值 默认为false
+    const useStringValue = this.props.useStringValue || false;
     let sheetData = luckysheet.getSheetData();
     let data = JSON.parse(JSON.stringify(sheetData))
       .filter((item) => item[0])
@@ -419,7 +418,13 @@ class DataValidation extends React.Component {
         let obj = {};
 
         item.slice(0, itemsTemp.length).map((innerItem, index) => {
-          obj[this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          // 如果使用字符串值，直接赋值字符串
+          if (useStringValue) {
+            obj[this.state.items[index].code] = innerItem && innerItem.m;
+          } else {
+            // 否则根据值是否相等来判断是否使用字符串值
+            obj[this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          }
         });
 
         return obj;
@@ -570,7 +575,6 @@ customSort = (a, b) => {
           resultData: res,
         });
 
-        console.log(setExportData);
         setExportData([123123]);
       })
       .catch((err:any) => { });
@@ -820,7 +824,6 @@ customSort = (a, b) => {
       top: '0px',
     };
 
-    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">

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

@@ -13,7 +13,7 @@ export const getValue = (value: any, selectMode?: any) => {
 }
 
 const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps={}, ctx }: any) => {
-  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, } = requestConfig;
+  const { filter, method = 'get', url, extralHeaders = {}, otherParams = {}, specialBracket = false, noNeedSplit = false, requestType = 'get' } = requestConfig;
   const selectParamsKey = filter || 'qp-codeAndName-like';
   const resultSourceKey = handleSourceName(requestConfig?.sourceName || ctx?.name || 'skuCode')
   const currentSelectProps = {
@@ -106,7 +106,7 @@ const QueryMutipleSearchSelect = ({ onValueChange, requestConfig={}, selectProps
     let getRequest;
     const methodName = method?.toLocaleLowerCase();
     if(['post','patch','put'].includes(methodName)) {
-      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams),{headers: { ...extralHeaders }})
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams({...queryParams, requestType}),{headers: { ...extralHeaders }})
     } else {
       getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }