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

修改金工页面尺寸

Browse Source
This commit is contained in:
bryan sun
2019-11-02 12:37:37 +08:00
parent 137702851c
commit 839bb64eef
10 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -1,12 +1,12 @@
<template>
<div class="app-container">
<el-row>
<el-col style="width: 850px">
<el-card style="width: 800px">
<span>加工日期：{{ dateTime }}</span>
<span style="margin-left: 20%;font-size: 20px;">正在加工零件</span>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
<el-col style="width: 610px">
<el-card style="width:610px">
<span style="margin-left: 45%;font-size: 25px;">正在加工零件</span>
<div>加工日期：{{ dateTime }}</div>
<el-table :data="tableData" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -16,12 +16,12 @@
<!-- {{ scope.row.机床名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="组号" prop="组号" align="center" width="70px">
<el-table-column label="组号" prop="组号" align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -31,12 +31,12 @@
<!-- {{ scope.row.零件名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="零件数" align="center" width="60px">
<el-table-column label="数量" align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" show-overflow-tooltip prop="工艺名" align="center" width="70px">
<el-table-column label="工序" show-overflow-tooltip prop="工艺名" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -46,29 +46,28 @@
{{ scope.row.终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" prop="姓名" align="center" width="90px">
<el-table-column label="操作者" prop="姓名" show-overflow-tooltip align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="105px">
<el-table-column label="操作" align="center" width="70px">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
type="text"
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
@click="viewProcedures(scope.row)">详情</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>
<el-col style="width: 800px">
<el-col style="width: 610px">
<el-card>
<span style="margin-left: 45%;font-size: 20px">待加工零件</span>
<el-table :data="tableData3" border size="mini" highlight-current-row style="width: 785px" stripe height="800px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="120px">
<div style="margin-left: 45%;margin-bottom: 20px; font-size: 25px">待加工零件</div>
<el-table :data="tableData3" border size="mini" highlight-current-row style="width: 610px" stripe height="640px">
<el-table-column label="机床图号" show-overflow-tooltip prop="机床图号" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
@@ -78,12 +77,12 @@
<!-- {{ scope.row.机床名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="70px">
<el-table-column label="组号" prop="组号" show-overflow-tooltip align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="180px">
<el-table-column label="零件图号" show-overflow-tooltip prop="零件图号" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -93,34 +92,33 @@
<!-- {{ scope.row.零件名称 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="零件数" align="center" width="60px">
<el-table-column label="数量" align="center" width="50px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工序名称" prop="工艺名称" align="center" width="70px">
<el-table-column label="工序" prop="工艺名称" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" prop="mes终端编号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
{{ scope.row.MES终端编号 }}
</template>
</el-table-column>
<el-table-column label="操作工" prop="姓名" align="center" width="90px">
<el-table-column label="操作者" show-overflow-tooltip prop="姓名" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="105">
<el-table-column label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
type="text"
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序</el-button>
@click="viewProcedures(scope.row)">详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -128,18 +126,18 @@
</el-col>
</el-row>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center width="550px">
<el-row>
<span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
<el-input v-model="SparePartsNumber" style="width: 150px" size="small"/>
<span>零件名称:</span>
<el-input v-model="SparePartsName" style="width: 200px" size="small"/>
<el-input v-model="SparePartsName" style="width: 150px" size="small"/>
</el-row>
<el-table
:data="tableData2"
style="width: 100%;margin-top: 20px"
style="width: 515px;margin-top: 20px"
size="mini"
height="300"
height="320"
stripe
highlight-current-row
border>
@@ -148,29 +146,29 @@
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺名称" width="120">
<el-table-column align="center" label="工艺名称" width="90">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺要求">
<el-table-column align="center" label="工艺要求" width="100">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工">
<el-table-column align="center" label="操作工" width="70">
<template slot-scope="scope">
{{ scope.row.员工姓名 }}
{{ scope.row.操作员 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺是否完成" width="120">
<el-table-column align="center" label="工序完成" width="80">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="工艺是否质检" width="120">
<el-table-column align="center" label="工序质检" width="80">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
@@ -209,6 +207,7 @@ export default {
},
fetchData1() {
searchData1().then(response => {
console.log(response, 121212)
this.tableData3 = response.data
})
},