From 17d72c3eae23f13917928928531fe43b3e3c351a Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 9 Dec 2019 12:14:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/OfflinePartOut/index.vue | 1 - .../PurchasingEfficiencyAnalysis/index.vue | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 903b4535..2e547f59 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -347,7 +347,6 @@ export default { }, // 打开表单 parOut(row) { - this.form.department = '装配车间' this.locateNumber = row.货位流水号 this.materialNumber = row.物料流水号 this.partnumber = row.货位存量 diff --git a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue index e7383d2c..e0f6a9c3 100644 --- a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue +++ b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue @@ -19,7 +19,7 @@ value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/> - 查询 + 查询
@@ -33,8 +33,8 @@ export default { data() { return { tableData: [], - data1: '', - data2: '' + date1: '', + date2: '' } }, mounted() {}, @@ -57,12 +57,15 @@ export default { }) }, getTableData1(row) { + console.log(row, 1) for (let i = 0; i < row.length; i++) { getData1(row[i].采购合同流水号).then(response => { + console.log(response.data, 2) this.tableData[i].平均分配日期 = response.data[0].平均分配日期 this.tableData[i].平均采购时间 = response.data[0].平均采购时间 }) } + console.log(this.tableData, 3) }, // 绘制图形 drawLine() { @@ -70,8 +73,8 @@ export default { const xData = [] const lineData = [] for (let i = 0; i < this.tableData.length; i++) { - xData.push(this.tableData[i].采购合同编号.split(' ')[0]) - lineData.push(this.tableData[i].平均采购时间.toFixed(2)) + xData.push(this.tableData[i].采购合同编号) + lineData.push(this.tableData[i].平均采购时间) } myChart.clear() myChart.setOption({ @@ -94,13 +97,17 @@ export default { data: xData, axisPointer: { type: 'shadow' + }, + axisLabel: { + interval: 0, + rotate: 40 } } ], yAxis: [ { type: 'value', - name: '采购用时' + name: '采购用时(H)' } ], series: [ From 56f5781ebc60cdc93e7a92000d23651539208b16 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Wed, 11 Dec 2019 17:19:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=87=BA?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inventory/SelfMadePartsWarehouseOut.js | 83 ++++++ src/utils/request.js | 6 +- src/views/Inventory/Inboundscanning/index.vue | 2 +- src/views/Inventory/OutPartSelect/index.vue | 8 +- .../SelfMadePartsWarehouseOut/index.vue | 269 ++++++++++++++++++ src/views/Inventory/StockInquiry/index.vue | 10 +- .../ActualTimeSupplement/index.vue | 6 +- .../MachiningSequenceAdjustment/index.vue | 2 +- .../ProcessingStatusEdit/index.vue | 4 +- .../ProcessingStatusNew/index.vue | 6 +- .../ShopScheduling/index.vue | 2 +- .../PartDrawingMaintenance/index.vue | 8 +- 12 files changed, 379 insertions(+), 27 deletions(-) create mode 100644 src/api/Inventory/SelfMadePartsWarehouseOut.js create mode 100644 src/views/Inventory/SelfMadePartsWarehouseOut/index.vue diff --git a/src/api/Inventory/SelfMadePartsWarehouseOut.js b/src/api/Inventory/SelfMadePartsWarehouseOut.js new file mode 100644 index 00000000..2e43594e --- /dev/null +++ b/src/api/Inventory/SelfMadePartsWarehouseOut.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} + +// 查询机床 +export function searchmachine(num, check) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0' + } + }) +} +// 获取组号 +export function searchgroup(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 获取表单 +export function searchdata(entryNameValue_check, entryNameValue, machineToolValue_check, machineToolValue, groupNumberValue_check, groupNumberValue, partNumber_check, partNumber, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '自制件出库_查询数据', + param: '项目流水号_check=' + entryNameValue_check + '&项目流水号=' + entryNameValue + '&机床流水号_check=' + machineToolValue_check + '&机床流水号=' + machineToolValue + '&组件流水号_check=' + groupNumberValue_check + '&组件流水号=' + groupNumberValue + '&零件图号_check=' + partNumber_check + '&零件图号=' + partNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 自制件出库 +export function warehousing(processPlanSerialNumber, leader, remarks) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '自制件出库_循环执行_新', + param: '工艺计划流水号组=' + processPlanSerialNumber + '&考勤编号=' + leader + '&出库备注=' + remarks + } + }) +} +export function selectdepartment() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '出库管理_部门查询' + } + }) +} +export function selectleaders(department) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '出库管理_人员查询', + param: '考核部门编号=' + department + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 14923715..b168c85f 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.0.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.104:8079/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.0.110:8002/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.0.110:8002/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index 29201e24..eaceafc5 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -3,7 +3,7 @@ 零件图号 - + 查询 清空 diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue index 83662ae3..24917a10 100644 --- a/src/views/Inventory/OutPartSelect/index.vue +++ b/src/views/Inventory/OutPartSelect/index.vue @@ -2,7 +2,7 @@
机床号: - + 组号: - + 零件图号: - + 查询 @@ -62,7 +62,7 @@ diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue new file mode 100644 index 00000000..3f16611e --- /dev/null +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c8b92807..86e7c636 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -2,7 +2,7 @@
机床号: - + 组号: - + 零件图号: - + 查询 @@ -121,9 +121,9 @@ {{ scope.row.组号 }} - + diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index aa250568..8b1aecfe 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -37,11 +37,11 @@ 操作者: - + 零件图号: - + 工艺名称: - + 查询 新增 diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 26528d60..0b272612 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -3,7 +3,7 @@ 工位号: - + 机床号: - + 零件号: - + 查询 diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index dd7449c7..f533c4ac 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -2,7 +2,7 @@
补录完成日期 - + {{ item.value2 }}
 - + - + 查询 diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 50014045..881b4e8f 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,7 +4,7 @@ - + 项目名称 - + 机床图号 - + 组号 - + - + Date: Thu, 12 Dec 2019 09:46:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/OfflinePartOut/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 903b4535..2c0015ea 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -375,7 +375,7 @@ export default { // 离线外购件出库 addDirectPartm() { if (Number(this.partnumber) < Number(this.form.DirectNumber)) { - this.$message.error('请正确输入数量') + this.$message.error('库存不够，重输领料数量') } else { this.$refs['form'].validate((valid) => { if (valid) { From 49f4eccd99c381531861997f378d9e79aa7e9115 Mon Sep 17 00:00:00 2001 From: liushuai Date: Thu, 12 Dec 2019 12:49:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 8 +- .../CreatePurchaseContract.js | 4 +- .../CreatingPurchasingMaterials.js | 19 ++++- src/views/Inventory/StockInquiry/index.vue | 21 ++---- .../CreateInquirySheet/index.vue | 73 ++++++++++--------- .../CreatePurchaseContract/index.vue | 7 +- .../PurchasingEfficiencyAnalysis/index.vue | 52 +++++++++++-- .../CreatingPurchasingMaterials/index.vue | 38 ++++++++-- .../NewArrivalList/index.vue | 8 +- .../OutsourcingMaterialsSearch/index.vue | 2 +- .../ProcurementContractEnquiry/index.vue | 2 +- 11 files changed, 152 insertions(+), 82 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 0538d1d9..1388878c 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -88,27 +88,27 @@ export function changeNum(num, num1, num2, num3, num4) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10, check8, val11) { return request({ url: '', method: 'post', 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}&时间_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}&供货商_check=${check8}&供货商=${val11}`, Pagination: pageCurrent + '&' + pageSize } }) } // 查询分配后的基本件 -export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, 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, check8, val11) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_创建询价单', - 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}`, + 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}&供货商_check=${check8}&供货商=${val11}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 9e36ac4b..e617e381 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -18,7 +18,7 @@ export function initSupplier11(num) { data: { type: '3', name: ` SELECT distinct 供应商流水号,供应商名称 - FROM 采购管理_询价单_视图 + FROM 采购管理_询价单_视图_新 where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and (是否未通过 is null or 是否未通过 <> 1) and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` } }) @@ -30,7 +30,7 @@ export function searchInquirySheet(check2, value2, check3, id, check4, supplier) method: 'post', data: { type: '1', - name: '采购管理_询价单_查询数据', + name: '采购管理_询价单_查询数据_创建合同', param: `询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` } }) diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 03f4eeb4..ef771d11 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -26,14 +26,14 @@ export function addMateriel2(num1, num2) { }) } // 保存重量和备注 -export function saveWeight(num1, num2, num3, num4, num5, num6, num7) { +export function saveWeight(num1, num2, num3, num4, num8) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_采购计划明细_保存重量和备注_9745', - param: `采购计划流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&零件图号=${num5}&材料=${num6}&零件名称=${num7}` + param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单位=${num4}&采购数量=${num8}` } }) } @@ -124,15 +124,26 @@ export function searchMateriel(num) { } }) } +export function searchMateriel1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据_新', + param: `采购计划流水号=${num}` + } + }) +} // 增加采购计划明细 -export function addMateriel(num1, num2) { +export function addMateriel(num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_采购计划明细_增加数据', - param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}` + param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}&数量组=${num3}` } }) } diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c8b92807..42d65808 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -210,21 +210,9 @@ export default { getTableData() { this.listLoading1 = true this.listLoading2 = true - if (this.Machine === '') { - this.checkbox_Machine = 0 - } else { - this.checkbox_Machine = 1 - } - if (this.Group === '') { - this.checkbox_Group = 0 - } else { - this.checkbox_Group = 1 - } - if (this.number === '') { - this.checkbox_number = 0 - } else { - this.checkbox_number = 1 - } + this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0 + this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0 + this.number ? this.checkbox_number = 1 : this.checkbox_number = 0 this.tableData1 = [] this.tableData0 = [] getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => { @@ -249,10 +237,13 @@ export default { handleSizeChange(val) { this.pageCurrent = 1 this.pageSize = val + this.pageCurrent0 = 1 + this.pageSize0 = val this.getTableData() }, handleCurrentChange(val) { this.pageCurrent = val + this.pageCurrent0 = val this.getTableData() } } diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index c1da8bed..a58ba796 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -47,6 +47,7 @@ + + end-placeholder="结束日期"/>
@@ -109,7 +109,7 @@ --> + + end-placeholder="结束日期"/> 调整采购任务