diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index a0b27598..f5a9001c 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -11,6 +11,18 @@ export function initProject() { } }) } +// 三表下达时间查询 +export function DeliveryTimeSelect(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_三表下达时间_查询数据', + param: '组件流水号=' + num + } + }) +} // 组件查询 export function searchgroup(num) { return request({ diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index 7b693454..5ff7f799 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -109,14 +109,14 @@ export function getGroups(stepNumber) { }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', - param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index aae52c5b..7d0dbbf6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel -export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel +export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 63e5c46a..2f7b7a27 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -127,12 +127,13 @@ export default { } else { this.ordername = '' } - console.log(this.ordername, 9990999) if (column.order === 'ascending') { this.order = 1 } else if (column.order === 'descending') { this.order = 2 } else { this.order = '' } + console.log(this.ordername, 9990999, this.order) + this.selecttable() }, initProject() { diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index b18e0f50..79c95e6f 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -421,14 +421,18 @@ export default { // 编辑 handleEdit(index, row, formName) { this.temp = 2 - this.dialogFormVisible = true this.form.WarehouseNumber = row.仓库编号 this.form.WarehouseName = row.仓库名称 this.form.WarehouseDescription = row.仓库描述 this.form.Address = row.地址 - this.form.ContactpeopleValue = row.人员编号 + if (this.role !== '15') { + this.form.ContactpeopleValue = this.Contactpeople[0].value + } else { + this.form.ContactpeopleValue = parseInt(row.人员编号) + } this.form.Note = row.备注 this.HouseNumber = row.仓库流水号 + this.dialogFormVisible = true }, // 执行修改 chaEdit() { diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue index 640fa768..d4dafd3d 100644 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -20,7 +20,7 @@ 查询 - 完成 + 完成 diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index bd4b2557..060763bd 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -1,6 +1,6 @@