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

package.json

@@ -13,7 +13,7 @@
     "build:yxc": "yarn api && yarn scripts:build-yxc && umi build",
     "build:analyze": "ANALYZE=1 umi build",
     "build:dev": "pm2 start scripts/devServer.js",
-    "build:clean": "umi build",
+    "build:clean": "NODE_OPTIONS=--max_old_space_size=4096 umi build",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",

src/formSchema/effects/useAsyncSelect.ts

@@ -24,6 +24,8 @@ export const useAsyncSelect = async (name, service: () => Promise<any[]>, format
           label: v[labelString],
           value: v[valueString]
         }))
+      } else {
+        enums = res
       }
       setFieldState(name, state => {
         state.originAsyncData = res

src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx

@@ -386,6 +386,7 @@ const Detail: React.FC<{}> = () => {
    * @return {type} 
    */
   const onCustomerCategoryChange = (value: any, options: any) => {
+    console.log(value, options)
     let seletCategoryId = value[value.length - 1]
     setcategoryId(seletCategoryId)
     setseletCategoryNameList(options)
@@ -556,6 +557,7 @@ const Detail: React.FC<{}> = () => {
     PublicApi.getProductPlatformGetCategoryTree({ rootNodeId: null }).then(res => {
       if (res.code === 1000) {
         let { data } = res
+        console.log(data, 10086)
         setCategoryTreeOne(data)
       }
     })
@@ -567,8 +569,8 @@ const Detail: React.FC<{}> = () => {
      * @description: 收货地址
      * @param {type} 
      * @return {type} 
-     */
-    PublicApi.getLogisticsSelectListShipperAddress().then(res => {
+     */       
+    PublicApi.getLogisticsSelectListReceiverAddress().then(res => {
       let list = []
       res.data.forEach(item => {
         list.push({ value: item.id, label: item.fullAddress })
@@ -621,7 +623,6 @@ const Detail: React.FC<{}> = () => {
           }
           //品类
           if (data.productCategory) {
-            console.log(10086, '============')
             setcustomerCategoryId([data.productCategory.key])
             initCreatePro(data.productCategory.key, false)//生产弹窗
           }
@@ -791,6 +792,7 @@ const Detail: React.FC<{}> = () => {
    */
   const handleSubmitTabForm = () => {
     tabForm.validateFields().then(values => {
+      console.log(values, `扑母早死仔`)
       if (id) {
         if (!haschangeCategory) {
           //不做处理
@@ -940,12 +942,18 @@ const Detail: React.FC<{}> = () => {
       })
     } else {
       Object.keys(values).forEach((key) => {
+        console.log(values[key], '嘿嘿嘿')
         item[key] = values[key]
       })
     }
+    
+    // 获得key
+    for(let k in item) {
+      console.log(k, k )
+    }
 
     list.push(item)
-
+    console.log(list, '嘿嘿嘿1000')
     setproductSource([...productSource, ...list])//新增就要合并
     setdialogVisible(false)
   }
@@ -1157,7 +1165,7 @@ const Detail: React.FC<{}> = () => {
                 </TabPane>
                 <TabPane tab="添加商品" key='2'>
                   <Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => handleOptionBtn(1)} type='dashed'>添加商品</Button>
-                  <Table rowKey={"id"} dataSource={productSource} columns={equiryColumns} pagination={pagination} />
+                  <Table rowKey={"title"} dataSource={productSource} columns={equiryColumns} pagination={pagination} />
                 </TabPane>
                 <TabPane tab="交易条件" key='3'>
                   <Row>

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -171,7 +171,7 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
   
   const fetchGoodsList = (params) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getProductCommodityCommonGetCommodityListByBuyer({...params,priceTypeList: 2,memberId:memberList[0].memberId }).then(res => {
+      PublicApi.getProductCommodityCommonGetCommodityListByBuyer({...params,priceTypeList: 2,memberId:memberList[0].memberId, shopType: 1 }).then(res => {
         if(res.code === 1000) {
           resolve(res.data)
         }

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/detail/index.tsx

@@ -19,15 +19,15 @@ const ReadyConfirmDelevedOrderDetail: React.FC = () => {
   const isHandDeleved = formContext.data && formContext.data.purchaseOrderInteriorState === SaleOrderInsideWorkState.HAND_DELEVED_ORDER
   
   // 所有发货单都是否已经发货了
-  const isShowBtn = formContext.data?.orderDeliveryDetailsResponses?.some(v => v.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER)
+  const isShowBtn = isHandDeleved || formContext.data?.orderDeliveryDetailsResponses?.some(v => v.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER)
   const approvedRef = useRef<any>({})
 
   const handleClick = useCallback(() => {
     if (isHandDeleved) {
+      approvedRef.current.setVisible(true)
+    } else {
       const deleveBox = document.querySelector('#deleveBox') as any
       window.scrollTo(0, deleveBox.offsetTop)
-    } else {
-      approvedRef.current.setVisible(true)
     }
   }, [isHandDeleved])