This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions

View File

@@ -1,11 +1,7 @@
<template>
<div>
<el-card>
<<<<<<< HEAD
<div style="width: 900px;margin: 3px auto">
=======
<div style="width: 900px;margin: 0 auto">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>机床名称</span>
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
<el-option
@@ -14,11 +10,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">分组名称</span>
=======
<span>分组名称</span>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
<el-option
v-for="item in groupsNames"
@@ -26,15 +18,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
<el-row style="margin-top: 10px">
=======
<el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
<el-row style="margin-top: 20px">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<span>机床名称</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
<span>机床数量</span>
@@ -48,53 +34,33 @@
:data="tableData"
:row-class-name="tableRowClassName"
size="mini"
<<<<<<< HEAD
height="300"
highlight-current-row
border
stripe
=======
border
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
@row-click="searchMaterial1">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<<<<<<< HEAD
<el-table-column align="center" label="物料状态" min-width="90">
=======
<el-table-column align="center" label="物料状态" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="图号" min-width="120">
=======
<el-table-column align="center" label="图号" min-width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="名称" min-width="80">
=======
<el-table-column align="center" label="名称" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="材料" width="100">
=======
<el-table-column align="center" label="材料" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.材料或者规格 }}
</template>
@@ -119,53 +85,31 @@
{{ scope.row.部件数量 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="制造商" min-width="80">
=======
<el-table-column align="center" label="制造商" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.制造商 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="备注" width="80">
=======
<el-table-column align="center" label="备注" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="分类码" width="60">
=======
<el-table-column align="center" label="分类码" width="80">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.分类码 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="整改类型" width="300">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.整改类型" @change="submitChangeType(scope.row)" >
=======
<el-table-column align="center" label="整改类型" width="250">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.整改类型" @change="submitChangeType(scope.row)">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-radio :label="1" class="radio">新增</el-radio>
<el-radio :label="2" class="radio">替换</el-radio>
<el-radio :label="3" class="radio">补充加工</el-radio>
</el-radio-group>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="旧图号" >
=======
<el-table-column align="center" label="旧图号" width="150">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.前图号或者型号 }}
</template>
@@ -189,13 +133,9 @@
style="width: 100%"
size="mini"
highlight-current-row
<<<<<<< HEAD
height="150"
border
stripe>
=======
border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
align="center"
@@ -822,16 +762,9 @@ export default {
<style scoped>
span{
<<<<<<< HEAD
margin: 3px;
}
radio {
margin-left: 3px;
=======
margin: 10px;
}
.radio {
margin-left: 10px;
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
}
</style>