|
@@ -17,13 +17,13 @@
|
|
<a-input placeholder="请输入" v-model="queryParam.name" ></a-input>
|
|
<a-input placeholder="请输入" v-model="queryParam.name" ></a-input>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <template v-if="toggleSearchStatus">
|
|
|
|
|
|
+ <!-- <template v-if="toggleSearchStatus"> -->
|
|
<a-col :md="8" :sm="24">
|
|
<a-col :md="8" :sm="24">
|
|
- <a-form-item label="ID">
|
|
|
|
- <a-input placeholder="请输入" v-model="queryParam.id" ></a-input>
|
|
|
|
|
|
+ <a-form-item label="Code">
|
|
|
|
+ <a-input placeholder="请输入" v-model="queryParam.code" ></a-input>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- </template>
|
|
|
|
|
|
+ <!-- </template> -->
|
|
<a-col :md="8" :sm="24">
|
|
<a-col :md="8" :sm="24">
|
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
|
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
|
@@ -47,7 +47,7 @@
|
|
:columns="columns"
|
|
:columns="columns"
|
|
rowKey="rowIndex"
|
|
rowKey="rowIndex"
|
|
:dataSource="dataSource"
|
|
:dataSource="dataSource"
|
|
- pagination="false"
|
|
|
|
|
|
+ :pagination="pagination"
|
|
:scroll="{ x: 800, y: 300 }"
|
|
:scroll="{ x: 800, y: 300 }"
|
|
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
|
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
|
@change="handleTableChange"
|
|
@change="handleTableChange"
|
|
@@ -111,9 +111,9 @@
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- title: 'ID',
|
|
|
|
|
|
+ title: 'Code',
|
|
align:"center",
|
|
align:"center",
|
|
- dataIndex: 'ID',
|
|
|
|
|
|
+ dataIndex: 'code',
|
|
ellipsis: true,
|
|
ellipsis: true,
|
|
},
|
|
},
|
|
],
|
|
],
|
|
@@ -145,7 +145,7 @@
|
|
this.selectedRows = []
|
|
this.selectedRows = []
|
|
getAction('/production/safetyStock/selectUnit',this.queryParam).then(res=>{
|
|
getAction('/production/safetyStock/selectUnit',this.queryParam).then(res=>{
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.dataSource = res.result
|
|
|
|
|
|
+ this.dataSource = res.result.records
|
|
this.pagination = {
|
|
this.pagination = {
|
|
total: res.result.total,
|
|
total: res.result.total,
|
|
current: res.result.current,
|
|
current: res.result.current,
|
|
@@ -164,7 +164,7 @@
|
|
},
|
|
},
|
|
searchReset(){
|
|
searchReset(){
|
|
this.queryParam.name = ''
|
|
this.queryParam.name = ''
|
|
- this.queryParam.id = ''
|
|
|
|
|
|
+ this.queryParam.code = ''
|
|
this.getData(this.queryParam.Org)
|
|
this.getData(this.queryParam.Org)
|
|
},
|
|
},
|
|
handleTableChange(pagination, filters, sorter) {
|
|
handleTableChange(pagination, filters, sorter) {
|