Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui
This commit is contained in:
commit
ab68eb9622
|
|
@ -16,6 +16,8 @@
|
|||
v-model="queryParams.proId"
|
||||
placeholder="请选择退料工程"
|
||||
style="width: 240px"
|
||||
clearable
|
||||
filterable
|
||||
@change="handleProChange"
|
||||
>
|
||||
<el-option v-for="item in proList" :key="item.id" :label="item.proName" :value="item.proId"></el-option>
|
||||
|
|
@ -135,8 +137,8 @@
|
|||
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
|
||||
<el-table-column label="序号" type="index" align="center" min-width="80" />
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModel" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" />
|
||||
<el-table-column label="当前在用量" align="center" prop="num"></el-table-column>
|
||||
<el-table-column label="管理模式" align="center" prop="manageType">
|
||||
|
|
@ -551,8 +553,8 @@ export default {
|
|||
this.equipmentList.unshift({
|
||||
...typeData,
|
||||
preNum: 0,
|
||||
typeModel: typeData.typeName,
|
||||
typeName: typeData.specificationType,
|
||||
// typeModel: typeData.typeName,
|
||||
// typeName: typeData.specificationType,
|
||||
apDetection: '',
|
||||
remark: '',
|
||||
maCodeList: [],
|
||||
|
|
|
|||
Loading…
Reference in New Issue