Merge branch 'v2-test' into 'v2-test'

src/locales/en_US/order.ts

@@ -94,6 +94,19 @@ export default {
   'order.bill.confirmAndSendMail': 'Confirm and send the email',
   'order.bill.pleaseEmail': 'Please enter the email address to receive the electronic invoice',
 
+  'order.detailInfo.orderTradeName': 'Trade Type',
+  'order.detailInfo.vendorOrderNo': 'Supplier order number',
+  'order.detailInfo.buyerAccount': "Purchasing party's business representative",
+  'order.detailInfo.vendorAccount': "Supplier's business representative",
+  'order.detailInfo.purchaseOrderDiffName': 'Purchase order differentiation',
+  'order.detailInfo.warehouseName': 'Warehouse Name',
+  'order.detailInfo.purchaseRate': 'Purchase Exchange Rate',
+  'order.detailInfo.etd': 'ETD',
+  'order.detailInfo.eta': 'ETA',
+  'order.detailInfo.portOfDepartment': 'Port of departure',
+  'order.detailInfo.portOfDestination': 'Destination Port',
+  'order.detailInfo.deliverPeriod': 'Planned shipment date',
+  'order.detailInfo.receivePeriod': 'Planned receipt date',
   'order.detailInfo.orderNo': 'order reference',
   'order.detailInfo.quoteNo': 'Corresponding quotation number',
   'order.detailInfo.digest': 'Order summary',

src/locales/zh_CN/order.ts

@@ -94,6 +94,19 @@ export default {
   'order.bill.confirmAndSendMail': '确认并发送邮件',
   'order.bill.pleaseEmail': '请输入接收电子发票的邮箱',
 
+  'order.detailInfo.orderTradeName': '贸易类型',
+  'order.detailInfo.vendorOrderNo': '供应商订单号',
+  'order.detailInfo.buyerAccount': '采方营业担当',
+  'order.detailInfo.vendorAccount': '供方营业担当',
+  'order.detailInfo.purchaseOrderDiffName': '采购订单区分',
+  'order.detailInfo.warehouseName': '仓库名称',
+  'order.detailInfo.purchaseRate': '采购汇率',
+  'order.detailInfo.etd': 'ETD',
+  'order.detailInfo.eta': 'ETA',
+  'order.detailInfo.portOfDeparture': '启运港',
+  'order.detailInfo.portOfDestination': '目的港',
+  'order.detailInfo.deliverPeriod': '计划发货日',
+  'order.detailInfo.receivePeriod': '计划收货日',
   'order.detailInfo.orderNo': '订单编号',
   'order.detailInfo.quoteNo': '对应报价单号',
   'order.detailInfo.digest': '订单摘要',
@@ -410,4 +423,7 @@ export default {
   'order.requireOrder.feedbackInformation': '反馈信息',
   'order.requireOrder.baojiadanshenhebutongguo': '报价单审核不通过',
 
+
+
+
 };

src/views/Order/MycommodityDetails/components/StaySubmit/index.tsx

@@ -144,6 +144,19 @@ const StaySubmit = (props: Iprops) => {
     { title: "order.detailInfo.orderNo", value: dataSource.orderNo, copyfn: () => handleCopy(dataSource.orderNo) },
     { title: 'order.detailInfo.quoteNo', value: dataSource.quoteNo, copyfn: () => handleCopy(dataSource.quoteNo) },
     { title: 'order.detailInfo.digest', value: dataSource.digest, },
+    { title: 'order.detailInfo.orderTradeName', value: dataSource.orderTradeName, },
+    { title: 'order.detailInfo.vendorOrderNo', value: dataSource.vendorOrderNo, },
+    { title: 'order.detailInfo.buyerAccount', value: dataSource.buyerAccount, },
+    { title: 'order.detailInfo.vendorAccount', value: dataSource.vendorAccount, },
+    { title: 'order.detailInfo.purchaseOrderDiffName', value: dataSource.purchaseOrderDiffName, },
+    { title: 'order.detailInfo.warehouseName', value: dataSource.warehouseName, },
+    { title: 'order.detailInfo.purchaseRate', value: dataSource.purchaseRate, },
+    { title: 'order.detailInfo.etd', value: dataSource.etd, },
+    { title: 'order.detailInfo.eta', value: dataSource.eta, },
+    { title: 'order.detailInfo.portOfDeparture', value: dataSource.portOfDeparture, },
+    { title: 'order.detailInfo.portOfDestination', value: dataSource.portOfDestination, },
+    { title: 'order.detailInfo.deliverPeriod', value: dataSource.deliverPeriod, },
+    { title: 'order.detailInfo.receivePeriod', value: dataSource.receivePeriod, },
     { title: 'order.detailInfo.deliverDate', value: dataSource.deliverDate },
     { title: 'order.detailInfo.remark', value: dataSource.requirement?.remarks },
     { title: 'order.detailInfo.pack', value: dataSource.requirement?.pack },

src/views/Order/OrderList/components/FilterModal/index.tsx

@@ -212,7 +212,7 @@ const FilterModal = (props: FilterProps) => {
                       ))}
                     </View>
                   </View>
-                  {
+                  {/* {需求变更需隐藏
                     more ? (
                       <>
                         <View style={style.radioBox}>
@@ -236,7 +236,7 @@ const FilterModal = (props: FilterProps) => {
                     ) : (
                       <Text style={{ textAlign: 'center', fontSize: 14, paddingVertical: 10, color: '#91959B' }} onPress={() => setmore(!more)}>{t('order.btn.moreSel')}</Text>
                     )
-                  }
+                  } */}
                 </ScrollView>
               </View>
               <View style={{   flexDirection:'row'}}>

src/views/Order/components/CommodityCard/index.tsx

@@ -103,7 +103,7 @@ const CommodityCard = (props: Iprops) => {
             </Text>
           </View>
           <View>
-            <Text style={myStyle.stauts}>{Item.outerStatusName}</Text>
+            <Text style={myStyle.stauts}>{Item.innerStatusName}</Text>
           </View>
         </View>
         {
@@ -118,7 +118,7 @@ const CommodityCard = (props: Iprops) => {
               Item.orderMode === 10 || Item.orderMode === 11 ? null : <Text style={{ fontSize: 12, color: Item.orderMode === 10 || Item.orderMode === 11 ? '#EB9B00' : '#EF3346' }}>{Item.symbol ||i18n.t('order:orderList.orderItem.unit$')}</Text>
             }
             <Text style={{ fontSize: 16, color: Item.orderMode === 10 || Item.orderMode === 11 ? '#EB9B00' : '#EF3346' }}>{`${Item.totalAmount?.split(".")[0]}`}</Text>
-           {Item.totalAmount?.split(".")[1] &&<Text style={{ fontSize: 10, color: Item.orderMode === 10 || Item.orderMode === 11 ? '#EB9B00' : '#EF3346' }}>{`.${Item.totalAmount?.split(".")[1]}`}</Text>} 
+           {Item.totalAmount?.split(".")[1] ?<Text style={{ fontSize: 10, color: Item.orderMode === 10 || Item.orderMode === 11 ? '#EB9B00' : '#EF3346' }}>{`.${Item.totalAmount?.split(".")[1]}`}</Text>:null} 
             {
               Item.orderMode === 10 || Item.orderMode === 11 ? <Text style={{ fontSize: 10, color: '#EB9B00' }}>{t('order.other.integral')}</Text> : null
             }