fix:…

src/pages/commodity/products/addDirectChannel.tsx

@@ -52,7 +52,7 @@ const AddDirectChannel:React.FC<{}> = (props) => {
         let params: any = {}
         console.log(values, 'vvv')
         values.map((item, index) => {
-          if(!item?.carriageType)
+          if(!item.deliveryType)
             params = { ...params, ...item }
           else
             params.logistics = { ...item }

src/pages/commodity/products/modifyDirectChannel.tsx

@@ -123,14 +123,22 @@ const ModifyDirectChannel:React.FC<{}> = () => {
   // 获取商品规格列表
   const fetchSpecData = () => {
     setLoading(true)
-    PublicApi.getProductChannelCommodityGetCommodityUnitPriceByChannel({id: history.location.query.id}).then(res => {
+    console.log(priceTableData, 'priceTableData')
+    PublicApi.postProductChannelCommodityGetCommodityUnitPriceByChannel({
+      id: history.location.query.id,
+      idList: priceTableData.map(item => item.id)
+    }, { ctlType: "none" }).then(res => {
       const { data } = res
       // let hasIds = priceTableData.map(item => item.id)
       // setOriginHasIds(hasIds)
-      let _data = data.filter(item => !originHasIds.includes(item.id))
-      setOriginTableData(_data)
-      if(_data.length > 0)
-        structureTable(_data)
+      // let _data = data.filter(item => !originHasIds.includes(item.id))
+      setOriginTableData(data)
+      if(data.length > 0) {
+        structureTable(data)
+      } else {
+        setLoading(false)
+        structureTable([])
+      }
     })
   }
 

src/pages/repositories/addRepository.tsx

@@ -46,12 +46,14 @@ const AddRepository:React.FC<{}> = (props) => {
           params['warehouseName'] = prevState.props.enum.filter((item: any) => item.value === prevState.value)[0]['label']
         }
       })
-      await PublicApi.postWarehouseFreightSpaceAdd(params)
+      let res = await PublicApi.postWarehouseFreightSpaceAdd(params)
+      if(res.code === 1000) {
         setTimeout(() => {
           history.goBack(-1)
         }, 1000)
       }
     }
+  }
 
   return (
     <PageHeaderWrapper

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

@@ -91,6 +91,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
   const [payOnReceived, setPayOnReceived] = useState<boolean>(false) // 是否要禁用到付方式
   const [blankAccountInfo, setBlankAccountInfo] = useState<any>()
   const { run, loading } = useHttpRequest(PublicApi.postOrderPendingOrderPay)
+  const [settleAccountsError, setSettleAccountsError] = useState<boolean>(true)
 
   useEffect(() => {
     if (currentRef) {
@@ -178,6 +179,9 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.supplyMembersId, memberRoleId: data.supplyMembersRoleId}).then(res => {
             if(res.code === 1000) {
               setBlankAccountInfo(res.data)
+              setSettleAccountsError(true)
+            } else {
+              setSettleAccountsError(false)
             }
           })
         } else if (checked.id === 6) { // 授信额度支付
@@ -310,6 +314,10 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       params.payOrderUrls = payOrderUrls.join(',')
     }
 
+    if(!settleAccountsError) {
+      return message.error('请先完成对公账户配置')
+    }
+
     const res = await run(params, mobilePayFlag.current === 4 ? { ctlType: "none" } : null)
     if (res.code === 1000) {
       if(mobilePayFlag.current !== 4) { // 非微信

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

@@ -206,7 +206,8 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
             }, {}),
             isMemberPrice: v.isMemberPrice,
             purchaseCount: v.count,
-            money: v.memberDiscount ? (v.count*1000 * v.unitPrice*100 * v.memberDiscount*100)/10000000 : (v.count*1000 * v.unitPrice*100)/100000,
+            // money: v.memberDiscount ? (v.count*1000 * v.unitPrice*100 * v.memberDiscount*100)/10000000 : (v.count*1000 * v.unitPrice*100)/100000,
+            money: (v.count*1000 * v.unitPrice*100)/100000,
             productId: v.id,
             channelProductId: v.channelProductId,
             memberId: initValue.supplyMembersId, // 添加 memberId, memberRoleId 字段
@@ -226,7 +227,7 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
       // ctx.setFormState(state => {
       //   state.remoteDataFn = fn
       // })
-
+      console.log(initValue, 'initValue')
       fn(initValue)
     }
 

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

@@ -321,7 +321,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           params.orderProductRequests = params.orderProductRequests.map(item => {
             let logistics: any = {
               ...item.logistics,
-              render: JSON.stringify(typeof item.logistics.render === "object" ? item.logistics.render : item.logistics.render.replace(/\"/g, ''))
+              render: JSON.stringify(typeof item.logistics.render === "object" ? item.logistics.render : (item.logistics?.render ? item.logistics.render.replace(/\"/g, '') : {}))
             };
             return {
               ...item,

src/pages/transaction/purchaseOrder/orderCollect/model/useProductTable.tsx

@@ -85,6 +85,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
 
     // 商品行数变动 清空之前的支付信息
     if (pageStatus === PageStatus.ADD) {
+      console.log('Add')
       let paymentInfo = ctx.getFieldValue('paymentInformationResponses').map(item => {
         let _item = {...item}
         delete _item.channel

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

@@ -141,7 +141,7 @@ export const useSelfTable = () => {
             }
           </Col> */}
         </Row>
-        <Progress percent={Math.ceil(record.currentPayments / record.sum)} showInfo={false} />
+        <Progress percent={Number(record.currentPayments / record.sum).toFixed(2) * 100} showInfo={false} />
       </>
     },
     {