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

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

Browse Source
This commit is contained in:
hedekun
2020-02-10 15:00:08 +08:00
parent e796a69dc9 3fb3038f8e
commit e12ce46a6b
39 changed files with 253 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,9 +33,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -177,7 +177,7 @@ export default {
selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注']
const filterVal = ['是否合格', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
const list = response.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({

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

@@ -6,7 +6,7 @@
<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: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
<el-table
:data="tableData"
border
@@ -29,10 +29,9 @@
<template slot-scope="scope">
<el-button
size="mini"
plain
type="danger"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -43,7 +42,7 @@
<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: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain 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"
@@ -59,10 +58,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -73,7 +71,7 @@
<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:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-table
:data="tableData2"
border
@@ -96,10 +94,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -110,7 +107,7 @@
<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:75%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;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"
@@ -126,10 +123,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -142,7 +138,7 @@
<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:75%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;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"
@@ -158,10 +154,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -172,7 +167,7 @@
<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:75%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;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"
@@ -188,10 +183,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>
@@ -202,7 +196,7 @@
<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:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
<el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain 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"
@@ -218,10 +212,9 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

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

@@ -59,9 +59,9 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px" plain @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -579,7 +579,7 @@ export default {
selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
const filterVal = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
const list = response.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({