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

src/components/AuthButton/AuthUrl.ts

+// 这里是处理比较特殊的url 跳转的
+export const AuthUrl = (menuCode: string, urlCode: string, btnCode?: string) => {
+  const userBtn = require('../../../config/router.config.json')
+  const AuthRoutes = userBtn.filter((item: any) => item.relationParentCode === urlCode);
+  const AuthButton = AuthRoutes[0]?.routes;
+  const AuthCode: any = [];
+  for (let i = 0; i < AuthButton.length; i++) {
+    if (AuthButton[i].btns.length != 0) {
+      for (let j = 0; j < AuthButton[i].btns.length; j++) {
+        if (AuthButton[i].btns[j].buttonCode === menuCode) {
+          AuthCode.push(AuthButton[i].btns[j]);
+          break;
+        }
+      }
+    }
+  }
+  if (btnCode === 'DevTest') return true
+  for (let i = 0; i < AuthCode.length; i++) {
+    if (menuCode) {
+      // 是否有页面标识
+      // 找到该页面标识的按钮权限数据,并匹配权限按钮是否勾选
+      if (AuthCode[i].buttonCode === menuCode) {
+        return true
+      }
+    }
+    continue
+  }
+  return false
+}
\ No newline at end of file

src/components/AuthButton/index.tsx

+
+export interface AuthButtonProps {
+  btnCode?: string
+  menuCode: string
+  children: any,
+  urlCode: string,
+}
+/**
+ * 按钮权限
+ * @param {String} menuCode 页面标识
+ * @param {String} btnCode 按钮标识
+ */
+const AuthButton = (props: AuthButtonProps) => {
+  const {
+    children,
+    btnCode, // 按钮标识
+    menuCode, // 按钮页面标识
+    urlCode, // 父级别菜单
+  } = props
+  const userBtn = require('../../../config/router.config.json')
+  const AuthRoutes = userBtn.filter((item: any) => item.relationParentCode === urlCode);
+  const AuthButton = AuthRoutes[0]?.routes;
+  const AuthCode: any = [];
+  for (let i = 0; i < AuthButton.length; i++) {
+    if (AuthButton[i].btns.length != 0) {
+      for (let j = 0; j < AuthButton[i].btns.length; j++) {
+        if (AuthButton[i].btns[j].buttonCode === menuCode) {
+          AuthCode.push(AuthButton[i].btns[j]);
+          break;
+        }
+      }
+    }
+  }
+  // console.log(AuthCode, 'AuthCode');
+
+  const _authorityBtn = () => {
+    // 本地开发时传的特殊标识，直接开放权限
+    if (btnCode === 'DevTest') return true
+    for (let i = 0; i < AuthCode.length; i++) {
+      if (menuCode) {
+        // 是否有页面标识
+        // 找到该页面标识的按钮权限数据,并匹配权限按钮是否勾选
+        if (AuthCode[i].buttonCode === menuCode) {
+          return true
+        }
+      }
+      continue
+    }
+    return false
+  }
+  return _authorityBtn() ? children : null
+}
+export default AuthButton;

src/components/AuthButton/按钮状态.mad

+
+
+priceManage.add" 价格策略列表新曾
+priceManage.del 价格策略列表删除
+priceManage.edit  价格策略编辑
+priceManage.state  价格策略设置是否有效按钮
+priceManage.see 价格策略查看详情
\ No newline at end of file

src/components/StandardTable/index.tsx

@@ -237,8 +237,8 @@ class StandardTable<RecordType extends object = any> extends PureComponent<
         } else {
           this.setState({
             tableLoading: false,
-            totalPage: result.totalCount || DEFAULT_TOTAL_PAGE,
-            dataSource: result.data || [],
+            totalPage: result?.totalCount || DEFAULT_TOTAL_PAGE,
+            dataSource: result?.data || [],
           });
           return result;
         }

src/locales/en-US/common.ts

@@ -111,4 +111,16 @@
   'common.huanyingzhuce': 'Welcome to register',
   'common.huanyingdenglu': 'Welcome to login',
   'common.bitian': 'This field is required',
+  'common.ruku': 'Warehousing',
+  'common.caigourukudan': 'Purchase receipt',
+  'common.xiaoshoufahuodan': 'Sales Invoice',
+  'common.jiagongrukudan': '  Processing warehousing list',
+  'common.jiagongfahuodan': 'Processing invoice',
+  'common.tuihuofahuodan': 'Return invoice',
+  'common.tuihuorukudan': 'Return goods receipt',
+  'common.huanhuotuihuofahuodan': 'Exchange return invoice',
+  'common.huanhuotuihuoruhuodan': 'Exchange return receipt',
+  'common.huanhuofahuodan': 'Exchange Invoice',
+  'common.huanhuorukudan': 'Exchange warehousing list',
+  'common.fiebiao': 'waste tenders',
 }

