Merge branch 'master' of http://123.56.95.229:10010/r/高精
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
|
||||
<el-tab-pane label="标准件" name="标准件">
|
||||
<el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
|
||||
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="90px">
|
||||
<el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom">
|
||||
<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>-->
|
||||
@@ -161,7 +161,7 @@
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent0"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[10, 20, 30, 40, 50]"
|
||||
:page-size="pageSize0"
|
||||
:total="total0"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
@@ -172,7 +172,7 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
|
||||
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
|
||||
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
|
||||
<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>
|
||||
@@ -276,7 +276,7 @@
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent1"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[10, 20, 30, 40, 50]"
|
||||
:page-size="pageSize1"
|
||||
:total="total1"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
@@ -287,7 +287,7 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="基本件" name="基本件">
|
||||
<el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
|
||||
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="90px">
|
||||
<el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom">
|
||||
<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>
|
||||
@@ -397,7 +397,7 @@
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent2"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[10, 20, 30, 40, 50]"
|
||||
:page-size="pageSize2"
|
||||
:total="total2"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
@@ -434,13 +434,13 @@ export default {
|
||||
tableData2: [],
|
||||
tableData3: [],
|
||||
pageCurrent0: 1,
|
||||
pageSize0: 20,
|
||||
pageSize0: 50,
|
||||
total0: 0,
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 20,
|
||||
pageSize1: 50,
|
||||
total1: 0,
|
||||
pageCurrent2: 1,
|
||||
pageSize2: 20,
|
||||
pageSize2: 50,
|
||||
total2: 0
|
||||
}
|
||||
},
|
||||
@@ -657,6 +657,10 @@ export default {
|
||||
this.partName = 4
|
||||
} else if (column.prop === '供应商名称') {
|
||||
this.partName = 5
|
||||
} else if (column.prop === '供货商') {
|
||||
this.partName = 4
|
||||
} else if (column.prop === '询价状态编号') {
|
||||
this.partName = 6
|
||||
} else {
|
||||
this.partName = ''
|
||||
}
|
||||
@@ -728,6 +732,8 @@ export default {
|
||||
this.partName = 4
|
||||
} else if (column.prop === '供应商名称') {
|
||||
this.partName = 5
|
||||
} else if (column.prop === '询价状态编号') {
|
||||
this.partName = 6
|
||||
} else {
|
||||
this.partName = ''
|
||||
}
|
||||
@@ -801,6 +807,8 @@ export default {
|
||||
this.partName = 4
|
||||
} else if (column.prop === '供应商名称') {
|
||||
this.partName = 5
|
||||
} else if (column.prop === '询价状态编号') {
|
||||
this.partName = 6
|
||||
} else {
|
||||
this.partName = ''
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user