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-25 11:03:38 +08:00
parent 375fb9fcb0
commit 3cd1f36946
2 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,8 +118,8 @@ export function searchTable02(...params) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_成组配套',
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[4]}&零件名称=${params[5]}&排序=${params[8]}`,
Pagination: params[4] + '&' + params[5] Pagination: params[6] + '&' + params[7]
} }
}) })
} }

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

@@ -105,13 +105,14 @@
<el-tab-pane label="采购部采购" name="采购部采购"> <el-tab-pane label="采购部采购" name="采购部采购">
<el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()"> <el-tabs v-model="PartType" type="border-card" style="margin-top: 10px" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件"> <el-tab-pane label="标准件" name="标准件">
<el-table :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3"> <el-table v-loading="searchTable0Loading" :data="tableData00" size="mini" height="530px" border stripe @sort-change="sortChange3">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left"> <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span> {{ scope.row.采购状态 }}
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span> <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" 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="info" size="small">已采购</span> <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
<!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号"> <el-table-column align="center" label="机床图号">
@@ -178,13 +179,14 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="外购件" name="外购件"> <el-tab-pane label="外购件" name="外购件">
<el-table :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4"> <el-table v-loading="searchTable1Loading" :data="tableData01" size="mini" height="530px" border stripe @sort-change="sortChange4">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left"> <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span> {{ scope.row.采购状态 }}
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span> <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" 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="info" size="small">已采购</span> <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
<!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号"> <el-table-column align="center" label="机床图号">
@@ -256,13 +258,14 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="基本件" name="基本件"> <el-tab-pane label="基本件" name="基本件">
<el-table :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5"> <el-table v-loading="searchTable2Loading" :data="tableData02" size="mini" height="530px" border stripe @sort-change="sortChange5">
<el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left"> <el-table-column align="center" prop="询价状态编号" label="进程" width="110px" sortable="custom" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span> {{ scope.row.采购状态 }}
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span> <!--<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>-->
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" 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="info" size="small">已采购</span> <!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>-->
<!--<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="机床图号"> <el-table-column align="center" label="机床图号">
@@ -438,6 +441,9 @@ import { searchTable, searchmachine, searchgroup, searchTable1, processingStatus
export default { export default {
data() { data() {
return { return {
searchTable0Loading: false,
searchTable1Loading: false,
searchTable2Loading: false,
order: 0, order: 0,
order2: 0, order2: 0,
order3: 0, order3: 0,
@@ -617,9 +623,11 @@ export default {
this.Machine ? check1 = 1 : check1 = 0 this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0 this.Group ? check2 = 1 : check2 = 0
this.materialName ? check = 1 : check = 0 this.materialName ? check = 1 : check = 0
this.searchTable0Loading = true
searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => { searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => {
this.tableData00 = response.data.rows this.tableData00 = response.data.rows
this.total00 = response.data.total this.total00 = response.data.total
this.searchTable0Loading = false
}) })
}, },
sortChange4(column, prop, order) { sortChange4(column, prop, order) {
@@ -630,6 +638,16 @@ export default {
} else { } else {
this.order4 = 0 this.order4 = 0
} }
let check1, check2, check
this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0
this.materialName ? check = 1 : check = 0
this.searchTable1Loading = true
searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => {
this.tableData01 = response.data.rows
this.total01 = response.data.total
this.searchTable1Loading = false
})
}, },
sortChange5(column, prop, order) { sortChange5(column, prop, order) {
if (column.order === 'ascending') { if (column.order === 'ascending') {
@@ -639,6 +657,16 @@ export default {
} else { } else {
this.order5 = 0 this.order5 = 0
} }
let check1, check2, check
this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0
this.materialName ? check = 1 : check = 0
this.searchTable2Loading = true
searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => {
this.tableData02 = response.data.rows
this.total02 = response.data.total
this.searchTable2Loading = false
})
}, },
turnTo() { turnTo() {
this.$router.push({ this.$router.push({
@@ -729,32 +757,41 @@ export default {
}, },
// 查询标准件 // 查询标准件
searchTable0() { searchTable0() {
let check1, check2 let check1, check2, check
this.Machine ? check1 = 1 : check1 = 0 this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0 this.Group ? check2 = 1 : check2 = 0
searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent00, this.pageSize00, 1, this.order3).then(response => { this.materialName ? check = 1 : check = 0
this.tableData00 = response.data.rows this.searchTable1Loading = true
this.total00 = response.data.total searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => {
this.tableData01 = response.data.rows
this.total01 = response.data.total
this.searchTable1Loading = false
}) })
}, },
// 查询外购件 // 查询外购件
searchTable1() { searchTable1() {
let check1, check2 let check1, check2, check
this.Machine ? check1 = 1 : check1 = 0 this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0 this.Group ? check2 = 1 : check2 = 0
searchTable01(check1, this.Machine, check2, this.Group, this.pageCurrent01, this.pageSize01, 2, this.order4).then(response => { this.materialName ? check = 1 : check = 0
this.searchTable1Loading = true
searchTable01(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent01, this.pageSize01, 2, this.order3).then(response => {
this.tableData01 = response.data.rows this.tableData01 = response.data.rows
this.total01 = response.data.total this.total01 = response.data.total
this.searchTable1Loading = false
}) })
}, },
// 查询基本件 // 查询基本件
searchTable2() { searchTable2() {
let check1, check2 let check1, check2, check
this.Machine ? check1 = 1 : check1 = 0 this.Machine ? check1 = 1 : check1 = 0
this.Group ? check2 = 1 : check2 = 0 this.Group ? check2 = 1 : check2 = 0
searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02, this.order5).then(response => { this.materialName ? check = 1 : check = 0
this.searchTable2Loading = true
searchTable02(check1, this.Machine, check2, this.Group, check, this.materialName, this.pageCurrent02, this.pageSize02, this.order5).then(response => {
this.tableData02 = response.data.rows this.tableData02 = response.data.rows
this.total02 = response.data.total this.total02 = response.data.total
this.searchTable2Loading = false
}) })
}, },
handleSizeChange(val) { handleSizeChange(val) {