Merge branch 'v2-220418' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220418

src/locales/zh-CN/commodity.ts

@@ -117,6 +117,7 @@ export default {
   'commodity.products.buttonGroup.5' : '上架',
   'commodity.products.buttonGroup.6' : '下架',
   'commodity.products.buttonGroup.7' : '查看供应商品',
+  'commodity.products.buttonGroup.8' : '查看上游商品',
   'commodity.products.operationHandler.1' : '复制',
   'commodity.products.operationHandler.2' : '提交审核',
   'commodity.products.operationHandler.3' : '修改',
@@ -124,6 +125,7 @@ export default {
   'commodity.products.operationHandler.5' : '上架',
   'commodity.products.operationHandler.6' : '下架',
   'commodity.products.operationHandler.7' : '查看供应商品',
+  'commodity.products.operationHandler.8' : '查看上游商品',
   'commodity.products.step0Description.text.1' : '点击下载 EXCEL文件模板',
   'commodity.products.step0Description.text.2' : '按照模板整理货品资料',
   'commodity.products.step0Description.text.3' : '点击导入按钮，导入整理好的货品资料',

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -829,7 +829,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
       >
         <InputNumber style={{ width: '100%' }} min={0} placeholder={intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.form.minOrder.placeholder' })} onChange={(e: number) => setMinOrderNumber(e)} />
       </Form.Item>
-      {/* <Form.Item
+      <Form.Item
         name="type"
         label={
           <span>
@@ -846,7 +846,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
           <Radio value={1}>{intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.form.type.radio1' })}</Radio>
           <Radio value={2}>{intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.form.type.radio2' })}</Radio>
         </Radio.Group>
-      </Form.Item> */}
+      </Form.Item>
       <Form.Item
         name="isCrossBorder"
         label={

src/pages/commodity/products/index.tsx

 import React, { useState, useEffect, useRef, useMemo } from 'react'
 import { history, useIntl } from 'umi'
-import { Button, Form, Card, Modal, Result, Progress, Select, Tooltip, Checkbox, Row, Col, Dropdown, Menu, Space, message, Badge } from 'antd'
+import { Button, Form, Card, Modal, Result, Progress, Select, Tooltip, Checkbox, Row, Col, Dropdown, Menu, Space, message, Badge, Table } from 'antd'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import {
   PlusOutlined,
@@ -38,6 +38,7 @@ import AuthButton from '@/components/AuthButton'
 import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 import allRouters from '../../../../config/router.config.json'
 import { postOrderCommonProductProcessFind } from '@/services/OrderNewV2Api'
+import { ProductView, ProductSel } from './productModal'
 
 const { confirm } = Modal;
 
@@ -71,6 +72,12 @@ const Products: React.FC<{}> = () => {
   const [giudeStep, setGiudeStep] = useState<number>()
   const [inconformityProductIds, setInconformityProductIds] = useState<number[]>([])
 
+  // 上游弹窗
+  const [upModal, setUpModal] = useState(false)
+  const [uppId, setUpId] = useState<number>();
+  const [upSelModal, setUpSelModal] = useState(false)
+  const [downSelModal, setDownSelModal] = useState(false)
+
   // const [shopId, setShopId] = useState<any>()
   const shopIdRef = useRef<any>()
   /** 带参数查询，给表单带默认值 */
@@ -141,6 +148,14 @@ const Products: React.FC<{}> = () => {
       render: t => t ? t : intl.formatMessage({ id: 'commodity.products.columns.upperMemberName.1' })
     },
     {
+      title: '商品类型',
+      dataIndex: 'CommodityType',
+      key: 'CommodityType',
+      render: t => {
+        return t === 1 ? '自营商品' : '上游供应商品'
+      }
+    },
+    {
       title: intl.formatMessage({ id: 'commodity.products.columns.min' }),
       dataIndex: 'min',
       key: 'min',
@@ -185,6 +200,10 @@ const Products: React.FC<{}> = () => {
     history.push(`/memberCenter/commodityAbility/commodity/products/detail?id=${upId}`)
   }
 
+  const upModalFn = (id: number) => {
+    setUpId(id);
+    setUpModal(true);
+  };
   /** 参照后台数据生成 */
   const renderOptionButton = (record) => {
 
@@ -207,6 +226,7 @@ const Products: React.FC<{}> = () => {
       [intl.formatMessage({ id: 'commodity.products.buttonGroup.5' })]: record.isOnPublish,
       [intl.formatMessage({ id: 'commodity.products.buttonGroup.6' })]: record.isOffPublish,
       [intl.formatMessage({ id: 'commodity.products.buttonGroup.7' })]: record.isUpperCommodity,
+      [intl.formatMessage({ id: 'commodity.products.buttonGroup.8' })]: record.type === 2,
     }
 
     const operationHandler = {
@@ -217,6 +237,7 @@ const Products: React.FC<{}> = () => {
       [intl.formatMessage({ id: 'commodity.products.operationHandler.5' })]: () => clickUp(1, record.id),
       [intl.formatMessage({ id: 'commodity.products.operationHandler.6' })]: () => clickUp(0, record.id),
       [intl.formatMessage({ id: 'commodity.products.operationHandler.7' })]: () => previewUpper(record.upperCommodityId),
+      [intl.formatMessage({ id: 'commodity.products.operationHandler.8' })]: () => upModalFn(record.id),
     }
 
     return (
@@ -624,6 +645,10 @@ const Products: React.FC<{}> = () => {
         return message.error(intl.formatMessage({ id: 'commodity.products.schema.fastSchema.qingxuanzeshangjiashangpin' }))
       }
       selectedRowKeys.length ? setExportQrcodeModal(true) : message.error(intl.formatMessage({ id: 'commodity.products.handleBatchDelete.error' }))
+    } else if (e.key === '6') {
+      setUpSelModal(true)
+    } else if (e.key === '7') {
+      setDownSelModal(true)
     }
   }
 
@@ -722,6 +747,14 @@ const Products: React.FC<{}> = () => {
       <Menu.Item key="5" icon={<ExportOutlined />}>
         {intl.formatMessage({ id: 'commodity.products.menuMore.5' })}
       </Menu.Item>
+      <Menu.Item key="6" icon={<ExportOutlined />}>
+        获取上游供应商品
+        {/* {intl.formatMessage({ id: 'commodity.products.menuMore.5' })} */}
+      </Menu.Item>
+      <Menu.Item key="7" icon={<ExportOutlined />}>
+        获取下游销售商品
+        {/* {intl.formatMessage({ id: 'commodity.products.menuMore.5' })} */}
+      </Menu.Item>
     </Menu>
   )
 
@@ -904,6 +937,9 @@ const Products: React.FC<{}> = () => {
         <p>{intl.formatMessage({ id: 'commodity.products.textthree' })}</p>
         <p>{intl.formatMessage({ id: 'commodity.products.textfour' })}</p>
       </Modal>
+      <ProductView visible={upModal} setVisible={setUpModal} productId={uppId} />
+      <ProductSel visible={upSelModal} setVisible={setUpSelModal} title="upperMemberName" />
+      <ProductSel visible={downSelModal} setVisible={setDownSelModal} title="subMemberName" />
       {/* 选择上游商品 */}
       <UpperProductModalTable currentRef={upperRef} type="checkbox" tableRef={ref} />
       {/* 商品上架引导 */}

src/pages/repositories/index.tsx

@@ -97,15 +97,26 @@ const Repositories: React.FC<{}> = () => {
       dataIndex: 'alreadyiInventory',
       key: 'alreadyiInventory',
     },
+    // {
+    //   title: intl.formatMessage({ id: 'repositories.columns.upperMemberName' }),
+    //   dataIndex: 'upperMemberName',
+    //   key: 'upperMemberName',
+    // },
+    // {
+    //   title: intl.formatMessage({ id: 'repositories.columns.upperStockCount' }),
+    //   dataIndex: 'upperStockCount',
+    //   key: 'upperStockCount',
+    // },
     {
-      title: intl.formatMessage({ id: 'repositories.columns.upperMemberName' }),
-      dataIndex: 'upperMemberName',
-      key: 'upperMemberName',
-    },
-    {
-      title: intl.formatMessage({ id: 'repositories.columns.upperStockCount' }),
+      title: <span>
+        上游商品库存&ensp;
+        <Tooltip title='关联的所有上游供应会员的上游供应商品的库存总数量'>
+          <QuestionCircleOutlined />
+        </Tooltip>
+      </span>,
       dataIndex: 'upperStockCount',
       key: 'upperStockCount',
+      render: text => text || '-',
     },
     {
       title: intl.formatMessage({ id: 'repositories.columns.status' }),