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

src/locales/en-US/transaction_components.ts

@@ -326,4 +326,7 @@ export default {
   'transaction_components.fukuanqianqingbuyaoguanbi': 'Please do not close this window until payment is completed. After completing the payment, please click the button below according to your situation.',
   'transaction_components.jianhangzhifuqueren': 'CCB payment confirmation',
   'transaction_components.jianhangzhifu': 'CCB',
+  'transaction_components.xiugaiyuanyin': 'Modify the reason',
+  'transaction_components.qingshuruxiugaiyuanyin': 'Please enter the reason for the change',
+  'transaction_components.shouhuodanhao': 'Receipt no',
 }

src/locales/ko-KR/transaction_components.ts

@@ -326,4 +326,6 @@ export default {
   'transaction_components.fukuanqianqingbuyaoguanbi': '결제가 완료되기 전에는이 창을 닫지 마십시오. 결제 완료 후 귀하의 상황에 맞게 아래 단추를 클릭해 주십시오.  ',
   'transaction_components.jianhangzhifuqueren': '건설은행의 지불 확인',
   'transaction_components.jianhangzhifu': '건설 은행',
+  'transaction_components.xiugaiyuanyin': '이유 수정',
+  'transaction_components.qingshuruxiugaiyuanyin': '수정한 이유를 입력하십시오',
 }

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -563,7 +563,10 @@ const MemberDetail: React.FC<{}> = () => {
                         );
                       })}
 
-                      <Button block type="dashed" onClick={handleOpenOrg}>
+                      <Button block type="dashed" onClick={handleOpenOrg} disabled={
+                        pageStatus === PageStatus.PREVIEW ||
+                        !disabledCheckAuthConfig.dataAuthConfig
+                      }>
                         <PlusOutlined /> {intl.formatMessage({ id: 'authConfig.orientation' })}
                       </Button>
                     </div>

src/pages/commodity/products/components/upperProductModalTable/index.tsx

@@ -40,15 +40,15 @@ const UpperProductModalTable: React.FC<UpperProductModalTableProps> = (props) =>
     const items = rowSelectionCtl.selectRow
     if (items.length) {
       setConfirmLoading(true)
-      postProductCommoditySaveUpperCommodity({ idList: items.map(item => item.id) }).then(res => {
-        const { data, code } = res
-        if (code === 1000) {
+      postProductCommoditySaveUpperCommodity({ idList: items.map(item => item.id) }).then(() => {
+        // const { data, code } = res
+        // if (code === 1000) {
           rowSelectionCtl.setSelectedRowKeys([])
           setVisible(false)
           setTimeout(() => {
             tableRef && tableRef.current && tableRef.current.reload()
           }, 800)
-        }
+        // }
       }).finally(() => setConfirmLoading(false))
     }
   }

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -12,12 +12,13 @@ import {
   OrderKindType,
 } from '@/constants/order'
 import { AddressPop } from '../addressPop'
-import { postOrderVendorPageFreightUpdate, postOrderVendorPageUnitPriceUpdate, postOrderVendorValidateSubmitFreightUpdate } from '@/services/OrderNewV2Api'
+import { postOrderVendorValidateSubmitFreightUpdate } from '@/services/OrderNewV2Api'
 import { postLogisticsFreightTemplateCalFreightPrice } from '@/services/LogisticsV2Api'
 import { getProductPositionDeductionRecordList } from '@/services/ProductV2Api'
 import { usePageStatus } from '@/hooks/usePageStatus'
 import { useHttpRequest } from '@/hooks/useHttpRequest'
 import { getIntl } from 'umi'
+
 const intl = getIntl();
 export interface OrderProductTableProps { }
 

src/pages/transaction/components/statusColors/index.tsx

@@ -98,7 +98,7 @@ const StatusColors: React.FC<StatusColorsProps> = (props) => {
   } else {
     _text = text
   }
-  console.log(_text)
+
   const css: CSSProperties = _text.length >= 16 ? {
     width: 100,
     whiteSpace: 'nowrap',