Merge branch 'znh-small' into znh

zhongnanhuang
2 parents 6f847267 0447a0a0
Showing 2 changed files with 3 additions and 2 deletions
src/pages/OrderPrint/components/HoujiePrinter.tsx
src/utils/index.ts
@@ -12,7 +12,7 @@ export default ({ mainOrder, subOrders }) =&gt; {
       <tr height="30" style={{ height: '15.00pt' }}>
         <td height="30" style={{ height: '15.00pt' }}></td>
         <td className="xl72">{i + 1}</td>
-        <td className="xl72">{subOrder.id}</td>
+        <td className="xl72">{mainOrder.id}</td>
         <td className="xl72">{subOrder.productName}</td>
         <td className="xl72">{subOrder.parameters}</td>
         <td className="xl72">{subOrder.unit}</td>
@@ -67,10 +67,11 @@ function formatdate(inputDateTime: string) {
 }
  
 function formatSalesCode(salesCode: any) {
+  console.log('in');
   let newSalesCode = salesCode;
   if (newSalesCode.indexOf('_')) {
     newSalesCode = newSalesCode.split('_');
-    if (salesCode?.length === 2) {
+    if (newSalesCode?.length === 2) {
       newSalesCode = newSalesCode[1] + '（' + newSalesCode[0] + '）';
     }
   }