Commit 9e1c62db authored by chenzj's avatar chenzj

编排对照表和物主数据的bug

parent b7d5e0d3
...@@ -7,7 +7,33 @@ ...@@ -7,7 +7,33 @@
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"
...@@ -16,38 +42,37 @@ ...@@ -16,38 +42,37 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="分类" prop="itemTypeName"> <!-- <el-form-item label="排序" prop="orderNum">
<el-input <el-input
v-model="queryParams.itemTypeName" v-model="queryParams.orderNum"
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="orderNum"> <el-form-item label="物料/产品" prop="itemOrProduct">
<el-input <el-input
v-model="queryParams.orderNum" v-model="queryParams.itemOrProduct"
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> <el-form-item>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</el-button
> >
<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"
...@@ -60,29 +85,29 @@ ...@@ -60,29 +85,29 @@
v-model="selectedItemId" v-model="selectedItemId"
:label="scope.row.itemTypeId" :label="scope.row.itemTypeId"
@change="handleRowChange(scope.row)" @change="handleRowChange(scope.row)"
>{{ "" }}</el-radio >{{ "" }}</el-radio
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="分类" label="分类"
align="left" align="left"
key="itemTypeName" key="itemTypeName"
prop="itemTypeName" prop="itemTypeName"
v-if="columns[0].visible" v-if="columns[0].visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="排序" label="排序"
align="center" align="center"
key="orderNum" key="orderNum"
prop="orderNum" prop="orderNum"
v-if="columns[1].visible" v-if="columns[1].visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="物料/产品" label="物料/产品"
align="center" align="center"
key="itemOrProduct" key="itemOrProduct"
...@@ -100,13 +125,16 @@ ...@@ -100,13 +125,16 @@
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> v-show="total > 0"
: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>
...@@ -114,7 +142,7 @@ ...@@ -114,7 +142,7 @@
</template> </template>
<script> <script>
import { treeselect,listItemTypes } from "@/api/mes/md/itemtype"; import { treeselect,listItemType } 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";
...@@ -137,7 +165,7 @@ export default { ...@@ -137,7 +165,7 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
// 物料产品表格数据 // 物料产品表格数据
itemList: [], itemList: null,
// 部门树选项 // 部门树选项
itemTypeOptions: undefined, itemTypeOptions: undefined,
// 部门名称 // 部门名称
...@@ -148,13 +176,11 @@ export default { ...@@ -148,13 +176,11 @@ export default {
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1,
pageSize: 10,
orderNum: null, orderNum: null,
itemTypeName: null, itemTypeName: null,
itemOrProduct: null itemOrProduct: null
}, },
// 列信息 // 列信息
columns: [ columns: [
{ key: 0, label: `物料分类`, visible: true }, { key: 0, label: `物料分类`, visible: true },
{ key: 1, label: `物料分类排序`, visible: true }, { key: 1, label: `物料分类排序`, visible: true },
...@@ -177,9 +203,9 @@ export default { ...@@ -177,9 +203,9 @@ export default {
/** 查询物料编码列表 */ /** 查询物料编码列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listItemTypes(this.queryParams).then(response => { listItemType(this.queryParams).then(response => {
this.itemList = response.rows; this.itemList = response.data;
this.total = response.total; // this.total = response.total;
this.loading = false; this.loading = false;
}); });
...@@ -207,13 +233,11 @@ export default { ...@@ -207,13 +233,11 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.form = { this.form = {
pageNum: 1,
pageSize: 10,
itemTypeName: null, itemTypeName: null,
orderNum: null, orderNum: null,
itemOrProduct: null itemOrProduct: null
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
......
...@@ -164,8 +164,8 @@ ...@@ -164,8 +164,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="物料/产品分类" prop="itemTypeName"> <el-form-item label="物料/产品分类" prop="itemTypeName">
<treeselect v-model="form.itemTypeName" :options="itemTypeOptions" :show-count="true" disabled
v-if="optType == 'view'" /> <el-input v-model="form.itemTypeName" readonly="readonly" v-if="optType == 'view'" />
<treeselect v-model="form.itemTypeName" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类" <treeselect v-model="form.itemTypeName" :options="itemTypeOptions" :show-count="true" placeholder="请选择所属分类"
v-else :disable-branch-nodes="true" /> v-else :disable-branch-nodes="true" />
</el-form-item> </el-form-item>
......
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