fix:searchHeader样式修改
This commit is contained in:
parent
21c1575ebb
commit
c5bd0352ec
|
|
@ -1,24 +1,47 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header style="height: 50%; padding: 0;">
|
||||
<el-header style="height: 50%; padding: 0">
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<div style="font-size: 14px">仓库</div>
|
||||
<el-select v-model="query.warehouse" clearable placeholder="所在仓库" @change="handleQuery"
|
||||
style="margin-left: 4px">
|
||||
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
v-model="query.warehouse"
|
||||
clearable
|
||||
placeholder="所在仓库"
|
||||
@change="handleQuery"
|
||||
style="margin-left: 10px; width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.search" placeholder="物料名/批次号" clearable
|
||||
style="margin-right: 5px;"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="物料名/批次号"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="params"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="批次" prop="batch">
|
||||
</el-table-column>
|
||||
|
|
@ -27,7 +50,8 @@
|
|||
<el-table-column label="规格型号">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.material_">
|
||||
{{ scope.row.material_.specification }} {{ scope.row.material_.model }}
|
||||
{{ scope.row.material_.specification }}
|
||||
{{ scope.row.material_.model }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -63,8 +87,15 @@
|
|||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe>
|
||||
<el-table-column label="批次" prop="batch"> </el-table-column>
|
||||
<scTable
|
||||
ref="table_wm"
|
||||
:apiObj="apiObjWm"
|
||||
row-key="id"
|
||||
:params="paramsWm"
|
||||
stripe
|
||||
>
|
||||
<el-table-column label="批次" prop="batch">
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名" prop="material">
|
||||
<template #default="scope">{{
|
||||
scope.row.material_.name
|
||||
|
|
@ -85,7 +116,10 @@
|
|||
scope.row.material_.process_name
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所在车间" prop="belong_dept_name">
|
||||
<el-table-column
|
||||
label="所在车间"
|
||||
prop="belong_dept_name"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count" width="80">
|
||||
</el-table-column>
|
||||
|
|
@ -108,29 +142,29 @@ export default {
|
|||
apiObjWm: this.$API.wpm.wmaterial.list,
|
||||
paramsWm: { count__gte: 1, material__type: 10 },
|
||||
// processOptions: [],
|
||||
queryWm: {}
|
||||
queryWm: {},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getWarehouse()
|
||||
this.getWarehouse();
|
||||
// this.getProcessOptions()
|
||||
},
|
||||
methods: {
|
||||
getWarehouse() {
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then(res => {
|
||||
this.warehouseOptions = res
|
||||
})
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
|
||||
this.warehouseOptions = res;
|
||||
});
|
||||
},
|
||||
getProcessOptions() {
|
||||
this.$API.mtm.process.list.req({ page: 0 }).then(res => {
|
||||
this.processOptions = res
|
||||
})
|
||||
this.$API.mtm.process.list.req({ page: 0 }).then((res) => {
|
||||
this.processOptions = res;
|
||||
});
|
||||
},
|
||||
handleQueryWm() {
|
||||
this.$refs.table_wm.queryData(this.queryWm)
|
||||
this.$refs.table_wm.queryData(this.queryWm);
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query)
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
|
|
|
|||
|
|
@ -1,24 +1,47 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header style="height: 50%; padding: 0;">
|
||||
<el-header style="height: 50%; padding: 0">
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<div style="font-size: 14px">仓库</div>
|
||||
<el-select v-model="query.warehouse" clearable placeholder="所在仓库" @change="handleQuery"
|
||||
style="margin-left: 4px">
|
||||
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
v-model="query.warehouse"
|
||||
clearable
|
||||
placeholder="所在仓库"
|
||||
@change="handleQuery"
|
||||
style="margin-left: 10px; width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.search" placeholder="物料名/批次号" clearable
|
||||
style="margin-right: 5px;"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="物料名/批次号"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="params"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="批次" prop="batch">
|
||||
</el-table-column>
|
||||
|
|
@ -27,7 +50,8 @@
|
|||
<el-table-column label="规格型号">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.material_">
|
||||
{{ scope.row.material_.specification }} {{ scope.row.material_.model }}
|
||||
{{ scope.row.material_.specification }}
|
||||
{{ scope.row.material_.model }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -55,16 +79,32 @@
|
|||
<el-header>
|
||||
<div class="left-panel">
|
||||
<span style="font-size: 14px">车间库存</span>
|
||||
<el-select v-model="queryWm.material__process" clearable placeholder="已到工序" @change="handleQueryWm"
|
||||
style="margin-left: 4px">
|
||||
<el-option v-for="item in processOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
v-model="queryWm.material__process"
|
||||
clearable
|
||||
placeholder="已到工序"
|
||||
@change="handleQueryWm"
|
||||
style="margin-left: 10px; width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in processOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe>
|
||||
<el-table-column label="批次" prop="batch"> </el-table-column>
|
||||
<scTable
|
||||
ref="table_wm"
|
||||
:apiObj="apiObjWm"
|
||||
row-key="id"
|
||||
:params="paramsWm"
|
||||
stripe
|
||||
>
|
||||
<el-table-column label="批次" prop="batch">
|
||||
</el-table-column>
|
||||
<el-table-column label="物料名" prop="material">
|
||||
<template #default="scope">{{
|
||||
scope.row.material_.name
|
||||
|
|
@ -85,7 +125,10 @@
|
|||
scope.row.material_.process_name
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所在车间" prop="belong_dept_name">
|
||||
<el-table-column
|
||||
label="所在车间"
|
||||
prop="belong_dept_name"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count" width="80">
|
||||
</el-table-column>
|
||||
|
|
@ -108,29 +151,29 @@ export default {
|
|||
apiObjWm: this.$API.wpm.wmaterial.list,
|
||||
paramsWm: { count__gte: 1 },
|
||||
processOptions: [],
|
||||
queryWm: {}
|
||||
queryWm: {},
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getWarehouse()
|
||||
this.getProcessOptions()
|
||||
this.getWarehouse();
|
||||
this.getProcessOptions();
|
||||
},
|
||||
methods: {
|
||||
getWarehouse() {
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then(res => {
|
||||
this.warehouseOptions = res
|
||||
})
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
|
||||
this.warehouseOptions = res;
|
||||
});
|
||||
},
|
||||
getProcessOptions() {
|
||||
this.$API.mtm.process.list.req({ page: 0 }).then(res => {
|
||||
this.processOptions = res
|
||||
})
|
||||
this.$API.mtm.process.list.req({ page: 0 }).then((res) => {
|
||||
this.processOptions = res;
|
||||
});
|
||||
},
|
||||
handleQueryWm() {
|
||||
this.$refs.table_wm.queryData(this.queryWm)
|
||||
this.$refs.table_wm.queryData(this.queryWm);
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query)
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
|
|
|
|||
|
|
@ -2,18 +2,43 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-select v-model="query.warehouse" clearable placeholder="所在仓库" @change="handleQuery">
|
||||
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
v-model="query.warehouse"
|
||||
clearable
|
||||
placeholder="所在仓库"
|
||||
@change="handleQuery"
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.search" placeholder="物料名" clearable style="margin-right: 5px;"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="物料名"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="params"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料批次" prop="batch">
|
||||
</el-table-column>
|
||||
|
|
@ -42,23 +67,23 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
apiObj: this.$API.inm.warehouse.batch,
|
||||
params: { count__gte: 1, material__type__in: '40, 50, 60, 70' },
|
||||
params: { count__gte: 1, material__type__in: "40, 50, 60, 70" },
|
||||
selection: [],
|
||||
query: {},
|
||||
warehouseOptions: []
|
||||
warehouseOptions: [],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getWarehouse()
|
||||
this.getWarehouse();
|
||||
},
|
||||
methods: {
|
||||
getWarehouse() {
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then(res => {
|
||||
this.warehouseOptions = res
|
||||
})
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
|
||||
this.warehouseOptions = res;
|
||||
});
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query)
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
|
|
|
|||
|
|
@ -2,18 +2,43 @@
|
|||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-select v-model="query.warehouse" clearable placeholder="所在仓库" @change="handleQuery">
|
||||
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
|
||||
:value="item.id"></el-option>
|
||||
<el-select
|
||||
v-model="query.warehouse"
|
||||
clearable
|
||||
placeholder="所在仓库"
|
||||
@change="handleQuery"
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input v-model="query.search" placeholder="物料名" clearable style="margin-right: 5px;"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="物料名"
|
||||
clearable
|
||||
style="margin-right: 5px"
|
||||
></el-input>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="apiObj"
|
||||
row-key="id"
|
||||
stripe
|
||||
:params="params"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="物料批次" prop="batch">
|
||||
</el-table-column>
|
||||
|
|
@ -42,23 +67,23 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
apiObj: this.$API.inm.warehouse.batch,
|
||||
params: { count__gte: 1, material__type__in: '30' },
|
||||
params: { count__gte: 1, material__type__in: "30" },
|
||||
selection: [],
|
||||
query: {},
|
||||
warehouseOptions: []
|
||||
warehouseOptions: [],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getWarehouse()
|
||||
this.getWarehouse();
|
||||
},
|
||||
methods: {
|
||||
getWarehouse() {
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then(res => {
|
||||
this.warehouseOptions = res
|
||||
})
|
||||
this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
|
||||
this.warehouseOptions = res;
|
||||
});
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query)
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
resetQuery() {
|
||||
this.query = {};
|
||||
|
|
|
|||
Loading…
Reference in New Issue