Merge branch 'feat-220518' into 'v2-220518'

src/locales/en-US/balance.ts

@@ -904,8 +904,58 @@ export default {
   'balance.platformSettlement.columns.payTime': 'payTime',
   'balance.platformSettlement.columns.settlementName': 'settlementName',
   'balance.memberSettle.settleMethod.payDay.default': 'Payment date: payment date is not set. It is the settlement date by default',
-  'balance.createTimeStart': 'createTimeStart',
-  'balance.createTimeEnd': 'createTimeEnd',
+  'balance.invoice.add.page.title': 'Add Invoice',
+  'balance.invoice.manage.addSchema.receiptInfo': 'Invoice information',
+  'balance.invoice.manage.addSchema.invoiceInfo': 'Invoice Information',
+  'balance.invoice.manage.addSchema.billInfo': 'Billing Information',
+  'balance.invoice.manage.addSchema.invoiceDetails': 'Invoice Details',
+  'balance.invoice.reconciliationNo.required': 'Please select the document number',
+  'balance.createTimeStart': 'Document start time',
+  'balance.createTimeEnd': 'Document end time',
   'balance.expectPayTimeStart': 'expectPayTimeStart',
   'balance.expectPayTimeEnd': 'expectPayTimeEnd',
+  'balance.accountsReceivable.invoice.columns.reconciliationAbstract': 'Document summary',
+  'balance.accountsReceivable.invoice.columns.createTime': 'Document time',
+  'balance.accountsReceivable.invoice.columns.reconciliationType': 'Document type',
+  'balance.accountsReceivable.invoice.columns.returnResource': 'Return Reason',
+  'balance.common.columns.productNoticecolumns.type': 'Notice type',
+  'balance.accountsReceivable.invoice.columns.bankOfDeposit': 'account bank',
+  'balance.accountsReceivable.invoice.columns.kind': 'Invoice type',
+  'balance.accountsReceivable.invoice.columns.account': 'Account',
+  'balance.accountsReceivable.invoice.columns.address': 'address',
+  'balance.accountsReceivable.invoice.columns.taxNo': 'tax number',
+  'balance.accountsReceivable.invoice.columns.tel': 'phone number',
+  'balance.common.columns.productNoticecolumns.code': 'Invoice code',
+  'balance.invoice.code.required': 'Please enter the invoice code',
+  'balance.invoice.invoiceDate.required': 'Please select an invoice date',
+  'balance.invoice.number.required': 'Please enter the invoice number',
+  'balance.accountsReceivable.invoice.columns.remark': 'Remark',
+  'balance.accountsReceivable.invoice.columns.urlImgs': 'Invoice file',
+  'balance.invoice.details.rows.required': 'Please select a statement',
+  'balance.invoice.manage.buttonGroup.1': 'Submit',
+  'balance.invoice.manage.buttonGroup.2': 'Edit',
+  'balance.invoice.manage.buttonGroup.3': 'Delete',
+  'balance.invoice.returnSource.required': 'Please enter the reason for return',
+  'balance.invoice.joint.buttonGroup.1': 'Confirm',
+  'balance.invoice.joint.buttonGroup.2': 'Return',
+  'balance.invoice.detail.page.title': 'Invoice Details',
+  'balance.invoice.edit.page.title': 'Edit Invoice',
+  'balance.invoice.columns.orderNo': 'Order number',
+  'balance.invoice.columns.deliveryNo': 'Invoice number',
+  'balance.invoice.columns.productNo': 'Material Code',
+  'balance.invoice.columns.productName': 'Material name',
+  'balance.invoice.columns.spec': 'Specification model',
+  'balance.invoice.columns.category': 'category',
+  'balance.invoice.columns.brand': 'brand',
+  'balance.invoice.columns.unit': 'unit',
+  'balance.invoice.columns.taxRate': 'tax rate',
+  'balance.invoice.columns.price': 'Unit price (tax included)',
+  'balance.invoice.columns.currentReconciliationQuantity': 'Reconciliation Quantity',
+  'balance.invoice.columns.currentMoney': 'Reconciliation amount (including tax)',
+  'balance.invoice.columns.receiveNo': 'Receipt No.',
+  'balance.invoice.columns.price.not': 'Unit price (excluding tax)',
+  'balance.invoice.columns.quantity': 'Quantity',
+  'balance.invoice.columns.moneyAmount': 'Amount (including tax)',
+  'balance.invoice.columns.moneyAmount.not': 'Amount (excluding tax)',
+  'balance.invoice.columns.taxAmount': 'tax amount',
 }

