From b6155c199784dfac3551643a20286ecdb22f1ad7 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Tue, 19 Nov 2019 11:41:30 +0800 Subject: [PATCH 01/11] 2 --- 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 3d83ef4f62a5aca26c60cbffb2b0c90d1904fd6d Mon Sep 17 00:00:00 2001 From: bryan sun Date: Mon, 25 Nov 2019 09:38:03 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 6 +-- .../CreatingProcurementContracts/index.vue | 54 ++++++++++++------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 03220e7d..04a0d5f7 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.103:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.0.103:8074/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.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 1d2b5b89..09ab1481 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -2,17 +2,24 @@
- + - - - - + + + + + + + - - + + 成组采购 取消成组采购 @@ -49,7 +56,7 @@ - + @@ -79,35 +86,35 @@ - - + + - + - + - + - + - + @@ -122,7 +129,7 @@ @change="update(scope.row)"/> - + @@ -337,6 +344,7 @@ export default { contractNumValue: '', contractNumType: 0, RequisitionNumber: '', + supplierNames: [], contract: [{ label: '合同模板1', value: 1 @@ -356,6 +364,7 @@ export default { supplierName: '', // 供应商 supplier: [], supplierValue: '', // 供应商流水号 + supplierValues: [], enterpriseNature: '', // 企业性质 createDate: '', // 创立日期 registeredCapital: '', // 注册资本 @@ -439,6 +448,7 @@ export default { }, created() { this.fetchData() + this.searchSupplier() }, methods: { linkGroup() { @@ -472,6 +482,7 @@ export default { }) }, searchData() { + this.contractSum = 0.00 for (let i = 0; i < this.contractNum.length; i++) { if (this.contractNum[i].value === this.contractNumValue) { this.contractNumType = this.contractNum[i].id @@ -486,6 +497,7 @@ export default { console.log(this.tableData5) }) searchData2(this.contractNumValue).then(response => { + console.log(response, 2233) this.tableData4 = response.data this.machineValue = response.data[0].机床流水号 this.form3.机床 = response.data[0].机床图号 @@ -570,6 +582,12 @@ export default { response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0] } } + for (let i = 0; i < response.data.length; i++) { + this.supplierValues.push({ + label: response.data[i].供应商名称, + value: response.data[i].供应商流水号 + }) + } this.tableData01 = response.data }) }, From dfce34e4b442d964abb3df3cc9486aee57ae9116 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 25 Nov 2019 16:05:50 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/ManufacturingCenter/ShopScheduling/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index cf56ddcf..0ca6cf77 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 diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 7d221ad8..50014045 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -13,7 +13,7 @@ :value="item.value"/> - + From a0ce5950656ea780899c4988280262ab10a35eff Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 27 Nov 2019 14:40:46 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E6=89=A3=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Outsourcing/OutsourcingPaymentPlanManagement.js | 6 +++--- .../Outsourcing/OutsourcingPaymentPlanManagement/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js index ef2d26f0..26bacdb0 100644 --- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js +++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js @@ -37,14 +37,14 @@ export function payTime(num, time) { }) } // 修改扣款数据、扣款说明 -export function WithdrawingEdit(num, quality, plan, Other, Explain) { +export function WithdrawingEdit(num, quality, Explain) { return request({ url: '', method: 'post', data: { type: '2', - name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款_计划=' + plan + '&扣款_其他=' + Other + '&扣款说明=' + Explain + name: '车间生产管理_外协扣款_编辑数据', + param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain } }) } diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index c53c5673..b8aa40d0 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -563,7 +563,7 @@ export default { }, // 扣款编辑 WithdrawingEdit() { - WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.计划, this.form2.其他, this.form2.扣款说明).then(response => { + WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.扣款说明).then(response => { if (response.data[0].result === '1') { this.$message.success('修改成功') this.searchTable() From f7c3b8229ff050d54097c52adcaf6fe85212a4d8 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 27 Nov 2019 15:11:25 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/EquipmentMonitoring/index.vue | 3 ++- src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index b53986dd..e0d450cc 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -633,7 +633,8 @@ export default { }, opclickshowPanel($event) { if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') { - var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101' + // var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101' + var aaa = 'http://192.168.1.232:8007/#/login?OPNAME=' + $event.path[2].id window.open(aaa) } }, diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index 74463e8e..fafd06aa 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -24,6 +24,7 @@ 全选 保存 + 保存 Date: Thu, 28 Nov 2019 11:28:49 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=87=91=E5=B7=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessTaskAssignment.js | 12 +++++ .../ActualTimeSupplement/index.vue | 7 ++- .../ProcessTaskAssignment/index.vue | 25 +++++++++-- .../ProcessingStatusEdit/index.vue | 6 +-- .../ScheduleCompletionDetails/index.vue | 44 ++++++++++--------- 5 files changed, 64 insertions(+), 30 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 8b763061..9b2151ba 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -133,3 +133,15 @@ export function initPerson() { } }) } +// 保存 +export function save2(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_工艺任务分配_保存数据', + param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3 + } + }) +} diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 3ca27de2..aa250568 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -37,11 +37,11 @@ 操作者: - + 零件图号: - + 工艺名称: - + 查询 新增 @@ -507,7 +507,6 @@ export default { this.partNumber ? check4 = 1 : check4 = 0 this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0 searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => { - console.log(res.data.rows, 898989) this.tableData = res.data.rows this.total = res.data.total this.tableData.map(v => { diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index fafd06aa..182b9ded 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -24,7 +24,7 @@ 全选 保存 - 保存 + 保存 { + if (!v.工艺员) { + return false + } + console.log(111) + this.通用件图号.push(v.零件号) + this.通用件规格.push(v.规格) + this.工艺员.push(v.工艺员) + }) + console.log(this.通用件图号, this.通用件规格, this.工艺员) } } } diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index bd86ff96..ce57deab 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -14,7 +14,7 @@ 组号: - + 零件号: + 查询 - + 计划下达时间: - 查询 diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 80af3cc6..f2a4a0ce 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -22,7 +22,7 @@ - + - + - + - + - + @@ -66,15 +66,15 @@
- + - + - + @@ -84,7 +84,7 @@ {{ scope.row.工艺名称 }} - + @@ -94,11 +94,11 @@ {{ scope.row.质检结果 }} - - - + + + + + - + + + + @@ -145,10 +150,10 @@ export default { loading2: '', pageCurrent: 1, pageSize: 10000, - total: '', + total: 0, pageCurrent2: 1, pageSize2: 10000, - total2: '', + total2: 0, timeCheck: '', operater: '' } @@ -166,8 +171,6 @@ export default { if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) { this.timeCheck = 1 } else { - // this.startTime = '' - // this.endTime = '' this.timeCheck = 0 } searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { @@ -197,7 +200,8 @@ export default { 不合格数量: response.data.rows[i].不合格数量, 理论加工时间段: response.data.rows[i].理论加工时间段, 实际加工时间段: response.data.rows[i].实际加工时间段, - 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : '' + 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '', + 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : '' }) } } From 0caf24a34feac012c27d4d534716a4ae9833d649 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 28 Nov 2019 12:00:50 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseSituationSearch/index.vue | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 3d59ff66..9d46b708 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -70,17 +70,12 @@ {{ scope.row.供货商 || '—' }} - - - - + - + @@ -105,6 +100,11 @@ {{ scope.row.姓名 || '—' }} + + +
- - - - + - + @@ -193,6 +188,11 @@ {{ scope.row.姓名 || '—' }} + + +
- - - - + @@ -286,6 +281,11 @@ {{ scope.row.姓名 || '—' }} + + +
Date: Thu, 28 Nov 2019 14:31:05 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/InventoryCheck/index.vue | 6 ++-- src/views/Inventory/OfflinePartOut/index.vue | 30 +++++++++---------- .../Inventory/PurchaseInRecord/index.vue | 10 +++---- .../Inventory/PurchaseOutRecord/index.vue | 10 +++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 8d31b698..203c969e 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -3,9 +3,9 @@
- - - + + +
- - 物料名称： - - 物料规格： - + + 名称规格型号： + + + + + + 查询 - 物料型号： - - 查询 - + - - - + + + + + - + - + - + - + @@ -90,21 +89,13 @@ :current-page="pageCurrent" :page-sizes="[5, 10, 20, 300]" :page-size="pageSize" + :pager-count="5" :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange"/>
- -
- -
- 零件工艺调整 -
- -
- From 5f5451c2251fafd7cbd5bdd2c36b3e8ca462d102 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 28 Nov 2019 15:43:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessTaskAssignment.js | 36 ++++++---------- src/views/Inventory/InventoryCheck/index.vue | 42 +++++++++---------- src/views/Inventory/MaterialOut/index.vue | 4 +- src/views/Inventory/OfflinePartOut/index.vue | 8 ++-- 4 files changed, 40 insertions(+), 50 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 9b2151ba..00a15510 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -97,30 +97,6 @@ export function getTable00(PageCurrent, PageSize, num) { } }) } -// 保存 -export function save(num1, num2, num3) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理工艺_工艺任务分配_保存数据', - param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3 - } - }) -} -// // 模糊查询 -// export function fuzzyQuery(num) { -// return request({ -// url: '', -// method: 'post', -// data: { -// type: '1', -// name: '车间生产管理工艺_传递后_机床名称_查询数据_模糊查询', -// param: '机床图号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1' -// } -// }) -// } // 工艺定额人员查询 export function initPerson() { return request({ @@ -134,6 +110,18 @@ export function initPerson() { }) } // 保存 +export function save(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_工艺任务分配_保存数据', + param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3 + } + }) +} +// 保存 export function save2(num1, num2, num3) { return request({ url: '', diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 203c969e..31d5b1d0 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -6,13 +6,13 @@ - - - + + + + + + + - - 物料名称: - - - - 物料规格: - - - - 物料型号: - + + 名称规格型号: + + + + + + + + + 查询 @@ -134,7 +134,7 @@ @current-change="handleCurrentChange01"/>
- + 仓库: { diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index d42569b9..020fa906 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -436,9 +436,9 @@ export default { }, // 领料确认 inputPassword() { - this.form3.outTypeValue = '' + this.form3.outTypeValue = 21 this.form3.password = '' - this.form3.department = '' + this.form3.department = '装配' this.dialogFormVisible3 = true }, selectable(row, index) { // 控制某行是否可选 diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 5929cad3..903b4535 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -169,7 +169,7 @@ - + @@ -220,7 +220,8 @@ export default { { required: true, message: '请输入数量', trigger: 'blur' }, { validator: checkNum, trigger: 'blur' } ], - DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }] + DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }], + department: [{ required: true, message: '请输入领料部门', trigger: 'blur' }] }, locateNumber: '', materialNumber: '', @@ -346,12 +347,13 @@ export default { }, // 打开表单 parOut(row) { - this.dialogFormVisible = true + this.form.department = '装配车间' this.locateNumber = row.货位流水号 this.materialNumber = row.物料流水号 this.partnumber = row.货位存量 this.离线合同明细流水号 = row.离线合同明细流水号 this.组件零件基本件流水号 = row.组件零件基本件流水号 + this.dialogFormVisible = true }, // 重置表单 callOff() { From 50861907a51c2f45315b86ded0f0377779fd506a Mon Sep 17 00:00:00 2001 From: bryan sun Date: Thu, 28 Nov 2019 15:53:29 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=88=B6=E9=80=A0=E9=83=A8=E9=87=87?= =?UTF-8?q?=E8=B4=AD?= 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 03220e7d..fc41e22d 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.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/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.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service