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

src/pages/member/memberPr1/index.tsx

@@ -204,7 +204,7 @@ const MemberPr1: React.FC<{}> = props => {
     return {};
   };
 
-  const controllerBtns = (
+  const ControllerBtns = () => (
     <Space>
       <Button onClick={handleBatch}>
         批量审核通过
@@ -226,8 +226,8 @@ const MemberPr1: React.FC<{}> = props => {
           <NiceForm
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
-            expressionScope={{
-              controllerBtns,
+            components={{
+              ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/memberPr2/index.tsx

@@ -204,7 +204,7 @@ const MemberPr2: React.FC<{}> = props => {
     return {};
   };
 
-  const controllerBtns = (
+  const ControllerBtns = () => (
     <Space>
       <Button onClick={handleBatch}>
         批量审核通过
@@ -226,8 +226,8 @@ const MemberPr2: React.FC<{}> = props => {
           <NiceForm
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
-            expressionScope={{
-              controllerBtns,
+            components={{
+              ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/memberPrConfirm/index.tsx

@@ -221,7 +221,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
     return {};
   };
 
-  const controllerBtns = (
+  const ControllerBtns = () => (
     <Space>
       <Button onClick={handleBatch}>
         批量确认审核通过
@@ -243,8 +243,8 @@ const MemberPrConfirm: React.FC<{}> = props => {
           <NiceForm
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
-            expressionScope={{
-              controllerBtns,
+            components={{
+              ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/memberPrConfirm/schema/index.ts

@@ -24,10 +24,7 @@ export const auditSchema: ISchema = {
           properties: {
             ctl: {
               type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
+              'x-component': 'ControllerBtns',
             },
             name: {
               type: 'string',

src/pages/member/memberPrSubmit/index.tsx

@@ -214,7 +214,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
     return {};
   };
 
-  const controllerBtns = (
+  const ControllerBtns = () => (
     <Space>
       <Button onClick={handleBatch}>
         批量审核通过
@@ -236,8 +236,8 @@ const MemberPrSubmit: React.FC<{}> = props => {
           <NiceForm
             actions={formActions}
             onSubmit={values => ref.current.reload(values)}
-            expressionScope={{
-              controllerBtns,
+            components={{
+              ControllerBtns,
             }}
             effects={($, actions) => {
               useStateFilterSearchLinkageEffect(

src/pages/member/schema/auditSchema.ts

@@ -17,10 +17,7 @@ export const auditSchema: ISchema = {
           properties: {
             ctl: {
               type: 'object',
-              'x-component': 'Children',
-              'x-component-props': {
-                children: '{{controllerBtns}}',
-              },
+              'x-component': 'ControllerBtns',
             },
             name: {
               type: 'string',

src/pages/orderSystem/orderDetail/components/orderMergeInfo/index.tsx

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

src/pages/purchaseAbility/schema/purchaseBid.ts

@@ -12,12 +12,10 @@ export const PurchaseBidSearchSchema: ISchema = {
         biddingNo: {
           type: 'string',
           "x-component": "Search",
-          "x-mega-props": {
-
-          },
           "x-component-props": {
             placeholder: '竞价单号',
             align: 'flex-left',
+            allowClear: true
           }
         }
       }
@@ -50,18 +48,24 @@ export const PurchaseBidSearchSchema: ISchema = {
               "x-component": "dateSelect",
               "x-component-props": {
                 placeholder: '单据时间（全部）',
+                allowClear: true
               }
             },
             memberName: {
               type: 'string',
               "x-component-props": {
-                placeholder: '采购会员'
+                placeholder: '采购会员',
+                allowClear: true
               }
             },
             externalState: {
               type: 'string',
               "x-component-props": {
-                placeholder: '外部状态'
+                placeholder: '外部状态',
+                allowClear: true,
+                style: {
+                  width: 160
+                }
               },
               enum: []
             },
@@ -102,11 +106,9 @@ export const PurchaseBidExamineSearchSchema: ISchema = {
         biddingNo: {
           type: 'string',
           "x-component": "Search",
-          "x-mega-props": {
-
-          },
           "x-component-props": {
             placeholder: '竞价单号',
+            allowClear: true
           }
         }
       }
@@ -138,12 +140,14 @@ export const PurchaseBidExamineSearchSchema: ISchema = {
               "x-component": "dateSelect",
               "x-component-props": {
                 placeholder: '单据时间（全部）',
+                allowClear: true
               }
             },
             memberName: {
               type: 'string',
               "x-component-props": {
-                placeholder: '采购会员'
+                placeholder: '采购会员',
+                allowClear: true
               }
             },
           }