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

src/global/styles/reset.less

@@ -256,15 +256,17 @@
   }
 
   // 处理高级筛选input和search按钮不对齐问题、search按钮背景
-  .ant-input-search {
-    .ant-input-group {
-      .ant-input {
-        padding: 6px;
+  .god-standard-table {
+    .ant-input-search {
+      .ant-input-group {
+        .ant-input {
+          padding: 6px;
+        }
       }
-    }
-    .ant-input-group-addon {
-      .ant-input-search-button {
-        background-color: #F7F8FA;
+      .ant-input-group-addon {
+        .ant-input-search-button {
+          background-color: #F7F8FA;
+        }
       }
     }
   }

src/pages/member/memberUpgradeRule/index.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { 
   Card, 
   Button, 
-  message, 
+  Tooltip,
 } from 'antd';
 import { PublicApi } from '@/services/api';
 import { VIP_RULE_TRANSACTION, VIP_RULE_LOGIN, VIP_RULE_COMMENT } from '@/constants/member';
@@ -45,29 +45,32 @@ const MemberUpgradeRule: React.FC<[]> = () => {
       title: 'ID',
       dataIndex: 'id',
       align: 'center',
+      width: '15%',
     },
     {
       title: '升级规则',
       dataIndex: 'ruleName',
       align: 'center',
+      width: '15%',
     },
     {
       title: '升级规则说明',
       dataIndex: 'remark',
       align: 'center',
       ellipsis: true, 
-      render: text => <span title={text}>{text}</span>, 
+      render: text => <Tooltip title={text}>{text}</Tooltip>, 
     },
     {
       title: '适用会员等级类型',
       dataIndex: 'levelTypeName',
       align: 'center',
+      width: '15%',
     },
     {
       title: '可获取的分值',
       dataIndex: 'score',
       align: 'center',
-      width: '30%',
+      width: '15%',
       editable: true, 
     },
   ];

src/pages/procurement/callForBids/addRemarkBidExpert/index.tsx

@@ -84,7 +84,7 @@ const AddRemarkBidExpert:React.FC<AddRemarkBidExpertProps> = (props) => {
 
   const fetchData = (params: any) => {
     return new Promise((resolve, reject) => {
-      PublicApi.getMemberUserPage({ ...params, status: 1 }).then(res => {
+      PublicApi.getMemberManageUsersPage({ ...params, status: 1 }).then(res => {
         resolve(res.data)
       })
     })
@@ -114,8 +114,8 @@ const AddRemarkBidExpert:React.FC<AddRemarkBidExpertProps> = (props) => {
     },
     {
       title: '职位',
-      dataIndex: 'roleName',
-      key: 'roleName',
+      dataIndex: 'jobTitle',
+      key: 'jobTitle',
     },
   ]
 

src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/index.tsx

@@ -59,7 +59,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
       /** 组合table所需data */
       let tempData: any = []
       // 只需取一个投标会员的物料项 决定table的行数
-      _memberList[0].submitTender.submitTenderMateriel.forEach((item, index) => {
+      _memberList[0]?.submitTender && _memberList[0].submitTender.submitTenderMateriel.forEach((item, index) => {
         tempData.push({
           inviteTenderMateriel: item.inviteTenderMateriel,
           count: item.inviteTenderMateriel.count,

src/pages/procurement/tender/addTender/components/relateProductDrawer/index.tsx

@@ -201,7 +201,8 @@ export const RelevanceTenderProduct: React.FC<RelateProductDrawerProps> = ({
             if(item => item.id === currentMaterial[0]['id']) {
               item.file = v['file']
               item.commodityId = selectRow[0]['id']
-              item.productId = selectRow[0]['commodityId']
+              item.commoditySkuId = selectRow[0]['commodityId']
+              // item.commodityId = selectRow[0]['commodityId']
             }
             return item
           })

src/pages/procurement/tender/addTender/index.tsx

@@ -110,7 +110,8 @@ const AddTender:React.FC<AddTenderProps> = (props) => {
         })
       }
       // 校验是否关联商品
-      if(!params.submitTenderMateriel.some(v => v.productId && v.commodityId)) {
+      if(!params.submitTenderMateriel.some(v => v.commoditySkuId && v.commodityId)) {
+      // if(!params.submitTenderMateriel.some(v => v.commodityId)) {
         setBtnLoading(false)
         return message.error('请先关联投标商品')
       }

src/pages/procurement/tender/addTender/model/useProductTable.tsx

@@ -97,7 +97,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
 
   const renderDescription = async (record) => {
     // 商品信息
-    let res = await PublicApi.getProductCommodityGetCommodity({id: record.productId})
+    let res = await PublicApi.getProductCommodityGetCommodity({id: record.commoditySkuId})
     // 商品规格信息
     let spec = await PublicApi.getProductCommodityGetCommodityAttributeByUnitPriceAndPicId({ unitPriceAndPicId: record.commodityId })
     const { code , data } = res
@@ -123,7 +123,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
             <div className={style.childrenContent}>
               <p><span>规格型号:</span>
               {
-                spec.data.length && spec.data.map(item => item.customerAttributeValueList[0].value).join('/')
+                spec.data.length ? spec.data.map(item => item.customerAttributeValueList[0].value).join('/') : null
               }
               </p>
               <p><span>品类:</span>{data.customerCategory.fullName}</p>

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

@@ -89,18 +89,23 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
       </Col>
       <Col span={6}>
         <MellowCard title='电子合同' fullHeight>
-          <ContractList
-            dataSource={
-              data.electronicContractUrl ?
-                [
-                  {
-                    electronicContractUrl: data.electronicContractUrl,
-                    electronicContractName: data.electronicContractName,
-                  },
-                ] :
-                null
-            }
-          />
+          {
+            data.externalStateName !== '不接受订单' ?
+            <ContractList
+              dataSource={
+                data.electronicContractUrl ?
+                  [
+                    {
+                      electronicContractUrl: data.electronicContractUrl,
+                      electronicContractName: data.electronicContractName,
+                    },
+                  ] :
+                  null
+              }
+            />
+            :
+            null
+          }
         </MellowCard>
       </Col>
     </Row>

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

@@ -332,7 +332,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
       id: Number(id),
       paymentInformationId: PayInfoObj.id,
       // 大于100为账期月结 id固定为-1
-      payTypeId: checked.id >= 100 && -1,
+      payTypeId: checked.id >= 100 ? -1 : checked.id,
       payType: checked.channel,
     }
 

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

@@ -325,10 +325,17 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
     },
     {
       title: '含税',
-      dataIndex: 'none',
+      dataIndex: 'taxInclusive',
       align: 'center',
-      key: 'none',
-      render: () => '是'
+      key: 'taxInclusive',
+      render: (t, r) => t ? '是' : '否'
+    },
+    {
+      title: '税率',
+      dataIndex: 'taxRate',
+      align: 'center',
+      key: 'taxRate',
+      render: (t, r) => `${t}%`
     },
     {
       title: creditsCommodity ? '所需积分小计' : '金额',
@@ -424,6 +431,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
       dataIndex: 'taxRate',
       align: 'center',
       key: 'taxRate',
+      render: (t, r) => `${t}%`
     },
     {
       title: '金额',

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

@@ -537,6 +537,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       dataIndex: 'taxRate',
       align: 'center',
       key: 'taxRate',
+      render: (t, r) => `${t}%`
     },
     {
       title: '金额',

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

@@ -440,10 +440,17 @@ export const productInfoColumns: any[] = [
   },
   {
     title: '含税',
-    dataIndex: 'none',
+    dataIndex: 'taxInclusive',
     align: 'center',
-    key: 'none',
-    render: () => '是'
+    key: 'taxInclusive',
+    render: (t, r) => r.taxRate ? '是' : '否'
+  },
+  {
+    title: '税率',
+    dataIndex: 'taxRate',
+    align: 'center',
+    key: 'taxRate',
+    render: (t, r) => `${t}%`
   },
   {
     title: '金额',
@@ -554,6 +561,7 @@ export const materialInfoColumns: any[] = [
     dataIndex: 'taxRate',
     align: 'center',
     key: 'taxRate',
+    render: (t, r) => `${t}%`
   },
   {
     title: '金额',