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

src/pages/lxMall/components/SideNav/index.less

@@ -55,13 +55,12 @@
 }
 
 .commodityList {
-  display: flex;
-  flex-wrap: wrap;
   padding: 0 5px 50px 0;
   overflow-y: auto;
   height: 100vh;
 
   .commodityItem {
+    display: inline-block;
     width: 50%;
 
     .commodityItemBody {

src/pages/lxMall/purchaseOrder/index.tsx

@@ -149,7 +149,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
         if(isMemberPrice) {
             parameter =  await getMemberCredit(item.commodityUnitPrice.commodity.memberId, item.commodityUnitPrice.commodity.memberRoleId)
         }
-        Object.keys(unitPrice).forEach(key => {
+        unitPrice && Object.keys(unitPrice).forEach(key => {
           const keyArr = key.split('-')
           const min = keyArr[0]
           const max = keyArr[1]
@@ -225,6 +225,9 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
       const index = checkedList.indexOf(id)
       checkedList.splice(index, 1)
       setCheckedList(checkedList)
+      if(checkedList.length === 0) {
+        setIndeterminate(false)
+      }
     }
   }
 
@@ -319,7 +322,7 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
       if (isEmpty(priceItem)) {
         priceItem = getMaxCountRange(priceRange, count)
       }
-      return parseFloat(priceItem.price) * count
+      return (priceItem && priceItem.price) ? parseFloat(priceItem.price) * count : 0
     }
   }
 

src/pages/trademark/addBrand.tsx

@@ -67,6 +67,7 @@ const AddBrand: React.FC<{}> = () => {
   const [formValues, setFormValues] = useState<any>({})
   const [banSomeField, setBanSomeField] = useState<boolean>(false)
   const [isDisabledSave, setIsDisabledSave] = useState<boolean>(false)
+  const [isDisabledCheck, setDisabledCheck] = useState<boolean>(false)
 
   useEffect(()=>{
     const { id } = history.location.query
@@ -153,7 +154,9 @@ const AddBrand: React.FC<{}> = () => {
   }
 
   const handleApplyCheck = () => {
+    setDisabledCheck(true)
     PublicApi.postProductBrandApplyCheckBrand({id: responseId}).then(res=>{
+        setDisabledCheck(false)
         setCurrentStep(1)
         setTimeout(() => {
           history.goBack()
@@ -183,7 +186,7 @@ const AddBrand: React.FC<{}> = () => {
       backIcon={<ReutrnEle description="返回"/>}
       title={history.location.query?.id?'修改品牌':'新建品牌'}
       extra={[
-        <Button key="2" disabled={isEnableCheck} onClick={handleApplyCheck}>直接提交审核</Button>,
+        <Button key="2" disabled={isEnableCheck} onClick={handleApplyCheck} disabled={isDisabledCheck}>直接提交审核</Button>,
         <Button icon={<SaveOutlined />} key="1" type="primary" onClick={handleSave} disabled={isDisabledSave}>
           保存
         </Button>,

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

@@ -233,7 +233,7 @@ const ProductModalTable:React.FC<ProductModalTableProps> = (props) => {
                 }
               })
               // FormEffectHooks.onFieldChange$('customerCategoryId').subscribe(state => {
-              //   searchCustomerCategoryOptionEffect(actions, 'customerCategoryId')
+              //   searchCustomerCategoryOptionEffect(schemaAction, actions, 'customerCategoryId')
               // })
               actions.setFieldState('brandId', state => {
                 state.props['x-component-props'].queryParams = {

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

@@ -356,11 +356,18 @@ export const useOrderUpdateChangeOther = (ctx: ISchemaFormActions | ISchemaFormA
 }
 
 // 高级筛选schema中用于输入搜索商品品类的Effect
-
-export const searchCustomerCategoryOptionEffect = (context: any, fieldName: string) => {
-  context.getFieldState(fieldName, state => {
-    PublicApi.getProductCustomerGetCustomerCategoryTree().then(res => {
-      context.setFieldState(fieldName, state => {
+/**
+ * @param ctx 外部表单action
+ * @param mctx 模态框表单action
+ * @param fieldName 字段名称
+ */
+export const searchCustomerCategoryOptionEffect = (ctx: any, mctx: any, fieldName: string) => {
+  let params: any = {}
+  params['memberId'] = ctx.getFieldValue('supplyMembersId')
+  params['memberRoleId'] = ctx.getFieldValue('supplyMembersRoleId')
+  mctx.getFieldState(fieldName, state => {
+    PublicApi.getProductSelectGetMemberCategory(params).then(res => {
+      mctx.setFieldState(fieldName, state => {
         state.props['x-component-props'].dataoption = res.data
       })
     })

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

@@ -194,7 +194,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
   }, [])
 
   const handleSubmit = async (value) => {
-    console.log(value, 'value', addSchemaAction.getFieldValue("orderProductRequests"))
     let _orderProductRequests = JSON.parse(JSON.stringify(value.orderProductRequests))
     let processEnum = value['processEnum']
     let usingElectronicContracts = value['usingElectronicContracts']

src/pages/transaction/purchaseOrder/orderCollect/schema/index.ts

@@ -131,9 +131,12 @@ const basicInfo: ISchema = {
         orderThe: {
           type: 'string',
           title: '订单摘要',
-          required: true,
           "x-rules": [
             {
+              required: true,
+              message: '请输入订单摘要'
+            },
+            {
               limitByte: true,
               maxByte: 60
             }

src/pages/transaction/purchaseOrder/readyFileOrder/model/useSelfTable.tsx

-import React, { useRef } from 'react'
-import { Button } from 'antd'
-import { baseOrderListColumns } from '../../constant'
-import { history } from 'umi'
-import { PublicApi } from '@/services/api'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
-
-// 业务hooks
-export const useSelfTable = () => {
-  const ref = useRef<any>({})
-  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
-
-  const handleSubmit = async (record) => {
-    if (record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/detail?id=${record.id}`)
-    }
-  }
-  const secondColumns: any[] = baseOrderListColumns.concat([
-    {
-      title: '操作',
-      align: 'center',
-      dataIndex: 'ctl',
-      key: 'ctl',
-      render: (text, record) => <>
-      {
-        record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER &&
-        <Button type='link' onClick={() => handleSubmit(record)}>归档</Button>
-      }
-      </>
-    }
-  ])
-
-  return {
-    columns: secondColumns,
-    ref,
-    rowSelection,
-    rowSelectionCtl
-  }
-}
+import React, { useRef } from 'react'
+import { Button } from 'antd'
+import { baseOrderListColumns } from '../../constant'
+import { history } from 'umi'
+import { PublicApi } from '@/services/api'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+
+// 业务hooks
+export const useSelfTable = () => {
+  const ref = useRef<any>({})
+  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
+
+  const handleSubmit = async (record) => {
+    if (record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER) {
+      history.push(`/memberCenter/tranactionAbility/purchaseOrder/readyFileOrder/detail?id=${record.id}`)
+    }
+  }
+  const secondColumns: any[] = baseOrderListColumns.concat([
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'ctl',
+      key: 'ctl',
+      render: (text, record) => <>
+      {
+        record.interiorState === PurchaseOrderInsideWorkState.FILLING_ORDER &&
+        <Button type='link' onClick={() => handleSubmit(record)}>归档</Button>
+      }
+      </>
+    }
+  ])
+
+  return {
+    columns: secondColumns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  }
+}

src/pages/transaction/purchaseOrder/readyReceiveOrder/model/useSelfTable.tsx

@@ -62,7 +62,7 @@ export const useSelfTable = () => {
       key: 'sumPrice',
       render: (t, r) => r.type === 7 || r.type === 8 ? t : '￥' + t
     },
-    { title: '已收货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => text ? `第${text}次` : '' },
+    { title: '已发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => text ? `第${text}次` : '' },
     // @todo 收货单号跳转
     {
       title: '入库单号',