canrd-main / canrd-erp-front · Commits

Commit 0447a0a0f0c73aece7ff5633658403f6284bfc34

Authored by zhongnanhuang
1 parent a948eae2

feat: update

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
src/pages/OrderPrint/components/HoujiePrinter.tsx
  View file @0447a0a
@@ -12,7 +12,7 @@ export default ({ mainOrder, subOrders }) => { @@ -12,7 +12,7 @@ export default ({ mainOrder, subOrders }) => {
12 <tr height="30" style={{ height: '15.00pt' }}> 12 <tr height="30" style={{ height: '15.00pt' }}>
13 <td height="30" style={{ height: '15.00pt' }}></td> 13 <td height="30" style={{ height: '15.00pt' }}></td>
14 <td className="xl72">{i + 1}</td> 14 <td className="xl72">{i + 1}</td>
15 - <td className="xl72">{subOrder.id}</td> 15 + <td className="xl72">{mainOrder.id}</td>
16 <td className="xl72">{subOrder.productName}</td> 16 <td className="xl72">{subOrder.productName}</td>
17 <td className="xl72">{subOrder.parameters}</td> 17 <td className="xl72">{subOrder.parameters}</td>
18 <td className="xl72">{subOrder.unit}</td> 18 <td className="xl72">{subOrder.unit}</td>
src/utils/index.ts
  View file @0447a0a
@@ -56,10 +56,11 @@ function formatDateTime(inputDateTime: string) { @@ -56,10 +56,11 @@ function formatDateTime(inputDateTime: string) {
56 } 56 }
57 57
58 function formatSalesCode(salesCode: any) { 58 function formatSalesCode(salesCode: any) {
  59 + console.log('in');
59 let newSalesCode = salesCode; 60 let newSalesCode = salesCode;
60 if (newSalesCode.indexOf('_')) { 61 if (newSalesCode.indexOf('_')) {
61 newSalesCode = newSalesCode.split('_'); 62 newSalesCode = newSalesCode.split('_');
62 - if (salesCode?.length === 2) { 63 + if (newSalesCode?.length === 2) {
63 newSalesCode = newSalesCode[1] + '（' + newSalesCode[0] + '）'; 64 newSalesCode = newSalesCode[1] + '（' + newSalesCode[0] + '）';
64 } 65 }
65 } 66 }