src/locales/ko-KR/balance.ts

@@ -904,8 +904,58 @@ export default {
   'balance.platformSettlement.columns.payTime': '실제 지불 시간',
   'balance.platformSettlement.columns.settlementName': '결제자',
   'balance.memberSettle.settleMethod.payDay.default': '결제일: 결제일은 설정되지 않으며 기본적으로 결제일',
+  'balance.invoice.add.page.title': '송장 추가',
+  'balance.invoice.manage.addSchema.receiptInfo': '송장 정보',
+  'balance.invoice.manage.addSchema.invoiceInfo': '송장 정보',
+  'balance.invoice.manage.addSchema.billInfo': '결제 정보',
+  'balance.invoice.manage.addSchema.invoiceDetails': '송장 세부정보',
+  'balance.invoice.reconciliationNo.required': '문서 번호를 선택하십시오',
   'balance.createTimeStart': '문서 시작 시간',
   'balance.createTimeEnd': '문서 종료 시간',
   'balance.expectPayTimeStart': '예상 지급 시작일',
   'balance.expectPayTimeEnd': '예상 지급 종료일',
+  'balance.accountsReceivable.invoice.columns.reconciliationAbstract': '문서 요약',
+  'balance.accountsReceivable.invoice.columns.createTime': '문서 시간',
+  'balance.accountsReceivable.invoice.columns.reconciliationType': '문서 유형',
+  'balance.accountsReceivable.invoice.columns.returnResource': '반품 사유',
+  'balance.common.columns.productNoticecolumns.type': '공지 유형',
+  'balance.accountsReceivable.invoice.columns.bankOfDeposit': '계좌 은행',
+  'balance.accountsReceivable.invoice.columns.kind': '송장 유형',
+  'balance.accountsReceivable.invoice.columns.account': '계정',
+  'balance.accountsReceivable.invoice.columns.address': '주소',
+  'balance.accountsReceivable.invoice.columns.taxNo': '세금 번호',
+  'balance.accountsReceivable.invoice.columns.tel': '전화번호',
+  'balance.common.columns.productNoticecolumns.code': '송장 코드',
+  'balance.invoice.code.required': '인보이스 코드를 입력하세요',
+  'balance.invoice.invoiceDate.required': '인보이스 날짜를 선택하세요',
+  'balance.invoice.number.required': '인보이스 번호를 입력하세요',
+  'balance.accountsReceivable.invoice.columns.remark': '비고',
+  'balance.accountsReceivable.invoice.columns.urlImgs': '송장 파일',
+  'balance.invoice.details.rows.required': '명세서를 선택하십시오',
+  'balance.invoice.manage.buttonGroup.1': '제출',
+  'balance.invoice.manage.buttonGroup.2': '편집',
+  'balance.invoice.manage.buttonGroup.3': '삭제',
+  'balance.invoice.returnSource.required': '반품 사유를 입력하세요',
+  'balance.invoice.joint.buttonGroup.1': '확인',
+  'balance.invoice.joint.buttonGroup.2': '반환',
+  'balance.invoice.detail.page.title': '인보이스 세부정보',
+  'balance.invoice.edit.page.title': '인보이스 편집',
+  'balance.invoice.columns.orderNo': '주문 번호',
+  'balance.invoice.columns.deliveryNo': '송장 번호',
+  'balance.invoice.columns.productNo': '재료 코드',
+  'balance.invoice.columns.productName': '재료 이름',
+  'balance.invoice.columns.spec': '사양 모델',
+  'balance.invoice.columns.category': '카테고리',
+  'balance.invoice.columns.brand': '브랜드',
+  'balance.invoice.columns.unit': '단위',
+  'balance.invoice.columns.taxRate': '세율',
+  'balance.invoice.columns.price': '단가(세금 포함)',
+  'balance.invoice.columns.currentReconciliationQuantity': '조정 수량',
+  'balance.invoice.columns.currentMoney': '조정 금액(세금 포함)',
+  'balance.invoice.columns.receiveNo': '영수증 번호',
+  'balance.invoice.columns.price.not': '단가(세금 별도)',
+  'balance.invoice.columns.quantity': '수량',
+  'balance.invoice.columns.moneyAmount': '금액(세금 포함)',
+  'balance.invoice.columns.moneyAmount.not': '금액(세금 별도)',
+  'balance.invoice.columns.taxAmount': '세액',
 }

src/locales/zh-CN/balance.ts

