From 431dd5f183a6f28dcb178b28e1a109b5889e928e Mon Sep 17 00:00:00 2001 From: bryan sun Date: Thu, 7 Nov 2019 08:54:54 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index fc41e22d..03220e7d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -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 2c6c251bd3b4c574880b39ac92d9d1bd240a73d1 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 7 Nov 2019 13:50:41 +0800 Subject: [PATCH 02/38] 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 03/38] =?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 05/38] =?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 06/38] =?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 @@ - - - - + + - - - - - - - - - - - 查询 + 查询
- + 已采购 + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + +
@@ -145,6 +161,7 @@ export default { }) } }) + this.searchTable1() }, machineChange() { this.group = [] @@ -163,6 +180,7 @@ export default { let check2, check3 this.machineValue ? check2 = 1 : check2 = 0 this.groupValue ? check3 = 1 : check3 = 0 + console.log(1, this.projectValue, check2, this.machineValue, check3, this.groupValue) searchProjectTotal(1, this.projectValue, check2, this.machineValue, check3, this.groupValue).then(response => { this.tableData1 = response.data }) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 7b03788a..152c41e6 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -24,7 +24,7 @@ - + @@ -56,7 +56,7 @@ size="small" icon="el-icon-search" style="margin-left:10px" - @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 + @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询 - + - - - - + + + + + + - + - + - + - + - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -201,7 +226,7 @@ diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue index bccf5d5b..b70f5f5f 100644 --- a/src/views/PurchasingCenter/SupplierManagement/index.vue +++ b/src/views/PurchasingCenter/SupplierManagement/index.vue @@ -8,61 +8,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 新增供应商 @@ -72,8 +72,8 @@ -
供应商列表
- +
供应商列表
+ @@ -128,44 +121,29 @@ {{ scope.row.供货商 }} - - - - - - - - - - - - - - - - - - + + + - + @@ -244,37 +222,33 @@ @size-change="handleSizeChange11" @current-change="handleCurrentChange11"/> - + - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + 调整采购任务 + + - - - - - - - - - - - + + + + + + + + + + + @@ -339,29 +338,29 @@ {{ scope.row.参考价格 }} - + - + - + - + - + - + - + - + @@ -583,40 +583,40 @@ -
- - - - - 查询 - + + + + 选入物料 - - 创建询价单 -
- -

询价单

- 编辑 - 删除 - - 打印 - 导出 - - 保存 - + icon="el-icon-search" + style="margin:0px 10px" + @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询 + + 选入物料 + + 创建询价单 + + +

询价单

+ 编辑 + 删除 + + 打印 + 导出 + + 保存 + + @@ -682,19 +682,19 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -710,7 +710,7 @@ {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }} - + @@ -720,9 +720,9 @@ {{ scope.row.技术下达数量 }} - + @@ -732,7 +732,7 @@ From 916ddb04fae5cd537ed6d3127a61c6fb93bfbfc2 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 11 Nov 2019 16:12:38 +0800 Subject: [PATCH 20/38] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/PurchaseContractRequestFund/index.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 9c20756d..eea2073c 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -36,13 +36,11 @@ {{ scope.row.姓名 }} - + - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + @@ -569,6 +570,8 @@ export default { }, data() { return { + customerName1: '', + customerName1_check: '', machineDATA: '', name: '', a: 1, @@ -748,6 +751,7 @@ export default { this.peoplename = '' }, fetchTableData1() { + if (this.customerName1 === '' || this.customerName1 === null) { this.customerName1_check = 0 } else { this.customerName1_check = 1 } if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 } if (this.MarketingManagerValue === '' || this.MarketingManagerValue === null) { this.peopleid_check = 0 } else { this.peopleid_check = 1 } if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } @@ -757,7 +761,7 @@ export default { this.uploader = false this.ExecutionProgress = null this.listLoading = true - this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine], ['tableData1', 'total', 'listLoading']) + this.getTable(searchTable1, [this.PageCurrent, this.PageSize, this.entryNameValue, this.peopleid, this.entryNameValue_check, this.peopleid_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.machine_check, this.machine, this.customerName1_check, this.customerName1], ['tableData1', 'total', 'listLoading']) }, fetchExecutionProgressdata(row) { this.projectNum = row.项目流水号 From 5223957c8e8eb947c5fb4a1f51b664b8e2a39876 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 12 Nov 2019 16:54:49 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractRequestFund.js | 18 +-- .../PurchaseContractRequestFund/index.vue | 152 ++++++++++++++---- 2 files changed, 131 insertions(+), 39 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index 4c8c7443..e00fd12b 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -12,14 +12,14 @@ export function searchTable0(check, date1, date2) { }) } // 采购合同内容查询 -export function searchContract(num) { +export function searchContract(check, num1, num2) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同内容_查询数据', - param: '采购合同流水号=' + num + name: '采购管理_采购合同内容_查询数据_合并后', + param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}` } }) } @@ -48,14 +48,14 @@ export function searchSupplier() { }) } // 采购合同请款 -export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { +export function submitRequestFund(contractGroup, offGroup, sumGroup, supplier, money, person) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_采购合同_请款_增加数据', - param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` + name: '采购管理_采购合同_请款_增加数据_合并后', + param: `采购合同流水号组=${contractGroup}&离线合同流水号组=${offGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` } }) } @@ -84,14 +84,14 @@ export function cancelRequestFund(num) { }) } // 查询离线合同待请款信息 -export function searchPurchaseContract(check, num) { +export function searchPurchaseContract(check1, check, num) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同_查询数据', - param: `供应商流水号_check=${check}&供应商流水号=${num}` + name: '采购管理_采购合同_查询数据_合并后', + param: `check=${check1}&供应商流水号_check=${check}&供应商流水号=${num}` } }) } diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index eea2073c..b6373f37 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -11,12 +11,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 请款

