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

src/locales/zh_CN/order.ts

@@ -350,8 +350,9 @@ export default {
   'order.filterBar.quotationAsTime': '报价截止时间',
 
   //查看询价单
-  'order.checkXun.placeholder': '询价单号/询价单摘要',
+  'order.checkXun.placeholder': '询价单摘要/询价单会员',
   'order.checkXun.memberName': '被询价会员',
+  'order.checkXun.memberName.1': '询价会员',
   'order.checkXun.commodityId': '商品ID：',
   'order.checkXun.purchaseCount': '采购数量：',
   'order.checkXun.category': '品类：',

src/views/AccountInfo/index.tsx

@@ -19,7 +19,7 @@ const AccountInfo: React.FC<any> = ({ navigation }) => {
     const _role = getCurrentRole(userStore?.userInfo);
     setCurrentAI([
       { title: t('home.name', '姓名'), value: _userInfo?.name },
-      { title: t('home.phone', '账号'), value: _userInfo?.phone },
+      { title: t('home.account', '账号'), value: _userInfo?.phone },
       { title: t('home.roleName', '角色'), value: _role?.roleName },
       { title: t('home.orgName', '所属机构'), value: _userInfo?.orgName },
     ]);

src/views/CheckInquiryOrder/components/InquiryOrderItem/index.tsx

@@ -68,11 +68,11 @@ const InquiryOrderItem = props => {
                 <View style={{ marginRight: 4 }}>
                   <Text style={myStyle['box-bottome-content-left-text-label']}>
                     {/* <Icons name="user" size={14} color="#C0C4CC" /> */}
-                    {`${t('order.checkXun.memberName', '被询价会员')}\t`}
+                    {`${t('order.checkXun.memberName.1', '询价会员')}\t`}
                   </Text>
                 </View>
                 <Text style={myStyle['box-bottome-content-left-text-value']}>
-                  {item?.memberName}
+                  {item?.inquiryListMemberName}
                 </Text>
               </View>
             </View>

src/views/CheckInquiryOrder/index.tsx

@@ -172,7 +172,7 @@ const CheckInquiryOrder = () => {
           onSearch = {handleSearchSubmit}
           onRightIcon = {handleFilterPress}
           customRightIcon={'filter'}
-          placeholder = {t('order.checkXun.placeholder', '询价单号/询价单摘要')}
+          placeholder = {t('order.checkXun.placeholder', '询价单摘要/询价单会员')}
         />}
       />
       {/* <OrderNavBar

src/views/CheckQuotationOrder/components/CheckOrderItem/index.tsx

@@ -109,7 +109,7 @@ const CheckOrderItem = props => {
                       style={myStyle['box-bottome-content-left-text-label']}
                     >
                       <Icons name="clockcircleo" size={14} color="#C0C4CC" />
-                      {`\t${fmtView(interval(item.deliveryTime))}`}
+                      {`\t${fmtView(interval(item.quotationAsTime))}`}
                     </Text>
                   </View>
                 </View>

src/views/CheckQuotationOrder/pages/CheckQuotationOrderDetail/index.tsx

@@ -66,6 +66,7 @@ const CheckQuotationOrderDetail: FcRoute<
   const [productData, setProductData] = useState<ProductDataType[]>([]);
   const [popupVisibal, setPopupVisibal] = useState<boolean>(false);
   const [modalVisible, setModalVisible] = useState<boolean>(false);
+  const [urlState, setUrlState] = useState<any>();
   const [popupInfo, setPopupInfo] = useState<PopupInfo>();
   const insets = useSafeAreaInsets();
   const fetchData = async () => {
@@ -164,14 +165,14 @@ const CheckQuotationOrderDetail: FcRoute<
                 marginBottom: 10,
               }}
             >
-              <Text style={{marginRight:10}}>
+              <Text style={{ marginRight: 10 }}>
                 {t('order.inquiry.details.products.quotedUnitPirce', '报价单价')}:
                 {formatNum(Goods.price, 6)}
                 {`\t${Goods.currencyName}`}
               </Text>
               <Text>
                 {t('order.inquiry.details.products.quotedPrice', '报价金额')}:
-                {Goods.currencyName== 'JPY' || Goods.currencyName== 'KRW' ?formatNum(Goods.money, 0): formatNum(Goods.money, 2)}
+                {Goods.currencyName == 'JPY' || Goods.currencyName == 'KRW' ? formatNum(Goods.money, 0) : formatNum(Goods.money, 2)}
                 {`\t${Goods.currencyName}`}
               </Text>
             </View>
@@ -182,14 +183,14 @@ const CheckQuotationOrderDetail: FcRoute<
                 marginBottom: 10,
               }}
             >
-              <Text style={{marginRight:10}}>
+              <Text style={{ marginRight: 10 }}>
                 {t('order.inquiry.details.products.businessUnitPrice', '交易单价')}:
-                {formatNum(Goods.tradePrice,6)}
+                {formatNum(Goods.tradePrice, 6)}
                 {`\t${Goods.tradeCurrencyName}`}
               </Text>
               <Text>
                 {t('order.inquiry.details.products.businessPrice', '交易金额')}:
-                {Goods.tradeCurrencyName== 'JPY' || Goods.tradeCurrencyName== 'KRW' ?formatNum(Goods.tradeMoney, 0): formatNum(Goods.tradeMoney, 2)}
+                {Goods.tradeCurrencyName == 'JPY' || Goods.tradeCurrencyName == 'KRW' ? formatNum(Goods.tradeMoney, 0) : formatNum(Goods.tradeMoney, 2)}
                 {/* {formatNum(Goods.tradeMoney,2)} */}
                 {`\t${Goods.tradeCurrencyName}`}
               </Text>
@@ -437,6 +438,10 @@ const CheckQuotationOrderDetail: FcRoute<
     }
   };
 
+  const handlePress = (url: string) => {
+    setUrlState(url);
+  };
+
   return (
     <View style={[myStyle.container, innerStatus ? { paddingBottom: 40 } : {}]}>
       <ScrollView>
@@ -557,14 +562,23 @@ const CheckQuotationOrderDetail: FcRoute<
                 {t('order.checkXun.enclosure', '附件')}
               </Text>
             </View>
-            {/* {basicInfoList.map((item, index) => {
-              if (item.value) {
-                return renderCommonList(item, index);
-              }
-              return false;
-            })} */}
+            {askPurchaseData?.enclosureUrls?.map((item: any) => {
+              return (
+                <>
+                  <TouchableOpacity
+                    onPress={() => {
+                      handlePress(item.url);
+                    }}
+                  >
+                    <Text>{item.name}</Text>
+                  </TouchableOpacity>
+                </>
+              );
+            })}
           </View>
 
+
+
           {/* 报价方交易条件 */}
           <View style={myStyle.cell}>
             <View style={myStyle.HeadCell}>
@@ -587,16 +601,23 @@ const CheckQuotationOrderDetail: FcRoute<
                 {t('order.checkXun.enclosure', '附件')}
               </Text>
             </View>
-            {/* {basicInfoList.map((item, index) => {
-              if (item.value) {
-                return renderCommonList(item, index);
-              }
-              return false;
-            })} */}
+            {orderData?.enclosureUrls?.map((item: any) => {
+              return (
+                <>
+                  <TouchableOpacity
+                    onPress={() => {
+                      handlePress(item.url);
+                    }}
+                  >
+                    <Text>{item.name}</Text>
+                  </TouchableOpacity>
+                </>
+              );
+            })}
           </View>
         </View>
       </ScrollView>
-
+      {urlState && <WebView source={{ uri: urlState }} />}
       <Popup
         visible={popupVisibal}
         onClose={() => {
@@ -624,7 +645,6 @@ const CheckQuotationOrderDetail: FcRoute<
           </View>
         </View>
       </Popup>
-
       {innerStatus ? renderFoot() : null}
     </View>
   );

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

@@ -4,11 +4,14 @@ import { RequireOrderStatusEnum } from '../../constants';
 import { useNavigation } from '@react-navigation/native';
 import useAppStyle from '../../../../hooks/useAppStyle';
 import styles from './styles';
+import { useCurrentRole } from '../../../../hooks/useCurrentRole';
+import { roleType } from '../../../../store/userStore';
 
 const CommodityItem = props => {
   const { data: item, haveFoot = true, onFeedback } = props;
   const myStyle = useAppStyle(styles);
   const navigation = useNavigation();
+  const { role } = useCurrentRole();
 
   return (
     <View style={myStyle.box}>
@@ -47,7 +50,7 @@ const CommodityItem = props => {
                   </Text>
                 </View>
                 <Text style={myStyle['box-bottome-content-left-text-value']}>
-                  {item?.billTime}
+                  {item?.billTime || item?.quoteEndTime}
                 </Text>
               </View>
             </View>
@@ -78,7 +81,15 @@ const CommodityItem = props => {
             {item?.whetherQuoted ? (
               <TouchableOpacity
                 onPress={() => {
-                  navigation.navigate('RequirePriceOrder', { id: item?.id || item?.askPurchaseId });
+                  if (role?.roleType === roleType.provider) {
+                    navigation.navigate('RequirePriceOrderDetail', {
+                      askPurchaseId: item.askPurchaseId,
+                      quoteNoId: item.quoteId,
+                    });
+                  } else {
+                    navigation.navigate('RequirePriceOrder', { id: item?.id || item?.askPurchaseId });
+                  }
+
                 }}
                 style={myStyle['box-bottome-content-button']}
               >
@@ -90,7 +101,7 @@ const CommodityItem = props => {
 
             <TouchableOpacity
               onPress={() => {
-                navigation.navigate('RequireOrderDetail', { id: item?.id });
+                navigation.navigate('RequireOrderDetail', { id: item?.id || item?.askPurchaseId });
               }}
               style={myStyle['box-bottome-content-button']}
             >