Commit 82078dd3f7ac46d81718333bdbaa90df50ccb3f8
1 parent
72eafa88
feat: bug修复
Showing
1 changed file
with
10 additions
and
3 deletions
src/pages/Invoice/components/InvoiceDetailTable.tsx
@@ -134,8 +134,15 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | @@ -134,8 +134,15 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | ||
134 | if ( | 134 | if ( |
135 | record && | 135 | record && |
136 | item.tid === record.tid && | 136 | item.tid === record.tid && |
137 | - item.projectName !== record.projectName | 137 | + item.projectName !== |
138 | + '*' + | ||
139 | + invoiceProject.productAndServiceCatagoryAbbreviation + | ||
140 | + '*' + | ||
141 | + invoiceProject?.name && | ||
142 | + item.specification !== invoiceProject?.specification | ||
138 | ) { | 143 | ) { |
144 | + console.log(item.projectName); | ||
145 | + console.log(invoiceProject?.name); | ||
139 | item.projectName = | 146 | item.projectName = |
140 | '*' + | 147 | '*' + |
141 | invoiceProject.productAndServiceCatagoryAbbreviation + | 148 | invoiceProject.productAndServiceCatagoryAbbreviation + |
@@ -151,7 +158,7 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | @@ -151,7 +158,7 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | ||
151 | }, | 158 | }, |
152 | }} | 159 | }} |
153 | /> | 160 | /> |
154 | - {/*<ProCard title="表格数据" headerBordered collapsible defaultCollapsed> | 161 | + {/*{<ProCard title="表格数据" headerBordered collapsible defaultCollapsed> |
155 | <ProFormField | 162 | <ProFormField |
156 | ignoreFormItem | 163 | ignoreFormItem |
157 | fieldProps={{ | 164 | fieldProps={{ |
@@ -163,7 +170,7 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | @@ -163,7 +170,7 @@ export default ({ recordId, details, updateDetails, readOnly }) => { | ||
163 | valueType="jsonCode" | 170 | valueType="jsonCode" |
164 | text={JSON.stringify(details)} | 171 | text={JSON.stringify(details)} |
165 | /> | 172 | /> |
166 | - </ProCard>*/} | 173 | + </ProCard>}*/} |
167 | </> | 174 | </> |
168 | ); | 175 | ); |
169 | }; | 176 | }; |