diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index 5ff7f799..8d17501e 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -49,15 +49,14 @@ export function deletePurchaseOrder(PurchaseOrderNameValue) { }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check3, name2) { +export function searchPurchaseOrder(check1, num, check3, name2) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_离线采购计划_查询数据', - param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}`, - Pagination: pageCurrent + '&' + pageSize + param: `离线采购计划编号_check=${check1}&离线采购计划编号=${num}&供应商流水号_check=${check3}&供应商流水号=${name2}` } }) } @@ -109,15 +108,14 @@ export function getGroups(stepNumber) { }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, 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 + '&排序名称=' + ordername + '&排序方式=' + order, - Pagination: pageCurrent + '&' + pageSize + 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 } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js index af080a0d..24fa5f45 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js @@ -13,27 +13,29 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 查询备料 -export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) { +export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order, pageSize, pageCurrent) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue, + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) } // 导出 -export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) { +export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, check3, starttime, endtime, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_外购备料_综合查询数据', - param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + + '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order } }) } diff --git a/src/assets/img/blueTWinkle.gif b/src/assets/img/blueTWinkle.gif new file mode 100644 index 00000000..42deff1d Binary files /dev/null and b/src/assets/img/blueTWinkle.gif differ diff --git a/src/assets/img/grayTwinkle.gif b/src/assets/img/grayTwinkle.gif new file mode 100644 index 00000000..9a11d358 Binary files /dev/null and b/src/assets/img/grayTwinkle.gif differ diff --git a/src/assets/img/greenTwinkle.gif b/src/assets/img/greenTwinkle.gif new file mode 100644 index 00000000..0dda29f2 Binary files /dev/null and b/src/assets/img/greenTwinkle.gif differ diff --git a/src/assets/img/yellowTwinkle.gif b/src/assets/img/yellowTwinkle.gif new file mode 100644 index 00000000..7e277d09 Binary files /dev/null and b/src/assets/img/yellowTwinkle.gif differ diff --git a/src/assets/img/设备监控.psd b/src/assets/img/设备监控.psd new file mode 100644 index 00000000..4b0d797b Binary files /dev/null and b/src/assets/img/设备监控.psd differ diff --git a/src/utils/request.js b/src/utils/request.js index 5948c0da..1840b290 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFil export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.5:8079/submit/MESCommonBase.ashx`, + baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index ba2627e9..d6db393e 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -29,7 +29,7 @@ v-loading="loading" :data="tableData" height="760" - style="width: 1126px; margin: 3px 0" + style="width: 1408px; margin: 3px 0" size="mini" border stripe @@ -81,6 +81,16 @@ {{ scope.row.工艺要求 }} + + + + + +
- 查询 + 查询 diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index e9b3dccf..930631c3 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -1,554 +1,581 @@