Commit 8187ccd6 authored by chenzj's avatar chenzj

编排对照表分类查询的界面修改

parent 7daa196d
...@@ -9,6 +9,16 @@ export function listItemType(query) { ...@@ -9,6 +9,16 @@ export function listItemType(query) {
}) })
} }
// 查询部门列表
export function listItemTypes(query) {
return request({
url: '/mes/md/itemtype/lists',
method: 'get',
params: query
})
}
// 查询部门列表(排除节点) // 查询部门列表(排除节点)
export function listItemTypeExcludeChild(itemTypeId) { export function listItemTypeExcludeChild(itemTypeId) {
return request({ return request({
......
...@@ -7,33 +7,7 @@ ...@@ -7,33 +7,7 @@
width="80%" width="80%"
append-to-body append-to-body
> >
<el-row :gutter="20" style="max-height: 600px; overflow-y: auto;">
<!--分类数据-->
<el-col :span="4" :xs="24">
<div class="head-container">
<el-input
v-model="itemTypeName"
placeholder="请输入分类名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
</div>
<div class="head-container">
<el-tree
:data="itemTypeOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
@node-click="handleNodeClick"
/>
</div>
</el-col>
<!--物料数据-->
<el-col :span="20" :xs="24">
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
...@@ -42,18 +16,18 @@ ...@@ -42,18 +16,18 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<!-- <el-form-item label="排序" prop="orderNum"> <el-form-item label="分类" prop="itemTypeName">
<el-input <el-input
v-model="queryParams.orderNum" v-model="queryParams.itemTypeName"
placeholder="请输入排序" placeholder="请输入分类"
clearable clearable
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料/产品" prop="itemOrProduct"> <el-form-item label="排序" prop="orderNum">
<el-input <el-input
v-model="queryParams.itemOrProduct" v-model="queryParams.orderNum"
placeholder="请输入排序" placeholder="请输入排序"
clearable clearable
style="width: 240px" style="width: 240px"
...@@ -71,8 +45,9 @@ ...@@ -71,8 +45,9 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="itemList" :data="itemList"
...@@ -125,16 +100,13 @@ ...@@ -125,16 +100,13 @@
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
v-show="total > 0" :limit.sync="queryParams.pageSize" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> <div slot="footer" class="dialog-footer">
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelect">确 定</el-button> <el-button type="primary" @click="confirmSelect">确 定</el-button>
<el-button @click="showFlag = false">取 消</el-button> <el-button @click="showFlag = false">取 消</el-button>
</div> </div>
...@@ -142,7 +114,7 @@ ...@@ -142,7 +114,7 @@
</template> </template>
<script> <script>
import { treeselect,listItemType } from "@/api/mes/md/itemtype"; import { treeselect,listItemTypes } from "@/api/mes/md/itemtype";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
...@@ -165,7 +137,7 @@ export default { ...@@ -165,7 +137,7 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
// 物料产品表格数据 // 物料产品表格数据
itemList: null, itemList: [],
// 部门树选项 // 部门树选项
itemTypeOptions: undefined, itemTypeOptions: undefined,
// 部门名称 // 部门名称
...@@ -176,6 +148,8 @@ export default { ...@@ -176,6 +148,8 @@ export default {
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
orderNum: null, orderNum: null,
itemTypeName: null, itemTypeName: null,
itemOrProduct: null itemOrProduct: null
...@@ -203,9 +177,9 @@ export default { ...@@ -203,9 +177,9 @@ export default {
/** 查询物料编码列表 */ /** 查询物料编码列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listItemType(this.queryParams).then(response => { listItemTypes(this.queryParams).then(response => {
this.itemList = response.data; this.itemList = response.rows;
// this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -234,6 +208,8 @@ export default { ...@@ -234,6 +208,8 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.form = { this.form = {
pageNum: 1,
pageSize: 10,
itemTypeName: null, itemTypeName: null,
orderNum: null, orderNum: null,
itemOrProduct: null itemOrProduct: null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment