Merge branch '0518' into 'jinfa-0518'

src/locales/zh-CN/material.ts

@@ -127,7 +127,7 @@ export default {
   'member.modal.selectMaterial.title': '选择会员',
   'material.output.title':'产地与配送',
   'material.materialsManufacturer':'生产厂家',
-  'material.materialsOrigin':'厂地',
+  'material.materialsOrigin':'产地',
   'material.materialsDeparture':'起运地',
   'material.materialsDeliverPeriod':'到货周期',
   'material.materialsDeliveryMethod':'交货方式',

src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx

@@ -205,7 +205,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         <a
           href={`/memberCenter/afterService/returnApplication/returnPrSubmit/orderDetail?id=${record.orderId}`}
           target="_blank"
-        >
+        >
           {text}
         </a>
       ),
@@ -238,7 +238,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         <a
           href={`/memberCenter/contract/manage/QueryList/QueryListdetails?contractId=${record.contractId}`}
           target="_blank"
-        >
+        >
           {text}
         </a>
       ),
@@ -253,16 +253,15 @@ const ReturnForm: React.FC<BillsFormProps> = ({
       title: intl.formatMessage({ id: 'afterService.order.query.column.materialNo' }, { default: '物料编号' }),
       dataIndex: 'productNo',
     },
-    isMateriel && {
-      title: intl.formatMessage({ id: 'afterService.apply.productBrandNo' }, { default: '物料牌号' }),
-      dataIndex: 'productBrandNo',
-      ellipsis: true,
-    },
-    !isMateriel ? {
+    ...(
+      !isMateriel ? [
+        {
           title: intl.formatMessage({ id: 'afterService.order.query.column.name' }, { default: '商品名称' }),
           dataIndex: 'name',
           ellipsis: true,
-    } : {
+        }
+      ] : [
+        {
           title: `${intl.formatMessage({ id: 'afterService.order.query.column.materialName' }, { default: '物料名称' })}/${intl.formatMessage({ id: 'afterService.order.query.column.quotedSpec' }, { default: '规格' })}`,
           dataIndex: 'name',
           render: (text, record) => `${text}/${record.quotedSpec}`,
@@ -270,7 +269,9 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         {
           title: intl.formatMessage({ id: 'afterService.order.query.column.category' }, { default: '品类' }),
           dataIndex: 'category',
-    },
+        }
+      ]
+    ),
     {
       title: intl.formatMessage({ id: 'afterService.order.query.column.brand' }, { default: '品牌' }),
       dataIndex: 'brand',
@@ -683,7 +684,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
       message.warning(intl.formatMessage({ id: 'afterService.apply.upload.legal' }, { default: '图片大小超过20M' }));
       return Upload.LIST_IGNORE;
     }
-    return Promise.resolve();
+    return Promise.resolve();
   };
 
   const handleGoodsConfirm = values => {

src/pages/commodity/material/materialPendingAdd/schema/add.tsx

@@ -84,7 +84,7 @@ export const getSchema = (schema: ISchema | null): any => {
                 ]
               },
               materialsOrigin: {
-                title: intl.formatMessage({ id: 'material.materialsOrigin', defaultMessage: '厂地' }),
+                title: intl.formatMessage({ id: 'material.materialsOrigin', defaultMessage: '产地' }),
                 type: 'string',
                 'x-rules': [
                   {

src/pages/commodity/material/materialQuery/detail.tsx

@@ -12,18 +12,20 @@ import { getProductGoodsGetGoodsProcessDetail, GetProductGoodsGetGoodsProcessDet
 import { useIntl } from 'umi';
 import { PENDING_ADD_MATERIAL, PENDING_SUBMIT_EXAM } from '@/constants/material';
 import { getAuth } from '@/utils/auth';
+import { RoleEnum } from '../common/constants';
 /**
  * 详情
  */
 const Detail = () => {
   const intl = useIntl();
+  const roleType = getAuth()?.memberRoleType;
   const { id } = usePageStatus();
   const { initialValue, record } = useGetInitialValueDetail<GetProductGoodsGetGoodsProcessDetailResponse, GetProductGoodsGetMaterInnerLogListResponse>({
     id: id,
     api: getProductGoodsGetGoodsProcessDetail,
     logApi: getProductGoodsGetMaterInnerLogList
   })
-  const { anchorHeader, auditProcess, basicInfoList, tableColumn, recordColumn, properties , outputInfoList,unitInfoList, contactInfoList} = useGetDetailCommon<GetProductGoodsGetGoodsResponse | null>({initialValue: initialValue})
+  const { anchorHeader, auditProcess, basicInfoList, tableColumn, recordColumn, properties, outputInfoList, unitInfoList, contactInfoList } = useGetDetailCommon<GetProductGoodsGetGoodsResponse | null>({ initialValue: initialValue })
 
 
   const urls = useMemo(() => {
@@ -90,21 +92,50 @@ const Detail = () => {
           <ImageList imageUrls={initialValue?.goodsPic} />
         </Card>
       </div>
+      {roleType === RoleEnum.Purchaser && (
+        <div style={{ marginBottom: '16px' }} id="files">
+          <Card title={intl.formatMessage({ id: 'material.enclosure.productInfo', defaultMessage: '商品信息' })}>
+            <Row>
+              <Col span={12}>
+                最小单位(包)：{initialValue?.miniUnit}
+              </Col>
+              <Col span={12}>
+                托盘类型(海关)：{initialValue?.trayType}
+              </Col>
+              <Col span={12}>
+                包装类型(海关)：{initialValue?.packageType}
+              </Col>
+              <Col span={12}>
+                托盘规格(海关)：{initialValue?.traySpec}
+              </Col>
+              <Col span={12}>
+                托规格(托)：{initialValue?.palmSpec}
+              </Col>
+              <Col span={12}>
+                柜/车规格(柜/车)：{initialValue?.cabinetSpec}
+              </Col>
+              <Col span={12}>
+                最小剩余货架寿命：{initialValue?.miniShelfLife} {initialValue?.sapSledTag}
+              </Col>
+            </Row>
+          </Card>
+        </div>
+      )}
 
       <div style={{ marginBottom: '16px' }} id="files">
         <Card title={intl.formatMessage({ id: 'material.enclosure.productInfo', defaultMessage: '商品信息' })}>
           <Row>
             <Col span={12}>
-              价格：{initialValue?.price}
+              价格：{initialValue?.materialsPrice}
             </Col>
             <Col span={12}>
-              起订量：{initialValue?.price}
+              起订量：{initialValue?.miniOrder}
             </Col>
             <Col span={12}>
-              发货地：{initialValue?.PointOfOrigin}
+              发货地：{initialValue?.provinceName} {initialValue?.cityName}
             </Col>
             <Col span={12}>
-              库存数量：{initialValue?.InventoryQuantity}
+              库存数量：{initialValue?.materialsStock}
             </Col>
           </Row>
         </Card>