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

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

@@ -51,6 +51,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
   const [settleAccountsError, setSettleAccountsError] = useState<boolean>(true)
   const [paymentAmount ,setPaymentAmount] = useState<string>()
   const [tradeNo, setTradeNo] = useState<string>() // 需要轮询支付结果的交易号
+  const [fileLists, setFileLists] = useState<any>([])
 
   useEffect(() => {
     if (currentRef) {
@@ -317,6 +318,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
     const { fileList } = e
     const urlList = fileList.map(v => v.response && v.response.code === 1000 ? v.response.data : '')
     formRef.current.urlList = urlList
+    setFileLists(() => {
+      return fileList.map((v: any) => {
+        if(v.response) {
+          v.url = v.response.data
+        }
+        return v
+      })
+    })
   }
 
   const handleBack = () => {
@@ -325,11 +334,6 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
     setOpenTimer(0)
   }
 
-  const handleOk = () => {
-    console.log('ODEK')
-    handleCancel()
-  }
-
   const onChange = (e) => {
     let v = e.target.value
     setCode(v)
@@ -424,6 +428,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
             }}
             onChange={handleUploadChange}
             showUploadList
+            fileList={fileLists}
           >
             <Button icon={<UploadOutlined />} type='dashed'>上传凭证</Button>
           </Upload>

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

-import React, { useRef, useState, useImperativeHandle } from 'react';
+import React, { useRef, useImperativeHandle, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { Card } from 'antd';
 import { StandardTable } from 'god';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { ColumnType, TableRowSelection } from 'antd/lib/table/interface';
+import { ColumnType } from 'antd/lib/table/interface';
 import NiceForm from '@/components/NiceForm';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
@@ -62,9 +62,6 @@ const Table: React.FC<Iprops> = (props: any) => {
   const [selectRow, selectRowFns] = useRowSelectionTable({
     customKey: rowKey || 'id',
     extendsSelection: {
-      onChange: (_rowKeys: any) => {
-        fetchRowkeys(selectRowFns.selectedRowKeys)
-      },
       getCheckboxProps: (record) => getCheckboxProps && getCheckboxProps(record)
     }
   });
@@ -122,6 +119,10 @@ const Table: React.FC<Iprops> = (props: any) => {
 
   }
 
+  useEffect(() => {
+    fetchRowkeys && fetchRowkeys(selectRowFns.selectedRowKeys)
+  }, [selectRowFns])
+
   return (
     <PageHeaderWrapper>
       <Card>

src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_3.tsx

@@ -96,9 +96,9 @@ const columns_3 = ({
               },
               () => ({
                 validator: (_rule, value) => {
-                  const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
+                  const pattern = /^(\d|[1-9]\d|99.999)(\.\d{1,3})?$/;
                   if (!pattern.test(value)) {
-                    return Promise.reject(new Error('折扣必须大于0'));
+                    return Promise.reject(new Error('折扣必须大于0且小于100最多保留3为小数'));
                   }
                   return Promise.resolve();
                 },

src/pages/transaction/purchaseOrder/orderCollectB2b/components/payInfoTableCell/index.tsx

@@ -74,7 +74,6 @@ export const PayInfoCell:React.FC<PayInfoCellProps> = ({
       }))
     }
   }
-
   const validatorNumber = (rule, value, callback) => {
     try {
       if(formItem !== 'input') {

src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx

@@ -73,7 +73,6 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
     // 存在商品 并且有选择收货地址，则开始计算运费(有物流和运费模板的商品)，此外 收货方式变动也要重新计算
     if (data && data.length > 0 && receiverAddressId) {
       // 筛选配送方式为物流的商品并且使用了运费模板
-      console.log(data, 'ooo')
       let logsiticsDataMaps = []
       // 新增和编辑取不同的字段
       if(pageStatus === PageStatus.ADD) {
@@ -213,26 +212,28 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
       console.log(value, 'value')
 
       // 校验是否选择支付渠道/支付比例
-      const judgementByPay = params.payments?.length && params.payments.map(item => {
-        if(item.payChannel && item.payType){
-          return true
-        } else {
-          return false
+      if(params.payments?.length) {
+        const judgementByPay = params.payments?.length && params.payments.map(item => {
+          if(item.payChannel && item.payType){
+            return true
+          } else {
+            return false
+          }
+        })
+        if(!judgementByPay || judgementByPay.includes(false)){
+          throw new Error('请选择支付方式或支付渠道')
         }
-      })
-      if(!judgementByPay || judgementByPay.includes(false)){
-        throw new Error('请选择支付方式或支付渠道')
-      }
-      const totalRatio = params.payments.reduce((a, b) => a + Number(b.payRate || 0), 0)
-      const judgementByRatio = params.payments?.length && params.payments.map(item => {
-        if(Number(item.payRate) > 0 && Number(item.payRate) <= 100 && totalRatio === 100 ){
-          return true
-        } else {
-          return false
+        const totalRatio = params.payments.reduce((a, b) => a + Number(b.payRate || 0), 0)
+        const judgementByRatio = params.payments?.length && params.payments.map(item => {
+          if(Number(item.payRate) > 0 && Number(item.payRate) <= 100 && totalRatio === 100 ){
+            return true
+          } else {
+            return false
+          }
+        })
+        if(!judgementByRatio || judgementByRatio.includes(false)){
+          throw new Error('请正确填写支付比例')
         }
-      })
-      if(!judgementByRatio || judgementByRatio.includes(false)){
-        throw new Error('请正确填写支付比例')
       }
 
       // 校验采购数量

src/pages/transaction/saleOrder/firstApprovedOrder/model/useSelfTable.tsx

@@ -15,6 +15,7 @@ export const useSelfTable = () => {
   const secondColumns = () => {
     const alreadyColumns = baseOrderListColumns()
     if(alreadyColumns) {
+      alreadyColumns.splice(6, 1)
       return alreadyColumns.concat([
         {
           title: '操作',

src/pages/transaction/saleOrder/readyApprovedOrder/model/useSelfTable.tsx

@@ -13,6 +13,7 @@ export const useSelfTable = () => {
   const secondColumns = () => {
     const alreadyColumns = baseOrderListColumns()
     if(alreadyColumns) {
+      alreadyColumns.splice(6, 1)
       return alreadyColumns.concat([
         {
           title: '操作',

src/pages/transaction/saleOrder/readyReturnDocument/model/useSelfTable.tsx

@@ -3,7 +3,6 @@ import { Button } from 'antd'
 import { baseOrderListColumns } from '../../constant'
 import { history } from 'umi'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { SaleOrderInsideWorkState } from '@/constants/order'
 
 // 业务hooks
 export const useSelfTable = () => {

src/pages/transaction/saleOrder/secondApprovedOrder/model/useSelfTable.tsx

@@ -13,6 +13,7 @@ export const useSelfTable = () => {
   const secondColumns = () => {
     const alreadyColumns = baseOrderListColumns()
     if(alreadyColumns) {
+      alreadyColumns.splice(6, 1)
       return alreadyColumns.concat([
         {
           title: '操作',