Merge branch 'feat-v2-220418-1-member' into 'v2-220418-1'

src/locales/en-US/common.ts

@@ -26,6 +26,7 @@
   'common.button.submit':'Submit',
   'common.button.upload': 'Upload files',
   'common.button.default': 'Default',
+  'common.button.addition': 'Add',
 
   /** tips */
   'common.tip.save.confirm':'You still have unsaved content. Are you sure you want to leave? ',

src/locales/en-US/member.ts

@@ -220,6 +220,17 @@ export default {
   'member.management.memberPrComingClassify.drawer.form.verify.reason':'Failure reason',
   'member.management.memberPrComingClassify.drawer.form.verify.placeholder':
     'Enter your content here, up to 120 characters, 60 Chinese characters',
+  'member.management.memberPrComingClassify.drawer.form.currencyType': 'Currency',
+  'member.management.memberPrComingClassify.drawer.form.currencyType.placeholder': 'Please select',
+  'member.management.memberPrComingClassify.drawer.form.remark': 'Remark',
+  'member.management.memberPrComingClassify.drawer.form.remark.placeholder': 'Up to 200 characters, 100 Chinese characters',
+  'member.management.memberPrComingClassify.drawer.form.index': 'Index',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge': 'Prepayment',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge.placeholder': 'Please select prepayment',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments': 'Settlement Document',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments.placeholder': 'Please select a settlement document',
+  'member.management.memberPrComingClassify.drawer.form.paymentType': 'Payment Type',
+  'member.management.memberPrComingClassify.drawer.form.paymentType.placeholder': 'Please select a payment type',
 
   // Pending review and storage (level one)
   'member.management.memberPrVerifyComing1.query.verify-tip':'Are you sure you want to verify the selected members? ',

src/locales/ko-KR/common.ts

@@ -26,6 +26,7 @@ export default {
   'common.button.submit': '커밋',
   'common.button.upload': '파일 업로드',
   'common.button.default': '묵인하다',
+  'common.button.addition': '에 추가',
 
   /** tips */
   'common.tip.save.confirm': '아직 저장하지 않은 내용이 있습니다. 떠나시겠습니까?',

src/locales/ko-KR/member.ts

@@ -212,6 +212,17 @@ export default {
   'member.management.memberPrComingClassify.drawer.form.verify.reason': '불통과 원인',
   'member.management.memberPrComingClassify.drawer.form.verify.placeholder':
     '최대 120자, 한자 60자를 입력하십시오',
+  'member.management.memberPrComingClassify.drawer.form.currencyType': '통화',
+  'member.management.memberPrComingClassify.drawer.form.currencyType.placeholder': '선택하십시오.',
+  'member.management.memberPrComingClassify.drawer.form.remark': '주목',
+  'member.management.memberPrComingClassify.drawer.form.remark.placeholder': '최대 200자, 한자 100자',
+  'member.management.memberPrComingClassify.drawer.form.index': '일련 번호',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge': '선불',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge.placeholder': '선불을 선택하세요',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments': '정산 문서',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments.placeholder': '청구 문서를 선택하십시오',
+  'member.management.memberPrComingClassify.drawer.form.paymentType': '지불 방법',
+  'member.management.memberPrComingClassify.drawer.form.paymentType.placeholder': '결제수단을 선택해주세요',
 
   // 待审核入库(一级)
   'member.management.memberPrVerifyComing1.query.verify-tip': '선택한 회원을 심사하여 통과시키시겠습니까?',

src/locales/zh-CN/common.ts

@@ -26,6 +26,7 @@ export default {
   'common.button.submit': '提交',
   'common.button.upload': '上传文件',
   'common.button.default': '默认',
+  'common.button.addition': '添加',
 
   /** tips */
   'common.tip.save.confirm': '您还有未保存的内容，是否确定要离开？',

src/locales/zh-CN/member.ts

@@ -209,6 +209,9 @@ export default {
   'member.management.memberPrComingClassify.drawer.form.classify.monthDay.limit': '请输入大于0 小于等于 31的数值',
   'member.management.memberPrComingClassify.drawer.form.classify.days.addonAfter': '天',
   'member.management.memberPrComingClassify.drawer.form.classify.days.legal': '请输入正整数',
+  'member.management.memberPrComingClassify.drawer.form.classify.months': '账期 (几个月)',
+  'member.management.memberPrComingClassify.drawer.form.classify.monthDay2': '结算日 (每月几号)',
+  'member.management.memberPrComingClassify.drawer.form.classify.days2': '账期 (间隔多少天)',
   'member.management.memberPrComingClassify.drawer.form.verify': '单据审核',
   'member.management.memberPrComingClassify.drawer.form.verify.agree': '是否通过',
   'member.management.memberPrComingClassify.drawer.form.verify.agree.pass': '审核通过',
@@ -216,6 +219,17 @@ export default {
   'member.management.memberPrComingClassify.drawer.form.verify.reason': '不通过原因',
   'member.management.memberPrComingClassify.drawer.form.verify.placeholder':
     '在此输入你的内容，最长120个字符，60个汉字',
+  'member.management.memberPrComingClassify.drawer.form.currencyType': '币别',
+  'member.management.memberPrComingClassify.drawer.form.currencyType.placeholder': '请选择',
+  'member.management.memberPrComingClassify.drawer.form.remark': '备注',
+  'member.management.memberPrComingClassify.drawer.form.remark.placeholder': '最长200个字符，100个汉字',
+  'member.management.memberPrComingClassify.drawer.form.index': '序号',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge': '预付款',
+  'member.management.memberPrComingClassify.drawer.form.advanceCharge.placeholder': '请选择预付款',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments': '结算单据',
+  'member.management.memberPrComingClassify.drawer.form.settlementDocuments.placeholder': '请选择结算单据',
+  'member.management.memberPrComingClassify.drawer.form.paymentType': '付款方式',
+  'member.management.memberPrComingClassify.drawer.form.paymentType.placeholder': '请选择付款方式',
 
   // 待审核入库(一级)
   'member.management.memberPrVerifyComing1.query.verify-tip': '确定要审核通过选中的会员吗？',

src/pages/member/components/MemberDocCategoryPro/components/PayTypeFiled/index.tsx

@@ -104,7 +104,7 @@ const PayTypeFiled = (props) => {
         return (
           <>
             <Form.Item
-              label="账期 (几个月)"
+              label={intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.months' }, { default: '账期 (几个月)' })}
               name="month"
               style={{ marginBottom: themeConfig['@margin-xs'] }}
               rules={[
@@ -117,7 +117,7 @@ const PayTypeFiled = (props) => {
               <Input addonAfter={intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.month.addonAfter' }, { default: '个月' })} />
             </Form.Item>
             <Form.Item
-              label="结算日 (每月几号)"
+              label={intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.monthDay2' }, { default: '结算日 (每月几号)' })}
               name="monthDay"
               style={{ marginBottom: themeConfig['@margin-xs'] }}
               rules={[
@@ -141,7 +141,7 @@ const PayTypeFiled = (props) => {
       case PAY_TYPE_PAYMENT_DAYS_MONTH: {
         return (
           <Form.Item
-            label="账期 (间隔多少天)"
+            label={intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.days2' }, { default: '账期 (间隔多少天)' })}
             name="days"
             rules={[
               {
@@ -157,7 +157,7 @@ const PayTypeFiled = (props) => {
       case PAY_TYPE_MONTHLY_STATEMENT: {
         return (
           <Form.Item
-            label="结算日 (每月几号)"
+            label={intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.monthDay2' }, { default: '结算日 (每月几号)' })}
             name="monthDay"
             style={{ marginBottom: themeConfig['@margin-xs'] }}
             rules={[
@@ -196,9 +196,9 @@ const PayTypeFiled = (props) => {
     <div>
       {`
         ${currentPayType ? currentPayType.label : ''}
-        ${formValues?.month ? '：'  +  formValues.month + '个月' : ''}
-        ${formValues?.monthDay ? '，结算日：' + formValues.monthDay + '号' : ''}
-        ${formValues?.days ? '：' + formValues.days + '天' : ''}
+        ${formValues?.month ? '：' + formValues.month + intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.month.addonAfter' }, { default: '个月' }) : ''}
+        ${formValues?.monthDay ? `，${intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.monthDay' }, { default: '结算日' })}：` + formValues.monthDay + intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.monthDay.addonAfter' }, { default: '号' }) : ''}
+        ${formValues?.days ? '：' + formValues.days + intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.days.addonAfter' }, { default: '天' }) : ''}
       `}
     </div>
   );
@@ -241,7 +241,9 @@ const PayTypeFiled = (props) => {
             </Form>
             <div className={styles['pay-type-actions']}>
               <div className={styles['pay-type-actions-item']}>
-                <Button onClick={() => setVisible(false)} block>取消</Button>   
+                <Button onClick={() => setVisible(false)} block>
+                  {intl.formatMessage({ id: 'common.button.cancel' }, { default: '取消' })}
+                </Button>   
               </div>
               <div className={styles['pay-type-actions-item']}>
                 <Button
@@ -249,7 +251,7 @@ const PayTypeFiled = (props) => {
                   onClick={handleSubmit}
                   block
                 >
-                  确定
+                  {intl.formatMessage({ id: 'common.button.confirm' }, { default: '确定' })}
                 </Button>  
               </div>
             </div>

src/pages/member/components/MemberDocCategoryPro/index.tsx

@@ -361,14 +361,20 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
 
   const MemberCodeDescription = isEditable ? (
     <div className={styles.description}>
-      <span>{intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.code.description-1' })}</span>
-      <span>{intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.code.description-2' })}</span>
+      <span>
+        {intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.code.description-1' }, { default: '长度最多10位，不可重复' })}
+      </span>
+      <span>
+        {intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.code.description-2' }, { default: '不支持特殊符号(除英文"_-";下划线和中划线)' })}
+      </span>
     </div>
   ) : null;
 
   const MemberCypher = isEditable ? (
     <div className={styles.description}>
-      <div>{intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.description-1' })}</div>
+      <div>
+        {intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.maxAmount.description-1' }, { default: '允许单次采购最大金额' })}
+      </div>
     </div>
   ) : null;
 
@@ -478,7 +484,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
         // }}
         block
       >
-        添加
+        {intl.formatMessage({ id: 'common.button.addition' }, { default: '添加' })}
       </Button>
     );
   };
@@ -497,7 +503,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
           width: 66,
         }}
       >
-        <a>删除</a>
+        <a>{intl.formatMessage({ id: 'common.button.delete' }, { default: '删除' })}</a>
       </Button>
     );
   };
@@ -517,7 +523,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
 
   return (
     <MellowCard
-      title={intl.formatMessage({ id: 'member.components.MemberDocCategory.title' })}
+      title={intl.formatMessage({ id: 'member.components.MemberDocCategory.title' }, { default: '分类信息' })}
       extra={(
         <>
           {validateId && (
@@ -528,7 +534,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
                   loading={infoLoading}
                   onClick={handleModify}
                 >
-                  {intl.formatMessage({ id: 'member.components.MemberDocCategory.edit' })}
+                  {intl.formatMessage({ id: 'member.components.MemberDocCategory.edit' }, { default: '编辑' })}
                 </Button>
               ) : (
                 <Button
@@ -536,7 +542,7 @@ const MemberDocCategoryPro: React.ForwardRefRenderFunction<MemberDocCategoryProR
                   loading={finishing}
                   onClick={handleFinish}
                 >
-                  提交
+                  {intl.formatMessage({ id: 'common.button.submit' }, { default: '提交' })}
                 </Button>
               )}
             </>

src/pages/member/components/MemberDocCategoryPro/schema.ts

@@ -89,10 +89,10 @@ export const schema = (editable: boolean): ISchema => {
           },
           currencyType: {
             type: 'string',
-            title: '币别',
+            title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.currencyType' }, { default: '币别' }),
             enum: [],
             'x-component-props': {
-              placeholder: '请选择',
+              placeholder: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.currencyType.placeholder' }, { default: '请选择' }),
             },
             required: true,
           },
@@ -101,9 +101,9 @@ export const schema = (editable: boolean): ISchema => {
               partnerType: {
                 type: 'string',
                 enum: [],
-                title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.partnerType' }),
+                title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.classify.partnerType' }, { default: '合作关系' }),
                 'x-component-props': {
-                  placeholder: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.select.placeholder' }),
+                  placeholder: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.select.placeholder' }, { default: '请选择' }),
                 },
                 required: true,
               }
@@ -172,10 +172,10 @@ export const schema = (editable: boolean): ISchema => {
           )),
           remark: {
             type: 'string',
-            title: '备注',
+            title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.remark' }, { default: '备注' }),
             'x-component': 'Textarea', 
             'x-component-props': {
-              placeholder: '最长200个字符，100个汉字',
+              placeholder: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.remark.placeholder' }, { default: '最长200个字符，100个汉字' }),
               rows: 1, 
             },
             'x-rules': [
@@ -209,7 +209,7 @@ export const schema = (editable: boolean): ISchema => {
               properties: {
                 index: {
                   type: 'string',
-                  title: '序号',
+                  title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.index' }, { default: '序号' }),
                   editable: false,
                   'x-component': 'IndexField',
                   'x-component-props': {
@@ -222,11 +222,11 @@ export const schema = (editable: boolean): ISchema => {
                   type: 'string',
                   'x-component': 'string',
                   enum: [],
-                  title: '预付款',
+                  title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.advanceCharge' }, { default: '预付款' }),
                   'x-rules': [
                     {
                       required: true,
-                      message: '请选择预付款',
+                      message: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.advanceCharge.placeholder' }, { default: '请选择预付款' }),
                     },
                   ],
                   'x-component-props': {
@@ -237,12 +237,12 @@ export const schema = (editable: boolean): ISchema => {
                 },
                 settlementDocuments: {
                   type: 'string',
-                  title: '结算单据',
+                  title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.settlementDocuments' }, { default: '结算单据' }),
                   enum: [],
                   'x-rules': [
                     {
                       required: true,
-                      message: '请选择结算单据',
+                      message: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.settlementDocuments' }, { default: '请选择结算单据' }),
                     },
                   ],
                   'x-component-props': {
@@ -270,12 +270,12 @@ export const schema = (editable: boolean): ISchema => {
                 },
                 paymentType: {
                   type: 'string',
-                  title: '付款方式',
+                  title: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.paymentType' }, { default: '付款方式' }),
                   enum: [],
                   'x-rules': [
                     {
                       required: true,
-                      message: '请选择付款方式',
+                      message: intl.formatMessage({ id: 'member.management.memberPrComingClassify.drawer.form.paymentType.placeholder' }, { default: '请选择付款方式' }),
                     },
                   ],
                   'x-component-props': {