请款表

@@ -82,9 +77,9 @@ - + @@ -116,39 +111,98 @@ @current-change="handleCurrentChange1"/> - + +

合同明细

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 供应商： - + - 查询 - - - + + + + - + - + - + + + + - + @@ -174,7 +228,6 @@ 确定请款 -
@@ -248,6 +301,7 @@ export default { tableData01: [], SUM: 0, contractGroup: [], + offGroup: [], gridData: [] } }, @@ -287,10 +341,37 @@ export default { }) }, searchContract(row) { - searchContract(row.采购合同流水号).then(response => { - this.returns = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContract(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.tableData2 = response.data }) }, + getSummaries(param) { // 合计 + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价' + } else if (index === 6) { + const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += ' 元' + } else { + sums[index] = 'N/A' + } + } + }) + return sums + }, handleSizeChange1(val) { this.pageSize1 = val this.pageCurrent1 = 1 @@ -310,7 +391,7 @@ export default { }) this.totalSum = 0 this.totalPay = 0 - searchPurchaseContract(check2, this.supplierValue).then(response => { + searchPurchaseContract(1, check2, this.supplierValue).then(response => { response.data.map(data => { this.totalSum += data.合同总额 this.totalPay += data.已付金额 @@ -327,18 +408,18 @@ export default { searchTable01() { // 查询待请款 if (this.supplierValue) { this.contractGroup = [] + this.offGroup = [] let check this.supplierValue ? check = 1 : check = 0 - searchPurchaseContract(check, this.supplierValue).then(response => { + searchPurchaseContract(2, check, this.supplierValue).then(response => { this.tableData01 = response.data this.tableData01.map(v => { this.$set(v, '请款金额', 0) v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) + console.log(this.tableData01) }) - } else { - this.$message.error('请选择供应商') } }, selectable(row, index) { // 控制某行是否可选 @@ -348,10 +429,12 @@ export default { this.selectContents = val this.SUM = 0 this.contractGroup = [] + this.offGroup = [] this.sumGroup = [] for (let i = 0; i < val.length; i++) { this.SUM += parseFloat(val[i].请款金额) this.contractGroup.push(val[i].采购合同流水号) + this.offGroup.push(val[i].采购合同流水号) this.sumGroup.push(val[i].请款金额) } }, @@ -359,20 +442,29 @@ export default { if (this.supplierValue && this.contractGroup.length !== 0) { this.SUM = 0 this.contractGroup = [] + this.offGroup = [] this.sumGroup = [] for (let i = 0; i < this.tableData01.length; i++) { for (let j = 0; j < this.selectContents.length; j++) { - if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) { - this.SUM += parseFloat(this.tableData01[i].请款金额) - this.contractGroup.push(this.tableData01[i].采购合同流水号) - this.sumGroup.push(this.tableData01[i].请款金额) + if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号 && this.selectContents[j].合同类型 === this.tableData01[i].合同类型) { + if (this.selectContents[j].合同类型 === 1) { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push(this.tableData01[i].采购合同流水号) + this.offGroup.push('a974548') + this.sumGroup.push(this.tableData01[i].请款金额) + } else { + this.SUM += parseFloat(this.tableData01[i].请款金额) + this.contractGroup.push('a974548') + this.offGroup.push(this.tableData01[i].采购合同流水号) + this.sumGroup.push(this.tableData01[i].请款金额) + } } } } if (this.SUM === 0) { this.$message.error('请款金额不能为0') } else { - submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person + submitRequestFund(this.contractGroup, this.offGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { if (response.data[0].result === '1') { this.$message.success('请款成功') this.searchTable1() From 51fb51efb43c29a6def7e32d541b552943af93b3 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 12 Nov 2019 17:27:17 +0800 Subject: [PATCH 26/38] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/PurchasingCenter/FundApproval.js | 6 +- .../PurchasingCenter/FundApproval1/index.vue | 83 +++---------------- .../PurchaseContractRequestFund/index.vue | 1 - 3 files changed, 16 insertions(+), 74 deletions(-) diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js index 5a696614..d334f78d 100644 --- a/src/api/PurchasingCenter/FundApproval.js +++ b/src/api/PurchasingCenter/FundApproval.js @@ -75,14 +75,14 @@ export function execApprovalOffline(num1, num2, reason, person, state) { }) } // 采购合同内容查询 -export function searchContactDetail(num) { +export function searchContactDetail(check, num1, num2) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_采购合同内容_查询数据', - param: '采购合同流水号=' + num + name: '采购管理_采购合同内容_查询数据_合并后', + param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}` } }) } diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index 9a3528c7..6327fb22 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -30,7 +30,7 @@ @@ -58,72 +58,11 @@ @current-change="handleCurrentChange1"/> - - -

离线合同

- - - - - - - - - - - - - - - - - -
- -
- -

采购合同

-
-

离线合同

+

合同明细

- + @@ -131,7 +70,7 @@ {{ scope.row.物料名称 }} - + @@ -158,7 +97,7 @@ @@ -205,8 +144,11 @@ export default { }, methods: { searchContactDetail(row) { - searchContactDetail(row.采购合同流水号).then(response => { - this.contractDetail1 = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.contractDetail2 = response.data + // this.contractDetail1 = response.data[0].合同内容 }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 @@ -241,7 +183,7 @@ export default { }, fetchData() { this.searchTable1() - this.searchTable2() + // this.searchTable2() }, searchTable1() { initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => { @@ -310,6 +252,7 @@ export default { execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => { if (response.data[0].result === '1') { this.$message.success('执行成功') + this.tableData2 = [] this.searchTable1() } else { this.$message.error('执行失败') } }) diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index b6373f37..bb9dcd53 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -418,7 +418,6 @@ export default { v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额 return v }) - console.log(this.tableData01) }) } }, From d4bd2f76a88316da73afde0d5e7901ce60304159 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 12 Nov 2019 17:38:01 +0800 Subject: [PATCH 27/38] ad --- src/views/PurchasingCenter/FundApproval1/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue index 6327fb22..e36f59c0 100644 --- a/src/views/PurchasingCenter/FundApproval1/index.vue +++ b/src/views/PurchasingCenter/FundApproval1/index.vue @@ -97,7 +97,7 @@ From 5b6d7fdf358af58c443746d5f19d935e851d34d6 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 13 Nov 2019 09:07:11 +0800 Subject: [PATCH 28/38] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseContractRequestFund/index.vue | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index bb9dcd53..cf83fd6a 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -141,17 +141,17 @@ @@ -178,7 +178,7 @@ - + @@ -188,11 +188,6 @@ {{ scope.row.采购合同名称 }} - - - - + @@ -364,7 +359,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } From 6948c1962d88f0310f5a2bd6d1f6b4e8710d988d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 13 Nov 2019 10:11:26 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/FundApproval2/index.vue | 49 ------------------- .../PurchaseContractRequestFund/index.vue | 41 +++++++++++++--- 2 files changed, 34 insertions(+), 56 deletions(-) diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index e766fa6b..7224ca88 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -158,55 +158,6 @@
- diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index cf83fd6a..b205da00 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -75,7 +75,7 @@ - + + + + @@ -162,7 +167,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 7) { + } else if (index === 6) { const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -173,7 +178,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 7224ca88..59ad373e 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -26,11 +26,11 @@ @@ -196,8 +149,33 @@ export default { this.fetchData() }, methods: { + getSummaries2(param) { // 合计 + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价' + return + } else if (index === 2 || index === 3) { + const values = data.map(item => Number(item[column.property])) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] = sums[index].toFixed(2) + ' 元' + } else { + sums[index] = 'N/A' + } + } + }) + return sums + }, showOffline(row) { - console.log(row, 222) const children = document.getElementsByClassName('tableData') const parent = document.getElementsByClassName('offlineContract')[0] if (children.length !== 0) { @@ -236,13 +214,13 @@ export default { document.getElementById('remark').innerHTML = row.离线合同备注 }, searchContactDetail(row) { - document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop - searchContactDetail(row.采购合同流水号).then(response => { - this.contractDetail1 = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.contractDetail2 = response.data }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 - document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop searchMateriel(row.离线合同流水号).then(response => { this.contractDetail2 = response.data this.showOffline(row) @@ -254,7 +232,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 7) { + } else if (index === 6) { const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -265,7 +243,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue index 2396f385..7d8861ce 100644 --- a/src/views/PurchasingCenter/FundApproval3/index.vue +++ b/src/views/PurchasingCenter/FundApproval3/index.vue @@ -26,11 +26,11 @@ @@ -203,9 +148,37 @@ export default { this.fetchData() }, methods: { + getSummaries2(param) { // 合计 + const { columns, data } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '总价' + return + } else if (index === 2 || index === 3) { + const values = data.map(item => Number(item[column.property])) + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] = sums[index].toFixed(2) + ' 元' + } else { + sums[index] = 'N/A' + } + } + }) + return sums + }, searchContactDetail(row) { - searchContactDetail(row.采购合同流水号).then(response => { - this.contractDetail1 = response.data[0].合同内容 + var check + row.采购合同流水号 ? check = 1 : check = 2 + searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => { + this.contractDetail2 = response.data }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 @@ -219,7 +192,7 @@ export default { columns.forEach((column, index) => { if (index === 0) { sums[index] = '总价' - } else if (index === 7) { + } else if (index === 6) { const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量']))) if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { @@ -230,7 +203,7 @@ export default { return prev } }, 0) - sums[index] += ' 元' + sums[index] = sums[index].toFixed(2) + ' 元' } else { sums[index] = 'N/A' } From 9ce1c49c749bc898ab695cb2841947a5072bd726 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Wed, 13 Nov 2019 18:00:48 +0800 Subject: [PATCH 31/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=A5=E9=94=80?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractCapitalManagement.js | 20 +- .../ContractInformationManagement.js | 6 +- src/api/MarketingCenter/InvoiceRecord.js | 4 +- src/utils/request.js | 4 +- .../ComprehensiveInquiryMS/index.vue | 1049 +++++++++-------- .../ContractCapitalManagement/index.vue | 232 ++-- .../ContractInformationManagement/index.vue | 148 +-- .../MarketingCenter/InvoiceRecord/index.vue | 314 +++-- 8 files changed, 994 insertions(+), 783 deletions(-) diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js index 00e6287c..3f52314e 100644 --- a/src/api/MarketingCenter/ContractCapitalManagement.js +++ b/src/api/MarketingCenter/ContractCapitalManagement.js @@ -20,14 +20,14 @@ export function initMarketingManager() { } }) } -export function searchTable1(pageCurrent, pageSize, num1, num2) { +export function searchTable1(pageCurrent, pageSize, num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '1', - name: '合同资金管理_资金信息_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int', + name: '合同资金管理_资金信息_查询1', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&客户名称=' + num3 + '=string', Pagination: pageCurrent + '&' + pageSize } }) @@ -237,7 +237,7 @@ export function fukuan(code, num1, num2) { method: 'post', data: { type: '2', - name: '合同资金管理_批次付款明细表_增加数据', + name: '合同资金管理_批次付款明细表_增加数据_新', param: '批次资金ID=' + code + '=int&本次收款金额=' + num1 + '=string&本次收款时间=' + num2 + '=string' } }) @@ -368,8 +368,18 @@ export function never(num1) { method: 'post', data: { type: '2', - name: '合同资金管理_催收账款_不再提醒', + name: '合同资金管理_资金信息_查询', param: '批次资金ID=' + num1 + '=int' } }) } +export function getcustomername() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '合同资金管理_资金信息_查询_新' + } + }) +} diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js index 6774730b..5a8ba895 100644 --- a/src/api/MarketingCenter/ContractInformationManagement.js +++ b/src/api/MarketingCenter/ContractInformationManagement.js @@ -49,7 +49,7 @@ export function delList(num) { method: 'post', data: { type: '2', - name: '合同信息管理_合同信息_删除', + name: '合同信息管理_合同信息_删除_合同收款计划', param: '合同ID=' + num + '=int' } }) @@ -60,8 +60,8 @@ export function addList() { method: 'post', data: { type: '2', - name: '基础表_合同信息表_增加数据', - param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + name: '基础表_合同信息表_增加数据_新', + param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&备注=' + arguments[8] + '&付款方式代码=' + arguments[9] + '&合同签订日期=' + arguments[10] + '&招标保证金流水号=' + arguments[11] + '&合同总额=' + arguments[12] } }) } diff --git a/src/api/MarketingCenter/InvoiceRecord.js b/src/api/MarketingCenter/InvoiceRecord.js index 8f4ae65f..ea73961a 100644 --- a/src/api/MarketingCenter/InvoiceRecord.js +++ b/src/api/MarketingCenter/InvoiceRecord.js @@ -10,14 +10,14 @@ export function initProject() { } }) } -export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8) { +export function searchTableData1(pageCurrent, pageSize, num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) { return request({ url: '', method: 'post', data: { type: '1', name: '合同资金管理_开票记录_合同信息统计_查询', - param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date', + param: '合同ID=' + num1 + '=int&人员ID=' + num2 + '=int&项目流水号_check=' + num3 + '=int&营销经理流水号_check=' + num4 + '=int&开始日期_check=' + num5 + '=int&结束日期_check=' + num6 + '=int&开始日期=' + num7 + '=date&结束日期=' + num8 + '=date&客户名称=' + num9 + '=string&客户名称_check=' + num10 + '=int', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..03220e7d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index 6d2e3d84..e0cbc807 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -72,54 +72,34 @@ {{ scope.row.项目名称 }} - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + @@ -127,6 +107,71 @@ {{ scope.row.合同信息备注 }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确认
- -
- - - 收款情况 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 开票情况 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 发货情况 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 投标保证金 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 履约保证金 - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - 安全保证金 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue index c988890b..5c887249 100644 --- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue +++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue @@ -9,10 +9,18 @@ :label="item.label" :value="item.value"/> - 营销经理： - + + + 客户名称： + + + 查询 - 新增 + 查看收款信息 @@ -62,9 +70,9 @@ {{ scope.row.项目名称 }} - + @@ -72,59 +80,59 @@ {{ scope.row.付款方式 }} - + - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233,16 +241,6 @@ {{ scope.row.已收金额 }} - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -540,7 +548,7 @@ + + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 02767b01..d8ed31e9 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -9,22 +9,23 @@ :label="item.label" :value="item.value"/> - 开始日期： - - 结束日期： - + + + + + + + + + + + + + + + + + 查询 @@ -260,7 +261,7 @@ - + @@ -352,6 +353,8 @@ export default { dialogImageUrl: '', fileList: [], performanceGuaranteeShow: true, + customerName_check: '', + customerName: '', // 客户名称 form: { 实际收回日期: '' }, @@ -402,8 +405,13 @@ export default { } else { this.endTime_check = 1 } + if (this.customerName === '' || this.customerName === null) { + this.customerName_check = 0 + } else { + this.customerName_check = 1 + } this.listLoading1 = true - searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => { + searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => { this.tableData2 = [] this.listLoading1 = false const data = response.data diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue index 817428a9..2f28cc6d 100644 --- a/src/views/MarketingCenter/SafetyMargin/index.vue +++ b/src/views/MarketingCenter/SafetyMargin/index.vue @@ -10,22 +10,23 @@ :label="item.label" :value="item.value"/> - 开始日期： - - 结束日期： - + + + + + + + + + + + + + + + + + 查询 @@ -541,6 +542,8 @@ export default { } } return { + customerName: '', + customerName_check: '', pickerOptions: {}, pickerOptions1: {}, pickerOptions2: {}, @@ -693,8 +696,13 @@ export default { } else { this.endTime_check = 1 } + if (this.customerName === '' || this.customerName === null) { + this.customerName_check = 0 + } else { + this.customerName_check = 1 + } this.listLoadingProject = true - searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => { + searchTableDataProject(this.PageCurrentProject, this.PageSizeProject, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime, this.customerName_check, this.customerName).then(response => { this.tableData1 = [] this.tableData2 = [] this.listLoadingProject = false diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue new file mode 100644 index 00000000..88e56a4c --- /dev/null +++ b/src/views/MarketingCenter/ShippingInquiries/index.vue @@ -0,0 +1,193 @@ + + + + + From 0b2103e6ad25488a53e2675172bb77b5e59637c2 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Fri, 15 Nov 2019 17:12:09 +0800 Subject: [PATCH 36/38] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/OfflinePartOut/index.vue | 18 +- .../ComprehensiveInquiryMS/index.vue | 2 +- .../DeliveryApplication/index.vue | 1 - .../MarketingCenter/PerformanceBond/index.vue | 16 +- .../MarketingCenter/SafetyMargin/index.vue | 16 +- .../ShippingInquiries/index.vue | 21 +- .../ImportChangeParts/index.vue | 20 +- .../ImportChangeParts/specificationData1.vue | 7 - .../TechnologyCenter/ImportParts/index.vue | 20 +- .../ImportParts/specificationData.vue | 275 +++++++++--------- 10 files changed, 203 insertions(+), 193 deletions(-) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 5bbd2eee..19abb8d8 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -164,15 +164,15 @@ - - - - - + + + + + + + + + diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index bf43cc6b..6273e274 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -37,7 +37,7 @@ :row-key="getRowKeys" :expand-row-keys="expands" highlight-current-row - style="width: 75%; margin-top: 3px" + style="width: 1280px; margin-top: 3px" height="700" border stripe diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue index 90b883e4..a1a980e1 100644 --- a/src/views/MarketingCenter/DeliveryApplication/index.vue +++ b/src/views/MarketingCenter/DeliveryApplication/index.vue @@ -1122,7 +1122,6 @@ export default { this.dialogFormVisible = false }, submit() { - this.dialogFormVisible = false for (let i = 0; i < this.array.length; i++) { this.tableData.push({ 货品名称: this.array[i].货品名称 ? this.array[i].货品名称 : '—' || '—', diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index d8ed31e9..3e0b5081 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -85,7 +85,7 @@ {{ scope.row.合同信息备注 }} - + - + diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue index 0204d468..63c09943 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/index.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue @@ -1,16 +1,16 @@ @@ -211,7 +216,7 @@ export default { pageSize: 10, total: 0, pageCurrent1: 1, - pageSize1: 10, + pageSize1: 1000000, total1: 0, list: [], check3: '', diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 41579e2f..404f9fa7 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -3,9 +3,9 @@
- - - + + + - 查询 + 查询
- + - + @@ -55,7 +55,7 @@ {{ scope.row.货位名称 }} - +