diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
index 22b17376..431c9047 100644
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -54,7 +54,7 @@ export function searchTable1(...params) {
data: {
type: '1',
name: '采购管理_采购部采购_查询物料',
- param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&分配状态=${params[10]}`,
+ param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}`,
Pagination: params[0] + '&' + params[1]
}
})
@@ -67,7 +67,7 @@ export function searchTable2(...params) {
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件',
- param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&分配状态=${params[4]}`,
+ param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}`,
Pagination: params[0] + '&' + params[1]
}
})
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index f8524905..1b01d4ad 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -11,14 +11,8 @@
:label="item.label"
:value="item.value"/>
- 分配情况:
-
-
-
+ 物料状态:
+
+
+
+ 未分配
+ 未询价
+ 已询价
+ 已采购
+
+
{{ scope.row.项目名称 }}
@@ -140,7 +142,7 @@
{{ scope.row.物料计划到货时间.split(' ')[0] }}
-
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -169,14 +171,8 @@
:label="item.label"
:value="item.value"/>
- 分配情况:
-
-
-
+ 物料状态:
+
+
+
+ 未分配
+ 未询价
+ 已询价
+ 已采购
+
+
{{ scope.row.项目名称 }}
@@ -262,7 +266,7 @@
{{ scope.row.物料计划到货时间.split(' ')[0] }}
-
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -300,8 +304,8 @@ export default {
projectValue: '',
project: [],
materialName: '',
- allocateStateValue: 0,
- allocateState: [
+ materialStatusValue: [0], // 物料状态
+ materialStatus: [
{
value: 0,
label: '全部'
@@ -312,9 +316,23 @@ export default {
},
{
value: 2,
- label: '已分配'
+ label: '已分配',
+ children: [{
+ value: 3,
+ label: '未询价'
+ }, {
+ value: 4,
+ label: '已询价',
+ children: [{
+ value: 5,
+ label: '未采购'
+ }, {
+ value: 6,
+ label: '已采购'
+ }]
+ }]
}
- ],
+ ], // 物料状态
personValue: '',
person: [],
check1: 0,
@@ -378,14 +396,14 @@ export default {
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
this.materialName ? this.check4 = 1 : this.check4 = 0
- searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.allocateStateValue).then(response => {
+ searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
})
},
searchTable2() { // 查询基本件
this.projectValue ? this.check3 = 1 : this.check3 = 0
- searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.allocateStateValue).then(response => {
+ searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
})
@@ -460,7 +478,6 @@ export default {
}
},
filterHandler(value, row) {
- console.log(row, value)
return parseInt(row['人员编号']) === parseInt(value)
},
handleSizeChange1(val) {
@@ -532,6 +549,9 @@ export default {