This commit is contained in:
Vergil
2020-05-06 17:45:29 +08:00
parent 5a070ed755
commit bdd9e92628
3 changed files with 42 additions and 83 deletions

View File

@@ -46,6 +46,16 @@
@selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -66,16 +76,6 @@
{{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料类别 }}
@@ -144,17 +144,6 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent11"-->
<!--:page-sizes="[10, 20, 30, 40, 100]"-->
<!--:page-size="pageSize11"-->
<!--:total="total11"-->
<!--style="display:inline-block;width:800px"-->
<!--layout="total, sizes, prev, pager, next, jumper"-->
<!--@size-change="handleSizeChange11"-->
<!--@current-change="handleCurrentChange11"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
@@ -335,7 +324,7 @@
<el-card>
<!--<h3>合同详细信息</h3>-->
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip>
<el-table-column label="物料名称" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>
@@ -612,13 +601,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="离线合同备注" prop="离线合同备注">-->
<!-- <el-input v-model="form2.离线合同备注" size="small" type="textarea" style="width: 550px"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button