From 2c6c251bd3b4c574880b39ac92d9d1bd240a73d1 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 7 Nov 2019 13:50:41 +0800 Subject: [PATCH 1/6] request --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..2cb92ad8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From 38b9a2f38d364d69006483c9a4dc4e96967d7243 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 7 Nov 2019 15:23:55 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=88=E9=87=87=E8=B4=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/OfflineContract.js | 2 +- .../MaterialMProcure/index.vue | 9 +- .../OfflineContract/index.vue | 125 ++++++++---------- 3 files changed, 64 insertions(+), 72 deletions(-) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index b0fee696..7b437320 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -215,7 +215,7 @@ export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check data: { type: '1', name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', - 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}`, + 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/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue index 1bdd18b6..0b86ba3f 100644 --- a/src/views/PurchasingCenter/MaterialMProcure/index.vue +++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue @@ -1,7 +1,7 @@ - + + + + + + + + + + @@ -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() } } } From fec631e2fcff7eb0afd4e078c59896bedcb3cd2f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 8 Nov 2019 17:48:09 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OfflineContract/index.vue | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 7b79ead5..b5c9b39a 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -111,7 +111,7 @@ {{ scope.row.物料型号 }} - + @@ -165,7 +165,7 @@ {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }} - + @@ -289,7 +289,7 @@

税率:

- 快速修改价格 + 快速修改价格 还原 @@ -363,11 +363,6 @@ - - - - - - + - + - + - + From 2cc8ce5025721d7d7de16c837faaa846ecd68388 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 9 Nov 2019 13:52:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/OfflineContract.js | 12 +-- src/utils/request.js | 2 +- .../OfflineContract/index.vue | 80 ++++++------------- 3 files changed, 33 insertions(+), 61 deletions(-) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index c1bef1f6..009a1eae 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -208,14 +208,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2 }) } // 查询分配后的标准件和外购件 -export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) { +export function searchMaterial1(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', - 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}`, + name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191109', + param: `名称规格型号_check=${check1}&名称规格型号=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -234,14 +234,14 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va }) } // 查询物料 -export function searchMaterial22(check1, val1, check2, val2, check3, val3, pageCurrent, pageSize) { +export function searchMaterial22(check1, val1, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_离线采购_物料主文件_基本_查询数据', - param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`, + param: `名称规格型号_check=${check1}&名称规格型号=${val1}`, Pagination: pageCurrent + '&' + pageSize } }) @@ -265,7 +265,7 @@ export function searchMachine(num) { data: { type: '1', name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=1&项目流水号=' + num + param: '项目流水号_check=0&项目流水号=' + num } }) } diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index b5c9b39a..d77b9660 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -5,34 +5,14 @@ - - - - + + - - - - - - - - - - - 查询 + 查询
- + 已采购 + + + + + + + + + - - - - - - - - -