Przeglądaj źródła

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

魏超 5 lat temu
rodzic
commit
163827cf29

+ 7
- 6
src/global.less Wyświetl plik

10
   filter: invert(80%);
10
   filter: invert(80%);
11
 }
11
 }
12
 
12
 
13
-.ant-layout {
14
-  min-height: 100vh;
15
-  background-color: #f8f8f8;
16
-  height: fit-content;
17
-}
18
-
19
 canvas {
13
 canvas {
20
   display: block;
14
   display: block;
21
 }
15
 }
191
     border-top:none;
185
     border-top:none;
192
   }
186
   }
193
 }
187
 }
188
+:global {
189
+  .ant-layout {
190
+    min-height: 100vh;
191
+    background-color: #f8f8f8;
192
+    height: fit-content;
193
+  }  
194
+}

+ 1
- 1
src/pages/customer/customerlist/components/BatchAssistConsultant.jsx Wyświetl plik

96
   // 提交
96
   // 提交
97
   submitGm(record) {
97
   submitGm(record) {
98
     // 网路请求
98
     // 网路请求
99
-    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, personIds: this.state.visibleData.customerId } }).then(res => {
99
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, customerIds: this.state.visibleData.customerId } }).then(res => {
100
       // eslint-disable-next-line no-unused-expressions
100
       // eslint-disable-next-line no-unused-expressions
101
       this.openNotificationWithIcon('success', '操作成功')
101
       this.openNotificationWithIcon('success', '操作成功')
102
       this.handleCancel()
102
       this.handleCancel()

+ 2
- 1
src/pages/statistical/consultant/index.jsx Wyświetl plik

400
     ]
400
     ]
401
     const list = data.records
401
     const list = data.records
402
     const _list = list && list.length > 0 ? [totalRow, ...list] : [];
402
     const _list = list && list.length > 0 ? [totalRow, ...list] : [];
403
+    let row = 0
403
     return (
404
     return (
404
 
405
 
405
         <>
406
         <>
454
                     导出
455
                     导出
455
                 </Button>
456
                 </Button>
456
             </AuthButton>
457
             </AuthButton>
457
-            <Table rowKey={(index => { index })}
458
+            <Table rowKey={record => data.current * data.size + (row++)}
458
                 style={{ marginTop: '30px' }}
459
                 style={{ marginTop: '30px' }}
459
                 dataSource={_list}
460
                 dataSource={_list}
460
                 // dataSource={data.records}
461
                 // dataSource={data.records}