guarantee-lsq 2 lat temu
rodzic
commit
654db7880a
2 zmienionych plików z 17 dodań i 14 usunięć
  1. 1 1
      src/components/Table/index.js
  2. 16 13
      src/views/sb/info/SbInfo.vue

+ 1 - 1
src/components/Table/index.js

@@ -367,7 +367,7 @@ export default {
       return (
         <a-alert showIcon={true} style="margin-bottom: 16px">
           <template slot="message">
-            <span style="margin-right: 12px">已选择:<a style="font-weight: 600">{this.selectedRows.length}</a></span>
+            <span style="margin-right: 12px">已选择:<a style="font-weight: 600">{this.selectedRowKeys.length}</a></span>
             {needTotalItems}
             {clearItem}
             {renderColumns}

+ 16 - 13
src/views/sb/info/SbInfo.vue

@@ -399,11 +399,10 @@ export default {
           }
         }, */
         {
-          title: '设备位号',
-          dataIndex: 'positionNo',
-          width: 150,
-          scopedSlots: { customRender: 'positionNo' },
-          checked: true
+          title: '设备位置',
+          checked: true,
+          width: 200,
+          dataIndex: 'positionName'
         },
         {
           title: '设备名称',
@@ -412,9 +411,10 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '设备号',
-          dataIndex: 'no',
+          title: '设备号',
+          dataIndex: 'positionNo',
           width: 150,
+          scopedSlots: { customRender: 'positionNo' },
           checked: true
         },
         {
@@ -423,6 +423,7 @@ export default {
           width: 120,
           checked: true
         },
+
         {
           title: '设备类型',
           checked: true,
@@ -447,6 +448,12 @@ export default {
           width: 150,
           checked: true
         },
+        {
+          title: '设备编号',
+          dataIndex: 'no',
+          width: 150,
+          checked: true
+        },
         /* {
           title: '自定义类型',
           checked: true,
@@ -456,12 +463,7 @@ export default {
             return this.BaseTool.Object.getField(this.useTypeMap, text)
           }
         }, */
-        {
-          title: '设备位置',
-          checked: true,
-          width: 200,
-          dataIndex: 'positionName'
-        },
+
         /* {
           title: '使用机台',
           checked: true,
@@ -609,6 +611,7 @@ export default {
             sortName: 'no'
           }
         }
+        this.selectedRowKeys = []
         return getSbInfoPage(Object.assign(parameter, this.queryParam))
           .then(res => {
             return res.data