fix: 翻译修复

src/locales/en-US/commodity.ts

@@ -116,7 +116,7 @@ export default {
   'commodity.products.operationHandler.3':'Modify',
   'commodity.products.operationHandler.4':'Delete',
   'commodity.products.operationHandler.5':'On shelf',
-  'commodity.products.operationHandler.6':'Remove shelf',
+  'commodity.products.operationHandler.6':'Remove',
   'commodity.products.operationHandler.7':'View supply products',
   'commodity.products.step0Description.text.1':'Click to download EXCEL file template',
   'commodity.products.step0Description.text.2':'According to the template to organize product information',
@@ -792,7 +792,7 @@ export default {
   'commodity.products.addProductsItem.productImageForm.setting.option.1':'All attributes share product image (default)',
   'commodity.products.addProductsItem.productImageForm.setting.option.2':'Set product image by attribute',
   'commodity.products.addProductsItem.productImageForm.item.1':'Add pictures by specific attributes',
-  'commodity.products.addProductsItem.productImageForm.item.1.label':'all attributes are shared',
+  'commodity.products.addProductsItem.productImageForm.item.1.label':'all attributes shared',
   'commodity.products.addProductsItem.productImageForm.alert.1': '1. You can select 6 images at a time',
   'commodity.products.addProductsItem.productImageForm.alert.2': '2. The size of the picture is 800*800, the size of a single sheet does not exceed 600K, and only JPEG/JPG/PNG formats are supported',
   'commodity.products.addProductsItem.productImageForm.alert.3': '3. The image quality should be clear and not blurred. It is recommended that the main image be a front view with a white background',

src/locales/en-US/logistics.ts

@@ -6,7 +6,7 @@ export default {
   'logistics.fahuoren': 'Consignor',
   'logistics.qingshurufahuo': 'Please enter the shipper',
   'logistics.shengfen/zhi': '-province/municipalities-',
-  'logistics.shiqu': '-市-',
+  'logistics.shiqu': '-City-',
   'logistics.qu': '-District/County-',
   'logistics.xiangxidizhi': 'Detailed address',
   'logistics.qingshuruxiangxi': 'Please enter the detailed address',
@@ -35,7 +35,7 @@ export default {
   'logistics.morenyunfei': 'Default freight',
   'logistics.nei': 'Inside,',
   'logistics.shuzileixing3': 'Number type, can keep 3 decimal places',
-  'logistics.yuan': '元',
+  'logistics.yuan': 'yuan',
   'logistics.shuzileixing2': 'Number type, can keep 2 decimal places',
   'logistics.meizengjia': 'Every increase',
   'logistics.zengjiayunfei': 'Increase freight',

src/locales/en-US/purchase.ts

@@ -976,5 +976,16 @@ export default {
   'table.purchase.zhongbiaoshuliang': 'Number of winning bids',
   'table.purchase.duiying': 'Correspondence',
   'table.purchase.zhi': 'To',
-
+  'purchase.xiugaizhaiyao': 'Edit summary',
+  'purchase.xiugaishijian': 'Modify the time',
+  'purchase.fangwengaiyemiandelianjie': 'Visit the link on that page',
+  'purchase.liuzhuanshunxuhao': 'Flow SN',
+  'purchase.caozuojuese': 'Operator Role',
+  'purchase.zhuangtai': 'Status',
+  'purchase.caozuoshijian': 'Operator Time',
+  'purchase.shenheyijian': 'Audit Opinion',
+  'purchase.caozuoren': 'Operant',
+  'purchase.bumen': 'Division',
+  'purchase.zhiwei': 'Position',
+  'purchase.zuichang400gezifu200ge': 'Up to 400 characters, 200 Chinese characters',
 }

src/locales/en-US/shop.ts

@@ -19,7 +19,7 @@
   'shop.form.label.albumName':'Promotional album',
   'shop.form.label.shopLink':'Shop Link',
   'shop.form.label.mallLink':'Mall Link',
-  'shop.form.label.phone':'Contact phone number',
+  'shop.form.label.phone':'Contact phone',
   'shop.form.label.phone.placeholder':'Please enter the phone number',
   'shop.form.label.address':'Detailed address',
   'shop.form.label.address.placeholder':'Please enter the detailed address',
@@ -123,13 +123,13 @@
   'own.constant.page.type_3':'Market Information',
   'own.about.tab.item_1':'Basic information',
   'own.about.tab.item_2':'Plant photo',
-  'own.about.tab.item_3':'Qualification honor',
+  'own.about.tab.item_3':'Aptitude honor',
   'own.about.tab.item_4':'Propaganda album',
-  'own.about.form.memberShopAreas':'Business coverage area city',
+  'own.about.form.memberShopAreas':'Business coverage',
   'own.about.form.memberShopAreas.required':'Please select a business coverage area',
-  'own.about.form.mall.link':'own.about.form.mall.link',
-  'own.about.form.mall.link.select':'Please select self-operated mall',
-  'own.about.form.mall.link.current':'Current self-operated mall link',
+  'own.about.form.mall.link':'self-run mall Link',
+  'own.about.form.mall.link.select':'Please select self-run mall Link',
+  'own.about.form.mall.link.current':'Current self-run mall Link',
   'own.mall.type_1':'Enterprise Mall',
   'own.mall.type_2':'Points Mall',
   'own.mall.type_3':'Channel Mall',
@@ -154,4 +154,4 @@
   'own.seo.add':'Add SEO',
   'own.seo.form.type':'Page Type',
   'own.seo.form.type.required':'Please select the page type',
-}
\ No newline at end of file
+}

src/locales/ko-KR/purchase.ts

@@ -976,5 +976,16 @@ export default {
   'table.purchase.zhongbiaoshuliang': '낙찰량',
   'table.purchase.duiying': '대응',
   'table.purchase.zhi': '대상',
-
+  'purchase.xiugaizhaiyao': '요점을 고치다',
+  'purchase.xiugaishijian': '수정한 날짜',
+  'purchase.fangwengaiyemiandelianjie': '이 페이지에 대한 링크입니다',
+  'purchase.liuzhuanshunxuhao': '이전 번호',
+  'purchase.caozuojuese': '역할 조작',
+  'purchase.zhuangtai': '상태',
+  'purchase.caozuoshijian': '작업 시간',
+  'purchase.shenheyijian': '의견을 심사하다',
+  'purchase.caozuoren': '오퍼레이터',
+  'purchase.bumen': '부문',
+  'purchase.zhiwei': '직위',
+  'purchase.zuichang400gezifu200ge': '길게는 400자, 200자',
 }

src/locales/zh-CN/purchase.ts

@@ -543,7 +543,8 @@ export default {
   'detail.purchase.label52': '操作时间',
 
   'schma.purchase.purchaseType.help': '采购类型',
-  'schma.purchase.purchaseType.help.text': '有固定采购金额：采购金额固定，合同期内不可超过采购金额，无固定采购金额：采购金额不固定，可在合同期内按需采购',
+  'schma.purchase.purchaseType.help.text':
+    '有固定采购金额：采购金额固定，合同期内不可超过采购金额，无固定采购金额：采购金额不固定，可在合同期内按需采购',
   'schma.purchase.orderNo': '请输入订单编号',
   'schma.purchase.orderThe': '请输入订单摘要',
   'schma.purchase.supplyMembersName': '请输入供应会员名称',
@@ -976,5 +977,16 @@ export default {
   'table.purchase.zhongbiaoshuliang': '中标数量',
   'table.purchase.duiying': '对应',
   'table.purchase.zhi': '至',
-
+  'purchase.xiugaizhaiyao': '修改摘要',
+  'purchase.xiugaishijian': '修改时间',
+  'purchase.fangwengaiyemiandelianjie': '访问该页面的链接',
+  'purchase.liuzhuanshunxuhao': '流转顺序号',
+  'purchase.caozuojuese': '操作角色',
+  'purchase.zhuangtai': '状态',
+  'purchase.caozuoshijian': '操作时间',
+  'purchase.shenheyijian': '审核意见',
+  'purchase.caozuoren': '操作人',
+  'purchase.bumen': '部门',
+  'purchase.zhiwei': '职位',
+  'purchase.zuichang400gezifu200ge': '最长400个字符，200个汉字',
 }

src/pages/classAndProperty/class/schema/index.ts

@@ -25,13 +25,16 @@ export const classSchema: ISchema = {
           properties: {
             name: {
               type: 'string',
-              title: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.name'}),
-              required: true,
+              title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name' }),
               'x-component-props': {
-                placeholder: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.name.placeholder'}),
+                placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name.placeholder' }),
               },
               'x-rules': [
                 {
+                  required: true,
+                  message: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.name.placeholder' }),
+                },
+                {
                   limitByte: true,
                   maxByte: 16,
                 },
@@ -39,20 +42,25 @@ export const classSchema: ISchema = {
             },
             type: {
               type: 'number',
-              title: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type'}),
-              required: true,
+              title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type' }),
               'x-component-props': {
-                placeholder: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type.placeholder'}),
+                placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.placeholder' }),
               },
+              'x-rules': [
+                {
+                  required: true,
+                  message: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.placeholder' }),
+                },
+              ],
               enum: [
-                { label: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type.value.1'}), value: 1 },
-                { label: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type.value.2'}), value: 2 },
-                { label: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type.value.3'}), value: 3 },
-                { label: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.type.value.4'}), value: 4 },
+                { label: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.value.1' }), value: 1 },
+                { label: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.value.2' }), value: 2 },
+                { label: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.value.3' }), value: 3 },
+                { label: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.type.value.4' }), value: 4 },
               ],
             },
             imageUrl: {
-              title: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.imageUrl'}),
+              title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.imageUrl' }),
               'x-component': 'CustomUpload',
             },
             category: {
@@ -64,7 +72,7 @@ export const classSchema: ISchema = {
                 },
                 name: {
                   type: 'string',
-                  title: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.category.name'}),
+                  title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.category.name' }),
                   'x-component-props': {
                     disabled: true,
                     addonAfter: '{{connectCategory}}',
@@ -74,11 +82,17 @@ export const classSchema: ISchema = {
             },
             sort: {
               type: 'number',
-              title: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.sort'}),
+              title: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.sort' }),
               required: true,
               'x-component-props': {
-                placeholder: getIntl().formatMessage({id: 'classAndProperty.class.classSchema.sort.placeholder'}),
+                placeholder: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.sort.placeholder' }),
               },
+              'x-rules': [
+                {
+                  required: true,
+                  message: getIntl().formatMessage({ id: 'classAndProperty.class.classSchema.sort.placeholder' }),
+                },
+              ],
             },
           },
         },

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

@@ -15,14 +15,12 @@ import { CommodityType, customerCategoryTypeLabel } from '../constant';
 import { getManageAreaAll, GetManageAreaAllResponse } from '@/services/ManageV2Api';
 
 const { Option } = Select
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 const layoutFormList = {
   labelCol: {
     span: 2,

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

@@ -5,14 +5,12 @@ import { store } from '@/store'
 import { getLogisticsSelectListCompany, GetLogisticsSelectListCompanyResponse, getLogisticsSelectListFreightTemplate, GetLogisticsSelectListFreightTemplateResponse, getLogisticsSelectListShipperAddress, GetLogisticsSelectListShipperAddressResponse } from '@/services/LogisticsV2Api'
 const { ProductStore } = store
 
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 
 export interface Iprops {
   onRef: (refs: any) => void;

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

@@ -6,14 +6,12 @@ import { validatorByte } from '@/utils/regExp'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 const { ProductStore } = store
 
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 
 export interface Iprops {
   onRef: (refs: any) => void;

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

@@ -11,14 +11,12 @@ import { IProductSelectAttribute } from '@/module/productModule'
 import { orderlyLadderPrice, validatorNumberRange } from '../constant'
 import { getProductSelectGetSelectCnUnit } from '@/services/ProductV2Api'
 
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 const layoutSetPrice = {
   labelCol: { span: 24 },
   wrapperCol: { span: 24 },

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

@@ -5,14 +5,12 @@ import { inject, observer } from 'mobx-react'
 import { store } from '@/store'
 import { validatorByte } from '@/utils/regExp'
 
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 export interface Iprops {
   attributesData: any[];
   onRef: (refs: any) => void;

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

@@ -8,14 +8,12 @@ import { inject, observer } from 'mobx-react'
 import { store } from '@/store'
 import { getProductGoodsGetGoodsList, GetProductGoodsGetGoodsListResponseDetail } from '@/services/ProductV2Api'
 
-const layout = {
-  labelCol: {
-    span: 2,
-  },
-  wrapperCol: {
-    span: 12,
-  },
-}
+const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  wrapperCol: { span: 12 },
+  labelAlign: "left"
+};
 
 const SelectGoodsForm: React.FC<{}> = (props) => {
   const intl = useIntl();

src/pages/member/memberImport/components/MemberForm/schema/index.ts

@@ -26,35 +26,44 @@ export const initDetailSchema = (props: GroupItem[]) => {
             properties: {
               memberTypeId: {
                 type: 'string',
-                required: true,
                 title: intl.formatMessage({ id: 'member.management.import.query.form.basic.memberTypeId' }),
                 enum: [],
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }),
                 },
+                'x-rules': [{
+                  required: true,
+                  message: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                }]
               },
               roleId: {
                 type: 'string',
-                required: true,
                 title: intl.formatMessage({ id: 'member.management.import.query.form.basic.roleId' }),
                 enum: [],
                 'x-component-props': {
-                  placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }), 
+                  placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }),
                 },
+                'x-rules': [{
+                  required: true,
+                  message: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                }],
                 'x-props': {
-                  hasFeedback: true, 
+                  hasFeedback: true,
                 },
               },
               level: {
                 type: 'string',
-                required: true,
                 title: intl.formatMessage({ id: 'member.management.import.query.form.basic.level' }),
                 enum: [],
                 'x-component-props': {
                   placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }),
                 },
+                'x-rules': [{
+                  required: true,
+                  message: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                }],
                 'x-props': {
-                  hasFeedback: true, 
+                  hasFeedback: true,
                 },
               },
               MEGA_LAYOUT1_1: {
@@ -62,9 +71,9 @@ export const initDetailSchema = (props: GroupItem[]) => {
                 'x-component': 'Mega-Layout',
                 'x-component-props': {
                   label: intl.formatMessage({ id: 'member.management.import.query.form.basic.phone' }),
-                  required: true, 
+                  required: true,
                   wrapperCol: 24,
-                }, 
+                },
                 properties: {
                   MEGA_LAYOUT1_1_1: {
                     type: 'object',
@@ -72,35 +81,41 @@ export const initDetailSchema = (props: GroupItem[]) => {
                     'x-component-props': {
                       grid: true,
                       full: true,
-                    }, 
+                    },
                     properties: {
                       countryCodeId: {
-                        type: 'string', 
+                        type: 'string',
                         enum: [],
                         'x-component-props': {
-                          placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }), 
-                        }, 
-                        required: true,
+                          placeholder: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' }),
+                        },
+                        'x-rules': [{
+                          required: true,
+                          message: intl.formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                        }],
                       },
                       phone: {
-                        type: 'string', 
-                        required: true, 
-                        'x-mega-props': { 
-                          span: 2, 
+                        type: 'string',
+                        'x-mega-props': {
+                          span: 2,
                         },
                         'x-component-props': {
                           placeholder: intl.formatMessage({ id: 'member.management.import.query.form.basic.phone.placeholder' }),
-                          maxLength: 11, 
-                        }, 
+                          maxLength: 11,
+                        },
                         'x-rules': [
                           {
-                            pattern: PATTERN_MAPS.phone, 
+                            required: true,
+                            message: intl.formatMessage({ id: 'member.management.import.query.form.basic.phone.placeholder' })
+                          },
+                          {
+                            pattern: PATTERN_MAPS.phone,
                             message: intl.formatMessage({ id: 'member.management.import.query.form.basic.phone.rules-fact' }),
                           },
                         ],
                       },
                     },
-                  }, 
+                  },
                 },
               },
               email: {
@@ -109,7 +124,7 @@ export const initDetailSchema = (props: GroupItem[]) => {
                 'x-component-props': {},
                 'x-rules': [
                   {
-                    pattern: PATTERN_MAPS.email, 
+                    pattern: PATTERN_MAPS.email,
                     message: intl.formatMessage({ id: 'member.management.import.query.form.basic.email.rules-fact' }),
                   },
                 ],
@@ -117,7 +132,7 @@ export const initDetailSchema = (props: GroupItem[]) => {
             },
           },
         },
-      }, 
+      },
       'tab-2': {
         type: 'object',
         'x-component': 'TabPane',
@@ -130,54 +145,54 @@ export const initDetailSchema = (props: GroupItem[]) => {
             'x-component': 'Mega-Layout',
             'x-component-props': {
               labelCol: 4,
-              wrapperCol: 12, 
-              labelAlign: 'left', 
-              full: true, 
+              wrapperCol: 12,
+              labelAlign: 'left',
+              full: true,
             },
             properties: {
               upperRelationId: {
-                type: 'string', 
+                type: 'string',
                 enum: [],
                 title: intl.formatMessage({ id: 'member.management.import.query.form.channel.upperRelationId' }),
-                required: true, 
+                required: true,
                 'x-component-props': {
-                  
+
                 },
               },
               channelLevel: {
-                type: 'text', 
+                type: 'text',
                 title: intl.formatMessage({ id: 'member.management.import.query.form.channel.channelLevel' }),
               },
               channelTypeId: {
-                type: 'string', 
+                type: 'string',
                 enum: [],
                 title: intl.formatMessage({ id: 'member.management.import.query.form.channel.channelTypeId' }),
-                required: true, 
+                required: true,
                 'x-component-props': {
-                  
+
                 },
-              }, 
+              },
               areas: {
                 type: 'array',
                 title: intl.formatMessage({ id: 'member.management.import.query.form.channel.areas' }),
-                required: true, 
+                required: true,
                 'x-component': 'CustomAddArray',
                 default: [],
                 items: {
                   type: 'object',
                   properties: {
                     provinceCode: {
-                      type: 'string', 
+                      type: 'string',
                       enum: [],
                       'x-component-props': {
-                        allowClear: true, 
+                        allowClear: true,
                       },
                     },
                     cityCode: {
-                      type: 'string', 
+                      type: 'string',
                       enum: [],
                       'x-component-props': {
-                        allowClear: true, 
+                        allowClear: true,
                       },
                     }
                   }
@@ -186,16 +201,16 @@ export const initDetailSchema = (props: GroupItem[]) => {
               remark: {
                 type: 'string',
                 title: intl.formatMessage({ id: 'member.management.import.query.form.channel.remark' }),
-                required: true, 
+                required: true,
                 'x-component': 'TextArea',
                 'x-component-props': {
-                  rows: 4, 
+                  rows: 4,
                   placeholder: intl.formatMessage({ id: 'member.management.import.query.form.channel.remark.placeholder' }),
                 },
                 'x-rules': [
                   {
                     limitByte: true,  // 自定义校验规则
-                    maxByte: 200, 
+                    maxByte: 200,
                   }
                 ],
               },
@@ -237,7 +252,7 @@ export const initDetailSchema = (props: GroupItem[]) => {
         type: 'object',
         'x-component': 'Tab',
         'x-component-props': {
-          type: 'card', 
+          type: 'card',
           hiddenKeys: ['tab-2'],
         },
         ...tabSchema,

src/pages/member/memberRectification/common/schema/add.tsx

@@ -124,7 +124,10 @@ export const rectificationAddSchema: ISchema = {
                   title: `${intl.formatMessage({ id: 'member.memberRectification.common.schema.add.rectifyAppendix'})}`,
                   type: 'array',
                   'x-component': 'FormilyUploadFiles',
-                  required: true,
+                  'x-rules': [{
+                    required: true,
+                    message: `${intl.formatHTMLMessage({id: 'common.form.upload.placeholder'})} ${intl.formatMessage({ id: 'member.memberRectification.common.schema.add.rectifyAppendix'})}`
+                  }]
                 }
               }
             }

src/pages/ownMall/ownMallManager/ownMallAboutUs/index.tsx

@@ -19,8 +19,8 @@ import { getManageWebShopWebFindWebEnterpriseSelfShop } from '@/services/ManageV
 
 const layout: any = {
   colon: false,
-  labelCol: { span: 4 },
-  wrapperCol: { span: 20 },
+  labelCol: { span: 6 },
+  wrapperCol: { span: 18 },
   labelAlign: "left"
 }
 
@@ -190,19 +190,19 @@ const OwnMallAboutUs = () => {
             <Col span={12}>
               <Form.Item
                 name='describe'
-                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.describe' })} isRequire={true}/>}
+                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.describe' })} isRequire={true} />}
                 rules={[
                   { required: true, message: intl.formatMessage({ id: 'shop.form.describe.required' }) },
                   { validator: (r, v, c) => validatorByte(r, v, c, 400) }
                 ]}
               >
-                <Input.TextArea rows={3} placeholder="最长400个字符，200个汉字"/>
+                <Input.TextArea rows={3} placeholder={intl.formatMessage({ id: 'purchase.zuichang400gezifu200ge' })} />
               </Form.Item>
             </Col>
             <Col span={12}>
               <Form.Item
                 name='memberShopAreas'
-                label={<RequireItem label={intl.formatMessage({ id: 'own.about.form.memberShopAreas' })} isRequire={true}/>}
+                label={<RequireItem label={intl.formatMessage({ id: 'own.about.form.memberShopAreas' })} isRequire={true} />}
                 rules={[
                   { required: true, message: intl.formatMessage({ id: 'own.about.form.memberShopAreas.required' }) }
                 ]}
@@ -219,7 +219,7 @@ const OwnMallAboutUs = () => {
             <Col span={12}>
               <Form.Item label={intl.formatMessage({ id: 'own.about.form.mall.link' })}>
                 <Form.Item name='shopId'>
-                  <Select placeholder={intl.formatMessage({ id: 'own.about.form.mall.link.select' })} allowClear options={allMallList} onChange={selectMall}/>
+                  <Select placeholder={intl.formatMessage({ id: 'own.about.form.mall.link.select' })} allowClear options={allMallList} onChange={selectMall} />
                 </Form.Item>
                 <Form.Item name='url'>
                   <div className={styles.mallLink}>
@@ -233,21 +233,21 @@ const OwnMallAboutUs = () => {
             <Col span={12}>
               <Form.Item
                 name='phone'
-                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.phone' })}/>}
+                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.phone' })} />}
                 rules={[{ max: 20, message: `${intl.formatMessage({ id: 'common.text.most' })}20${intl.formatMessage({ id: 'common.unit.individual.character' })}` }]}
               >
-                <Input placeholder={intl.formatMessage({ id: 'shop.form.label.phone.placeholder' })}/>
+                <Input placeholder={intl.formatMessage({ id: 'shop.form.label.phone.placeholder' })} />
               </Form.Item>
             </Col>
             <Col span={12}>
               <Form.Item
                 name='address'
-                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.address' })}/>}
+                label={<RequireItem label={intl.formatMessage({ id: 'shop.form.label.address' })} />}
                 rules={[
                   { validator: (r, v, c) => validatorByte(r, v, c, 100) }
                 ]}
               >
-                <Input placeholder={intl.formatMessage({ id: 'shop.form.label.address.placeholder' })}/>
+                <Input placeholder={intl.formatMessage({ id: 'shop.form.label.address.placeholder' })} />
               </Form.Item>
             </Col>
           </Row>

src/pages/ownMall/ownMallManager/ownMallSeo/add.tsx

@@ -154,7 +154,7 @@ const SeoAdd = () => {
                   { validator: (r, v, c) => validatorByte(r, v, c, 200) }
                 ]}
               >
-                <Input.TextArea rows={1} placeholder="最长200个字符，100个汉字" disabled={isView} />
+                <Input.TextArea rows={1} placeholder={intl.formatMessage({ id: 'handling.zuichang200gezifu100ge' })} disabled={isView} />
               </Form.Item>
             </Col>
           </Row>

src/pages/priceManage/schema/index.tsx

@@ -177,10 +177,13 @@ export const setPriceSchema: ISchema = {
                   type: 'number',
                   enum: [],
                   title: getIntl().formatMessage({id: 'priceManage.schema.setPriceSchema.shopId'}),
-                  required: true,
                   "x-component-props": {
                     disabled: false,
                   },
+                  'x-rules': [{
+                    required: true,
+                    message: getIntl().formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                  }],
                 },
                 productName: {
                   type: 'string',
@@ -192,7 +195,10 @@ export const setPriceSchema: ISchema = {
                     disabled: true,
                     addonAfter: "{{connectProduct}}"
                   },
-                  required: true
+                  'x-rules': [{
+                    required: true,
+                    message: getIntl().formatMessage({ id: 'member.management.import.query.form.placeholder-select' })
+                  }],
                 },
                 productId: {
                   type: 'string',

src/pages/repositories/components/positionSetting.tsx

@@ -310,6 +310,7 @@ const PositionSetting: React.FC<PositionSettingProps> = (props) => {
       dataIndex: 'id',
       align: 'center',
       key: 'id',
+      ellipsis: true,
     },
     {
       title: intl.formatMessage({ id: 'repositories.components.positionSetting.columnsSetProduct.name' }),
@@ -324,30 +325,35 @@ const PositionSetting: React.FC<PositionSettingProps> = (props) => {
       dataIndex: 'customerCategoryName',
       align: 'center',
       key: 'customerCategoryName',
+      ellipsis: true,
     },
     {
       title: intl.formatMessage({ id: 'repositories.components.positionSetting.columnsSetProduct.brandName' }),
       dataIndex: 'brandName',
       align: 'center',
       key: 'brandName',
+      ellipsis: true,
     },
     {
       title: intl.formatMessage({ id: 'repositories.components.positionSetting.columnsSetProduct.unitName' }),
       dataIndex: 'unitName',
       align: 'center',
       key: 'unitName',
+      ellipsis: true,
     },
     {
       title: intl.formatMessage({ id: 'repositories.components.positionSetting.columnsSetProduct.upperMemberName' }),
       dataIndex: 'upperMemberName',
       align: 'center',
       key: 'upperMemberName',
+      ellipsis: true,
     },
     {
       title: intl.formatMessage({ id: 'repositories.components.positionSetting.columnsSetProduct.upperStockCount' }),
       dataIndex: 'upperStockCount',
       align: 'center',
       key: 'upperStockCount',
+      ellipsis: true,
     }
   ]
 

src/pages/transaction/logisticsAbility/logisticsAdminister/shipmentsAddress/form.tsx

@@ -191,10 +191,13 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                             provinceCode: {
                               type: 'string',
                               enum: [],
-                              required: true,
                               "x-component-props": {
                                 placeholder: intl.formatMessage({ id: 'logistics.shengfen/zhi' }),
                               },
+                              'x-rules': [{
+                                required: true,
+                                message: `${intl.formatMessage({id: 'logistics.qingxuanze'})}${intl.formatMessage({ id: 'logistics.shengfen/zhi' })}`
+                              }],
                               "x-mega-props": {
                                 span: 1
                               },
@@ -210,10 +213,13 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                             cityCode: {
                               type: 'string',
                               enum: [],
-                              required: true,
                               "x-component-props": {
                                 placeholder: intl.formatMessage({ id: 'logistics.shiqu' }),
                               },
+                              'x-rules': [{
+                                required: true,
+                                message: `${intl.formatMessage({id: 'logistics.qingxuanze'})}${intl.formatMessage({ id: 'logistics.shiqu' })}`
+                              }],
                               "x-mega-props": {
                                 span: 1
                               },
@@ -229,10 +235,13 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                             districtCode: {
                               type: 'string',
                               enum: [],
-                              required: true,
                               "x-component-props": {
                                 placeholder: intl.formatMessage({ id: 'logistics.qu' }),
                               },
+                              'x-rules': [{
+                                required: true,
+                                message: `${intl.formatMessage({id: 'logistics.qingxuanze'})}${intl.formatMessage({ id: 'logistics.qu' })}`
+                              }],
                               "x-mega-props": {
                                 span: 1
                               },
@@ -271,7 +280,7 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                       "x-rules": [
                         {
                           required: true,
-                          message: '',
+                          message: `${intl.formatMessage({id: 'detail.purchase.message22'})} ${intl.formatMessage({ id: 'logistics.xiangxidizhi' })} `,
                         },
                         {
                           limitByte: true,
@@ -317,7 +326,6 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                             },
                             phone: {
                               type: 'string',
-                              required: true,
                               'x-mega-props': {
                                 span: 3,
                               },
@@ -327,6 +335,10 @@ const AddedAddressLayout: React.FC<AddressModalProps> = (props) => {
                               },
                               'x-rules': [
                                 {
+                                  required: true,
+                                  message: intl.formatMessage({ id: 'logistics.qingshurunide' }),
+                                },
+                                {
                                   pattern: PATTERN_MAPS.phone,
                                   message: intl.formatMessage({ id: 'logistics.qingshuruzhengque' }),
                                 },

src/pages/transaction/purchaseAbility/components/detail/components/progressLayout/index.tsx

@@ -48,8 +48,8 @@ const ProgressLayout: React.FC<ProgressProps> = (props: any) => {
               defaultValue={data.externalLogStates ? LOGSTATESTYPE.EXTERNALSTATES : LOGSTATESTYPE.INTERIORSTATES}
             >
               {data.externalLogStates && <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>{intl.formatMessage({ id: 'detail.purchase.externalLogStates' })}</Radio.Button>}
-              {data.interiorLogStates && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>{intl.formatMessage({ id: 'detail.interiorLogStates' })}</Radio.Button>}
-              {data.examineInteriorLogStates && <Radio.Button value={LOGSTATESTYPE.EXMAINEINERIORSTATES}>{intl.formatMessage({ id: 'detail.examineInteriorLogStates' })}</Radio.Button>}
+              {data.interiorLogStates && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>{intl.formatMessage({ id: 'detail.purchase.interiorLogStates' })}</Radio.Button>}
+              {data.examineInteriorLogStates && <Radio.Button value={LOGSTATESTYPE.EXMAINEINERIORSTATES}>{intl.formatMessage({ id: 'detail.purchase.examineInteriorLogStates' })}</Radio.Button>}
             </Radio.Group>
           )}
         </>

src/pages/transaction/purchaseAbility/components/detail/components/recordLyout/index.tsx

@@ -50,7 +50,7 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
               defaultValue={data.externalLogs ? LOGSTATESTYPE.EXTERNALSTATES : LOGSTATESTYPE.INTERIORSTATES}
             >
               {data.externalLogs && <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>{intl.formatMessage({ id: 'detail.purchase.externalLogStates' })}</Radio.Button>}
-              {data.interiorLogs && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>{intl.formatMessage({ id: 'detail.interiorLogStates' })}</Radio.Button>}
+              {data.interiorLogs && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>{intl.formatMessage({ id: 'detail.purchase.interiorLogStates' })}</Radio.Button>}
             </Radio.Group>
           )}
         </>

src/pages/transaction/purchaseAbility/components/detail/index.less

 .wrap {
-  margin: -24px -24px 0;
+  // margin: -24px -24px 0;
   .title {
     display: flex;
     align-items: center;

src/pages/transaction/purchaseAbility/components/modalOperate/index.tsx

@@ -302,21 +302,23 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
             title={modalText()}
             name={causeName(modalType)}
             x-component="TextArea"
-            required
             x-component-props={{
               placeholder: `${intl.formatMessage({ id: 'detail.purchase.tips17' })}${maxNumber}${intl.formatMessage({ id: 'detail.purchase.tips18' })}`
             }}
-            x-rules={{
+            x-rules={[{
+              required: true,
+              message: `${intl.formatMessage({ id: 'detail.purchase.message22' })} ${modalText()}`,
+            }, {
               validator: (value) => {
                 let _str = value;
                 _str = _str.replace(/[\u4E00-\u9FA5]/g, "AA");
                 if (_str.length > maxNumber * 2) {
-                  return { type: 'error', message: `${intl.formatMessage({ id: 'detail.purchase.tips19' })}${maxNumber * 2}${intl.formatMessage({ id: 'detail.purchase.tips20' })}，${maxNumber}${intl.formatMessage({ id: 'detail.purchase.tips18' })}`};
+                  return { type: 'error', message: `${intl.formatMessage({ id: 'detail.purchase.tips19' })}${maxNumber * 2}${intl.formatMessage({ id: 'detail.purchase.tips20' })}，${maxNumber}${intl.formatMessage({ id: 'detail.purchase.tips18' })}` };
                 } else {
                   return null;
                 }
               }
-            }}
+            }]}
           />)}
       </SchemaForm>
     </Modal>

src/pages/transaction/purchaseAbility/constants/columns.tsx

@@ -20,18 +20,18 @@ const { Text } = Typography;
 /** 外部流转记录 */
 export const EXTERNALLOGS: ColumnType<any>[] = [
   {
-    title: '流转顺序号',
+    title: intl.formatMessage({id: 'purchase.liuzhuanshunxuhao'}),
     key: 'index',
     dataIndex: 'index',
     render: (_text: any, _record: any, index: number) => <Text>{index + 1}</Text>
   },
   {
-    title: '操作角色',
+    title: intl.formatMessage({id: 'purchase.caozuojuese'}),
     key: 'roleName',
     dataIndex: 'roleName',
   },
   {
-    title: '状态',
+    title: intl.formatMessage({id: 'purchase.zhuangtai'}),
     key: 'state',
     dataIndex: 'state',
     render: (_text: any, _record: any) => <Tag color={OFFTER_EXTERNALSTATE_COLOR[_text] || 'default'}>{_record.stateName}</Tag>
@@ -42,13 +42,13 @@ export const EXTERNALLOGS: ColumnType<any>[] = [
     dataIndex: 'operation',
   },
   {
-    title: '操作时间',
+    title: intl.formatMessage({id: 'purchase.caozuoshijian'}),
     key: 'createTime',
     dataIndex: 'createTime',
     render: (_text: any, _record: any) => <Text>{format(_text)}</Text>
   },
   {
-    title: '审核意见',
+    title: intl.formatMessage({id: 'purchase.shenheyijian'}),
     key: 'auditOpinion',
     dataIndex: 'auditOpinion',
   },
@@ -56,28 +56,28 @@ export const EXTERNALLOGS: ColumnType<any>[] = [
 /** 内部流转记录 */
 export const INTERNALLOGS: ColumnType<any>[] = [
   {
-    title: '流转顺序号',
+    title: intl.formatMessage({id: 'purchase.liuzhuanshunxuhao'}),
     key: 'index',
     dataIndex: 'index',
     render: (_text: any, _record: any, index: number) => <Text>{index + 1}</Text>
   },
   {
-    title: '操作人',
+    title: intl.formatMessage({id: 'purchase.caozuoren'}),
     key: 'roleName',
     dataIndex: 'roleName',
   },
   {
-    title: '部门',
+    title: intl.formatMessage({id: 'purchase.bumen'}),
     key: 'department',
     dataIndex: 'department',
   },
   {
-    title: '职位',
+    title: intl.formatMessage({id: 'purchase.zhiwei'}),
     key: 'position',
     dataIndex: 'position',
   },
   {
-    title: '状态',
+    title: intl.formatMessage({id: 'purchase.zhuangtai'}),
     key: 'state',
     dataIndex: 'state',
     render: (_text: any, _record: any) => <Tag color={OFFTER_INTERNALSTATE_COLOR[_text] || 'default'}>{_record.stateName}</Tag>
@@ -88,13 +88,13 @@ export const INTERNALLOGS: ColumnType<any>[] = [
     dataIndex: 'operation',
   },
   {
-    title: '操作时间',
+    title: intl.formatMessage({id: 'purchase.caozuoshijian'}),
     key: 'createTime',
     dataIndex: 'createTime',
     render: (_text: any, _record: any) => <Text>{format(_text)}</Text>
   },
   {
-    title: '审核意见',
+    title: intl.formatMessage({id: 'purchase.shenheyijian'}),
     key: 'auditOpinion',
     dataIndex: 'auditOpinion',
   },

src/pages/transaction/purchaseAbility/demandPlan/demandPlanAdded/index.tsx

@@ -64,7 +64,7 @@ const DemandPlanAdded = () => {
     render: (text: any, record: any) => (
       <>
         {record.innerStatus === DEMANDPLAN_INTERNALSTATE_TYPE.WAITESUBMITAUDIT_TYPE && (
-          <Popconfirm title="确定要提交吗？" okText="是" cancelText="否" onConfirm={() => handleSubmit(record.id)}>
+          <Popconfirm title={intl.formatMessage({ id: 'table.purchase.popconfirm' })} okText={intl.formatMessage({ id: 'table.purchase.okText' })} cancelText={intl.formatMessage({ id: 'table.purchase.cancelText' })} onConfirm={() => handleSubmit(record.id)}>
             <Button type='link'>
               {intl.formatMessage({ id: 'table.purchase.submit' })}
             </Button>
@@ -72,7 +72,7 @@ const DemandPlanAdded = () => {
         )}
         <Button type='link' onClick={() => history.push(`/memberCenter/procurementAbility/demandPlan/demandPlanAdded/edit?id=${record.id}`)}>{intl.formatMessage({ id: 'table.purchase.eidt' })}</Button>
         {record.innerStatus === DEMANDPLAN_INTERNALSTATE_TYPE.WAITESUBMITAUDIT_TYPE && (
-          <Popconfirm title="确定要删除吗？" okText="是" cancelText="否" onConfirm={() => handleDelect(record.id)}>
+          <Popconfirm title={intl.formatMessage({ id: 'table.purchase.popconfirm2' })} okText={intl.formatMessage({ id: 'table.purchase.okText' })} cancelText={intl.formatMessage({ id: 'table.purchase.cancelText' })} onConfirm={() => handleDelect(record.id)}>
             <Button type='link'>
               {intl.formatMessage({ id: 'table.purchase.delete' })}
             </Button>

src/pages/transaction/purchaseAbility/purchasDoor/purchasSeo/add.tsx

@@ -101,7 +101,7 @@ const PurchasSeoAdded = () => {
               </Form.Item>
               <Form.Item
                 name='link'
-                label={<RequireItem label={intl.formatMessage({ id: 'detail.purchase.doorLink' })} brief={<Tooltip placement="top" title="访问该页面的链接"><QuestionCircleOutlined /></Tooltip>} />}
+                label={<RequireItem label={intl.formatMessage({ id: 'detail.purchase.doorLink' })} brief={<Tooltip placement="top" title={intl.formatMessage({id: 'purchase.fangwengaiyemiandelianjie'})}><QuestionCircleOutlined /></Tooltip>} />}
               >
                 <Input disabled={link === 'detail'} addonBefore={<Typography.Text type='secondary'>http://</Typography.Text>} />
               </Form.Item>

src/pages/transaction/purchaseAbility/purchasDoor/purchasSeo/index.tsx

@@ -53,6 +53,7 @@ const PurchasSeo = () => {
       title: intl.formatMessage({ id: 'detail.purchase.pageName' }),
       key: 'name',
       dataIndex: 'name',
+      width: 200,
       render: (text: any, record: any) => <Typography.Link href={`/memberCenter/procurementAbility/purchasDoor/purchasSeo/detail?id=${record.id}`}>{text}</Typography.Link>
     },
     {

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

@@ -72,7 +72,7 @@ const PurchasePlanDetailed = () => {
             label: intl.formatMessage({ id: 'detail.purchase.summary' }), extra: (
               <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
                 <span>{data.summary}</span>
-                { (pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.summary, intl.formatMessage({ id: 'detail.purchase.summary' }), 'summary')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>修改摘要</span>)}
+                { (pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.summary, intl.formatMessage({ id: 'detail.purchase.summary' }), 'summary')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>{intl.formatMessage({id: 'purchase.xiugaizhaiyao'})}</span>)}
 
               </div>
             )
@@ -86,7 +86,7 @@ const PurchasePlanDetailed = () => {
             label: intl.formatMessage({ id: 'detail.purchase.startTime' }), extra: (
               <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
                 <span>{format(data.startTime, "YYYY-MM-DD")}</span>
-                {(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.startTime, intl.formatMessage({ id: 'detail.purchase.purchaseStartTime' }), 'startTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>修改时间</span>)}
+                {(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.startTime, intl.formatMessage({ id: 'detail.purchase.purchaseStartTime' }), 'startTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>{intl.formatMessage({id: 'purchase.xiugaishijian'})}</span>)}
               </div>
             )
           },
@@ -94,7 +94,7 @@ const PurchasePlanDetailed = () => {
             label: intl.formatMessage({ id: 'detail.purchase.endTime' }), extra: (
               <div style={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}>
                 <span>{format(data.endTime, "YYYY-MM-DD")}</span>
-                {(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.endTime, intl.formatMessage({ id: 'detail.purchase.purchaseEndTime' }), 'endTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>修改时间</span>)}
+                {(pathPci === 'purchasePlanSubmit' && path === 'detail') && (<span onClick={() => handleEidt(data.endTime, intl.formatMessage({ id: 'detail.purchase.purchaseEndTime' }), 'endTime')} style={{ padding: 0, color: '#00B37A', cursor: 'pointer' }}>{intl.formatMessage({id: 'purchase.xiugaishijian'})}</span>)}
               </div>
             )
           },