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

src/components/AuditProcess/index.tsx

@@ -43,7 +43,7 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
   <MellowCard>
     <Tabs onChange={() => {}}>
       <Tabs.TabPane tab="外部审核流程" key="1">
-        <Steps style={{ marginTop: 30 }} progressDot current={outerVerifyCurrent}>
+        <Steps style={{ marginTop: 30, overflow: "auto" }} progressDot current={outerVerifyCurrent}>
           {outerVerifySteps.map(item => (
             <Steps.Step 
               key={customKey ? item[customKey] : item.step}
@@ -55,7 +55,7 @@ const AuditProcess: React.FC<AuditProcessProp> = ({
         </Steps>
       </Tabs.TabPane>
       <Tabs.TabPane tab="内部审核流程" key="2">
-        <Steps style={{ marginTop: 30 }} progressDot current={innerVerifyCurrent}>
+        <Steps style={{ marginTop: 30, overflow: "auto" }} progressDot current={innerVerifyCurrent}>
           {innerVerifySteps.map(item => (
             <Steps.Step
               key={customKey ? item[customKey] : item.step}

src/constants/index.ts

@@ -792,6 +792,7 @@ export const PurchaseOrderOutWorkStateTexts = {
 // 采购订单内部
 export const PurchaseOrderInsideWorkStateTexts = {
   "-1": '取消订单',
+  0: '订单完成',
   1: '待新增采购订单',
   2: '一级待审核订单',
   3: '二级待审核订单',
@@ -811,6 +812,7 @@ export const PurchaseOrderInsideWorkStateTexts = {
 
 // 销售订单内部显示文案
 export const SaleOrderInsideWorkStateTexts = {
+  0: '订单完成',
   1: '待审核订单',
   2: '一级待审核订单',
   3: '二级待审核订单',

src/pages/commodity/products/index.tsx

@@ -916,7 +916,7 @@ const Products: React.FC<{}> = () => {
           <Form.Item
             label={
               <span>
-                请选择需要{isUp ? '上架' : '下架'}的商城&nbsp;
+                请{isUp ? '选择' : '反选'}需要{isUp ? '上架' : '下架'}的商城&nbsp;
                   <Tooltip title="已上架的商城为已勾选的商城，不可选择，只可以选择未勾选的商城。">
                   <QuestionCircleOutlined />
                 </Tooltip>

src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx

@@ -16,10 +16,16 @@ import { PublicApi } from '@/services/api'
 import { StandardTable } from 'god'
 import QRCode from 'qrcode';
 import { ScanOutlined } from '@ant-design/icons'
-import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
+
+interface rechargeItem {
+  codeUrl: string;
+  tradeRecordId: number;
+}
 
 const schemaActions = createFormActions()
 
+let timeChange; // Tiemr
+
 const AccountDetail: React.FC<{}> = () => {
   const modalRef = useRef<any>()
   const refTrade = useRef<any>({})
@@ -29,15 +35,26 @@ const AccountDetail: React.FC<{}> = () => {
   const [isBtnLoading, setIsBtnLoading] = useState<boolean>(false)
   const [scanVisible, setScanVisible] = useState<boolean>(false)
   const [qrCode, setQrCode] = useState('')
-  const [renderCodeCharacter, setRenderCodeCharacter] = useState('')
+  const [renderCodeCharacter, setRenderCodeCharacter] = useState<rechargeItem>()
   const [rechargeType, setRechargeType] = useState<number>()
 
   useEffect(() => {
     getAccountInfo()
+    clearInterval(timeChange)
   } ,[])
 
+  //timer
+  const [openTimer, setOpenTimer] = useState(0); // timer
+  useEffect(() => {
+    console.log(openTimer)
+    if(openTimer === 1) runTimerJump()
+  }, [openTimer])
+  const runTimerJump = () => {
+    timeChange = setInterval(() => pollPayResult(), 3000)
+  }
+
   useEffect(() => {
-    if(renderCodeCharacter){
+    if(renderCodeCharacter?.codeUrl){
       generateQrCode()
     }
   }, [renderCodeCharacter])
@@ -66,15 +83,37 @@ const AccountDetail: React.FC<{}> = () => {
 
   const generateQrCode = () => {
     // 生成二维码
-    QRCode.toDataURL(renderCodeCharacter).then((url:any) => {
+    QRCode.toDataURL(renderCodeCharacter.codeUrl).then((url:any) => {
       setQrCode(url)
-      console.log(url)
+      // 轮询支付结果
+      setOpenTimer(1)
     })
     .catch((err:any) => {
       console.error(err)
     })
   }
 
+  const pollPayResult = () => {
+    if(renderCodeCharacter?.tradeRecordId) {
+      // @ts-ignore
+      PublicApi.getPayAssetAccountGetRechargeResult({tradeRecordId: renderCodeCharacter.tradeRecordId}).then(res => {
+        console.log(res)
+        if(res.code === 1000) {
+          if(res.data) {
+            clearInterval(timeChange)
+            setScanVisible(false)
+            Modal.success({
+              content: '充值成功',
+            });
+            getAccountInfo()
+          }
+        } else {
+          message.error(res.message)
+        }
+      })
+    }
+  }
+
   const columns: ColumnType<any>[] = [
     {
       title: '交易流水号',
@@ -174,7 +213,6 @@ const AccountDetail: React.FC<{}> = () => {
         modalRef.current.setVisible(false)
         setScanVisible(true)
         setRenderCodeCharacter(data)
-        console.log(data)
       }else{
         message.error(res.message)
       }

src/pages/repositories/schema/index.tsx

@@ -74,16 +74,29 @@ export const repositSchema: ISchema = padRequiredMessage({
                 inline: true
               },
               properties: {
-                productName: {
+                id: {
                   type: 'string',
                   "x-component-props": {
-                    placeholder: '商品名称'
+                    placeholder: '仓位ID'
                   }
                 },
-                productId: {
+                state: {
+                  type: 'string',
+                  "x-component-props": {
+                    placeholder: '仓位状态',
+                    style: {
+                      width: 160,
+                    }
+                  },
+                  enum: [
+                    { label: '有效', value: 1 },
+                    { label: '无效', value: 0 }
+                  ]
+                },
+                productName: {
                   type: 'string',
                   "x-component-props": {
-                    placeholder: '商品ID'
+                    placeholder: '商品名称'
                   }
                 },
                 category: {

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

@@ -122,7 +122,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           setPayStep(1)
         } else if (checked.id === 4) { // 余额支付
           console.log('选择了余额支付')
-          PublicApi.getPayAssetAccountGetUserBalance({parentMemberId: data.supplyMembersId, parentMemberRoleId: data.supplyMembersRoleId}).then(res => {
+          PublicApi.getPayAssetAccountGetUserBalance({parentMemberId: data.supplyMembersId, parentMemberRoleId: data.supplyMembersRoleId, payType: data.ruleConfigurationId}).then(res => {
             if(res.code === 1000) {
               setBalanceInfo(res.data)
             } else {

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

@@ -13,7 +13,7 @@ import { usePageStatus } from '@/hooks/usePageStatus'
 import ModalTable from '@/components/ModalTable'
 import { formatTimeString } from '@/utils'
 import { AddressPop } from '../../purchaseOrder/orderCollect/components/productModalTable'
-import { DELIVERY_TYPE } from '@/constants'
+import { DELIVERY_TYPE, SaleOrderInsideWorkStateTexts } from '@/constants'
 
 export interface OrderProductTableProps {}
 
@@ -25,6 +25,7 @@ interface Item {
   name: string;
   age: string;
   address: string;
+  purchaseCount: string;
 }
 
 interface EditableRowProps {
@@ -85,19 +86,28 @@ const modalPriceActions = createFormActions()
 // 总计金额联动框
 export const MoneyTotalBox = ({ dataSource, isEditData }) => {
   const { orderProductRequests = [], receiverAddressId, freight, amount  } = dataSource || {}
-  const sum = orderProductRequests.reduce((prev, next) => prev + parseInt((next.money || 0)), 0)
-  
   const modelRef = useRef<any>({})
   const [freePrice, setFreePrice] = useState<number>(freight || 0)
+  const [sum, setSum] = useState<number>(0)
+  // const sum = orderProductRequests.reduce((prev, next) => prev + Number((next.money || 0)), 0)
   const handleSetting = () => {
     modelRef.current.setVisible(true)
   }
 
+  const [amountMoney, setAmountMoney] = useState<number>(amount || sum + freePrice)
+
+  // useEffect(() => {
+  //   const _sum = orderProductRequests.reduce((prev, next) => prev + Number((next.money || 0)), 0)
+  //   setSum(_sum)
+  // }, [])
+
   // 总计金额
-  const amountMoney = amount || sum + freePrice
+  useEffect(() => {
+    setAmountMoney(() => (sum*1000 + freePrice*1000)/1000)
+  }, [sum, freePrice])
 
   const handleConfirm = () => {
-    setFreePrice(parseInt(modalPriceActions.getFieldValue('freePrice') || 0))
+    setFreePrice(Number(modalPriceActions.getFieldValue('freePrice') || 0))
     modelRef.current.setVisible(false)
   }
 
@@ -120,7 +130,11 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
         })
       }
     }
+
+    const _sum = orderProductRequests.reduce((prev, next) => prev + Number((next.money || 0)), 0)
+    setSum(_sum)
   }, [orderProductRequests])
+
   return <RowStyle>
     <Col span={2}>
       <div>合计金额</div>
@@ -153,9 +167,21 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
                 title: '设置运费',
                 "x-props": {
                   addonBefore: '￥'
-                }
+                },
+                "x-rules": [
+                  {
+                    validator: value => {
+                      return isNaN(value)
+                    },
+                    message:'请正确输入数字金额',
+                  },
+                  {
+                    pattern: /^\d+(\.\d{1,2})?$/,
+                    message: '运费仅限两位小数',
+                  },
+                ]
               }
-            }
+            },
           }
         }
       }}
@@ -213,7 +239,8 @@ const EditableCell: React.FC<EditableCellProps> = ({
   const save = async e => {
     try {
       const values = await form.validateFields();
-      values.price = parseInt(values.price)
+      values.price = Number(values.price)
+      values.money = ((Number(values.price)*1000) * parseInt(record.purchaseCount))/1000 // 计算金额
       toggleEdit();
       handleSave({ ...record, ...values });
     } catch (errInfo) {
@@ -238,6 +265,10 @@ const EditableCell: React.FC<EditableCellProps> = ({
             required: true,
             message: `单价是必填的`,
           },
+          {
+            pattern: /^\d+(\.\d{1,3})?$/,
+            message: '价格数值仅限三位小数',
+          }
         ]}
       >
         <Input type='number' ref={inputRef} onBlur={save} onPressEnter={save}/>
@@ -263,7 +294,8 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
   const warehouseRef = useRef<any>({})
 
   // 判断是否可操作当前表格
-  const isEditData = SALE_ORDER_STATUS.READY_APPROVED_ORDER === parseInt(page_type)
+  console.log(SaleOrderInsideWorkStateTexts[data.purchaseOrderInteriorState],data, 'data')
+  const isEditData = SaleOrderInsideWorkStateTexts[data.purchaseOrderInteriorState] === '待审核订单'
   const productComponents = {
     body: {
       row: EditableRow,

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -159,7 +159,7 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
       environment: 1,
       memberId: supplyMembersId,
       // 手工下单/合并订单下单时，查询现货价格商品
-      priceTypeList: modelType === (OrderModalType.CONSOLIDATED_ORDER || OrderModalType.HAND_ORDER) ? [1] : undefined
+      priceTypeList: (modelType === OrderModalType.CONSOLIDATED_ORDER || modelType === OrderModalType.HAND_ORDER) ? [1] : undefined
     }
     return fetchOrderApi.getProductList(params)
   }