Commit dcb230cf authored by 徐来柯's avatar 徐来柯

fix bug

parent 334c7487
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<el-table-column <el-table-column
label="产品编号" label="产品编号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="MHSort" prop="wlid"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
...@@ -72,16 +72,16 @@ export default { ...@@ -72,16 +72,16 @@ export default {
name: '线体名称' name: '线体名称'
}, },
{ {
id: '物料编号', id: '产品编号',
name: '物料编号' name: '产品编号'
}, },
{ {
id: '物料名称', id: '产品名称',
name: '物料名称' name: '产品名称'
}, },
{ {
id: '物料描述', id: '产品描述',
name: '物料描述' name: '产品描述'
} }
], ],
deletetext: '', deletetext: '',
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<div class="search-btn" @click="searchData" >查询</div> <div class="search-btn" @click="searchData" >查询</div>
<div class="search-block search-input" v-if="formList.includes(3)" style="width: 280px; margin-left: 20px"> <div class="search-block search-input" v-if="formList.includes(3)" style="width: 280px; margin-left: 20px">
<el-input type="text" ref="codeInput" v-model="formData.scanValue" @keyup.enter.native="scanGunCode" ></el-input> <el-input type="text" ref="codeInput" placeholder="扫码前请点击" v-model="formData.scanValue" @keyup.enter.native="scanGunCode" ></el-input>
</div> </div>
</div> </div>
......
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<el-select v-model="PID" placeholder="请选择"> <el-select v-model="PID" placeholder="请选择">
<el-option <el-option
v-for="item in proList" v-for="item in proList"
:key="item.Name" :key="item.ProNumber"
:label="item.Name" :label="item.ProNumber"
:value="item.ID"> :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
......
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" /> <baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" /> <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
width: 180, width: 180,
}, },
{ {
prop: 'ProductID', prop: 'ProNumber',
label: '产品编号', label: '产品编号',
width: 180, width: 180,
}, },
......
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