|
@@ -61,24 +61,13 @@
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.productSn"
|
|
|
- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
+ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange }"
|
|
|
:data-source="loadData"
|
|
|
:columns="columns"
|
|
|
:pagination="paginationProps"
|
|
|
- :scroll="{ y: 400 }"
|
|
|
:loading="loading"
|
|
|
bordered>
|
|
|
</a-table>
|
|
|
- <!-- <s-table
|
|
|
- class="sTable"
|
|
|
- ref="table"
|
|
|
- size="small"
|
|
|
- :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
- :rowKey="(record) => record.id"
|
|
|
- :columns="columns"
|
|
|
- :data="loadData"
|
|
|
- bordered>
|
|
|
- </s-table> -->
|
|
|
</div>
|
|
|
<!-- 按钮 -->
|
|
|
<div class="btn-con">
|
|
@@ -137,19 +126,6 @@ export default {
|
|
|
{ title: '产品编码', dataIndex: 'code', align: 'center' },
|
|
|
{ title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
- // 加载数据方法 必须为 Promise 对象
|
|
|
- // loadData: parameter => {
|
|
|
- // this.disabled = true
|
|
|
- // return productList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- // const data = res.data
|
|
|
- // const no = (data.pageNo - 1) * data.pageSize
|
|
|
- // for (var i = 0; i < data.list.length; i++) {
|
|
|
- // data.list[i].no = no + i + 1
|
|
|
- // }
|
|
|
- // this.disabled = false
|
|
|
- // return data
|
|
|
- // })
|
|
|
- // },
|
|
|
loadData: [],
|
|
|
pageNo: 1, // 分页页码
|
|
|
pageSize: 10, // 分页 每页多少条
|
|
@@ -187,27 +163,24 @@ export default {
|
|
|
this.$emit('ok', this.selectedRows)
|
|
|
this.isShow = false
|
|
|
},
|
|
|
- onSelectChange (selectedRowKeys, selectedRows) {
|
|
|
- const _this = this
|
|
|
- console.log('selectedRowKeys changed: ', selectedRowKeys, selectedRows)
|
|
|
+ onChange (selectedRowKeys, selectedRows) {
|
|
|
this.selectedRowKeys = selectedRowKeys
|
|
|
- this.selectedRows = selectedRows
|
|
|
- // this.selectedRows = []
|
|
|
- // loadData
|
|
|
- // this.loadData.map(item => {
|
|
|
- // _this.selectedRowKeys.map(subItem => {
|
|
|
- // if (item.productSn == subItem) {
|
|
|
- // _this.selectedRows.push(item)
|
|
|
- // console.log(111)
|
|
|
- // }
|
|
|
- // })
|
|
|
- // })
|
|
|
-
|
|
|
- // console.log(_this.selectedRows, '+++++++++')
|
|
|
+ },
|
|
|
+ onSelectChange (record, selected, selectedRows, nativeEvent) {
|
|
|
+ const _this = this
|
|
|
+ if (selected) { // 选择
|
|
|
+ this.selectedRows.push(record)
|
|
|
+ } else { // 取消
|
|
|
+ this.selectedRows.map((item, index) => {
|
|
|
+ if (item.productSn == record.productSn) {
|
|
|
+ _this.selectedRows.splice(index, 1)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
// 产品列表
|
|
|
getProductList (pageNo) {
|
|
|
- this.pageNo = this.pageNo || pageNo
|
|
|
+ this.pageNo = pageNo || this.pageNo
|
|
|
this.disabled = true
|
|
|
const params = {
|
|
|
pageNo: this.pageNo,
|