Commit a487d78c authored by 前端-陈智峰's avatar 前端-陈智峰

fix: 按钮权限串台、金发bug

parent 6a3ec8f5
......@@ -40,6 +40,7 @@ const CheckboxTree: React.FC<CheckboxTreeProps> = props => {
actions.current.selected = selected;
actions.current.setSelected = setSelected;
actions.current.getSelected = () => selected;
actions.current.unSelectAll = unSelectAll;
}
const toggleSelectAll = () => {
......
......@@ -276,8 +276,17 @@ const MemberDetail: React.FC<{}> = () => {
);
return res;
};
const resset= ()=>{
setNodeRecord(null)
setButtonInfos([])
actionRef.current.unSelectAll()
setAuthInfos({})
setcheckIds({})
setdataId([])
setplateformTreeList([])
}
useEffect(() => {
resset()
if (!id) return;
fetchRoleMenuDetail(id,source).then(res => {
const { data } = res;
......
......@@ -164,7 +164,6 @@ const FormList = (props: any) => {
list.map((item: any, index: number) => {
item.prpIds = item.prpId
val_taxPoint(item)
})
setSelectData(list)
......@@ -172,12 +171,15 @@ const FormList = (props: any) => {
newList.map((i, k) => {
i.newId = i.prpId
i.isHasTax = form.getFieldValue(`isHasTax${i.prpId}_${i.id}`) || undefined
i.taxRate = form.getFieldValue(`taxRate${i.prpId}_${i.id}`) || ''
i.price = form.getFieldValue(`price${i.prpId}`) || ''
val_taxPoint(i)
// i.isHasTax = form.getFieldValue(`isHasTax${i.prpId}_${i.id}`) || undefined
// i.taxRate = form.getFieldValue(`taxRate${i.prpId}_${i.id}`) || ''
// i.price = form.getFieldValue(`price${i.prpId}_${i.id}`) || ''
i.bidAmount = (i.bidCount && i.price) ? new BigNumber(+i.bidCount).multipliedBy(i.price).toNumber().toFixed(2) : ''
})
console.log('list',newList);
setData(newList)
setIsPurchaseModalVisible(false)
......@@ -191,7 +193,6 @@ const FormList = (props: any) => {
// val_taxPoint(item)
})
setIsModalVisible(false)
console.log('list',list);
setData(list)
}
......@@ -508,7 +509,7 @@ const FormList = (props: any) => {
key: 'price' + refresh,
render: (text: any, record: any, index: number) =>
<Form.Item
name={`price${record.id}`}
name={`price${record.prpId}_${record.id}`}
initialValue={text != '' ? String(text).replace(/^(.*\..{4}).*$/, "$1") : ''}
rules={[{
required: true,
......
......@@ -32,6 +32,7 @@ import ViewInventory from './components/viewInventory'
import EditSalesman from './components/editSalesman'
import { useLinkageUtils } from '@/utils/formEffectUtils'
import { getPurchaseRequisitionSrmGetEnumsData } from '@/services/PurchaseV2Api'
import { getMemberParameterManageGetArrivalArea } from '@/services/MemberV2Api'
import { postContractManageGetFeignPayPlan } from '@/services/ContractV2Api'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import RelationSaleOrderEdit from '../components/relationSaleOrderEdit'
......@@ -622,11 +623,13 @@ const IncreaseRequisition: React.FC<{}> = () => {
getPurchaseRequisitionSrmGetEnumsData().then((res: any) => {
const businessTypeMap = fnMap(res.data?.businessTypeMap)
const currencyMap = fnMap(res.data?.currencyMap)
const arrivalAreaMap = fnMap(res.data?.arrivalAreaMap)
linkage.enum('business', businessTypeMap)
// 默认小料
if(res.data?.businessTypeMap?.['1'] ==='小料') addSchemaAction.setFieldValue('business', '1')
linkage.enum('currency', currencyMap)
})
getMemberParameterManageGetArrivalArea().then((res: any) => {
const arrivalAreaMap = fnMap(res.data)
linkage.enum('arrivalArea', arrivalAreaMap);
})
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment