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

src/pages/procurement/tender/readyAddTender/schema/index.ts

@@ -8,7 +8,7 @@ export const tableListSchema: ISchema = {
       type: 'string',
       "x-component": 'SearchFilter',
       'x-component-props': {
-        placeholder: '请输入招标编号',
+        placeholder: '请输入投标编号',
         align: 'flex-end',
       },
     },

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

@@ -193,7 +193,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       dataIndex: 'logisticsNo',
       align: 'center',
       key: 'logisticsNo',
-      render: text => <a target="blank" href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`}>{text}</a>
+      // render: text => <a target="blank" href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${text}`}>{text}</a>
     },
     {
       title: '物流公司',

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

@@ -77,20 +77,22 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
   return (
     <>
     <Row style={{ marginTop: 24 }} gutter={24}>
-      <Col span={12}>
+      <Col span={(data.externalStateName !== '不接受订单') || (data.orderModel > 30) ? 15 : 12}>
         <MellowCard title='交易信息' fullHeight>
           <RenderCard infoList={payInfo} dataSource={data} />
         </MellowCard>
       </Col>
-      <Col span={6}>
+      <Col span={(data.externalStateName !== '不接受订单') || (data.orderModel > 30) ? 9: 6}>
         <MellowCard title='其他信息' fullHeight>
           <RenderCard infoList={otherInfo} dataSource={data} />
         </MellowCard>
       </Col>
-      <Col span={6}>
-        <MellowCard title='电子合同' fullHeight>
-          {
-            data.externalStateName !== '不接受订单' ?
+      {
+        (data.externalStateName !== '不接受订单') || (data.orderModel > 30) ?
+        null
+        :
+        <Col span={6}>
+          <MellowCard title='电子合同' fullHeight>
             <ContractList
               dataSource={
                 data.electronicContractUrl ?
@@ -103,11 +105,9 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
                   null
               }
             />
-            :
-            null
-          }
-        </MellowCard>
-      </Col>
+          </MellowCard>
+        </Col>
+      }
     </Row>
     <Modal title="发票信息" visible={isModalVisible} onOk={()=>setIsModalVisible(false)} onCancel={()=>setIsModalVisible(false)}>
       <Row gutter={[0 ,10]} style={{fontSize: 14}}>

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

@@ -335,7 +335,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
       dataIndex: 'taxRate',
       align: 'center',
       key: 'taxRate',
-      render: (t, r) => `${t}%`
+      render: (t, r) => t ? `${t}%` : null
     },
     {
       title: creditsCommodity ? '所需积分小计' : '金额',
@@ -431,7 +431,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
       dataIndex: 'taxRate',
       align: 'center',
       key: 'taxRate',
-      render: (t, r) => `${t}%`
+      render: (t, r) => t ? `${t}%` : null
     },
     {
       title: '金额',

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

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

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

@@ -34,7 +34,7 @@ export const procurementRenderField = (_orderProductRequests) => {
       relevanceProductBrand: item.brand,
       relevanceProductCategory: item.category,
       logistics: item.logistics.deliveryType,
-      id: item.materialId,
+      // id: item.materialId,
       code: item.materialCode,
       name: item.materialName,
       type: item.materialType,
@@ -62,7 +62,7 @@ export const procurementProcessField = (value) => {
       // @todo 后端暂无返回 写死1
       minOrder: 1,
       // 物料信息
-      materialId: item.id,
+      // materialId: item.id,
       materialCode: item.code,
       materialName: item.name,
       materialType: item.type,
@@ -450,7 +450,7 @@ export const productInfoColumns: any[] = [
     dataIndex: 'taxRate',
     align: 'center',
     key: 'taxRate',
-    render: (t, r) => `${t}%`
+    render: (t, r) => t ? `${t}%` : null
   },
   {
     title: '金额',
@@ -491,6 +491,13 @@ export const materialInfoColumns: any[] = [
     className: 'commonHide'
   },
   {
+    title: '物料ID',
+    dataIndex: 'materialId',
+    align: 'center',
+    key: 'materialId',
+    className: 'commonHide'
+  },
+  {
     title: '物料编号',
     dataIndex: 'code',
     align: 'center',
@@ -561,7 +568,7 @@ export const materialInfoColumns: any[] = [
     dataIndex: 'taxRate',
     align: 'center',
     key: 'taxRate',
-    render: (t, r) => `${t}%`
+    render: (t, r) => t ? `${t}%` : null
   },
   {
     title: '金额',

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

@@ -109,6 +109,8 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
   }
 
   const handleSave = row => {
+    const { pageStatus } = usePageStatus()
+
     return new Promise((resolve, reject) => {
       const newData = [...ctx.getFieldValue('orderProductRequests')];
       const index = newData.findIndex(item => row.id === item.id);
@@ -120,7 +122,7 @@ export const useMaterialTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActio
         addModel === OrderModalType["HAND_ORDER"] ||
         addModel === OrderModalType["CHANNEL_DIRECT_MINING_ORDER"] ||
         addModel === OrderModalType["CHANNEL_SPOT_MANUAL_ORDER"]
-      ) ? row.id : row.productId
+      ) && (pageStatus === PageStatus.ADD) ? row.id : row.productId
       newData.splice(index, 1, {
         ...item,
         ...row,

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

@@ -169,6 +169,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
   }
 
   const handleSave = row => {
+    const { pageStatus } = usePageStatus()
     // 商品采购数量变动 清空之前的支付信息
     if (pageStatus === PageStatus.ADD) {
       ctx.setFieldValue('paymentInformationResponses', [])
@@ -184,7 +185,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
         addModel === OrderModalType["HAND_ORDER"] ||
         addModel === OrderModalType["CHANNEL_DIRECT_MINING_ORDER"] ||
         addModel === OrderModalType["CHANNEL_SPOT_MANUAL_ORDER"]
-      ) ? row.id : row.productId
+      ) && (pageStatus === PageStatus.ADD) ? row.id : row.productId
       newData.splice(index, 1, {
         ...item,
         ...row,