feat: 物料货源清单的供应商接口引入

api.config.js

@@ -20,7 +20,7 @@
 //  0418 token
 module.exports = [
   { name: 'LogisticsV2', token: '5b6895dc979cdfab94633c2e4560a93447433a9d6fd21a104cc7172de4a4ca37', categoryIds: [0], },  // 物流能力v2
-  { name: 'ProductV2', token: 'f29e9838081cc781c714c9097e1c2d97710f089d1d63a165558f21d2061a2404', categoryIds: [0], },  // 商品服务V2
+  { name: 'ProductV2', token: '8bd449fc3f420605aa4c6567087e18da33bbdbf02eb90aa75251d23a6d03072d', categoryIds: [0], },  // 商品服务V2-0418-1
   { name: 'TemplateV2', token: '3ec622ca65837d19c73a0ccca73da613b9aa1895f4f9143bf3eb98c8f605e66e', categoryIds: [0], },  // 页面模板服务V2
   { name: 'PayV2', token: 'ed541f0943fbc761e47c5d413a7776186bf67c43f99d1e91214ae122cee465c0', categoryIds: [0], }, // 支付服务
   { name: 'SearchV2', token: 'b0423596740a30283a6b70343800e2e174a6560a127232194771573848f67163', categoryIds: [0], },  // 搜索服务V2

config/routes/index.ts

@@ -48,7 +48,7 @@ const homeRoute = {
 };
 // isDev ? [ homeRoute, OrderRoute ] :
 // const routes = asyncRoutes;
-const routes = isDev ? [ homeRoute, OrderRoute ] : asyncRoutes;
+const routes = isDev ? [ homeRoute, ProcurementRoute ] : asyncRoutes;
 
 const memberCenterRoute = {
   path: '/memberCenter',

src/pages/transaction/purchaseRequisition/increaseRequisition/apis/index.ts

 import { getMemberUserPage, postMemberManageLowerProviderPage } from "@/services/MemberV2Api"
-import { getProductCommodityCommonGetCommodityListByBuyer, getProductGoodsGetGoodsByMemberList, getProductGoodsGetGoodsList } from "@/services/ProductV2Api"
+import { getProductCommodityCommonGetCommodityListByBuyer, getProductGoodsGetGoodsSupplyList } from "@/services/ProductV2Api"
 
 export const fetchOrderApi = {
   /** 弹窗获取商品列表 */
@@ -10,7 +10,7 @@ export const fetchOrderApi = {
 
   /** 获取下架服务提供者会员列表 */
   async getMemberListByMemberName(params) {
-    const { data } = await postMemberManageLowerProviderPage({...params}, { ctlType: 'none' })
+    const { data } = await postMemberManageLowerProviderPage({ ...params }, { ctlType: 'none' })
     return data
   },
 
@@ -22,17 +22,22 @@ export const fetchOrderApi = {
   // },
 
   // async getPurchaseRequesitionMaterielList(params) {
-    
+
   //   params.materialGroupId = params.materialGroupId  ? params.materialGroupId?.pop() :''
   //   const { data } = await getProductGoodsGetGoodsByMemberList(params)
   //   return data
   // },
 
-/** 查询请购人 */ 
- async getMemberUserPageList (params) {
-    const {data} = await getMemberUserPage(params)
+  /** 查询请购人 */
+  async getMemberUserPageList(params) {
+    const { data } = await getMemberUserPage(params)
     return data;
- }
+  },
 
+  /** 查询物料货源清单的供应商(列表) */
+  async getProductGoodsGetGoodsSupply(params) {
+    const { data } = await getProductGoodsGetGoodsSupplyList(params)
+    return data;
+  },
 
 }

src/pages/transaction/purchaseRequisition/increaseRequisition/components/newMemberModalTable/columns/index.ts

@@ -32,69 +32,66 @@ export const memberColumns: ColumnType<any>[] = [
 export const materialSupplyColumns: ColumnType<any>[] = [
   {
     title: '采购商物料编号',
-    key: '',
-    dataIndex: '',
+    key: 'code',
+    dataIndex: 'code',
   },
   {
-    title: '采购商物料摘要',
-    key: '',
-    dataIndex: '',
+    title: '采购商物料名称',
+    key: 'name',
+    dataIndex: 'name',
   },
   {
     title: '规格型号',
-    key: '',
-    dataIndex: '',
+    key: 'type',
+    dataIndex: 'type',
   },
   {
     title: '品类',
-    key: '',
-    dataIndex: '',
+    key: 'customerCategory',
+    dataIndex: 'customerCategory',
+    render: (_text) => _text?.name
   },
   {
     title: '品牌',
-    key: '',
-    dataIndex: '',
+    key: 'brand',
+    dataIndex: 'brand',
+    render: (_text) => _text?.name
   },
   {
     title: '单位',
-    key: '',
-    dataIndex: '',
+    key: 'unitName',
+    dataIndex: 'unitName',
   },
   {
     title: '供应商',
-    key: '',
-    dataIndex: '',
+    key: 'memberName',
+    dataIndex: 'memberName',
   },
   {
     title: '供应商物料编号',
-    key: '',
-    dataIndex: '',
-  },
-  {
-    title: '供应商物料摘要',
-    key: '',
-    dataIndex: '',
+    key: 'goodsNo',
+    dataIndex: 'goodsNo',
   },
   {
     title: '生产厂家',
-    key: '',
-    dataIndex: '',
+    key: 'manufacturer',
+    dataIndex: 'manufacturer',
   },
   {
     title: '起运地',
-    key: '',
-    dataIndex: '',
+    key: 'departure',
+    dataIndex: 'departure',
   },
   ,
   {
     title: '到货周期',
-    key: '',
-    dataIndex: '',
+    key: 'deliveryCycle',
+    dataIndex: 'deliveryCycle',
   },
   ,
   {
     title: '交货方式',
-    key: '',
-    dataIndex: '',
+    key: 'deliveryMethod',
+    dataIndex: 'deliveryMethod',
   },
 ]

src/pages/transaction/purchaseRequisition/increaseRequisition/components/newMemberModalTable/index.tsx

@@ -45,9 +45,9 @@ const NewMemberModalTable: React.FC<MemberModalTableProps> = (props: MemberModal
     const rowItem = ref.current.RowCtl.selectRow[0]
     console.log(rowItem, 'row')
     if (rowItem) {
-      schemaAction.setFieldValue('vendorRoleId', rowItem.roleId)
+      schemaAction.setFieldValue('vendorRoleId', rowItem.roleId || rowItem.memberRoleId)
       schemaAction.setFieldValue('vendorMemberId', rowItem.memberId)
-      schemaAction.setFieldValue('vendorMemberName', rowItem.name)
+      schemaAction.setFieldValue('vendorMemberName', rowItem.name  || rowItem.memberName)
     }
     confirmModal && confirmModal()
     setLik(rowItem)
@@ -103,7 +103,6 @@ const NewMemberModalTable: React.FC<MemberModalTableProps> = (props: MemberModal
       title={drawer?.title}
       visible={visible}
       onClose={() => setVisible(false)}
-      onCancel={() => setVisible(false)}
       width={drawer?.width}
       {...otherProps}
     >
@@ -126,7 +125,7 @@ const NewMemberModalTable: React.FC<MemberModalTableProps> = (props: MemberModal
             columns={materialSupplyColumns}
             scroll={{ x: '100vw' }}
             schema={materialSupplySchema}
-            fetchdata={(params) => fetchOrderApi.getMemberListByMemberName({ ...params })}
+            fetchdata={(params) => fetchOrderApi.getProductGoodsGetGoodsSupply({ ...params })}
           />
         </Tabs.TabPane>
       </Tabs>