diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index d93677ff..0b2693e7 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -76,27 +76,27 @@ export function getExport2(num) {
})
}
// 查询分配后的标准件和外购件
-export function searchMaterial(pageCurrent, pageSize, person, check5, val5, val8, val9, val10, val11, val12) {
+export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_创建询价单',
- param: `人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}&名称规格型号_check=${val11}&名称规格型号=${val12}`,
+ param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询分配后的基本件
-export function searchPart(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) {
+export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单',
- param: `名称图号规格材料_check=${check1}&名称图号规格材料=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
+ param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 07de5932..dbac4fd1 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -46,7 +46,7 @@
-
+
-->
+ 查询
+ 导出未询价单
+
-
- 查询
- 导出未询价物料清单
-
-
-
-
-
- 确定
-
- 调整采购任务
-
+ 调整采购任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{{ scope.row.任务分配时间.split(' ')[0] }}
@@ -233,7 +241,7 @@
-
+
-->
+ 查询
+ 导出未询价单
- 查询
- 导出未询价物料清单
-
-
-
-
-
- 确定
-
- 调整采购任务
-
+ 调整采购任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -736,8 +752,8 @@
-
-
+
+
@@ -1691,11 +1707,15 @@ export default {
return row['供货商'].trim() === value
},
searchTable11() { // 查询外购件列表
- let check5, check7, check9
+ let check1, check2, check3, check4, check5, check6, check7
+ this.materialName ? check1 = 1 : check1 = 0
+ this.materialSpec ? check2 = 1 : check2 = 0
+ this.materialModel ? check3 = 1 : check3 = 0
+ this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
- this.startTime ? check7 = 1 : (check7 = 0, this.startTime = [])
- this.materialName ? check9 = 1 : check9 = 0
- searchMaterial(this.pageCurrent11, this.pageSize11, this.id, check5, this.machineValue, check7, this.startTime[0], this.startTime[1], check9, this.materialName).then(response => {
+ this.groupValue ? check6 = 1 : check6 = 0
+ this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+ searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1726,11 +1746,15 @@ export default {
this.searchTable11()
},
searchTable12() { // 查询基本件列表
- let check3, check7, check5
- this.partNum ? check3 = 1 : check3 = 0
+ let check1, check2, check3, check4, check5, check6, check7
+ this.partNum ? check1 = 1 : check1 = 0
+ this.partName ? check2 = 1 : check2 = 0
+ this.partSpec ? check3 = 1 : check3 = 0
+ this.projectValue ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
+ this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
- searchPart(this.pageCurrent12, this.pageSize12, check3, this.partNum, this.id, check5, this.machineValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []