From 998944ad0dc1938c017b989782a9a07f8a3fc8f2 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 8 Nov 2019 16:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/OfflineContract.js | 11 +- .../OfflineContract/index.vue | 475 +++--------------- 2 files changed, 82 insertions(+), 404 deletions(-) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 7b437320..c1bef1f6 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -214,7 +214,7 @@ export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check method: 'post', data: { type: '1', - name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', + name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191108', 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 } @@ -233,15 +233,16 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va } }) } -// 查询分配后的仓库采购件 -export function searchMaterial22(num1, check1, val1, check2, val2, check3, val3, person, val8, val9, val10) { +// 查询物料 +export function searchMaterial22(check1, val1, check2, val2, check3, val3, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_仓库采购_离线合同_查询', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}` + name: '采购管理_离线采购_物料主文件_基本_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 9b6d9f80..7b79ead5 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -3,7 +3,7 @@ - + @@ -121,19 +121,38 @@ {{ scope.row.零件数量 }} - + + + + + + + + + + @@ -148,7 +167,7 @@ @@ -164,386 +183,35 @@ @current-change="handleCurrentChange11"/> - - - - - - - - - - - - - - - - - - - - 查询 - -
- - - - 确定 -
- 调整采购任务 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - 查询 - -
- - - - 确定 -
- 调整采购任务 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - 物料状态: - - - 查询 + + + + + + + + + + + + + + 查询 - - - - - - - - - - - - - - - - + - + - - - - - - +
+ +
@@ -1202,7 +871,10 @@ export default { 离线合同状态: '', paramRow: '', // 参数row disable: true, // 其他的禁用 - tabName: '标准件' + tabName: '标准件', + total22: 0, + pageCurrent22: 1, + pageSize22: 20 } }, computed: { @@ -1917,8 +1589,8 @@ export default { if (this.tabName === '外购件') { this.partType = 2 } if (this.tabName === '标准件') { this.partType = 1 } searchMaterial1(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, this.partType, check7, this.startTime[0], this.startTime[1]).then(response => { + console.log(response.data, 111222) this.tableData00 = response.data.rows - console.log(this.tableData00, 111222) this.total11 = response.data.total const remark = [] const supplier = [] @@ -1947,7 +1619,8 @@ export default { this.pageCurrent11 = val this.searchTable11() }, - searchTable12() { // 查询基本件列表 + // 查询基本件列表 + searchTable12() { let check1, check2, check3, check4, check5, check6, check7 this.partNum ? check1 = 1 : check1 = 0 this.partName ? check2 = 1 : check2 = 0 @@ -1984,30 +1657,34 @@ export default { this.searchTable12() }, searchTable22() { - let check1, check2, check3, check7 + let check1, check2, check3 this.materialName ? check1 = 1 : check1 = 0 this.materialSpec ? check2 = 1 : check2 = 0 this.materialModel ? check3 = 1 : check3 = 0 - this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') - searchMaterial22(this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check7, this.startTime[0], this.startTime[1]).then(response => { - this.tableData22 = response.data - const remark = [] + searchMaterial22(check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent22, this.pageSize22).then(response => { + console.log(response.data, 3333) + this.tableData22 = response.data.rows + this.total22 = response.data.total const supplier = [] this.remarkFilters = [] this.supplierFilters = [] - response.data.map(v => { - if (v.备注 === null) { v.备注 = '' } + response.data.rows.map(v => { if (v.供货商 === null) { v.供货商 = '' } - if (!remark.includes(v.备注)) { - remark.push(v.备注) - this.remarkFilters.push({ text: v.备注, value: v.备注 }) - } if (!supplier.includes(v.供货商)) { supplier.push(v.供货商) this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) } }) }) + }, + handleSizeChange22(val) { // 标准件和外购件列表分页 + this.pageSize11 = val + this.pageCurrent11 = 1 + this.searchTable22() + }, + handleCurrentChange22(val) { // 标准件和外购件列表分页 + this.pageCurrent11 = val + this.searchTable22() } } }