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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-11-02 18:38:08 +08:00
parent a2595e981b 4b718ff6ed
commit d2b879835c
2 changed files with 245 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<div>
<el-row>
<!-- <span style="margin-left: 10px">机床号：</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -15,7 +15,7 @@
</el-option>
</el-select>
<!-- <span style="margin-left: 10px">组号：</span>-->
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:150px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
@@ -23,25 +23,28 @@
:value="item.value"/>
</el-select>
<!-- <span style="margin-left: 10px">零件号：</span>-->
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px"/>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px;width:150px"/>
<!-- <span style="margin-left: 10px">工艺员：</span>-->
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px" clearable >
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
<el-option
v-for="item in person"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
<el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
</el-row>
</div>
</el-card>
<el-row>
<el-col style="width: 670px">
<el-card>
<el-table
v-loading="loading"
:data="tableData"
size="mini"
height="530"
height="740"
style="width: 650px"
border
stripe
highlight-current-row
@@ -51,32 +54,32 @@
type="selection"
align="center"
width="55"/>
<el-table-column label="机床号" prop="机床图号" align="center" width="150px">
<el-table-column label="机床号" prop="机床图号" align="center" width="120px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center">
<el-table-column label="组号" prop="组号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center">
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center">
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件投产数量" align="center">
<el-table-column label="投产数量" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="工艺员" prop="工艺员" align="center">
<el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.工艺员 }}
</template>
@@ -85,7 +88,7 @@
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[5, 10, 20]"
:page-sizes="[5, 10, 20, 300]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@@ -95,15 +98,16 @@
</el-card>
<el-card>
<div>
<el-tooltip effect="dark" content="将在制零件打回，重新编制工艺定额" placement="top">
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<div style="display: inline-block">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</div>
</el-tooltip>
</div>
</el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>
<div v-if="tableData2.length">
</el-col>
<el-col style="width: 1000px">
<el-card v-if="tableData2.length">
<table class="tg">
<tr>
<td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
@@ -169,8 +173,78 @@
<td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
</tr>
</table>
</div>
</el-dialog>
</el-card>
</el-col>
</el-row>
<!-- <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>-->
<!-- <div 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">{{ 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].机加工开始时间 : '' }}</td>-->
<!-- <td class="tg-c3ow">加工结束</td>-->
<!-- <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>-->
<!-- </tr>-->
<!-- </table>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
@@ -189,7 +263,7 @@ export default {
personValue: '',
person: [],
pageCurrent: 1,
pageSize: 20,
pageSize: 300,
total: 0,
tableData: [],
loading: false,

62
src/views/ManufacturingCenter/SparePartsForScrap/index.vue
View File

@@ -29,8 +29,8 @@
</el-row>
</el-card>
<el-row>
<el-col style="width: 850px">
<el-card style="width: 830px">
<el-col style="width: 690px">
<el-card style="width: 690px">
<el-table
v-loading="loading"
:data="tableData"
@@ -47,7 +47,7 @@
align="center"
prop="零件图号"
label="零件号"
width="180px"
width="150px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.零件图号 }}</template>
@@ -56,7 +56,7 @@
align="center"
prop="零件名称"
label="零件名称"
width="160px"
width="140px"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
@@ -88,24 +88,24 @@
>
<template slot-scope="scope">{{ scope.row.机加工结束时间 }}</template>
</el-table-column>
<el-table-column
align="center"
prop="province7"
label="零件状态"
width="80px"
>
<template slot-scope="scope">
<el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
<el-tag v-else type="success" size="small">生产</el-tag>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- align="center"-->
<!-- prop="province7"-->
<!-- label="状态"-->
<!-- width="50px"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>-->
<!-- <el-tag v-else type="success" size="small">生产</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
align="center"
label="操作"
width="100px"
width="80px"
>
<template slot-scope="scope" >
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="small" @click="handleEdit(scope.row)">停产</el-button>
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="mini" @click="handleEdit(scope.row)">停产</el-button>
</template>
</el-table-column>
</el-table>
@@ -121,7 +121,7 @@
</div>
</el-card>
</el-col>
<el-col style="width: 690px">
<el-col style="width: 510px">
<el-card>
<el-table
v-loading="loading2"
@@ -132,17 +132,17 @@
height="600"
border
stripe
style="width: 830px">
style="width: 510px">
<el-table-column
width="80px"
width="50px"
prop="province1"
label="工序顺序"
label="顺序"
align="center"
>
<template slot-scope="scope">{{ scope.row.工序顺序 }}</template>
</el-table-column>
<el-table-column
width="100px"
width="80px"
prop="province2"
label="工艺名称"
align="center"
@@ -153,30 +153,30 @@
prop="province4"
label="工艺要求"
align="center"
width="150px"
width="100px"
>
<template slot-scope="scope">{{ scope.row.工艺要求 }}</template>
</el-table-column>
<el-table-column
width="110px"
width="80px"
prop="province5"
label="单件定额工时"
label="单件定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.单件定额工时 }}</template>
</el-table-column>
<el-table-column
width="110px"
width="80px"
prop="province6"
label="准结定额工时"
label="准结定额"
align="center"
>
<template slot-scope="scope">{{ scope.row.准结定额工时 }}</template>
</el-table-column>
<el-table-column
width="110px"
width="90px"
prop="province7"
label="工艺是否完成"
label="完成状态"
align="center"
>
<template slot-scope="scope">
@@ -200,7 +200,7 @@
</el-row>
<el-card>
<div style="margin-top: 10px">停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
<div style="margin-top: 20px; display: block">
<div style="margin-top: 10px; display: block">
<span>补投接着加工零件数量</span>
<el-input v-model="inputA" auto-complete="off" style="width: 100px" size="small"/>
<span>开始工序</span>
@@ -208,7 +208,7 @@
<el-button type="primary" plain size="small" @click="editA">补投接着生产零件</el-button>
</div>
<!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
<div style="margin-top: 20px; display: block">
<div style="margin-top: 10px; display: block">
<span>补投重新加工零件数量</span>
<el-input v-model="inputC" auto-complete="off" style="width: 100px" size="small" />
<span>开始工序</span>