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':'交货方式',
@@ -140,4 +140,4 @@ export default {
   'material.chargeRoleName':'负责人所属角色',
   'material.contactMemberName':'联系人',
   'material.contactMemberPhone':'联系人电话',
-}
+}
\ No newline at end of file

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,24 +253,25 @@ 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 ? {
-      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}`,
-    },
-    {
-      title: intl.formatMessage({ id: 'afterService.order.query.column.category' }, { default: '品类' }),
-      dataIndex: 'category',
-    },
+    ...(
+      !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}`,
+        },
+        {
+          title: intl.formatMessage({ id: 'afterService.order.query.column.category' }, { default: '品类' }),
+          dataIndex: 'category',
+        }
+      ]
+    ),
     {
       title: intl.formatMessage({ id: 'afterService.order.query.column.brand' }, { default: '品牌' }),
       dataIndex: 'brand',
@@ -485,12 +486,12 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         setOrderTypeValue(+outerOrderType);
       }
     })
-    .catch((err) => {
-      console.warn(err);
-    })
-    .finally(() => {
-      setInfoLoading(false);
-    });
+      .catch((err) => {
+        console.warn(err);
+      })
+      .finally(() => {
+        setInfoLoading(false);
+      });
   };
 
   useEffect(() => {
@@ -558,30 +559,30 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         sendAddress:
           deliveryType === 1 ?
             shippingAddress.fullAddress :
-              deliveryType === 2 ?
-                pickupAddress.fullAddress :
-                ''
+            deliveryType === 2 ?
+              pickupAddress.fullAddress :
+              ''
         ,
         sendUserName:
           deliveryType === 1 ?
             shippingAddress.name :
-              deliveryType === 2 ?
-                pickupAddress.name :
-                ''
+            deliveryType === 2 ?
+              pickupAddress.name :
+              ''
         ,
         sendUserTel:
           deliveryType === 1 ?
             shippingAddress.phone :
-              deliveryType === 2 ?
-                pickupAddress.phone :
-                ''
+            deliveryType === 2 ?
+              pickupAddress.phone :
+              ''
         ,
         sendId:
           deliveryType === 1 ?
             shippingAddress.id :
-              deliveryType === 2 ?
-                pickupAddress.id :
-                ''
+            deliveryType === 2 ?
+              pickupAddress.id :
+              ''
         ,
       },
       proofFileList: proofFileList.filter(item => item.status === 'done').map(item => ({
@@ -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 => {
@@ -807,23 +808,23 @@ const ReturnForm: React.FC<BillsFormProps> = ({
         title={
           !id ?
             intl.formatMessage({ id: 'returnApplication.returnPrSubmit.add' }, { default: '新建退货申请单' }) :
-              isEdit ?
-                intl.formatMessage({ id: 'returnApplication.returnPrSubmit.edit' }, { default: '编辑退货申请单' }) :
-                intl.formatMessage({ id: 'returnApplication.returnPrSubmit.check' }, { default: '查看退货申请单' })
+            isEdit ?
+              intl.formatMessage({ id: 'returnApplication.returnPrSubmit.edit' }, { default: '编辑退货申请单' }) :
+              intl.formatMessage({ id: 'returnApplication.returnPrSubmit.check' }, { default: '查看退货申请单' })
         }
         extra={
           (isEdit || !id)
             ? [
-                <Button
-                  key="1"
-                  type="primary"
-                  icon={<SaveOutlined />}
-                  loading={submitLoading}
-                  onClick={() => addSchemaAction.submit()}
-                >
-                  {intl.formatMessage({ id: 'afterService.apply.save' }, { default: '保存' })}
-                </Button>,
-              ]
+              <Button
+                key="1"
+                type="primary"
+                icon={<SaveOutlined />}
+                loading={submitLoading}
+                onClick={() => addSchemaAction.submit()}
+              >
+                {intl.formatMessage({ id: 'afterService.apply.save' }, { default: '保存' })}
+              </Button>,
+            ]
             : []
         }
       >

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,19 +12,21 @@ 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(() => {
     if (initialValue) {
@@ -64,47 +66,76 @@ const Detail = () => {
         column={2}
         style={{ marginBottom: '16px' }}
       />
-        <CustomizeColumn 
-          id="output" 
-          data={outputInfoList} 
-          title={intl.formatMessage({ id: 'material.output.title', defaultMessage: '产地配送' })} 
-          column={2} 
-          style={{ marginBottom: '16px' }}
-        />
-         <CustomizeColumn 
-         id="unitInfoList" 
-         data={unitInfoList} 
-          title={intl.formatMessage({ id: 'material.unitConversion.title', defaultMessage: '单位换算' })} 
-          column={2} 
-          style={{ marginBottom: '16px' }}
-        />
-        <CustomizeColumn 
-          id="contact" 
-          data={contactInfoList} 
-          title={intl.formatMessage({ id: 'material.contact.title', defaultMessage: '联系信息' })} 
-          column={2} 
-          style={{ marginBottom: '16px' }}
-        />
+      <CustomizeColumn
+        id="output"
+        data={outputInfoList}
+        title={intl.formatMessage({ id: 'material.output.title', defaultMessage: '产地配送' })}
+        column={2}
+        style={{ marginBottom: '16px' }}
+      />
+      <CustomizeColumn
+        id="unitInfoList"
+        data={unitInfoList}
+        title={intl.formatMessage({ id: 'material.unitConversion.title', defaultMessage: '单位换算' })}
+        column={2}
+        style={{ marginBottom: '16px' }}
+      />
+      <CustomizeColumn
+        id="contact"
+        data={contactInfoList}
+        title={intl.formatMessage({ id: 'material.contact.title', defaultMessage: '联系信息' })}
+        column={2}
+        style={{ marginBottom: '16px' }}
+      />
       <div style={{ marginBottom: '16px' }} id="images">
         <Card title={intl.formatMessage({ id: 'material.images.title', defaultMessage: '物料图片' })} bodyStyle={{ paddingTop: '0' }}>
           <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>
@@ -131,4 +162,4 @@ const Detail = () => {
   )
 }
 
-export default Detail;
+export default Detail;
\ No newline at end of file