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

jiangfuzhuang

Browse Source
This commit is contained in:
Vergil
2020-05-12 17:14:01 +08:00
parent d77511942c
commit 84d3a2140b
7 changed files with 148 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -55,42 +55,41 @@
</div>
</el-card>
<el-row>
<el-col style="width: 700px">
<el-col style="width: 1240px">
<el-card>
<el-table
v-loading="loading"
:data="tableData"
size="mini"
height="740"
style="width: 750px"
style="width: 1240px"
border
stripe
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange"
@row-click="click">
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column label="进程" prop="进程" align="center" width="95px" sortable>
<template slot-scope="scope">
{{ scope.row.进程 }}
</template>
</el-table-column>
<el-table-column label="机床号" prop="机床图号" align="center" width="95px">
<el-table-column label="机床号" prop="机床图号" align="center" width="110px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50px">
<el-table-column label="组号" prop="组号" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="175px">
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="130px">
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" min-width="130px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -105,21 +104,26 @@
{{ scope.row.工艺员 }}
</template>
</el-table-column>
<el-table-column label="编制时间" prop="工艺完成" align="center" width="85px">
<el-table-column label="编制时间" prop="工艺完成" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺完成 }}
</template>
</el-table-column>
<el-table-column label="分配时间" prop="分配时间" align="center" width="85px">
<el-table-column label="分配时间" prop="分配时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.工艺分配时间 ? scope.row.工艺分配时间.split( ' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="下达时间" prop="下达时间" align="center" width="85px">
<el-table-column label="下达时间" prop="下达时间" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.操作时间 .split( ' ')[0] }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button :disabled="scope.row.进程 === '编制中'" type="primary" size="mini" icon="el-icon-search" plain @click="viewDetails(scope.row)">查看工单</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@@ -134,7 +138,7 @@
</div>
</el-card>
</el-col>
<el-col style="width: 680px">
<!-- <el-col style="width: 680px">
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
@@ -202,8 +206,81 @@
</tr>
</table>
</el-card>
</el-col>
</el-col> -->
</el-row>
<el-dialog
:visible.sync="centerDialogVisible"
title=""
width="680px"
center>
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
<td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
<td class="tg-c3ow" colspan="3">零件图号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
<td class="tg-c3ow">数量</td>
</tr>
<tr>
<td class="tg-c3ow" colspan="3">零件名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
<td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow" colspan="2">项目名称</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
<td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
<td class="tg-c3ow" colspan="3">机床</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow">材质</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
<td class="tg-c3ow">规格</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
<td class="tg-c3ow" colspan="3">组号</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
</tr>
<tr>
<td class="tg-c3ow">序次</td>
<td class="tg-c3ow">工艺名称</td>
<td class="tg-c3ow" colspan="3">工艺要求</td>
<td class="tg-c3ow">难度系数</td>
<td class="tg-c3ow">工作者</td>
<td class="tg-c3ow">单件</td>
<td class="tg-c3ow">准结</td>
<td class="tg-c3ow">检查结果</td>
<td class="tg-c3ow">计划完成日期</td>
<td class="tg-c3ow">工序条码</td>
</tr>
<tr v-for="(value,key) in tableData2" :id="key" :key="key">
<td class="tg-c3ow">{{ key + 1 }}</td>
<td class="tg-c3ow">{{ value.工艺名称 }}</td>
<td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
<td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.单件定额工时 }}</td>
<td class="tg-c3ow">{{ value.准结定额工时 }}</td>
<td class="tg-c3ow"/>
<td class="tg-c3ow">{{ value.计划日期 }}</td>
<td class="tg-c3ow">2{{ value.工序流水号 }}</td>
</tr>
<tr>
<td class="tg-c3ow">工艺员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
<td class="tg-c3ow">定额员</td>
<td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
<td class="tg-c3ow">工艺完成</td>
<td class="tg-c3ow">{{ tableData2[0].工艺实际完成时间 ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">计划开始</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间.split(' ')[0] : '' }}</td>
<td class="tg-c3ow">计划结束</td>
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间.split(' ')[0] : '' }}</td>
</tr>
</table>
</el-card>
</el-dialog>
</div>
</template>
@@ -213,6 +290,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, retu
export default {
data() {
return {
centerDialogVisible: false,
order: '',
finishTime: '',
partNumValue: [],
@@ -253,6 +331,10 @@ export default {
// this.searchData()
},
methods: {
viewDetails(row) {
this.centerDialogVisible = true
this.click(row)
},
tiaozheng() {
if (this.partNumValue.length !== 0) {
if (this.PersonValue1) {