diff --git a/src/api/Assembly/SparePartsOutStockRecord.js b/src/api/Assembly/SparePartsOutStockRecord.js new file mode 100644 index 00000000..2cfefe58 --- /dev/null +++ b/src/api/Assembly/SparePartsOutStockRecord.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 组件查询 +export function searchgroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} +// 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据 +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据', + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5 + } + }) +} + diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index 2811ed77..e27efdec 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据', + name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int', pagination: pageCurrent + '&' + pageSize } diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index f271b239..45b96472 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -55,14 +55,14 @@ export function getExport2(num) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) { 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}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 0cd9792f..11414bc7 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -171,14 +171,14 @@ export function setSafeValue(...params) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, type) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&零件类型=${type}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index 29d56ee3..b650c6eb 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -31,7 +31,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后_加供应商', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`, Pagination: params[4] + '&' + params[5] } }) diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index bd1c5039..2b1e345a 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -77,7 +77,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后', - param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}`, + param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}`, Pagination: params[0] + '&' + params[1] } }) diff --git a/src/icons/svg/AssemblyExecution.svg b/src/icons/svg/AssemblyExecution.svg new file mode 100644 index 00000000..9ee2e989 --- /dev/null +++ b/src/icons/svg/AssemblyExecution.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/DeliveryApplication.svg b/src/icons/svg/DeliveryApplication.svg new file mode 100644 index 00000000..fca39892 --- /dev/null +++ b/src/icons/svg/DeliveryApplication.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/QualityInspectionInformationInquiry.svg b/src/icons/svg/QualityInspectionInformationInquiry.svg new file mode 100644 index 00000000..7339fb9c --- /dev/null +++ b/src/icons/svg/QualityInspectionInformationInquiry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/SparePartsOutStockRecord.svg b/src/icons/svg/SparePartsOutStockRecord.svg new file mode 100644 index 00000000..ca0c397d --- /dev/null +++ b/src/icons/svg/SparePartsOutStockRecord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue new file mode 100644 index 00000000..94b32697 --- /dev/null +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index aba0b89e..d612721c 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -75,7 +75,7 @@ - + - + + + + + + + + + +