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

a

Browse Source
This commit is contained in:
Vergil
2020-05-22 17:58:06 +08:00
parent 4102840f00
commit e9a2038d2d
2 changed files with 126 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/ManufacturingCenter/GroupMatching.js
View File

@@ -27,7 +27,7 @@ export function searchgroup(num) {
}
})
}
export function searchTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
export function searchTable(check1, machine, check2, groupNum, check3, num, order, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -36,7 +36,7 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_基本件成组配套_查询数据_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num + '&排序=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}
@@ -66,7 +66,7 @@ export function searchTable22(check1, machine, check2, groupNum, check3, year, c
}
})
}
export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pageSize) {
export function searchTable1(check1, machine, check2, groupNum, check3, num, order, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
@@ -75,7 +75,7 @@ export function searchTable1(check1, machine, check2, groupNum, pageCurrent, pag
ModularID: router.currentRoute.path,
type: '1',
name: '库存管理_车间采购出库_零件查询_新',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '&名称规格型号_check=' + check3 + '&名称规格型号=' + num + '&排序=' + order,
pagination: pageCurrent + '&' + pageSize
}
})

154
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -21,13 +21,30 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-input v-model="materialName" placeholder="图号名称规格" size="small" style="width:140px" clearable/>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="text" plain style="float: right;margin-right: 20px;margin-top: 5px" @click="turnTo()">组件状态查询</el-button>
</el-card>
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
<el-tab-pane label="车间生产" name="车间生产">
<el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
<el-table
v-loading="loading"
:data="tableData"
:summary-method="getSummaries"
style="width: 100%;margin-top: 6px"
highlight-current-row
height="600"
size="mini"
show-summary
border
stripe
@sort-change="sortChange">
<el-table-column align="center" label="进程" width="100" sortable="custom">
<template slot-scope="scope">
{{ scope.row.进程 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -88,13 +105,9 @@
<el-tab-pane label="采购部采购" name="采购部采购">
<el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData00" size="mini" height="530px" border stripe>
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
<el-table :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -165,13 +178,9 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table :data="tableData01" size="mini" height="530px" border stripe>
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
<el-table :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -247,13 +256,9 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table :data="tableData02" size="mini" height="530px" border stripe>
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
<el-table :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope">
<!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
@@ -326,8 +331,8 @@
</el-tabs>
</el-tab-pane>
<el-tab-pane label="制造部采购" name="制造部采购">
<el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600">
<el-table-column label="进程" align="center" min-width="80">
<el-table :data="tableData1" border style="width: 100%;margin-top: 6px;" height="600" @sort-change="sortChange2">
<el-table-column label="进程" align="center" min-width="80" sortable="custom">
<template slot-scope="scope">
{{ scope.row.采购状态 }}
</template>
@@ -433,6 +438,12 @@ import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus
export default {
data() {
return {
order: 0,
order2: 0,
order3: 0,
order4: 0,
order5: 0,
materialName: '',
titleaa: '',
零件图号: '',
Machines: [],
@@ -544,20 +555,21 @@ export default {
this.SearchMachine()
},
methods: {
turnTo() {
this.$router.push({
path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
query: {
机床流水号: this.Machine
}
})
},
searchData() {
sortChange(column, prop, order) {
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') {
this.order = 2
} else {
this.order = 0
}
this.totalNum = 0
this.loading = true
var check
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
this.materialName ? check = 1 : check = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
@@ -574,7 +586,85 @@ export default {
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
},
sortChange2(column, prop, order) {
if (column.order === 'ascending') {
this.order2 = 1
} else if (column.order === 'descending') {
this.order2 = 2
} else {
this.order2 = 0
}
this.totalNum = 0
var check
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
this.materialName ? check = 1 : check = 0
searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order2, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.rows
this.total5 = parseInt(response.data.total)
})
},
sortChange3(column, prop, order) {
if (column.order === 'ascending') {
this.order3 = 1
} else if (column.order === 'descending') {
this.order3 = 2
} else {
this.order3 = 0
}
},
sortChange4(column, prop, order) {
if (column.order === 'ascending') {
this.order4 = 1
} else if (column.order === 'descending') {
this.order4 = 2
} else {
this.order4 = 0
}
},
sortChange5(column, prop, order) {
if (column.order === 'ascending') {
this.order5 = 1
} else if (column.order === 'descending') {
this.order5 = 2
} else {
this.order5 = 0
}
},
turnTo() {
this.$router.push({
path: '/ManufacturingCenter/CompletionOfWorkshopComponents',
query: {
机床流水号: this.Machine
}
})
},
searchData() {
this.totalNum = 0
this.loading = true
var check
this.Machine ? this.check1 = 1 : this.check1 = 0
this.Group ? this.check2 = 1 : this.check2 = 0
this.materialName ? check = 1 : check = 0
searchTable(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
for (let i = 0; i < response.data.result.length; i++) {
if (response.data.result[i].入库时间) {
response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
this.totalNum += 1
}
if (response.data.result[i].计划完成时间) {
response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
}
if (response.data.result[i].机加工实际完成时间) {
response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
}
}
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent, this.pageSize).then(response => {
this.tableData1 = response.data.rows
this.total5 = parseInt(response.data.total)
})