@bit-sun/business-component 2.2.9 → 2.2.10

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

@@ -12,7 +12,7 @@ import { Resizable } from 'react-resizable';
 import { checkQuantityAccuracy, precisionQuantity } from '@/utils/checkUtils';
 import TableColumnSetting from '@/plugin/TableColumnSetting';
 import { setInitialShowColumn } from '@/plugin/TableColumnSetting/utils';
-import { handleAntdColumnsSpecialParams } from '@/utils/utils';
+import { handleAntdColumnsSpecialParams, uuid } from '@/utils/utils';
 import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnSettingTable/utils';
 
 const loadSelectSource = (url: string, params?: any) => {
@@ -100,10 +100,13 @@ const AddSelect = (props: any) => {
     buttonProps = {},
     beforeShowModal,
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
+    businessType = 'sku',
+    isAllowRepeatedSelect = false
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
   const realButtonProps = {type: "primary", ...buttonProps};
+  const selectRowKey = isAllowRepeatedSelect ? 'uuid' : mappingValueField
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   const initVal = value || (selectMode ? [] : null);
@@ -188,7 +191,9 @@ const AddSelect = (props: any) => {
             if(record.needFocus === true && currentIndex === 0) {
 
             }
-            let precisionObj={};
+            let precisionObj=businessType == 'skc'?{
+              precision: 0
+            }:{};
             const unitAccuracy = record.packingUnitList?.[0]?.unitAccuracy
             const isCountUnitAccuracyCheck = item.dataIndex =='count' && unitAccuracy !== undefined
             if(isCountUnitAccuracyCheck) {
@@ -305,6 +310,52 @@ const AddSelect = (props: any) => {
         }
       }
 
+      const selectLength = modalTableProps.selectColumn.filter(item => item.isSelectItem).length
+      const currentSelectIndex = selectIndex
+      if(item.isSelectItem) {
+        selectIndex++;
+        return {
+          ...item,
+          render: (text, record, index) => {
+            if (item.dataSource?.length) {
+              return (
+                <Select
+                  value={text || null}
+                  onChange={(value) => {
+                    if(businessType == 'skc' && popvalue.some((i: any) => i.code == record.code && i[item.dataIndex] == value)) {
+                      message.warning('相同skc配码不可设置相同哦')
+                      record[item.dataIndex] = null;
+                      const newPopValue = popvalue.map((i: any, innerIndex: number) => {
+                        if(innerIndex == index) {
+                          i[item.dataIndex] =  record[item.dataIndex]
+                        }
+                        return i
+                      })
+                      setPopValue(newPopValue)
+                      return false
+                    }
+                    record[item.dataIndex] = value
+                    const newPopValue = popvalue.map((i: any, innerIndex: number) => {
+                      if(innerIndex == index) {
+                        i[item.dataIndex] =  record[item.dataIndex]
+                      }
+                      return i
+                    })
+                    setPopValue(newPopValue)
+                  }}
+                  style={{width: '160px'}}
+                >
+                  {item.dataSource.map((item: any) => {
+                    return <Select.Option value={item.code}>{item.name}</Select.Option>
+                  })}
+                </Select>
+              )
+            }
+            return <></>
+          },
+        }
+      }
+
       return item
     }), {
       title: '操作',
@@ -543,21 +594,50 @@ const AddSelect = (props: any) => {
   }
 
   useEffect(() => {
-    Promise.all([
-      loadSelectSource(`/items/brand/queryBrandList`, {
-        pageSize: 5000,
-        currentPage: 1,
-        'ctl-withAuth': true
-      }),
-      loadSelectSource(`/items/category/queryCategoryTree`, {
-        pageSize: 5000,
-        currentPage: 1,
-      }),
-    ]).then((x: any)=>{
-      formatSource(x,0, 2, tableSearchForm,['id','name'])
-      formatTreeDataSource(x,1, 3, tableSearchForm)
-    })
-  }, [])
+    if(businessType == 'sku') {
+      Promise.all([
+        loadSelectSource(`/items/brand/queryBrandList`, {
+          pageSize: 5000,
+          currentPage: 1,
+          'ctl-withAuth': true
+        }),
+        loadSelectSource(`/items/category/queryCategoryTree`, {
+          pageSize: 5000,
+          currentPage: 1,
+        }),
+      ]).then((x: any)=>{
+        formatSource(x,0, 2, tableSearchForm,['id','name'])
+        formatTreeDataSource(x,1, 3, tableSearchForm)
+      })
+    }
+    if(businessType == 'skc') {
+      Promise.all([
+        loadSelectSource(`/items/item/propertyValue`, {
+          pageSize: 5000,
+          currentPage: 1,
+          'qp-propertyId-eq': '1467042217951883265'
+        }),
+        loadSelectSource(`/items/category/queryCategoryTree`, {
+          pageSize: 5000,
+          currentPage: 1,
+        }),
+        loadSelectSource(`/items/class/withProperty`, {
+          pageSize: 5000,
+          currentPage: 1,
+        }),
+        loadSelectSource(`/items/brand/queryBrandList`, {
+          pageSize: 5000,
+          currentPage: 1,
+          'ctl-withAuth': true
+        }),
+      ]).then((x: any)=>{
+        formatSource(x,0, 3, tableSearchForm,['value','value'])
+        formatTreeDataSource(x,1, 4, tableSearchForm)
+        formatSource(x,2, 5, tableSearchForm,['id','name'])
+        formatSource(x,3, 6, tableSearchForm,['id','name'])
+      })
+    }
+  }, [businessType])
 
   useEffect(() => {
     if (value) {
@@ -719,8 +799,14 @@ const AddSelect = (props: any) => {
         selectRows[selectedRowKeys.length]['needFocus'] = true;
       }
     }
-    setPopValue(selectRows);
-    setSelectedRowKeys(selectKeys)
+    if(isAllowRepeatedSelect) {
+      const list = popvalue.concat(selectRows).map((i: any) => ({...i, uuid: i.uuid || uuid()}))
+      setPopValue(list);
+      setSelectedRowKeys([])
+    } else {
+      setPopValue(selectRows);
+      setSelectedRowKeys(selectKeys)
+    }
     // setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
     // setCheckedAll(filterRows.length === tablePagination?.total);
   }
@@ -844,11 +930,17 @@ const AddSelect = (props: any) => {
   }
 
   const deleteRecord = (record) => {
-    setPopValue(popvalue.filter(item => item.skuCode !== record.skuCode))
-    setSelectedRowKeys([...selectedRowKeys.filter(item => item !== record.skuCode)])
+    if(isAllowRepeatedSelect) {
+      setPopValue(popvalue.filter(item => item.uuid !== record.uuid))
+      setSelectedRowKeys([])
+    } else {
+      setPopValue(popvalue.filter(item => item.skuCode !== record.skuCode))
+      setSelectedRowKeys([...selectedRowKeys.filter(item => item !== record.skuCode)])
+    }
   }
 
   let inputIndex = 0;
+  let selectIndex = 0;
 
   useEffect(() => {
     setInitialShowColumn(codeSelected,selectColumns,(res) => {
@@ -915,6 +1007,7 @@ const AddSelect = (props: any) => {
   })
   handleColumns(showSelectedCol, [],(res)=> setShowColumnsCallback(res));
 
+  const selectLength = isAllowRepeatedSelect ? (popvalue?.length || 0) : (selectedRowKeys?.length || 0)
   return (
     <div className={'add_select'}>
       <div className="add_select_show" id={`add_select_div_${uniqueValue}`}>
@@ -978,7 +1071,7 @@ const AddSelect = (props: any) => {
               <div className={caretLeftFlag ? 'add_select_wrapper_right' : 'add_select_wrapper_right1'}>
                 <div>
                   <div className={'select_list_selectTips'}>
-                    <div style={{ marginLeft: 8 }}>搜索结果共&nbsp;<span style={themeColor}>{tablePagination?.total || 0}</span>&nbsp;项{selectMode ? <span>， 本次已选&nbsp;<span style={themeColor}>{selectedRowKeys?.length || 0}</span>&nbsp;项</span> : ''}</div>
+                    <div style={{ marginLeft: 8 }}>搜索结果共&nbsp;<span style={themeColor}>{tablePagination?.total || 0}</span>&nbsp;项{selectMode ? <span>， 本次已选&nbsp;<span style={themeColor}>{selectLength}</span>&nbsp;项</span> : ''}</div>
                     <div>
                       <span style={{ marginRight: 8 }}>
                         <TableColumnSetting
@@ -1027,7 +1120,7 @@ const AddSelect = (props: any) => {
             </div>
             <div className={'add_select_wrapper_select'}>
               <div className={'select_list_selectTips'}>
-                <div style={{ marginLeft: 8 }}><span>本次已选&nbsp;<span style={themeColor}>{selectedRowKeys?.length || 0}</span>&nbsp;项</span></div>
+                <div style={{ marginLeft: 8 }}><span>本次已选&nbsp;<span style={themeColor}>{selectLength}</span>&nbsp;项</span></div>
                 <div style={{ display: 'flex' }}>
                   <span style={{ marginRight: 8 }}>
                     <TableColumnSetting
@@ -1047,7 +1140,7 @@ const AddSelect = (props: any) => {
                 dataSource={popvalue}
                 pagination={false}
                 // onChange={handleTableChange}
-                rowKey={mappingValueField}
+                rowKey={selectRowKey}
                 rowClassName={'row-class'}
                 scroll={{ y: 500 }}
                 onRow={record => {

package/src/utils/requestUtils.ts

@@ -20,6 +20,8 @@ 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
   if (localStorage.getItem('x-user-auth-context')) {
     config.headers['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');