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

env.js

@@ -117,4 +117,27 @@ module.exports = {
       forcePasv: true
     })
   },
+  v2: {
+    SITE_ID: '1',
+    BACK_GATEWAY: 'http://10.0.0.17:8100',
+    USE_ROUTE_CONFIG: true,
+    SOCKET_URL: 'ws://10.0.0.17:8100',
+    ssh: JSON.stringify({
+      user: "root",
+      // Password optional, prompted if none given
+      password: "123456",
+      host: "10.0.0.17",
+      port: 22,
+      localRoot: path.resolve('./dist/'),
+      remoteRoot: "/home/www/lingxi/lingxi-business-platform/dist/",
+      // include: ["*", "**/*"],      // this would upload everything except dot files
+      include: ["*"],
+      // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
+      // exclude: ["dist/**/*.map", "node_modules/**", "node_modules/**/.*", ".git/**"],
+      // delete ALL existing files at destination before uploading, if true
+      deleteRemote: true,
+      // Passive mode is forced (EPSV command is not sent)
+      forcePasv: true
+    })
+  },
 }

package.json

@@ -6,6 +6,7 @@
     "upload:10": "cross-env local=10 taskName=upload yarn scripts:build",
     "upload:25": "cross-env local=25 taskName=upload yarn scripts:build",
     "upload:study": "cross-env local=study taskName=upload yarn scripts:build",
+    "upload:v2": "cross-env local=v2 taskName=upload yarn scripts:build",
     "api": "god-ytt",
     "scripts:build": "node scripts/run",
     "scripts:build-yxc": "node scripts/run http://yxc-web-demo.shushangyun.com/api",
@@ -22,6 +23,7 @@
     "build:all": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn build",
     "build:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.10:9400 yarn build",
     "build:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.207:9400 yarn build",
+    "build:v2": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.17:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.17:9400 yarn build",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
     "test": "umi-test",
@@ -31,7 +33,8 @@
     "start:url": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-all.wg.shushangyun.com USE_ROUTE_CONFIG=true SOCKET_URL=ws://lingxi-all.wg.shushangyun.com yarn start",
     "start:10": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.10:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.10:9400 yarn start",
     "start:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.1.207:9400 yarn start",
-    "start:25": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.25:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.25:9400 yarn start"
+    "start:25": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.25:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.25:9400 yarn start",
+    "start:v2": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.17:8100 USE_ROUTE_CONFIG=true SOCKET_URL=ws://10.0.0.17:9400 yarn start"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [

src/global/styles/global.less

@@ -358,3 +358,20 @@ a {
     }
   }
 }
+
+// 重置步骤条顶部边距
+.ant-steps-horizontal {
+  margin-top: 0 !important;
+}
+
+// 固定头部
+// .ant-layout-header {
+//   position: fixed;
+//   top: 0;
+// }
+// .ant-pro-page-header-wrap-page-header-warp {
+//   position: fixed;
+//   top: 0;
+//   width: 100%;
+//   z-index: 8;
+// }

src/global/styles/reset.less

@@ -10,10 +10,6 @@
     margin: 8px auto 32px auto;
   }
 
-  .ant-page-header {
-    padding: 8px 24px;
-  }
-
   .common_checkbox {
 
     &:hover,
@@ -225,6 +221,46 @@
     padding: 16px;
   }
 
+  // 覆写page-header-title
+  .ant-page-header {
+    padding: 4px 16px;
+  }
+  .ant-page-header-heading-title {
+    font-size: 16px;
+  }
+
+  // 覆写左边菜单
+  .ant-menu-item {
+    padding-left: 16px !important;
+  }
+  .ant-menu-submenu-title {
+    padding-left: 16px !important;
+  }
+  .anticon-border {
+    margin-right: 8px;
+  }
+
+  // 覆写page 报个上部操作按钮样式
+  .mega-layout-item-content {
+    .ant-space {
+      .ant-space-item {
+        margin-right: 16px !important;
+      }
+    }
+  }
+
+  .god-table-content {
+    .ant-table-wrapper {
+      .ant-spin-nested-loading {
+       .ant-spin-container {
+         .ant-pagination {
+           margin: 16px 0 0 0;
+         }
+       }
+      }
+    }
+  }
+
 }
 
 .ant-descriptions-item-label {
@@ -238,4 +274,4 @@
 .ant-form-item-label > label {
   font-size: 12px !important;
   color: #909399 !important;
-}
\ No newline at end of file
+}

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

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} />
       </>
     },
     {