Merge branch 'fix-0518-bug' into 'v2-220518'

src/locales/zh-CN/balance.ts

@@ -949,7 +949,7 @@ export default {
   'balance.invoice.columns.productName': '物料名称',
   'balance.invoice.columns.spec': '规格型号',
   'balance.invoice.columns.category': '品类',
-  'balance.invoice.columns.brand': 'brand',
+  'balance.invoice.columns.brand': '品牌',
   'balance.invoice.columns.unit': '单位',
   'balance.invoice.columns.taxRate': '税率',
   'balance.invoice.columns.price': '单价(含税)',

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

@@ -258,7 +258,7 @@ const InvoiceManage: React.FC = () => {
 
   const controllerBtns = (
     <Space>
-      <AuthButton btnCode="readyAddBill.add">
+      <AuthButton btnCode="invoice.srm.add">
         <Button icon={<PlusCircleOutlined />} type="primary" onClick={clickAdd}>
           {intl.formatMessage({
             id: 'purchaseRequisition.xinjian',

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

@@ -140,6 +140,8 @@ const InvoiceForm: React.FC<InvoiceFormProps> = (props) => {
     if (res.code === 1000 && res.data) {
 
       return res.data as InvoiceDetailType
+    } else {
+      message.info(res.message)
     }
     return undefined
   }

src/pages/balance/invoice/srm/manage/schema/index.tsx

@@ -417,6 +417,11 @@ const billInfo: ISchema = {
             {
               required: true,
               message: getIntl().formatMessage({ id: 'balance.invoice.number.required', defaultMessage: '请输入发票号码' }),
+            },
+            {
+              limitByte: true,
+              maxByte: 20,
+              message: '最长20个字符'
             }
           ],
         },

src/pages/user/components/index.less

@@ -27,7 +27,6 @@
   }
 }
 
-
 .loginInput {
   border: none;
   outline: none;
@@ -36,9 +35,11 @@
   border-radius: 4px;
   font-size: 14px;
   height: 40px;
+  background-color: #F5F6F7;
 
   input {
     font-size: 14px;
+    background-color: #F5F6F7;
   }
 
   &:hover, &:focus {
@@ -46,3 +47,4 @@
     border: none;
   }
 }
+