This commit is contained in:
liushuai
2020-05-20 18:08:00 +08:00
parent 56c42f1a52
commit 6e4a26aeed
7 changed files with 107 additions and 84 deletions

View File

@@ -75,7 +75,6 @@
<el-table
v-loading="loading"
:data="tableData11"
:row-class-name="tableRowClassName"
border
style="width: 100%;max-height: 500px;"
height="300px"
@@ -83,7 +82,6 @@
highlight-current-row
@sort-change="sortChange"
@selection-change="handleSelectionChange1"
@select="handleSelection"
@row-click="rowClick">
<el-table-column :selectable="selectable" align="center" width="43" type="selection" fixed="left"/>
<!--物料名称排序-->
@@ -272,14 +270,12 @@
<el-table
v-loading="loading2"
:data="tableData12"
:row-class-name="tableRowClassName2"
border
style="width: 100%;max-height: 500px;"
height="300px"
size="mini"
@selection-change="handleSelectionChange2"
@sort-change="sortChange"
@select="handleSelection1">
@sort-change="sortChange">
<el-table-column :selectable="selectable" align="center" width="50" type="selection" fixed="left"/>
<!--<el-table-column label="操作" align="center" width="100" fixed="left">-->
<!--<template slot-scope="scope">-->
@@ -1075,8 +1071,6 @@ export default {
cancelNum: 0,
machines1: [],
machines2: [],
numbers: [],
numbers1: [],
row1: '',
ordername: '',
order: '',
@@ -1163,30 +1157,6 @@ export default {
}
})
},
handleSelection(val, row) {
this.tableData11.forEach((item, i) => {
if (item.组件零件流水号 === row.组件零件流水号) {
console.log(this.numbers.indexOf(i), 234)
if (this.numbers.indexOf(i) === -1) {
this.numbers.push(i)
} else {
this.numbers.splice(this.numbers.indexOf(i), 1)
}
}
})
},
handleSelection1(val, row) {
this.tableData12.forEach((item, i) => {
if (item.组件零件基本件流水号 === row.组件零件基本件流水号) {
console.log(this.numbers1.indexOf(i), 234)
if (this.numbers1.indexOf(i) === -1) {
this.numbers1.push(i)
} else {
this.numbers1.splice(this.numbers1.indexOf(i), 1)
}
}
})
},
Jump() {
window.location.hash = '#PurchasingCenter/CreateInquirySheet'
},
@@ -2098,7 +2068,6 @@ export default {
}
},
addInquirySheet() { // 追加物料
this.numbers = []
const numGroup1 = [] // 空数组,放该询价单中已有的组件零件流水号
const numGroup2 = [] // 空数组,放该询价单中已有的组件零件基本件流水号
if (this.inquirySheetFlowNum === '' || this.inquirySheetFlowNum === null) {
@@ -2286,28 +2255,6 @@ export default {
this.searchTable11()
} else { this.$message.error('操作失败') }
})
},
tableRowClassName({ row, rowIndex }) {
let color = ''
if (this.numbers.length > 0) {
this.numbers.forEach((r, i) => {
if (rowIndex === r) {
color = 'MistyRose'
}
})
} else {
color = ''
}
return color
},
tableRowClassName2({ row, rowIndex }) {
let color = ''
this.numbers1.forEach((r, i) => {
if (rowIndex === r) {
color = 'MistyRose'
}
})
return color
}
}
}

View File

@@ -57,8 +57,8 @@
<!--<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.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" 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>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">
@@ -176,8 +176,8 @@
<template slot-scope="scope">
<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.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" 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>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">
@@ -301,8 +301,8 @@
<template slot-scope="scope">
<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.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" 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>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">

View File

@@ -117,13 +117,13 @@
</el-tooltip>
<!--</div>-->
</el-row>
<el-row style="margin-bottom: 3px">
<el-row style="margin-bottom: 5px">
<el-table
v-loading="loading"
:data="tableData0"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}"
size="mini"
height="740px"
height="782"
style="width: 1650px"
border
stripe
@@ -250,7 +250,7 @@
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize0"
:total="total0"
style="display:inline-block;width:50%"
style="display:inline-block;width:50%;margin-top: 5px"
small
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange0"
@@ -341,7 +341,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
<el-table v-loading="loading" :data="tableData1" size="mini" height="780px" style="width: 1650px" border stripe @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="100px" width="60px">
<template slot-scope="scope">
@@ -457,7 +457,7 @@
:page-size="pageSize1"
:total="total1"
small
style="display:inline-block;width:30%"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
@@ -522,7 +522,7 @@
<!--<el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData2" size="mini" height="774px" style="width: 16505px" border stripe @selection-change="handleSelectionChange2">
<el-table-column :selectable="selectable" align="center" type="selection" width="42px"/>
<el-table-column align="center" prop="询价状态编号" label="进程" min-width="80px" width="60px">
<template slot-scope="scope">