47357 47409 求购需求单- 增加外部状态 币种符号

src/views/RequireOrder/components/CommodityItem/index.tsx

@@ -20,9 +20,11 @@ const CommodityItem = props => {
           求购需求单号：
           {item.askPurchaseNo}
         </Text>
-        {item?.status ? (
+        {item?.status || item?.outerStatus ? (
           <Text style={myStyle['box-top-text']}>
-            {RequireOrderStatusEnum.getLabelByValue(item?.status)}
+            {RequireOrderStatusEnum.getLabelByValue(
+              item?.status || item?.outerStatus,
+            )}
           </Text>
         ) : null}
       </View>

src/views/RequireOrder/pages/RequireOrderDetail/index.tsx

@@ -227,7 +227,10 @@ const RequireOrderDetail = ({ route, navigation }: IProp) => {
           }}
         >
           <Text>期望单价： </Text>
-          <Text> {formatNum(Goods?.expectedUnitPrice, 6)}</Text>
+          <Text>
+            {`${Goods?.currencySymbol}\t`}
+            {formatNum(Goods?.expectedUnitPrice, 6)}
+          </Text>
         </View>
       </View>
     );

src/views/RequireOrder/pages/RequirePriceOrderDetail/index.tsx

@@ -57,7 +57,7 @@ const RequirePriceOrderDetail: FcRoute<
   const [askPurchaseData, setAskPurchaseData] = useState<AskPurchaseDataType>();
   const [popupVisibal, setPopupVisibal] = useState<boolean>(false);
   const [modalVisible, setModalVisible] = useState<boolean>(false);
-  const [popupInfo, setPopupInfo] = useState<PopupInfo>();
+  const [popupInfo, setPopupInfo] = useState<any>();
   const insets = useSafeAreaInsets();
   const fetchData = async () => {
     console.log(quoteNoId, 'paramsparams', askPurchaseId);
@@ -144,6 +144,7 @@ const RequirePriceOrderDetail: FcRoute<
           </Text>
           <Text>
             {t('order.requireOrder.expectedUnitPrice', '期望单价：')}
+            {`${Goods?.currencySymbol}\t`}
             {formatNum(Goods.expectedUnitPrice, 6)}
           </Text>
         </View>
@@ -160,10 +161,7 @@ const RequirePriceOrderDetail: FcRoute<
               <Text
                 onPress={() => {
                   setPopupVisibal(!popupVisibal);
-                  setPopupInfo({
-                    supplierQuote: item.supplierQuote,
-                    manufacturerPrice: item.manufacturerPrice,
-                  });
+                  setPopupInfo(item);
                 }}
                 style={{ color: '#00A98F' }}
               >
@@ -596,12 +594,14 @@ const RequirePriceOrderDetail: FcRoute<
               {t('order.requireOrder.supplierQuotation', '供应商报价')}
             </Text>
             <Text style={myStyle['Popup-text']}>
+              {`${popupInfo?.currencySymbol}\t`}
               {formatNum(popupInfo?.supplierQuote, 6)}
             </Text>
           </View>
           <View style={myStyle['Popup-content']}>
             <Text>{t('order.requireOrder.factoryQuotation', '厂家报价')}</Text>
             <Text style={myStyle['Popup-text']}>
+              {`${popupInfo?.currencySymbol}\t`}
               {formatNum(popupInfo?.manufacturerPrice, 6)}
             </Text>
           </View>