Browse Source

选择按钮

dev
0.0 2 years ago
parent
commit
46ffc40067
  1. 17
      src/components/jeecg/modal/ProcessPlan.vue
  2. 11
      src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

17
src/components/jeecg/modal/ProcessPlan.vue

@ -54,11 +54,11 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
this.selectedRowKeys.length }}</a> <!-- this.selectedRowKeys.length }}</a>-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@ -71,10 +71,12 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="pagination" :pagination="pagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
:customRow="clickThenSelect" :customRow="clickThenSelect"
@change="handleTableChange"> @change="handleTableChange">
<span slot="describes" slot-scope="text, record">
<j-ellipsis :value="text" :length="30"/>
</span>
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div> <div v-html="text"></div>
</template> </template>
@ -173,6 +175,7 @@
{ {
title: '流程提示', title: '流程提示',
align: 'center', align: 'center',
scopedSlots: { customRender: 'describes' },
dataIndex: 'describes' dataIndex: 'describes'
}, },
{ {

11
src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

@ -25,10 +25,10 @@
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> <!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <!-- <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
</div> <!-- </div>-->
<a-table <a-table
ref="table" ref="table"
@ -40,7 +40,6 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text">
@ -101,6 +100,7 @@
mainId:{ mainId:{
immediate: true, immediate: true,
handler(val) { handler(val) {
console.log("val>>>>>>>>>>>>>>>>>>>>>>>>>>>",val)
if(!this.mainId){ if(!this.mainId){
this.clearList() this.clearList()
}else{ }else{
@ -203,6 +203,7 @@
{ {
title:'单价', title:'单价',
align:"center", align:"center",
disabled: this.disabled,
dataIndex: 'materialPrice' dataIndex: 'materialPrice'
}, },
/* { /* {

Loading…
Cancel
Save