src/locales/en-US/logistics.ts

@@ -105,7 +105,7 @@ export default {
   'logistics.yunfei': 'Freight',
   'logistics.liuzhuanjilu': 'Circulation record',
   'logistics.danjuzhaiyao': 'Document summary',
-  'logistics.duiyingfahuodanhao': 'corresponding to the invoice number',
+  'logistics.duiyingfahuodanhao': 'Invoice Number',
   'logistics.duiyingdingdanshouhoudan': 'Corresponding order/after-sales order',
   'logistics.shouhuofang': 'Consignee',
   'logistics.danjushijian': 'Document time',
@@ -146,9 +146,9 @@ export default {
   'logistics.cidingdanidbucunzai': 'This order id does not exist! ',
   'logistics.qingshurudanjuzhaiyao': 'Please enter the document summary',
   'logistics.qingxuanzeliufuwushang': 'Please choose a streaming service provider',
-  'logistics.zhakandanhaoxiangqing': 'View tracking number details',
+  'logistics.zhakandanhaoxiangqing': 'View Detail',
   'logistics.qingxuanzefahuodizhi': 'Please select shipping address',
-  'logistics.duiyingdingdanhaoshouhou': 'Corresponding order number/after-sales order',
+  'logistics.duiyingdingdanhaoshouhou': 'Corres/after-sales Number',
   'logistics.daitijiao': 'Pending submission',
   'logistics.daiqueren': 'To be confirmed',
   'logistics.xuanzeshangpin': 'Choose goods',

src/locales/en-US/purchase.ts

@@ -118,7 +118,7 @@ export default {
   'detail.purchase.contactsAddress': 'Contact address',
   'detail.purchase.startSignUp': 'Registration required time',
   'detail.purchase.startSignUp1': 'Registration start time',
-  'detail.purchase.demandUrls': 'Attachment to registration requirements',
+  'detail.purchase.demandUrls': 'Pretrial requirements',
   'detail.purchase.biddingStartTime': 'Bidding Time',
   'detail.purchase.startingPrice': 'Starting Price',
   'detail.purchase.isStartingPrice': 'Is there a starting price',
@@ -128,10 +128,10 @@ export default {
   'detail.purchase.minPrice1': 'Lowest price',
   'detail.purchase.nowMinPrice1': 'Current lowest price',
   'detail.purchase.isMinPrice': 'Is there a minimum price difference',
-  'detail.purchase.allowPurchaseCount': 'Allowed number of quotations',
+  'detail.purchase.allowPurchaseCount': 'Allowed number quotations',
   'detail.purchase.allowPurchaseCount1': 'Quotes',
   'detail.purchase.offerRank': 'Offer Rank',
-  'detail.purchase.isOpenPurchase': 'Open the current lowest price',
+  'detail.purchase.isOpenPurchase': 'Open current lowest price',
   'detail.purchase.isOpenPurchase1': 'Whether to disclose the current lowest price',
   'detail.purchase.isOpenRanking': 'Open Price Ranking',
   'detail.purchase.isOpenRanking1': 'Whether to open the quotation ranking',
@@ -572,7 +572,7 @@ export default {
   'table.purchase.pingbiaoyaoqiu': 'Requirements for bid evaluation',
   'table.purchase.pingbiaoyaoqiushi': 'Time required for bid evaluation',
   'table.purchase.zuichang100zifu': 'Maximum 100 characters, 50 Chinese characters',
-  'table.purchase.pingbiaoyaoqiufu': 'Attachment to bid evaluation requirements',
+  'table.purchase.pingbiaoyaoqiufu': 'Attachment Appendix',
   'table.purchase.zaixianpingbiao': 'Online bid evaluation',
   'table.purchase.pingbiaoxiangmuban': 'Bid evaluation template',
   'table.purchase.qingxuanzepingbiao': 'Please select a bid evaluation template',
@@ -656,7 +656,7 @@ export default {
   'table.purchase.zhuanjiazhuanyezhi': 'Expert professional title',
   'table.purchase.yaoqiudiqu': 'Request area',
   'table.purchase.paichudiqu': 'Exclude area',
-  'table.purchase.chouqurenshu': 'Number of people to be drawn',
+  'table.purchase.chouqurenshu': 'Number Extracted',
   'table.purchase.lianxidianhua': 'Contact number',
   'table.purchase.diqu': 'Region',
   'table.purchase.laiyuan': 'Source',
@@ -995,6 +995,6 @@ export default {
   'purchase.zhaobiaoxiagmuqiwnag': 'Expected transaction price of bidding project',
   'purchase.zhaobiaofabuzhicaigoumen': 'Tender is posted to the procurement portal',
   'purchase.yaoqingzhaobiao': 'Invite bidding',
-  'purchase.xuanzeyudangqianhuiyuanxia':
-    'Select members who are affiliated with the current member and whose role type is service provision members (suppliers), the bidding will only be sent to designated members',
+  'purchase.xuanzeyudangqianhuiyuanxia': 'Select members who are affiliated with the current member and whose role type is service provision members (suppliers), the bidding will only be sent to designated members',
+  'purchase.zaixianpingbiaodafen': 'Online bid evaluation and scoring',
 }

src/locales/ko-KR/afterService/components.ts

@@ -3,7 +3,7 @@ export default {
 
   'afterService.components.CheckVoucherModal.title': '자격 증명 보기',
 
-  'afterService.components.DeliverDrawer.title': '{type}发货处理',
+  'afterService.components.DeliverDrawer.title': '{type}배송 처리',
   'afterService.components.DeliverDrawer.overflow': '입력한 값이 미{flow} 발송 수량을 초과하였습니다. 다시 기입하십시오',
   'afterService.components.DeliverDrawer.type.replace': '교환하다',
   'afterService.components.DeliverDrawer.type.refund': '반품',
@@ -15,17 +15,17 @@ export default {
   'afterService.components.DeliverDrawer.category': '종류',
   'afterService.components.DeliverDrawer.brand': '브랜드',
   'afterService.components.DeliverDrawer.unit': '유닛',
-  'afterService.components.DeliverDrawer.applyCount': '{type}数量',
+  'afterService.components.DeliverDrawer.applyCount': '{type}수량',
   'afterService.components.DeliverDrawer.deliveryCount': '배송 완료',
   'afterService.components.DeliverDrawer.noDeliveryCount': '배송되지 않음',
   'afterService.components.DeliverDrawer.receiveCount': '배송 완료',
   'afterService.components.DeliverDrawer.subCount': '차이 수량',
-  'afterService.components.DeliverDrawer.count': '{flow}发货数量',
+  'afterService.components.DeliverDrawer.count': '{flow}출하 수',
   'afterService.components.DeliverDrawer.count.required': '배송 수량을 입력하십시오.',
   'afterService.components.DeliverDrawer.count.legal': '최대 3자리의 소수점을 보존합니다. 0보다 크거나 같습니다.',
-  'afterService.components.DeliverDrawer.returnDeliverAddress': '{flow}发货地址',
+  'afterService.components.DeliverDrawer.returnDeliverAddress': '{flow}배달 주소',
   'afterService.components.DeliverDrawer.returnDeliverAddress.required': '배송 주소를 선택하십시오.',
-  'afterService.components.DeliverDrawer.deliveryTime': '{flow}发货时间',
+  'afterService.components.DeliverDrawer.deliveryTime': '{flow}배달 시간',
   'afterService.components.DeliverDrawer.logisticsOrderNo': '물류번호',
   'afterService.components.DeliverDrawer.logisticsName': '물류 회사',
 
@@ -126,7 +126,7 @@ export default {
   'afterService.components.GoodsDrawer.query': '조회',
   'afterService.components.GoodsDrawer.filter.1': '이미 계약 번호가 다른 상품을 필터하였다',
   'afterService.components.GoodsDrawer.filter.2': '판매 후 작업 흐름이 다른 상품을 필터하였습니다',
-  
+
   'afterService.components.ManualDeliveryModal.title': '교환 배송 처리',
   'afterService.components.ManualDeliveryModal.deliveryAddress': '배송 주소',
   'afterService.components.ManualDeliveryModal.deliveryAddress.placeholder': '선택하십시오.',
@@ -245,4 +245,4 @@ export default {
   'afterService.components.VerifyModal.reason.noPass': '심사 불통과 원인',
   'afterService.components.VerifyModal.reason.pass': '심사 통과 원인',
   'afterService.components.VerifyModal.reason.placeholder': '최대 120자, 한자 60자를 입력하십시오',
-}
\ No newline at end of file
+}

src/locales/ko-KR/common.ts

@@ -111,4 +111,16 @@ export default {
   'common.huanyingzhuce': '등록을 환영합니다',
   'common.huanyingdenglu': '로그인을 환영합니다',
   'common.bitian': '이 필드는 필수 항목입니다.',
+  'common.ruku': '창고',
+  'common.caigourukudan': '구매 영수증',
+  'common.xiaoshoufahuodan': '판매 인보이스',
+  'common.jiagongrukudan': '입고 목록 처리',
+  'common.jiagongfahuodan': '송장 처리 중',
+  'common.tuihuofahuodan': '송장 반환',
+  'common.tuihuorukudan': '반품 영수증',
+  'common.huanhuotuihuofahuodan': '교환 반품 송장',
+  'common.huanhuotuihuoruhuodan': '교환 반품 영수증',
+  'common.huanhuofahuodan': '교환 인보이스',
+  'common.huanhuorukudan': '교환 창고 목록',
+  'common.fiebiao': '무효 선언',
 }

src/locales/ko-KR/purchase.ts

@@ -995,6 +995,6 @@ export default {
   'purchase.zhaobiaoxiagmuqiwnag': '입찰 프로젝트의 예상 거래 가격',
   'purchase.zhaobiaofabuzhicaigoumen': '입찰이 조달 포털에 게시됨',
   'purchase.yaoqingzhaobiao': '입찰 초대',
-  'purchase.xuanzeyudangqianhuiyuanxia':
-    '현재 회원과 제휴하고 역할 유형이 서비스 제공 회원(공급자)인 회원을 선택하면 지정된 회원에게만 입찰이 발송됩니다.',
+  'purchase.xuanzeyudangqianhuiyuanxia': '현재 회원과 제휴하고 역할 유형이 서비스 제공 회원(공급자)인 회원을 선택하면 지정된 회원에게만 입찰이 발송됩니다.',
+  'purchase.zaixianpingbiaodafen': '온라인 입찰 평가 및 채점',
 }

src/locales/zh-CN/common.ts

@@ -111,4 +111,16 @@ export default {
   'common.huanyingzhuce': '欢迎注册',
   'common.huanyingdenglu': '欢迎登录',
   'common.bitian': '该字段是必填字段',
+  'common.ruku': '入库',
+  'common.caigourukudan': '采购入库单',
+  'common.xiaoshoufahuodan': '销售发货单',
+  'common.jiagongrukudan': '加工入库单',
+  'common.jiagongfahuodan': '加工发货单',
+  'common.tuihuofahuodan': '退货发货单',
+  'common.tuihuorukudan': '退货入库单',
+  'common.huanhuotuihuofahuodan': '换货退货发货单',
+  'common.huanhuotuihuoruhuodan': '换货退货入货单',
+  'common.huanhuofahuodan': '换货发货单',
+  'common.huanhuorukudan': '换货入库单',
+  'common.fiebiao': '废标',
 }

src/locales/zh-CN/purchase.ts

@@ -996,6 +996,6 @@ export default {
   'purchase.zhaobiaoxiagmuqiwnag': '招标项目期望成交价格',
   'purchase.zhaobiaofabuzhicaigoumen': '招标发布至采购门户',
   'purchase.yaoqingzhaobiao': '邀请招标',
-  'purchase.xuanzeyudangqianhuiyuanxia':
-    '选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员',
+  'purchase.xuanzeyudangqianhuiyuanxia': '选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员',
+  'purchase.zaixianpingbiaodafen': '在线进行评标打分',
 }

src/pages/handling/assign/tobeAddQuery/index.tsx

@@ -42,7 +42,7 @@ const TobeAddQuery = () => {
   });
   const { columns } = useColumnWithFilter(queryColumns, [
     {
-      title: intl.formatMessage({id: 'common.tabel.action'}),
+      title: intl.formatMessage({id: 'common.table.action'}),
       render: (text, record) => {
         const loading = submitLoadingID.includes(record.id);
         const IS_TO_BE_SUBMIT_EXAM = record.supplierInnerStatus === 1

src/pages/priceManage/priceStrategy/index.tsx

@@ -14,6 +14,8 @@ import { history, useIntl } from 'umi'
 import StatusSwitch from '@/components/StatusSwitch'
 import { PlusOutlined } from '@ant-design/icons'
 import { getProductCommodityGetUnitPriceStrategyList, postProductCommodityDeleteUnitPriceStrategy, postProductCommodityUpdateUnitPriceStrategyStatus } from '@/services/ProductV2Api'
+import AuthButton from '@/components/AuthButton'
+import { AuthUrl } from '@/components/AuthButton/AuthUrl'
 
 const formActions = createFormActions();
 
@@ -32,11 +34,14 @@ const PriceManage: React.FC<{}> = () => {
       dataIndex: 'name',
       key: 'name',
       className: 'commonPickColor',
-      render: (text: any, record: any) => <EyePreview
-        url={`/memberCenter/commodityAbility/priceManage/priceStrategy/setStrategy/detail?id=${record.id}&preview=1`}
-      >
-        {text}
-      </EyePreview>
+      render: (text: any, record: any) =>
+
+        <EyePreview
+          url={`/memberCenter/commodityAbility/priceManage/priceStrategy/setStrategy/detail?id=${record.id}&preview=1`}
+          type={AuthUrl('priceManage.see', 'jiageguanl') ? 'link' : 'button'}
+        >
+          {text}
+        </EyePreview>
     },
     // {
     //   title: '商品ID',
@@ -133,10 +138,14 @@ const PriceManage: React.FC<{}> = () => {
       render: (text: any, record: any) => {
         return (
           <>
-            <Button type='link' className="padLeft0" onClick={() => handleModify(record)}>{intl.formatMessage({ id: 'dealAbility.xiugai' })}</Button>
-            <Popconfirm title={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.title' })} okText={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.okText' })} cancelText={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.cancelText' })} onConfirm={() => handleDelete(record)}>
-              <Button type='link' className="padLeft0">{intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.link' })}</Button>
-            </Popconfirm>
+            <AuthButton menuCode='priceManage.edit' urlCode='jiageguanl'>
+              <Button type='link' className="padLeft0" onClick={() => handleModify(record)}>{intl.formatMessage({ id: 'dealAbility.xiugai' })}</Button>
+            </AuthButton>
+            <AuthButton menuCode='priceManage.del' urlCode='jiageguanl'>
+              <Popconfirm title={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.title' })} okText={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.okText' })} cancelText={intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.cancelText' })} onConfirm={() => handleDelete(record)}>
+                <Button type='link' className="padLeft0">{intl.formatMessage({ id: 'priceManage.priceStrategy.popconfirm.link' })}</Button>
+              </Popconfirm>
+            </AuthButton>
           </>
         )
       }
@@ -178,12 +187,14 @@ const PriceManage: React.FC<{}> = () => {
 
   const controllerBtns = (
     <Space>
-      <Button
-        type='primary'
-        onClick={() => history.push('/memberCenter/commodityAbility/priceManage/priceStrategy/setStrategy/add')}
-      >
-        <PlusOutlined />{intl.formatMessage({ id: 'priceManage.priceStrategy.controllerBtns' })}
-      </Button>
+      <AuthButton menuCode='priceManage.add' urlCode='jiageguanl'>
+        <Button
+          type='primary'
+          onClick={() => history.push('/memberCenter/commodityAbility/priceManage/priceStrategy/setStrategy/add')}
+        >
+          <PlusOutlined />{intl.formatMessage({ id: 'priceManage.priceStrategy.controllerBtns' })}
+        </Button>
+      </AuthButton>
     </Space>
   )
 

src/pages/priceManage/priceStrategy/setStrategy.tsx

@@ -54,15 +54,15 @@ const SetStrategy: React.FC<{}> = () => {
       backIcon={<ReutrnEle description={intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.description' })} />}
       className="setStrategy"
       title={pageStatus === PageStatus.PREVIEW ? intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.title1' }) : (pageStatus === PageStatus.ADD ? intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.title2' }) : intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.title3' }))}
-      extra={(
-        pageStatus !== PageStatus.PREVIEW
-          ? (
-            <Button key="1" loading={btnLoading} onClick={() => addSchemaAction.submit()} type="primary" icon={<SaveOutlined />}>
-              {intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.extra' })}
-            </Button>
-          )
-          : null
-      )}
+    // extra={(
+    //   pageStatus !== PageStatus.PREVIEW
+    //     ? (
+    //       <Button key="1" loading={btnLoading} onClick={() => addSchemaAction.submit()} type="primary" icon={<SaveOutlined />}>
+    //         {intl.formatMessage({ id: 'priceManage.priceStrategy.setStrategy.extra' })}
+    //       </Button>
+    //     )
+    //     : null
+    // )}
     >
       <Card>
         <PriceSetting addSchemaAction={addSchemaAction} schema={setPriceSchema} formSubmit={formSubmit} />

src/pages/procurement/callForBids/addNewBid/schema/index.ts

@@ -339,7 +339,7 @@ const bidRequestInfo: ISchema = {
           type: 'string',
           title: ' ',
           "x-component-props": {
-            prefix: intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency'}),
+            prefix: intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' }),
             style: { width: '100%' },
           },
           "x-rules": [
@@ -632,7 +632,7 @@ const evaluationNeedInfo: ISchema = {
               marginTop: 4,
             }
           },
-          title: '{{help("是否在线评标", "在线进行评标打分")}}',
+          title: `{{help("${intl.formatMessage({ id: 'table.purchase.shifouzaixianping' })}", "${intl.formatMessage({ id: 'purchase.zaixianpingbiaodafen' })}")}}`,
           default: true,
           // "x-linkages": [
           //   {
@@ -677,7 +677,7 @@ const otherRequset: ISchema = {
       properties: {
         deliverAddressId: {
           type: 'number',
-          title: intl.formatMessage({ id: 'table.purchase.jiaofudizhi'}),
+          title: intl.formatMessage({ id: 'table.purchase.jiaofudizhi' }),
           enum: [],
           "x-component-props": {
             placeholder: intl.formatMessage({ id: 'table.purchase.qingxuanzejiaofu' })

src/pages/procurement/callForBids/callForBidsSearch/index.tsx

@@ -47,13 +47,13 @@ const callForBidsSearch: React.FC<{}> = () => {
   ])
 
   const renderOptionButton = (record: any) => {
-    const buttonGroup = { '复制': true, '修改开标时间': record.isOpenTenderTime, '抽取专家': record.isExpert, '废标': record.isDiscardTender }
+    const buttonGroup = { [`${intl.formatMessage({ id: 'commodity.products.buttonGroup.1' })}`]: true, [`${intl.formatMessage({ id: 'table.purchase.xiugaikaibiaoshi' })}`]: record.isOpenTenderTime, [`${intl.formatMessage({ id: 'table.purchase.chouquzhuanjia' })}`]: record.isExpert, [`${intl.formatMessage({ id: 'common.fiebiao' })}`]: record.isDiscardTender }
 
     const operationHandler = {
-      '复制': () => handleCopy(record.id),
-      '修改开标时间': () => handleChangeTime(record),
-      '抽取专家': () => handleWithdraw(record.id),
-      '废标': () => handleDestory(record.id),
+      [`${intl.formatMessage({ id: 'commodity.products.buttonGroup.1' })}`]: () => handleCopy(record.id),
+      [`${intl.formatMessage({ id: 'table.purchase.xiugaikaibiaoshi' })}`]: () => handleChangeTime(record),
+      [`${intl.formatMessage({ id: 'table.purchase.chouquzhuanjia' })}`]: () => handleWithdraw(record.id),
+      [`${intl.formatMessage({ id: 'common.fiebiao' })}`]: () => handleDestory(record.id),
     }
 
     const keyNames = Object.keys(buttonGroup)

src/pages/transaction/logisticsAbility/logisticsBillSubmit/addLogistics/index.less

@@ -20,8 +20,9 @@
       }
       .ant-input-group-addon {
         .ant-input-search-button {
-          background-color: #6B778C;
-          border-color: #6B778C;
+          color: #FFFFFF!important;
+          background-color: #6B778C !important;
+          border-color: #6B778C !important;
         }
       }
     }
@@ -51,7 +52,7 @@
 
       :global {
         .anticon-file-word {
-          color: #4279df; 
+          color: #4279df;
           font-size: 20px;
           margin-right: 8px;
         }
@@ -70,4 +71,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

src/pages/transaction/purchaseAbility/onlineBid/detail/index.tsx

@@ -98,7 +98,7 @@ const SearchDetail = () => {
     setBasicEffect([
       {
         col: [
-          { label: intl.formatMessage({ id: 'detail.purchase.biddingNo'}), extra: data.biddingNo, type: 'text' },
+          { label: intl.formatMessage({ id: 'detail.purchase.biddingNo' }), extra: data.biddingNo, type: 'text' },
           { label: intl.formatMessage({ id: 'detail.purchase.biddingDetails' }), extra: data.details, type: 'text' },
           { label: intl.formatMessage({ id: 'table.purchase.externalStatus' }), extra: <StatusTag type={BID_EXTERNALSTATE_COLOR(data.externalState)} title={data.externalStateName} />, type: 'text' },
           { label: intl.formatMessage({ id: 'table.purchase.innerStatus' }), extra: <Badge status={BID_INTERNALSTATE_COLOR(data.interiorState)} text={data.interiorStateName} />, type: 'text' },
@@ -124,7 +124,7 @@ const SearchDetail = () => {
     setResultEffect([
       {
         col: [
-          { label: intl.formatMessage({ id: 'detail.purchase.label' }), extra: data?.sumAwardPrice ? `¥ ${priceFormat(data?.sumAwardPrice)}` : '-', type: 'text' },
+          { label: intl.formatMessage({ id: 'detail.purchase.label' }), extra: data?.sumAwardPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data?.sumAwardPrice)}` : '-', type: 'text' },
           { label: intl.formatMessage({ id: 'detail.purchase.label1' }), extra: intl.formatMessage({ id: 'detail.purchase.label2' }), type: 'text' },
         ]
       },
@@ -141,20 +141,20 @@ const SearchDetail = () => {
       {
         col: [
           { label: intl.formatMessage({ id: 'detail.purchase.biddingStartTime' }), extra: `${formatTimeString(data.biddingStartTime)} ${intl.formatMessage({ id: 'detail.purchase.label3' })} ${formatTimeString(data.biddingEndTime)}`, type: 'text' },
-          { label: intl.formatMessage({ id: 'detail.purchase.startingPrice' }), extra: data.startingPrice ? `¥ ${priceFormat(data.startingPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips9' }) },
-          { label: intl.formatMessage({ id: 'detail.purchase.targetPrice' }), extra: data.targetPrice ? `¥ ${priceFormat(data.targetPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips10' })},
+          { label: intl.formatMessage({ id: 'detail.purchase.startingPrice' }), extra: data.startingPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.startingPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips9' }) },
+          { label: intl.formatMessage({ id: 'detail.purchase.targetPrice' }), extra: data.targetPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.targetPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips10' }) },
         ]
       },
       {
         col: [
-          { label: intl.formatMessage({ id: 'detail.purchase.minPrice' }), extra: data.minPrice ? `¥ ${priceFormat(data.minPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips11' }) },
+          { label: intl.formatMessage({ id: 'detail.purchase.minPrice' }), extra: data.minPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.minPrice)}` : '-', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips11' }) },
           { label: intl.formatMessage({ id: 'detail.purchase.allowPurchaseCount' }), extra: data.allowPurchaseCount, type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips12' }) },
         ]
       },
       {
         col: [
           { label: intl.formatMessage({ id: 'detail.purchase.isOpenPurchase' }), extra: transforType[data.isOpenPurchase], type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips13' }), isMix: [intl.formatMessage({ id: 'detail.purchase.isMix1' }), intl.formatMessage({ id: 'detail.purchase.isMix2' })] },
-          { label: intl.formatMessage({ id: 'detail.purchase.isOpenRanking' }), extra: transforType[data.isOpenRanking], type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips14' })},
+          { label: intl.formatMessage({ id: 'detail.purchase.isOpenRanking' }), extra: transforType[data.isOpenRanking], type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips14' }) },
         ]
       },
     ])

src/pages/transaction/purchaseAbility/purchaseBid/detail/index.tsx

@@ -162,14 +162,14 @@ const SearchDetail = () => {
     setRulesEffect([
       {
         col: [
-          { label: intl.formatMessage({ id: 'detail.purchase.biddingStartTime' }), extra: `${formatTimeString(data.biddingStartTime)} 至 ${formatTimeString(data.biddingEndTime)}`, type: 'text' },
-          { label: intl.formatMessage({ id: 'detail.purchase.startingPrice' }), extra: data.startingPrice ? `¥ ${priceFormat(data.startingPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips9' }) },
-          { label: intl.formatMessage({ id: 'detail.purchase.targetPrice' }), extra: data.targetPrice ? `¥ ${priceFormat(data.targetPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips10' }) },
+          { label: intl.formatMessage({ id: 'detail.purchase.biddingStartTime' }), extra: `${formatTimeString(data.biddingStartTime)} ${intl.formatMessage({ id: 'common.text.to' })} ${formatTimeString(data.biddingEndTime)}`, type: 'text' },
+          { label: intl.formatMessage({ id: 'detail.purchase.startingPrice' }), extra: data.startingPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.startingPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips9' }) },
+          { label: intl.formatMessage({ id: 'detail.purchase.targetPrice' }), extra: data.targetPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.targetPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips10' }) },
         ]
       },
       {
         col: [
-          { label: intl.formatMessage({ id: 'detail.purchase.minPrice' }), extra: data.minPrice ? `¥ ${priceFormat(data.minPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips11' }) },
+          { label: intl.formatMessage({ id: 'detail.purchase.minPrice' }), extra: data.minPrice ? `${intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })} ${priceFormat(data.minPrice)}` : '', type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips11' }) },
           { label: intl.formatMessage({ id: 'detail.purchase.allowPurchaseCount' }), extra: data.allowPurchaseCount, type: 'text', tips: intl.formatMessage({ id: 'detail.purchase.tips12' }) },
         ]
       },

src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/components/bidRules.tsx

@@ -169,7 +169,7 @@ const BidRules: React.FC<Iprops> = (props: any) => {
           ]}
         >
           <Input
-            addonBefore={'¥'}
+            addonBefore={intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })}
             value={startingPrice}
             placeholder={intl.formatMessage({ id: 'detail.purchase.placeholder9' })}
             onChange={(e) => {
@@ -210,7 +210,7 @@ const BidRules: React.FC<Iprops> = (props: any) => {
           ]}
         >
           <Input
-            addonBefore={'¥'}
+            addonBefore={intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })}
             value={targetPrice}
             placeholder={intl.formatMessage({ id: 'detail.purchase.placeholder10' })}
             onChange={(e) => {
@@ -251,7 +251,7 @@ const BidRules: React.FC<Iprops> = (props: any) => {
           ]}
         >
           <Input
-            addonBefore={'¥'}
+            addonBefore={intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })}
             value={minPrice}
             placeholder={intl.formatMessage({ id: 'detail.purchase.placeholder11' })}
             onChange={(e) => {

src/pages/transaction/purchaseAbility/purchaseBid/readyAdd/components/file.tsx

@@ -88,7 +88,7 @@ const File: React.FC<IProps> = (props) => {
       {...layout}
       className={styles.revise_style}
     >
-      <Form.Item label='附件' name='upload'>
+      <Form.Item label={intl.formatMessage({ id: 'balance.components.businessFileLayout.title' })} name='upload'>
         <div className={styles.upload_data}>
           {files.length > 0 && files.map((v, index) => (
             <div key={index} className={styles.upload_item}>

src/pages/transaction/stockSellStorage/bills/components/BillsFormPage/index.tsx

@@ -39,16 +39,16 @@ import { getIntl } from 'umi';
 export * from './interface';
 const intl = getIntl();
 const TITLE_MAP = {
-  [DOC_TYPE_PURCHASE_RECEIPT]: '采购入库单',
-  [DOC_TYPE_SALES_INVOICE]: '销售发货单',
-  [DOC_TYPE_PROCESS_RECEIPT]: '加工入库单',
-  [DOC_TYPE_PROCESS_INVOICE]: '加工发货单',
-  [DOC_TYPE_RETURN_INVOICE]: '退货发货单',
-  [DOC_TYPE_RETURN_RECEIPT]: '退货入库单',
-  [DOC_TYPE_EXCHANGE_RETURN_INVOICE]: '换货退货发货单',
-  [DOC_TYPE_EXCHANGE_RETURN_RECEIPT]: '换货退货入货单',
-  [DOC_TYPE_EXCHANGE_INVOICE]: '换货发货单',
-  [DOC_TYPE_EXCHANGE_RECEIPT]: '换货入库单',
+  [DOC_TYPE_PURCHASE_RECEIPT]: intl.formatMessage({id: 'common.caigourukudan'}),
+  [DOC_TYPE_SALES_INVOICE]: intl.formatMessage({id: 'common.xiaoshoufahuodan'}),
+  [DOC_TYPE_PROCESS_RECEIPT]: intl.formatMessage({id: 'common.jiagongrukudan'}),
+  [DOC_TYPE_PROCESS_INVOICE]: intl.formatMessage({id: 'common.jiagongfahuodan'}),
+  [DOC_TYPE_RETURN_INVOICE]: intl.formatMessage({id: 'common.tuihuofahuodan'}),
+  [DOC_TYPE_RETURN_RECEIPT]: intl.formatMessage({id: 'common.tuihuorukudan'}),
+  [DOC_TYPE_EXCHANGE_RETURN_INVOICE]: intl.formatMessage({id: 'common.huanhuotuihuofahuodan'}),
+  [DOC_TYPE_EXCHANGE_RETURN_RECEIPT]: intl.formatMessage({id: 'common.huanhuotuihuoruhuodan'}),
+  [DOC_TYPE_EXCHANGE_INVOICE]: intl.formatMessage({id: 'common.huanhuofahuodan'}),
+  [DOC_TYPE_EXCHANGE_RECEIPT]: intl.formatMessage({id: 'common.huanhuorukudan'}),
 };
 
 const formActions = createFormActions();