From cb976a1b98370b7556cc7d25adbe89feff4973ca Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 23 Nov 2019 18:20:15 +0800 Subject: [PATCH] =?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/api/Inventory/MaterialOut.js | 2 +- src/api/Inventory/OfflinePartOut.js | 4 +-- src/utils/request.js | 2 +- src/views/Inventory/MaterialOut/index.vue | 7 ++++- src/views/Inventory/OfflinePartOut/index.vue | 26 +++++++++---------- .../CreatingProcurementContracts/index.vue | 11 ++++++++ 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js index aebd121f..34be6e77 100644 --- a/src/api/Inventory/MaterialOut.js +++ b/src/api/Inventory/MaterialOut.js @@ -103,7 +103,7 @@ export function submitOutStore(...params) { data: { type: '2', name: '库存管理_物料出库_出库记录_增加数据_循环', - param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}` + param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}&领料部门=${params[12]}` } }) } diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js index 6f2cf921..90c313d2 100644 --- a/src/api/Inventory/OfflinePartOut.js +++ b/src/api/Inventory/OfflinePartOut.js @@ -61,14 +61,14 @@ export function searchPeople(data1) { }) } // 离线件出库 -export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) { +export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_离线采购件_零件出库', - param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + '&领料部门=' + data13 } }) } diff --git a/src/utils/request.js b/src/utils/request.js index cf56ddcf..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // 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.0.110:8002/submit/downloadFile.ashx' // 导出excel +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 diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 1dc805ef..d42569b9 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -188,6 +188,9 @@ :value="item.value"/> + + + @@ -272,6 +275,7 @@ export default { }, form3: { outTypeValue: '', + department: '', password: '' }, form4: { @@ -434,6 +438,7 @@ export default { inputPassword() { this.form3.outTypeValue = '' this.form3.password = '' + this.form3.department = '' this.dialogFormVisible3 = true }, selectable(row, index) { // 控制某行是否可选 @@ -559,7 +564,7 @@ export default { this.outNumber.push(this.pickListTable2[i].出库数量) } } - submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum).then(response => { + submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.form3.department).then(response => { if (response.data[0].result === '1') { this.$message.success('出库成功') this.dialogFormVisible3 = false diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 19abb8d8..0e94e373 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -9,7 +9,7 @@ 物料型号： - 查询 + 查询 @@ -113,7 +113,12 @@ {{ scope.row.出库人姓名 }} - + + + + @@ -152,15 +157,6 @@ :value="item.value"/> - - - - - @@ -173,6 +169,9 @@ + + + @@ -208,6 +207,7 @@ export default { ProjectValue: '', MachineValue: '', GroupNumValue: '', + department: '', DirectNumber: '', PeopleValue: '', DirectNote: '' @@ -230,7 +230,7 @@ export default { listLoading1: '', partnumber: '', pageCurrent1: 1, - pageSize1: 10, + pageSize1: 20, total1: 0, pageCurrent2: 1, pageSize2: 10, @@ -377,7 +377,7 @@ export default { } else { this.$refs['form'].validate((valid) => { if (valid) { - outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号).then(response => { + outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.form.department).then(response => { if (response.data[0].result === '1') { this.$message.success('零件出库成功') this.dialogFormVisible = false diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 1d2b5b89..c44c6c94 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -450,6 +450,16 @@ export default { if (response.data[0].result === '1') { this.contractNumType = 1 this.dialogVisible2 = false + this.contractNum = [] + initPurchaseOrder().then(response => { + for (let i = 0; i < response.data.length; i++) { + this.contractNum.push({ + label: response.data[i].请购单编号, + value: response.data[i].请购单流水号, + id: response.data[i].请购类型 + }) + } + }) this.searchData() this.$message.success('转换成功') } else { @@ -491,6 +501,7 @@ export default { this.form3.机床 = response.data[0].机床图号 this.form3.groupNumValue = response.data[0].组件流水号 console.log(this.machineValue, 111) + this.groupNum = [] initGroupNum(this.machineValue).then(response => { for (let i = 0; i < response.data.length; i++) { this.groupNum.push({