Merge branch 'dev' into test

package.json

@@ -19,6 +19,7 @@
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "start:cross": "cross-env SITE_ID=352 USE_ROUTE_CONFIG=false SOCKET_URL=ws://10.0.0.25:8100 yarn start",
+    "start:scm": "cross-env SITE_ID=1 BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com yarn start",
     "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:8100 yarn start"
   },

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -323,14 +323,13 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         }) : _tempObj[_attributeNameArr[i]||_attributeNameArr[0]] = _rowArr  // 当一项变动的时候 找_attributeNameArr可能会找不到 找不到的情况下置为索引0的那项
         if(history.location.query?.id){
           // 编辑的时候，先指定数据中的货品id，如果是重新组合的不存在id就使用选择的货品中的第一个，如果没有置为0；同理，不存在单价就置为{}
-
           // _tempObj['对应货品'] = selectedGoods[i] && selectedGoods[i]?.id || selectedGoods[0]?.id || 0
           _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0
 
           if(updateFlag.current){ // 初次渲染tab 再次进入tab采用缓存数据
             _tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {}
           }else{
-            _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] || {}
+            _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价'] || {}
           }
         }else{
           _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0

src/pages/commodity/products/addProductsItem/productAttributeForm.tsx

@@ -59,7 +59,7 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
         paramsArray = []
         setProductSelectAttribute([])
         attributeForm.resetFields()
-        clearProductDetailsUnitPriceAndPicListInEdit([]) // 清空商品编辑数据中的商品属性 *9.12*
+        clearProductDetailsUnitPriceAndPicListInEdit([]) // 清空商品编辑数据中的商品属性
       }else{
         setIsClearFormAndDataInEdit(true)
       }

src/pages/lxMall/components/Filter/components/CommodityType/index.tsx

@@ -51,6 +51,12 @@ const CommodityType: React.FC<CommodityTypePropsType> = (props) => {
         key: result[0],
         title: getItemText(result[0])
       })
+    } else {
+      onFilter({
+        type: FILTER_TYPE.commodityType,
+        key: [],
+        title: ''
+      })
     }
   }
 

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

@@ -139,6 +139,8 @@
     &_item {
       width: 50%;
       padding: 20px;
+      border-top: 1px solid #F5F5F5;
+      border-right: 1px solid #F5F5F5;
 
       &_header {
         display: flex;

src/pages/lxMall/purchaseOrder/index.tsx

@@ -294,6 +294,8 @@ const PurchaseOrder: React.FC<PurchaseOrderPropsType> = (props) => {
       centered: true,
       className: styles.mallComfirm,
       content: `是否从进货单中移除该商品？`,
+      okText: '确定',
+      cancelText: '取消',
       onOk: () => {
         return new Promise((resolve, reject) => {
           let postFn

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

@@ -186,6 +186,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
         // $('onFormInit').subscribe(() => {
           if (data.isElectronicContract === 1) {
             useAsyncSelect('contractTemplateId', async () => (await PublicApi.getOrderSelectListContractTemplate()).data, ['name', 'id'])
+            actions.setFieldValue("contractTemplateId", data.contractTemplateId)
           } else {
             actions.setFieldState('usingElectronicContracts', state => {
               state.value = 0

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

@@ -30,14 +30,16 @@ const DemandModalTable:React.FC<DemandModalTableProps> = (props) => {
 
   const handleConfirm = async () => {
     const item = rowSelectionCtl.selectRow[0]
+    console.log(item, '看需求报价item有没有member信息')
     if (item) {
       schemaAction.setFieldValue('quotationNo', item.quotationNo)
       const data = await fetchOrderApi.getProductListByDemandOrderId({
         id: item.id
       })
       schemaAction.setFieldValue('orderProductRequests', data)
-      schemaAction.setFieldValue('supplyMembersName', item.demandMembers)
-      schemaAction.setFieldValue('supplyMembersId', item.demandMemberId)
+      schemaAction.setFieldValue('supplyMembersName', item.offerMemberName)
+      schemaAction.setFieldValue('supplyMembersId', item.offerMemberId)
+      schemaAction.setFieldValue('supplyMembersRoleId', item.offerMemberRoleId)
       // 需求单回显订单明细
       schemaAction.setFieldValue('orderThe', item.quotationSummary)
     }

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

@@ -30,6 +30,7 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
 
   const handleConfirm = async () => {
     const item = rowSelectionCtl.selectRow[0]
+    console.log(item, '看询价报价item有没有member信息')
     if (item) {
       schemaAction.setFieldValue('quotationNo', item.quotationNo)
       const data = await fetchOrderApi.getProductListByQuotationOrderId({
@@ -37,11 +38,13 @@ const InquiryModalTable:React.FC<InquiryModalTableProps> = (props) => {
       })
       // 将询价报价单的id字段 冗余给商品列表
       schemaAction.setFieldValue('orderProductRequests', data.map((v: any) => {
-        v.memberId = item.memberId
-        v.memberRoleId = item.memberRoleId
+        v.memberId = item.offerMemberId
+        v.memberRoleId = item.offerMemberRoleId
         return v
       }))
-      schemaAction.setFieldValue('supplyMembersName', item.memberName || '后端没有返回会员名称')
+      schemaAction.setFieldValue('supplyMembersName', item.offerMemberName)
+      schemaAction.setFieldValue('supplyMembersId', item.offerMemberId)
+      schemaAction.setFieldValue('supplyMembersRoleId', item.offerMemberRoleId)
       // 询价单回显订单明细
       schemaAction.setFieldValue('orderThe', item.details)
     }

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

@@ -28,9 +28,11 @@ const MemberModalTable:React.FC<MemberModalTableProps> = (props) => {
 
   const handleConfirm = () => {
     const rowItem = rowSelectionCtl.selectRow[0]
+    console.log(rowItem, '看会员item有没有member信息')
     if (rowItem) {
       schemaAction.setFieldValue('supplyMembersName', rowItem.name)
       schemaAction.setFieldValue('supplyMembersId', rowItem.memberId)
+      schemaAction.setFieldValue('supplyMembersRoleId', rowItem.roleId)
     }
     confirmModal && confirmModal()
     setVisible(false)

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

@@ -213,7 +213,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
           }
           // logistics render字段字符串化
           params.orderProductRequests = params.orderProductRequests.map(item => {
-            let logs: any = { ...item.logistics, render: JSON.stringify(item.logistics.render) };
+            let logs: any = { ...item.logistics, render: item.logistics?.render ? JSON.stringify(item.logistics.render) : '' };
             return {
               ...item,
               logistics: logs

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

@@ -8,6 +8,7 @@ import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 
 export const getUnitPriceTotal = (record) => {
   const purchaseCount = Number(record['purchaseCount']) || 0
+  console.log(record,purchaseCount,'rrr')
   // fix 当没有传递unitPrice字段时 自动容错， 单价显示为0
   record.unitPrice = record.unitPrice || record.price || 0
   if (typeof record.unitPrice === 'number') {
@@ -20,8 +21,8 @@ export const getUnitPriceTotal = (record) => {
       unitPrice = Number(value)
       return false
     }
-    if (purchaseCount >= min && purchaseCount <= max) {
-      // 处于该区间
+    if ((purchaseCount >= min && purchaseCount <= max) || (purchaseCount > max)) {
+      // 处于该区间或者大于该区间
       unitPrice = Number(value)
       return false
     }