Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/global.less

@@ -10,12 +10,6 @@ body,
   filter: invert(80%);
 }
 
-.ant-layout {
-  min-height: 100vh;
-  background-color: #f8f8f8;
-  height: fit-content;
-}
-
 canvas {
   display: block;
 }
@@ -191,3 +185,10 @@ ol {
     border-top:none;
   }
 }
+:global {
+  .ant-layout {
+    min-height: 100vh;
+    background-color: #f8f8f8;
+    height: fit-content;
+  }  
+}

src/pages/customer/customerlist/components/BatchAssistConsultant.jsx

@@ -96,7 +96,7 @@ class ModalAttribution extends React.Component {
   // 提交
   submitGm(record) {
     // 网路请求
-    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, personIds: this.state.visibleData.customerId } }).then(res => {
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, customerIds: this.state.visibleData.customerId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()

src/pages/statistical/consultant/index.jsx

@@ -400,6 +400,7 @@ function record(props) {
     ]
     const list = data.records
     const _list = list && list.length > 0 ? [totalRow, ...list] : [];
+    let row = 0
     return (
 
         <>
@@ -454,7 +455,7 @@ function record(props) {
                     导出
                 </Button>
             </AuthButton>
-            <Table rowKey={(index => { index })}
+            <Table rowKey={record => data.current * data.size + (row++)}
                 style={{ marginTop: '30px' }}
                 dataSource={_list}
                 // dataSource={data.records}