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

src/locales/zh_CN/order.ts

@@ -363,7 +363,8 @@ export default {
   'order.filterBar.quotationAsTime': '报价截止时间',
 
   //查看询价单
-  'order.checkXun.placeholder': '询价单摘要/询价单会员',
+  'order.checkXun.placeholder': '询价单摘要/询价会员',
+  'order.checkXun.placeholder.1': '询价单号/询价单摘要',
   'order.checkXun.memberName': '被询价会员',
   'order.checkXun.memberName.1': '询价会员',
   'order.checkXun.commodityId': '商品ID：',

src/views/CheckInquiryOrder/index.tsx

@@ -165,15 +165,20 @@ const CheckInquiryOrder = () => {
       <NavBar
         title={''}
         extra={
-        <SearchFilter
-          value={innerValue}
-          customLeftIcon={searchImg}
-          onChange={handleChange}
-          onSearch = {handleSearchSubmit}
-          onRightIcon = {handleFilterPress}
-          customRightIcon={'filter'}
-          placeholder = {t('order.checkXun.placeholder', '询价单摘要/询价单会员')}
-        />}
+          <SearchFilter
+            value={innerValue}
+            customLeftIcon={searchImg}
+            onChange={handleChange}
+            onSearch={handleSearchSubmit}
+            onRightIcon={handleFilterPress}
+            customRightIcon={'filter'}
+            placeholder={
+              role?.roleType === roleType.provider
+                ? t('order.checkXun.placeholder', '询价单摘要/询价会员')
+                : t('order.checkXun.placeholder.1', '询价单号/询价单摘要')
+            }
+          />
+        }
       />
       {/* <OrderNavBar
         placeholder={t('order.checkXun.placeholder', '询价单号/询价单摘要')}

src/views/CheckInquiryOrder/pages/InquiryOrderDetail/index.tsx

-import React, { useRef, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   View,
   Text,
@@ -143,13 +143,13 @@ const InquiryOrderDetail: FcRoute<'InquiryOrderDetail', Param> = props => {
                 return (
                   <View style={myStyle['Mcell-content']}>
                     <View style={myStyle['Mcell-item']}>
-                       <Text style={myStyle['Mcell-text']}>{title}</Text>
-                        <Text style={{ color: '#252D37' }}>
-                          {item.formatNum
-                            ? formatNum(Goods?.[value], 6)
-                            : Goods?.[value]}
-                        </Text>
-                      </View>
+                      <Text style={myStyle['Mcell-text']}>{title}</Text>
+                      <Text style={{ color: '#252D37' }}>
+                        {item.formatNum
+                          ? formatNum(Goods?.[value], 6)
+                          : Goods?.[value]}
+                      </Text>
+                    </View>
                   </View>
                 );
               }}
@@ -168,7 +168,7 @@ const InquiryOrderDetail: FcRoute<'InquiryOrderDetail', Param> = props => {
     },
     {
       title: t('order.checkXun.memberName', '被询价会员'),
-      value: orderData?.memberName,
+      value: orderData?.memberName,  //服务消费者
     },
     {
       title: t('order.requireOrder.detail', '需求摘要'),
@@ -315,6 +315,12 @@ const InquiryOrderDetail: FcRoute<'InquiryOrderDetail', Param> = props => {
             </View>
             {basicInfoList.map((item, index) => {
               if (item.value) {
+                if (index === 1 && role?.roleType === roleType.provider) {
+                  item = {
+                    title: t('order.checkXun.memberName.1'),
+                    value: orderData?.inquiryListMemberName,
+                  };
+                }
                 return renderCommonList(item, index);
               }
               return false;

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>