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

src/global/styles/reset.less

@@ -268,6 +268,12 @@
           background-color: #F7F8FA;
         }
       }
+      .ant-input-affix-wrapper{
+        padding: 0;
+        .ant-input-suffix{
+          margin-right: 11px;
+        }
+      }
     }
   }
   // 处理因为antd版本不同导致anchor的背景色不同

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

@@ -62,9 +62,10 @@ const Table: React.FC<Iprops> = (props: any) => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<Array<number>>([]);
   const rowSelection = {
     selectedRowKeys: selectedRowKeys,
-    onChange: (selectedRowKeys: any, selectedRows: any) => {
-      fetchRowkeys(selectedRowKeys)
-      setSelectedRowKeys(selectedRowKeys);
+    onChange: (rowKeys: any) => {
+      console.log(rowKeys, 98)
+      fetchRowkeys(rowKeys)
+      setSelectedRowKeys(rowKeys);
     },
   }
 
@@ -108,7 +109,9 @@ const Table: React.FC<Iprops> = (props: any) => {
           controlRender={
             <NiceForm
               actions={formActions}
-              expressionScope={{ controllerBtns }}
+              components={{
+                controllerBtns: () => controllerBtns,
+              }}
               onSubmit={values => search(values)}
               effects={($, actions) => {
                 useStateFilterSearchLinkageEffect($, actions, effects, FORM_FILTER_PATH)

src/pages/transaction/components/detailLayout/components/recordLyout/index.tsx

@@ -23,7 +23,7 @@ export interface ProgressProps {
 const RecordLayout: React.FC<ProgressProps> = (props: any) => {
   const { logstate } = props;
   const context = useContext(Context);
-  const [logStatus, setLogStatus] = useState<number>(logstate || LOGSTATESTYPE.EXTERNALSTATES);
+  const [logStatus, setLogStatus] = useState<number>(context.externalLogs ? LOGSTATESTYPE.EXTERNALSTATES : LOGSTATESTYPE.INTERIORSTATES );
 
   return (
     <Card
@@ -32,10 +32,12 @@ const RecordLayout: React.FC<ProgressProps> = (props: any) => {
       extra={
         <Radio.Group
           onChange={(e) => setLogStatus(e.target.value)}
-          defaultValue={logStatus}
+          defaultValue={context.externalLogs ? LOGSTATESTYPE.EXTERNALSTATES : LOGSTATESTYPE.INTERIORSTATES}
         >
-          {context.externalLogs && <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>外部流转</Radio.Button>}
-          {context.interiorLogs && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>内部流转</Radio.Button>}
+          {/* {context.externalLogs && <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>外部流转</Radio.Button>}
+          {context.interiorLogs && <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>内部流转</Radio.Button>} */}
+          <Radio.Button value={LOGSTATESTYPE.EXTERNALSTATES}>外部流转</Radio.Button>
+          <Radio.Button value={LOGSTATESTYPE.INTERIORSTATES}>内部流转</Radio.Button>
         </Radio.Group>
       }
     >

src/pages/transaction/dealAbility/confirmOffer/offerSearch/schema.ts

@@ -53,7 +53,7 @@ export const OFFERSEARCHSCHEMA: ISchema = {
             memberName: {
               type: "string",
               "x-component-props": {
-                placeholder: "询价会员"
+                placeholder: "报价会员"
               }
             },
             details: {

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryOne/schema.ts

@@ -13,10 +13,7 @@ export const WAITAUDITINQUIRYONESCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/confirmOffer/waitAuditInquiryTwo/schema.ts

@@ -13,10 +13,7 @@ export const WAITAUDITINQUIRYTWOSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/confirmOffer/waitSubmitAuditOffer/schema.ts

@@ -13,10 +13,7 @@ export const WAITSUBMITAUDITOFFERSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/confirmOffer/waitSubmitOffer/schema.ts

@@ -13,10 +13,7 @@ export const WAITSUBMITOFFERSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/inquiryOffer/waitAddOffer/schema.ts

@@ -13,10 +13,7 @@ export const WAITADDOFFERSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferOne/schema.ts

@@ -13,10 +13,7 @@ export const WAITAUDITOFFERONESCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/inquiryOffer/waitAuditOfferTwo/schema.ts

@@ -13,10 +13,7 @@ export const WAITADUITOFFERTWOSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/inquiryOffer/waitSubmitOffer/schema.ts

@@ -13,10 +13,7 @@ export const WAITSUBMITOFFERSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         quotationNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/productInquiry/inquirySearch/schema.ts

@@ -42,6 +42,12 @@ export const INQUIRYSEARCHSCHEMA: ISchema = {
             inline: true
           },
           properties: {
+            details: {
+              type: "string",
+              "x-component-props": {
+                placeholder: "被询价会员"
+              }
+            },
             memberName: {
               type: "string",
               "x-component-props": {

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/index.tsx

@@ -5,8 +5,8 @@ import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import moment from 'moment'
 import { PublicApi } from '@/services/api';
-import { Row, Col, Space, Button, Dropdown, Menu, Tag, Badge, Popconfirm, Typography } from 'antd';
-import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons';
+import { Row, Col, Space, Button, Tag, Badge, Popconfirm, Typography } from 'antd';
+import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { WAITADDINQURYSCHEMA } from './schema';
 import { EXTERNALSTATE_COLOR, INTERNALSTATE_COLOR } from '@/pages/transaction/components/stateColor';
 
@@ -17,8 +17,8 @@ const WaitAddInquiry = () => {
     return <>{moment(text).format(fmt || "YYYY-MM-DD HH:mm:ss")}</>
   }
 
-  const [rowkeys, setRowKeys] = useState<Array<number>>([]);
-
+  const [rowkeys, setRowKeys] = useState<any>([]);
+  console.log(rowkeys)
   /** 批量审核 */
   const fetchSubmitBatch = async (id?: number) => {
     let res = null;
@@ -164,20 +164,13 @@ const WaitAddInquiry = () => {
               >
                 批量提交审核
               </Button>
-              <Dropdown.Button
+              <Button
+                icon={<DeleteOutlined />}
+                onClick={() => fetchDeleteBatch()}
                 disabled={rowkeys.length === 0}
-                trigger={['click']}
-                overlay={
-                  <Menu onClick={() => fetchDeleteBatch()}>
-                    <Menu.Item key='1' icon={<DeleteOutlined />}>
-                      批量删除
-                    </Menu.Item>
-                  </Menu>
-                }
-                icon={<DownOutlined />}
               >
-                更多
-              </Dropdown.Button>
+                批量删除
+              </Button>
             </Space>
           </Col>
         </Row>

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/schema.ts

@@ -13,10 +13,7 @@ export const WAITADDINQURYSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         inquiryListNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryOne/schema.ts

@@ -13,10 +13,7 @@ export const WAITAUDITINQUIRYONESCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         inquiryListNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/productInquiry/waitAuditInquiryTwo/schema.ts

@@ -13,10 +13,7 @@ export const WAITAUDITINQUIRYTWOSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         inquiryListNo: {//报价单号
           type: "string",

src/pages/transaction/dealAbility/productInquiry/waitSubmitInquiry/schema.ts

@@ -13,10 +13,7 @@ export const WAITSUBMITINQUIRYSCHEMA: ISchema = {
       properties: {
         ctl: {
           type: "object",
-          "x-component": "Children",
-          "x-component-props": {
-            children: "{{controllerBtns}}"
-          }
+          "x-component": "controllerBtns",
         },
         inquiryListNo: {//报价单号
           type: "string",

src/pages/transaction/logisticsAbility/logisticsBillManage/detail/index.tsx

@@ -70,8 +70,8 @@ const LogisticsBillManageDetail = () => {
     setFreightEffect([
       {
         col: [
-          { label: '含税/税率', extra: `${data.taxInclusive}/${data.taxRate}` },
-          { label: '运费', extra: `￥${data.freightPrice && data.freightPrice.toFixed(2)}` },
+          { label: '含税/税率', extra: `${data.taxInclusive ? '是' : '-'}/${data.taxRate ? data.taxRate : '-'}` },
+          { label: '运费', extra: `￥${data.freightPrice ? Number(data.freightPrice).toFixed(2) : '-' }` },
           { label: '结算方式', extra: data.settlementWay },
         ]
       },
@@ -156,6 +156,15 @@ const LogisticsBillManageDetail = () => {
     fetchData();
   }, [])
 
+  const handleConfirm = (value) => {
+    const params = { ...dataSource }
+    params.taxInclusive = 1;
+    params.taxRate = value.taxRate;
+    params.freightPrice = value.freightPrice;
+    handleFreightEffect(params);
+    setFreightVisible(false);
+  }
+
   return (
     <Context.Provider value={dataSource}>
       <PeripheralLayout
@@ -206,7 +215,12 @@ const LogisticsBillManageDetail = () => {
           </Fragment>
         }
       />
-      <FreightEdit visible={freightVisible} />
+      <FreightEdit
+        visible={freightVisible}
+        effect={dataSource}
+        onClose={() => setFreightVisible(false)}
+        onConfirm={handleConfirm}
+      />
     </Context.Provider>
   )
 }

src/pages/transaction/logisticsAbility/logisticsBillManage/freightEdit/index.tsx

@@ -3,35 +3,49 @@ import { Modal, Form, Input, Checkbox } from 'antd';
 
 interface FreightEditProps {
   /** 显示隐藏 */
-  visible: boolean
+  visible: boolean,
+  /** 回显数据 */
+  effect?: any,
+  /** 关闭 */
+  onClose?: () => void,
+  /** 确定 */
+  onConfirm?: (e: any) => void,
 }
 
 const FreightEdit: React.FC<FreightEditProps> = (props: any) => {
-  const { visible } = props;
+  const { visible, onClose, effect, onConfirm } = props;
+  const [form] = Form.useForm<any>();
+  const handleSubmit = async () => {
+    await form.validateFields().then(res => {
+      onConfirm(res)
+    })
+  }
   return (
     <Modal
       visible={visible}
+      onCancel={onClose}
+      onOk={handleSubmit}
     >
-      <Form layout="vertical">
-        <Form.Item label="是否含税">
-          <Checkbox checked>是</Checkbox>
+      <Form layout="vertical" form={form}>
+        <Form.Item label="是否含税" required name='taxInclusive'>
+          <Checkbox checked value={1}>是</Checkbox>
         </Form.Item>
-        <Form.Item label="税率">
+        <Form.Item label="税率" name="taxRate" rules={[{ required: true, message: '请输入税率' }]} initialValue={effect.taxRate}>
           <Input
             type='number'
-            addonAfter='%'
+            addonAfter={<div style={{ width: 40 }}>%</div>}
             maxLength={25}
           />
         </Form.Item>
-        <Form.Item label="运费">
+        <Form.Item label="运费" name="freightPrice" rules={[{ required: true, message: '请输入运费' }]} initialValue={effect.freightPrice}>
           <Input
             type='number'
-            addonBefore="¥"
+            addonBefore={<div style={{ width: 40 }}>￥</div>}
             maxLength={25}
           />
         </Form.Item>
-        <Form.Item label="结算方式">
-          <Input />
+        <Form.Item label="结算方式" name="settlement" required initialValue={effect.settlementWay}>
+          <Input disabled />
         </Form.Item>
       </Form>
     </Modal>

src/pages/transaction/purchaseAbility/purchasDoor/purchasSeo/add.tsx

@@ -32,10 +32,10 @@ const PurchasSeoAdded = () => {
     form.validateFields().then((value: any) => {
       const type: number = value.type;
       const link: string = value.link;
+
       const params = {
         id,
         ...value,
-        link: `http://${link}`,
         doorType: DOORTYPE.PROCUREMENT_DOORTYPE,
         name: SELECT_NAME[type]
       }

src/pages/transaction/purchaseAbility/purchasDoor/purchasSeo/index.tsx

@@ -53,6 +53,7 @@ const PurchasSeo = () => {
       title: '访问链接',
       key: 'link',
       dataIndex: 'link',
+      render: (text) => `http://${text}`
     },
     {
       title: '状态',

src/pages/transaction/purchaseAbility/schema/onlineBid.ts

@@ -12,12 +12,10 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
                 biddingNo: {
                     type: 'string',
                     "x-component": "Search",
-                    "x-mega-props": {
-
-                    },
                     "x-component-props": {
                         placeholder: '竞价单号',
                         align: 'flex-left',
+                        allowClear: true
                     }
                 }
             }
@@ -49,12 +47,14 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
                             type: 'string',
                             "x-component-props": {
                                 placeholder: '竞价单摘要',
+                                allowClear: true
                             }
                         },
                         memberName: {
                             type: 'string',
                             "x-component-props": {
                                 placeholder: '采购会员',
+                                allowClear: true
                             }
                         },
                         "[startTime,endTime]": {
@@ -62,6 +62,7 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
                             "x-component": "dateSelect",
                             "x-component-props": {
                                 placeholder: '报名开始时间',
+                                allowClear: true
                             }
                         },
                         externalState: {
@@ -70,7 +71,8 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
                                 placeholder: '外部状态',
                                 style: {
                                     width: 160
-                                }
+                                },
+                                allowClear: true
                             },
                             enum: []
                         },
@@ -80,7 +82,8 @@ export const ONLINEBIDORDER_SCHEMA: ISchema = {
                                 placeholder: '内部状态',
                                 style: {
                                     width: 160
-                                }
+                                },
+                                allowClear: true
                             },
                             enum: []
                         },
@@ -114,12 +117,10 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
                 biddingNo: {
                     type: 'string',
                     "x-component": "Search",
-                    "x-mega-props": {
-
-                    },
                     "x-component-props": {
                         align: 'flex-left',
-                        placeholder: '竞价单号'
+                        placeholder: '竞价单号',
+                        allowClear: true
                     }
                 }
             }
@@ -150,13 +151,15 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
                         details: {
                             type: 'string',
                             "x-component-props": {
-                                placeholder: '竞价单摘要'
+                                placeholder: '竞价单摘要',
+                                allowClear: true
                             }
                         },
                         memberName: {
                             type: 'string',
                             "x-component-props": {
                                 placeholder: '采购会员',
+                                allowClear: true
                             }
                         },
                         "[startTime,endTime]": {
@@ -164,6 +167,7 @@ export const ONLINEBIDREADYSIGN_SCHEMA: ISchema = {
                             "x-component": "dateSelect",
                             "x-component-props": {
                                 placeholder: '报名开始时间',
+                                allowClear: true
                             }
                         },
                     }
@@ -196,12 +200,10 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
                 biddingNo: {
                     type: 'string',
                     "x-component": "Search",
-                    "x-mega-props": {
-
-                    },
                     "x-component-props": {
                         align: 'flex-left',
-                        placeholder: '竞价单号'
+                        placeholder: '竞价单号',
+                        allowClear: true
                     }
                 }
             }
@@ -232,13 +234,15 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
                         details: {
                             type: 'string',
                             "x-component-props": {
-                                placeholder: '竞价单摘要'
+                                placeholder: '竞价单摘要',
+                                allowClear: true
                             }
                         },
                         memberName: {
                             type: 'string',
                             "x-component-props": {
                                 placeholder: '采购会员',
+                                allowClear: true
                             }
                         },
                         "[startTime,endTime]": {
@@ -246,6 +250,7 @@ export const ONLINEBIDREADYBID_SCHEMA: ISchema = {
                             "x-component": "dateSelect",
                             "x-component-props": {
                                 placeholder: '竞价开始时间',
+                                allowClear: true
                             }
                         },
                     }

src/pages/transaction/purchaseAbility/schema/purchaseBid.ts

@@ -12,12 +12,10 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
         biddingNo: {
           type: 'string',
           "x-component": "Search",
-          "x-mega-props": {
-
-          },
           "x-component-props": {
             placeholder: '竞价单号',
             align: 'flex-left',
+            allowClear: true
           }
         }
       }
@@ -49,6 +47,7 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
               type: 'string',
               "x-component-props": {
                 placeholder: '竞价单摘要',
+                allowClear: true
               }
             },
             "[startTime,endTime]": {
@@ -56,6 +55,7 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
               "x-component": "dateSelect",
               "x-component-props": {
                 placeholder: '单据时间（全部）',
+                allowClear: true
               }
             },
             externalState: {
@@ -64,7 +64,8 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
                 placeholder: '外部状态',
                 style: {
                   width: 160
-                }
+                },
+                allowClear: true
               },
               enum: []
             },
@@ -74,7 +75,8 @@ export const PURCHASEBIDORDER_SCHEMA: ISchema = {
                 placeholder: '内部状态',
                 style: {
                   width: 160
-                }
+                },
+                allowClear: true
               },
               enum: []
             },
@@ -119,7 +121,8 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
 
           },
           "x-component-props": {
-            placeholder: '竞价单号'
+            placeholder: '竞价单号',
+            allowClear: true
           }
         }
       }
@@ -149,7 +152,8 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
             details: {
               type: 'string',
               "x-component-props": {
-                placeholder: '竞价单摘要'
+                placeholder: '竞价单摘要',
+                allowClear: true
               }
             },
             "[startTime,endTime]": {
@@ -157,6 +161,7 @@ export const PURCHASEBIDREADYADD_SCHEMA: ISchema = {
               "x-component": "dateSelect",
               "x-component-props": {
                 placeholder: '单据时间（全部）',
+                allowClear: true
               }
             },
           }
@@ -186,12 +191,10 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
         biddingNo: {
           type: 'string',
           "x-component": "Search",
-          "x-mega-props": {
-
-          },
           "x-component-props": {
             placeholder: '竞价单号',
             align: 'flex-left',
+            allowClear: true
           }
         }
       }
@@ -223,6 +226,7 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
               type: 'string',
               "x-component-props": {
                 placeholder: '竞价单摘要',
+                allowClear: true
               }
             },
             "[startTime,endTime]": {
@@ -230,6 +234,7 @@ export const PURCHASEBIDOSIGNUP_SCHEMA: ISchema = {
               "x-component": "dateSelect",
               "x-component-props": {
                 placeholder: '单据时间（全部）',
+                allowClear: true
               }
             },
           }