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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-20 19:34:56 +08:00
parent 95284fab38
commit 9c2b03c2b5
11 changed files with 405 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -2,8 +2,7 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,7 +12,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-option
v-for="item in groupNumber"
@@ -21,7 +19,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>检测项:</span>
<el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable>
<el-option
v-for="item in Test"
@@ -29,7 +26,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>质检情况:</span>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
<el-option
v-for="item in qualityInspection"
@@ -42,7 +38,7 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" height="600px">
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
<el-table-column align="center" label="检验情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
@@ -60,17 +56,17 @@
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center" width="120px">
<el-table-column label="组号" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="部件名称" align="center" width="120px">
<el-table-column label="部件名称" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.组件名称 }}
</template>
</el-table-column>
<el-table-column label="检测项" align="center" width="120px">
<el-table-column label="检测项" align="center" width="100px">
<template slot-scope="scope">
{{ scope.row.检测项 }}
</template>

41
src/views/Assembly/QualityBasicData/index.vue
View File

@@ -6,14 +6,15 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd1()">增加</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
<el-table
:data="tableData"
border
style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px"
highlight-current-row
size="small">
size="mini"
stripe
highlight-current-row>
<el-table-column
type="index"
label="序号"
@@ -28,6 +29,7 @@
<template slot-scope="scope">
<el-button
size="mini"
plain
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@@ -41,8 +43,8 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格处理</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd2()">增加</el-button>
<el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
<el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" stripe height="350px" highlight-current-row size="mini">
<el-table-column
type="index"
label="序号"
@@ -58,6 +60,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -72,14 +75,15 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd3()">增加</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-table
:data="tableData2"
border
style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px"
height="350px"
stripe
highlight-current-row
size="small">
size="mini">
<el-table-column
type="index"
label="序号"
@@ -95,6 +99,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -107,8 +112,8 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column
type="index"
label="序号"
@@ -124,6 +129,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -136,8 +142,8 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column
type="index"
label="序号"
@@ -153,6 +159,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -167,8 +174,8 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small" @row-click="searchTesting">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
<el-table-column
type="index"
label="序号"
@@ -184,6 +191,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -196,8 +204,8 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项明细</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
<el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
<el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column
type="index"
label="序号"
@@ -213,6 +221,7 @@
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>

86
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<span style="margin-left:10px">机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
@@ -33,14 +33,14 @@
</el-select>
</el-row>
<el-row style="margin-top: 20px">
<span class="demonstration">时间区间:</span>
<!--<span class="demonstration">时间区间:</span>-->
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 160px;margin-left: 10px"
type="date"
placeholder="选择日期"/>
placeholder="选择开始日期"/>
<span class="demonstration">~</span>
<el-date-picker
v-model="endTime"
@@ -48,17 +48,17 @@
size="small"
style="width: 160px"
type="date"
placeholder="选择日期"/>
<span>质检情况:</span>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
placeholder="选择结束日期"/>
<!--<span>质检情况:</span>-->
<el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 140px;margin-left: 50px" clearable>
<el-option
v-for="item in qualityInspection"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>质检人员:</span>
<el-select v-model="personNum" filterable placeholder="质检人员" size="small" clearable>
<!--<span>质检人员:</span>-->
<el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 140px;margin-left: 10px" clearable>
<el-option
v-for="item in person"
:key="item.value"
@@ -70,7 +70,7 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column align="center" label="禁用情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -82,17 +82,17 @@
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="160px">
<el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<el-table-column label="组号" align="center" width="60px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件型号" align="center">
<el-table-column label="零件型号" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -160,7 +160,7 @@
<el-table-column label="形位" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope">
@@ -185,7 +185,7 @@
<el-table-column label="尺寸" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope">
@@ -210,7 +210,7 @@
<el-table-column label="外观" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click">
<el-table :data="gridData" highlight-current-row size="mini">
<el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="类别">
<template slot-scope="scope">
@@ -232,11 +232,12 @@
</el-popover>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100">
<el-table-column label="操作" fixed="right" align="center" min-width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewPicture(scope.row)">查看图片</el-button>
</template>
@@ -255,14 +256,14 @@
</div>
</el-card>
<el-card>
<h3 align="center">正在加工零件列表</h3>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="160px">
<el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -272,7 +273,7 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<el-table-column label="零件图号" align="center" min-width="110px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
@@ -302,13 +303,14 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100">
<el-table-column label="操作" fixed="right" align="center" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序情况</el-button>
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
@@ -324,34 +326,34 @@
</div>
</el-card>
<el-card>
<h3 align="center">待加工零件列表</h3>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table-column label="机床图号" align="center">
<el-table-column label="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="160px">
<el-table-column label="机床名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
<el-table-column label="组号" align="center">
<el-table-column label="组号" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center">
<el-table-column label="零件图号" align="center" width="140px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center">
<el-table-column label="零件名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件数量" align="center">
<el-table-column label="零件数量" align="center" width="70px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -361,7 +363,7 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="工位" align="center" width="100px">
<el-table-column label="工位" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.mes终端编号 }}
</template>
@@ -371,13 +373,14 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="100">
<el-table-column label="操作" fixed="right" align="center" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-search"
@click="viewProcedures(scope.row)">查看工序情况</el-button>
@click="viewProcedures(scope.row)">查看工序</el-button>
</template>
</el-table-column>
</el-table>
@@ -392,7 +395,7 @@
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
<el-row>
<span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
@@ -404,14 +407,15 @@
style="width: 100%;max-height: 400px;margin-top: 20px"
size="mini"
height="300"
stripe
highlight-current-row
border>
<el-table-column align="center" label="工序顺序" width="100">
<el-table-column align="center" label="工序顺序" width="70">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺名称" width="150">
<el-table-column align="center" label="工艺名称" width="120">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -426,14 +430,14 @@
{{ scope.row.员工姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺是否完成" width="130">
<el-table-column align="center" label="工艺是否完成" width="120">
<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="130">
<el-table-column align="center" label="工艺是否质检" width="120">
<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>
@@ -442,9 +446,9 @@
</el-table-column>
</el-table>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="1100px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="800px">
<viewer>
<img v-for="url in urls" :key="url" :src="url" lazy style="width: 1000px;height: 700px">
<img v-for="url in urls" :key="url" :src="url" lazy style="width: 700px;height: 700px">
</viewer>
</el-dialog>
</div>
@@ -695,5 +699,7 @@ export default {
</script>
<style scoped>
h3{
margin: 5px !important;
}
</style>