Merge branch 'dev-srm' into v2

src/pages/procurement/components/descriptionsInfo/index.tsx

@@ -124,7 +124,7 @@ const DescriptionsInfo: React.FC<BasicInfoProps> = ({cardTitle, type}) => {
     {
       span: 8,
       fieldList: [
-        { title: '招标编号:', name: 'code', render: (t) => <a href={`/memberCenter/procurementAbility/tender/callForBidsSearch/detail?id=${_data.inviteTender.id}`} target="_blank">{t}</a> },
+        { title: '招标编号:', name: 'code', render: (t) => <a href={`/memberCenter/procurementAbility/${apiType[0]==='c'?'callForBids':'tender'}/callForBidsSearch/detail?id=${_data.inviteTender.id}`} target="_blank">{t}</a> },
         { title: '招标会员:', name: 'memberName' },
         {
           title: '适用城市:',

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -188,7 +188,8 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
       environment: 1,
       memberId: supplyMembersId,
       // 手工下单/合并订单下单时，查询现货价格商品
-      priceTypeList: (modelType === OrderModalType.CONSOLIDATED_ORDER || modelType === OrderModalType.HAND_ORDER) ? [1] : undefined
+      priceTypeList: (modelType === OrderModalType.CONSOLIDATED_ORDER || modelType === OrderModalType.HAND_ORDER) ? [1] : undefined,
+      shopId: schemaAction.getFieldValue('shopId')
     }
     return fetchOrderApi.getProductList(params)
   }

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -113,6 +113,7 @@ export const useProductTableChangeForPay = (ctx: ISchemaFormActions | ISchemaFor
           memberId: productItem?.memberId || ctx.getFieldValue('supplyMembersId'),
           memberRoleId: productItem?.memberRoleId || ctx.getFieldValue('supplyMembersRoleId'),
           orderModel: orderModel,
+          shopId: ctx.getFieldValue('shopId')
         }).then(data => {
           ctx.setFieldValue('paymentInformationResponses', data)
         }).catch(err => {

src/pages/transaction/purchaseOrder/orderCollect/index.tsx

@@ -405,6 +405,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   const handleOrderNo = async () => {
     // @todo 未完整实现功能, 缺少商品接口
     // 询价报价单, 合并订单需要唤起询价弹窗
+    if(!addSchemaAction.getFieldValue('shopId')) {
+      return message.error('请先选择适应商城')
+    }
     const orderModel = addSchemaAction.getFieldValue('orderModel')
     if (orderModel === OrderModalType.INQUIRY_QUOTATION_ORDER || orderModel === OrderModalType.CONSOLIDATED_ORDER) {
       inquiryRef.current.setVisible(true)
@@ -414,6 +417,9 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   }
   // 选择会员弹窗
   const handleOrderMember = () => {
+    if(!addSchemaAction.getFieldValue('shopId')) {
+      return message.error('请先选择适应商城')
+    }
     memberRef.current.setVisible(true)
   }