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:
zhangdingyu
2019-10-25 09:24:50 +08:00
parent 3d02306337 4e538ba9f3
commit cc964bc310
5 changed files with 69 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/Assembly/AssemblyQualityInspection.js
View File

@@ -35,7 +35,7 @@ export function searchgroup(num) {
})
}
// 质检管理_质量情况_查询数据
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) {
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
return request({
url: '',
method: 'post',
@@ -43,8 +43,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
type: '1',
name: '质检管理_装配质检_质检情况_查询数据',
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&检测项_check=' + check3 + '&检测项流水号=' + value3 +
'&质检情况_check=' + check4 + '&质检情况=' + value4,
Pagination: pageCurrent + '&' + pageSize
'&质检情况_check=' + check4 + '&质检情况=' + value4
}
})
}

3
src/api/Outsourcing/OutsourcingQCSearch.js
View File

@@ -8,8 +8,7 @@ export function searchTable1(...params) {
data: {
type: '1',
name: '车间生产管理_外协到货单_查询数据',
param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`,
Pagination: params[0] + '&' + params[1]
param: `外协到货单号_check=${params[0]}&外协到货单号=${params[1]}&外协厂家_check=${params[2]}&外协厂家=${params[3]}`
}
})
}

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

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-row>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -12,21 +12,21 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable>
<el-select v-model="TestValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in Test"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
<el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in qualityInspection"
:key="item.value"
@@ -40,7 +40,7 @@
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="830px">
<el-table-column align="center" prop="是否合格" 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>
@@ -84,16 +84,16 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 100]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
</div>
</template>
@@ -119,10 +119,10 @@ export default {
label: '不合格'
}
],
tableData1: [],
total: 0, // 总条数
pageSize: 10, // 每页显示条数
pageCurrent: 1 // 后台获取页
tableData1: []
// total: 0, // 总条数
// pageSize: 10, // 每页显示条数
// pageCurrent: 1 // 后台获取页
}
},
created() {
@@ -198,23 +198,20 @@ export default {
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
if (this.TestValue !== '' && this.TestValue !== null) { this.check3 = 1 } else { this.check3 = 0 }
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data.rows, 111)
this.tableData1 = response.data.rows
this.total = response.data.total
console.log(this.tableData1)
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
this.tableData1 = response.data
})
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.selecttable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.selecttable()
}
// 分页
// handleSizeChange(val) {
// this.pageCurrent = 1
// this.pageSize = val
// this.selecttable()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.selecttable()
// }
}
}

14
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -2,8 +2,8 @@
<div class="app-container">
<el-card>
<el-row>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
<!-- <span>机床编号:</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px" clearable @change="machineChange">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -13,8 +13,8 @@
<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>
<!-- <span>组号:</span>-->
<el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
<el-option
v-for="item in groupNumber"
:key="item.value"
@@ -196,13 +196,13 @@
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
<el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
<el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
<el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 15px" @click="Production()">车间生产</el-button>
</el-tooltip>
</el-card>
<el-card>

56
src/views/Outsourcing/OutsourcingQCSearch/index.vue
View File

@@ -2,9 +2,9 @@
<div class="app-container">
<el-card>
<el-input v-model="orderNumber" clearable style="width: 200px" placeholder="请输入外协到货单" size="small"/>
<el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
<!-- <span style="margin-left: 10px">外协厂家:</span>-->
<el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
<el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
<el-table-column label="序号" align="center" width="55" type="index"/>
@@ -24,18 +24,18 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize1"
:total="total1"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="400px" size="mini">
<!-- <div class="block" style="margin: 10px 0;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="420px" size="mini">
<el-table-column label="序号" align="center" width="50px" type="index"/>
<el-table-column label="零件名称" align="center" min-width="70px">
<template slot-scope="scope">
@@ -171,9 +171,9 @@ export default {
orderNumber: '',
outsourcingSupplier: '',
tableData1: [],
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
// pageCurrent1: 1,
// pageSize1: 10,
// total1: 0,
tableData2: [],
pageCurrent2: 1,
pageSize2: 10,
@@ -248,20 +248,20 @@ export default {
let check1, check2
this.orderNumber ? check1 = 1 : check1 = 0
this.outsourcingSupplier ? check2 = 1 : check2 = 0
searchTable1(this.pageCurrent1, this.pageSize1, check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
this.tableData1 = response.data.rows
searchTable1(check1, this.orderNumber, check2, this.outsourcingSupplier).then(response => {
this.tableData1 = response.data
this.total1 = response.data.total
})
},
handleSizeChange1(val) {
this.pageSize1 = val
this.pageCurrent1 = 1
this.searchTable1()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.searchTable1()
},
// handleSizeChange1(val) {
// this.pageSize1 = val
// this.pageCurrent1 = 1
// this.searchTable1()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.searchTable1()
// },
searchTable2(row) {
searchTable2(row.外协到货单流水号).then(response => {
this.tableData2 = response.data