|
@@ -141,13 +141,14 @@
|
|
|
</span>
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
- <s-table
|
|
|
+ <v-table
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
:style="{ height: tableHeight+68+'px' }"
|
|
|
size="small"
|
|
|
- :row-selection="showSelect?{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.settleState=='FINISH' } })}:null"
|
|
|
+ :row-selection="showSelect?{ columnWidth: 40 }:null"
|
|
|
@rowSelection="rowSelectionFun"
|
|
|
+ :disableSelectedRowKeys="disableSelectedRowKeys"
|
|
|
:rowKey="(record) => record.id"
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
@@ -182,7 +183,7 @@
|
|
|
id="financialCollectionList-voucher-btn">凭证</a-button>
|
|
|
<span v-if="record.settleState=='WAIT' && record.voidFlag==1">--</span>
|
|
|
</template>
|
|
|
- </s-table>
|
|
|
+ </v-table>
|
|
|
|
|
|
<!-- 销售收款凭证 -->
|
|
|
<voucherModal v-drag ref="voucherModal" modalTit="销售收款凭证" :openModal="showVoucher" @cancel="closeVoucherModal"></voucherModal>
|
|
@@ -218,7 +219,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
-import { STable, VSelect } from '@/components'
|
|
|
+import { VTable, VSelect } from '@/components'
|
|
|
import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import subarea from '@/views/common/subarea.js'
|
|
|
import Area from '@/views/common/area.js'
|
|
@@ -232,7 +233,7 @@ import customerService from '@/views/common/customerService'
|
|
|
export default {
|
|
|
name: 'SalesCollectionList',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { STable, VSelect, subarea, rangeDate, commonModal, Area, voucherModal, dealerSubareaScopeList, salesDetail, dispatchDetail, customerService },
|
|
|
+ components: { VTable, VSelect, subarea, rangeDate, commonModal, Area, voucherModal, dealerSubareaScopeList, salesDetail, dispatchDetail, customerService },
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
@@ -283,6 +284,9 @@ export default {
|
|
|
const no = (data.pageNo - 1) * data.pageSize
|
|
|
for (var i = 0; i < data.list.length; i++) {
|
|
|
data.list[i].no = no + i + 1
|
|
|
+ if (data.list[i].settleState == 'FINISH') {
|
|
|
+ this.disableSelectedRowKeys.push(data.list[i].id)
|
|
|
+ }
|
|
|
}
|
|
|
this.total = data.count || 0
|
|
|
this.disabled = false
|
|
@@ -291,6 +295,7 @@ export default {
|
|
|
return data
|
|
|
})
|
|
|
},
|
|
|
+ disableSelectedRowKeys: [],
|
|
|
total: 0, // 合计
|
|
|
rowSelectionInfo: null, // 批量选择的数据
|
|
|
handlePlData: [], // 收款临时数据
|
|
@@ -348,6 +353,7 @@ export default {
|
|
|
},
|
|
|
// 表格选中项
|
|
|
rowSelectionFun (obj) {
|
|
|
+ console.log(obj)
|
|
|
this.rowSelectionInfo = obj || null
|
|
|
},
|
|
|
// 选择审核时间 change
|