样式
This commit is contained in:
@@ -2,21 +2,13 @@
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-row>
|
||||
<<<<<<< HEAD
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
=======
|
||||
<el-col style="width: 280px">
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<span>物料类别:</span>
|
||||
<el-select
|
||||
v-model="MaterialCategoryValue"
|
||||
placeholder="请选择"
|
||||
size="small"
|
||||
clearable
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
@change="searchMaterialVariety">
|
||||
<el-option
|
||||
v-for="item in MaterialCategory"
|
||||
@@ -25,21 +17,13 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<<<<<<< HEAD
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
=======
|
||||
<el-col style="width: 280px">
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<span>物料品种:</span>
|
||||
<el-select
|
||||
v-model="MaterialVarietyValue"
|
||||
placeholder="请选择"
|
||||
size="small"
|
||||
clearable
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
@change="searchMaterial">
|
||||
<el-option
|
||||
v-for="item in MaterialVariety"
|
||||
@@ -48,58 +32,32 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<<<<<<< HEAD
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
<span>物料名称:</span>
|
||||
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
|
||||
</el-col>
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
=======
|
||||
<el-col style="width: 280px">
|
||||
<span>物料名称:</span>
|
||||
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px">
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<span>物料全称:</span>
|
||||
<el-input
|
||||
v-model="FullNameOfMaterial"
|
||||
placeholder="物料全称"
|
||||
size="small"
|
||||
<<<<<<< HEAD
|
||||
clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px">
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<span>物料规格:</span>
|
||||
<el-input
|
||||
v-model="MaterialSpecification"
|
||||
placeholder="物料规格"
|
||||
size="small"
|
||||
<<<<<<< HEAD
|
||||
clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px;margin-top: 3px">
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px">
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<span>物料型号:</span>
|
||||
<el-input
|
||||
v-model="MaterialModel"
|
||||
placeholder="物料型号"
|
||||
size="small"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
clearable/>
|
||||
</el-col>
|
||||
<el-col style="width: 280px">
|
||||
@@ -107,11 +65,7 @@
|
||||
<el-select
|
||||
v-model="MeasurementUnitValue"
|
||||
placeholder="请选择"
|
||||
<<<<<<< HEAD
|
||||
style="margin-bottom: 3px;margin-top: 10px"
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
size="small"
|
||||
clearable>
|
||||
<el-option
|
||||
@@ -126,11 +80,7 @@
|
||||
<el-select
|
||||
v-model="MaterialSourceValue"
|
||||
placeholder="请选择"
|
||||
<<<<<<< HEAD
|
||||
style="margin-bottom: 3px;margin-top: 10px"
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
size="small"
|
||||
clearable>
|
||||
<el-option
|
||||
@@ -146,11 +96,7 @@
|
||||
v-model="supplier"
|
||||
placeholder="供货商"
|
||||
size="small"
|
||||
<<<<<<< HEAD
|
||||
style="margin-bottom: 3px;margin-top: 10px"
|
||||
=======
|
||||
style="margin-bottom: 10px;"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
clearable
|
||||
@dblclick.native="param=0;openSupplier()"/>
|
||||
</el-col>
|
||||
@@ -162,28 +108,19 @@
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent=1;searchMaterial()">查询
|
||||
</el-button>
|
||||
<<<<<<< HEAD
|
||||
<el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
|
||||
=======
|
||||
<el-button :disabled="token !== 11 && token !== 36" type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<el-button
|
||||
:disabled="token !== 11 && token !== 36"
|
||||
type="warning"
|
||||
icon="el-icon-refresh"
|
||||
size="small"
|
||||
<<<<<<< HEAD
|
||||
style="margin:10px 10px 3px"
|
||||
=======
|
||||
style="margin-left: 10px"
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
@click="CategoryMaintenance">维护物料类别
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<el-card>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
@@ -193,16 +130,6 @@
|
||||
highlight-current-row
|
||||
border
|
||||
stripe>
|
||||
=======
|
||||
<el-card style="margin-top: 15px">
|
||||
<el-table
|
||||
:data="tableData"
|
||||
style="width: 100%;min-height: 500px"
|
||||
height="500"
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
border>
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
<el-table-column align="center" label="物料名称">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
@@ -228,7 +155,6 @@
|
||||
{{ scope.row.参考价格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<<<<<<< HEAD
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
@@ -252,24 +178,6 @@
|
||||
@click="handleDelete(scope.row)"/>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
=======
|
||||
<el-table-column label="操作" fixed="right" align="center" width="200">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="token !== 11 && token !== 36"
|
||||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click="handleEdit(scope.row)">编辑
|
||||
</el-button>
|
||||
<el-button
|
||||
:disabled="token !== 11 && token !== 36"
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)">删除
|
||||
</el-button>
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -590,11 +498,7 @@ export default {
|
||||
param: 0,
|
||||
tableData: [],
|
||||
pageCurrent: 1,
|
||||
<<<<<<< HEAD
|
||||
pageSize: 30,
|
||||
=======
|
||||
pageSize: 10,
|
||||
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
|
||||
total: null,
|
||||
tableData1: [],
|
||||
pageCurrent1: 1,
|
||||
|
||||
Reference in New Issue
Block a user