meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -3,7 +3,11 @@
<el-card>
<div style="width: 900px;margin: 0 auto">
<span>机床名称：</span>
<<<<<<< HEAD
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px" @change="getGroups">
=======
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in machineNames"
:key="item.value"
@@ -18,9 +22,15 @@
: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" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
<el-row style="margin-top: 5px;margin-bottom: 3px">
=======
<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>
@@ -35,8 +45,11 @@
:row-class-name="tableRowClassName"
size="mini"
border
<<<<<<< HEAD
stripe
height="280px"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
highlight-current-row
@row-click="searchMaterial1">
<el-table-column
@@ -44,6 +57,7 @@
align="center"
type="index"
width="50"/>
<<<<<<< HEAD
<el-table-column align="center" label="物料状态" min-width="50">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small" style="margin: 0px">不存在</el-tag>
@@ -51,11 +65,24 @@
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="150">
=======
<el-table-column align="center" label="物料状态" min-width="100">
<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>
<el-table-column align="center" label="图号" min-width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="名称" min-width="200" show-overflow-tooltip>
=======
<el-table-column align="center" label="名称" min-width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
@@ -65,7 +92,11 @@
{{ scope.row.材料或者规格 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="规格" width="150">
=======
<el-table-column align="center" label="规格" width="100">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.规格 }}
</template>
@@ -115,7 +146,11 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<<<<<<< HEAD
<div class="block">
=======
<div class="block" style="margin-top: 10px;">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 40, 100]"
@@ -132,10 +167,15 @@
:cell-class-name="cell"
style="width: 100%"
size="mini"
<<<<<<< HEAD
height="200px"
highlight-current-row
border
stripe>
=======
highlight-current-row
border>
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-table-column
label="序号"
align="center"