@@ -917,4 +917,49 @@ export default {
   'balance.createTimeEnd': '单据结束时间',
   'balance.expectPayTimeStart': '预计付款开始日期',
   'balance.expectPayTimeEnd': '预计付款结束日期',
+  'balance.accountsReceivable.invoice.columns.reconciliationAbstract': '单据摘要',
+  'balance.accountsReceivable.invoice.columns.createTime': '单据时间',
+  'balance.accountsReceivable.invoice.columns.reconciliationType': '单据类型',
+  'balance.accountsReceivable.invoice.columns.returnResource': '退回原因',
+  'balance.common.columns.productNoticecolumns.type': '开具类型',
+  'balance.accountsReceivable.invoice.columns.bankOfDeposit': '开户行',
+  'balance.accountsReceivable.invoice.columns.kind': '发票种类',
+  'balance.accountsReceivable.invoice.columns.account': '账号',
+  'balance.accountsReceivable.invoice.columns.address': '地址',
+  'balance.accountsReceivable.invoice.columns.taxNo': '纳税号',
+  'balance.accountsReceivable.invoice.columns.tel': '电话号码',
+  'balance.common.columns.productNoticecolumns.code': '发票代码',
+  'balance.invoice.code.required': '请输入发票代码',
+  'balance.invoice.invoiceDate.required': '请选择开票日期',
+  'balance.invoice.number.required': '请输入发票号码',
+  'balance.accountsReceivable.invoice.columns.remark': '备注',
+  'balance.accountsReceivable.invoice.columns.urlImgs': '发票文件',
+  'balance.invoice.details.rows.required': '请选择对账单',
+  'balance.invoice.manage.buttonGroup.1': '提交',
+  'balance.invoice.manage.buttonGroup.2': '编辑',
+  'balance.invoice.manage.buttonGroup.3': '删除',
+  'balance.invoice.returnSource.required': '请输入退回原因',
+  'balance.invoice.joint.buttonGroup.1': '确认',
+  'balance.invoice.joint.buttonGroup.2': '退回',
+  'balance.invoice.detail.page.title': '发票详情',
+  'balance.invoice.edit.page.title': '编辑发票',
+  'balance.invoice.columns.orderNo': '订单号',
+  'balance.invoice.columns.deliveryNo': '发货单号',
+  'balance.invoice.columns.productNo': '物料编码',
+  'balance.invoice.columns.productName': '物料名称',
+  'balance.invoice.columns.spec': '规格型号',
+  'balance.invoice.columns.category': '品类',
+  'balance.invoice.columns.brand': 'brand',
+  'balance.invoice.columns.unit': '单位',
+  'balance.invoice.columns.taxRate': '税率',
+  'balance.invoice.columns.price': '单价(含税)',
+  'balance.invoice.columns.currentReconciliationQuantity': '对账数量',
+  'balance.invoice.columns.currentMoney': '对账金额(含税)',
+  'balance.invoice.columns.receiveNo': '收货单号',
+  'balance.invoice.columns.price.not': '单价(不含税)',
+  'balance.invoice.columns.quantity': '数量',
+  'balance.invoice.columns.moneyAmount': '金额(含税)',
+  'balance.invoice.columns.moneyAmount.not': '金额(不含税)',
+  'balance.invoice.columns.taxAmount': '税额',
+
 }

src/pages/balance/invoice/srm/invoiceDetail/index.tsx

-import React from 'react'
-import styels from './index.less'
-
-const InvoiceDetail: React.FC = () => {
-
-  return (
-    <div>
-      InvoiceDetail
-    </div>
-  )
-}
-
-export default InvoiceDetail

src/pages/balance/invoice/srm/manage/invoiceForm.tsx

@@ -111,7 +111,11 @@ const InvoiceForm: React.FC<InvoiceFormProps> = (props) => {
           state.props["x-component-props"] = undefined
         })
       }
-      addSchemaAction.clearErrors()
+
+      // 先清理页面表单的错误验证项
+      setTimeout(() => {
+        addSchemaAction.clearErrors()
+      }, 200)
       setInvoiceDrawerVisible(false)
     }
   }

src/pages/balance/invoice/srm/readyInvoice/index.tsx

@@ -191,7 +191,7 @@ const SettlementList: React.FC = () => {
       <Card className="white_bg_card">
         <StandardTable
           tableProps={{
-            rowKey: 'id',
+            rowKey: 'reconciliationId',
           }}
           columns={columns as any}
           currentRef={ref}