|
@@ -69,6 +69,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
|
|
|
initData()
|
|
|
}, [])
|
|
|
const initData = async () => {
|
|
|
+
|
|
|
const data = await apiContractIncome(tenderStore.bid)
|
|
|
if (data.code === consts.RET_CODE.SUCCESS) {
|
|
|
if (data.isTemplate && data.isTemplate === 1) {
|
|
@@ -85,6 +86,10 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
|
|
|
contractReturnStore.updateTree(data.sectionTree.children)
|
|
|
}
|
|
|
}
|
|
|
+ // 初始化时如果id存在说明只是table更新了,那么要将store里面的合同数据也一起更新,防止合同详情不是最新的数据
|
|
|
+ if (row.id) {
|
|
|
+ handleRowClick(row.id, row.bidsectionId)
|
|
|
+ }
|
|
|
}
|
|
|
interface HandleLabelProps {
|
|
|
id: string
|
|
@@ -256,7 +261,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
|
|
|
const onClickRow = (record: iIncomeTree) => {
|
|
|
return {
|
|
|
onClick() {
|
|
|
- rowClickHandler(record.id, record.bidsectionId, record.isEdit, record.isNew)
|
|
|
+ handleRowClick(record.id, record.bidsectionId, record.isEdit, record.isNew)
|
|
|
},
|
|
|
onDoubleClick() {
|
|
|
contractReturnStore.rowChange(row.id)
|
|
@@ -265,7 +270,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
|
|
|
}
|
|
|
|
|
|
// 行点击回调
|
|
|
- const rowClickHandler = async (id: string, bid: string, isEdit?: boolean, isNew?: boolean) => {
|
|
|
+ const handleRowClick = async (id: string, bid: string, isEdit?: boolean, isNew?: boolean) => {
|
|
|
if (!isEdit && !isNew) {
|
|
|
const { code = -1, section = {}, contract: newContract = {} } = await apiGetIncome(id, bid)
|
|
|
if (code === consts.RET_CODE.SUCCESS) {
|
|
@@ -412,7 +417,7 @@ const GCsheet: React.FC<iTableContentPorps> = ({ changeModalType, row, setRow, h
|
|
|
<Detail {...contractReturnStore.contract} />
|
|
|
</TabPane>
|
|
|
<TabPane key="2" tab="合同回款">
|
|
|
- <Receivable />
|
|
|
+ <Receivable updateTreeAndContract={initData}/>
|
|
|
</TabPane>
|
|
|
<TabPane key="3" tab="合同文件">
|
|
|
<File />
|