diff --git a/src/api/base/site.js b/src/api/base/site.js index 57dff4f..bfcd604 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -105,6 +105,8 @@ export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyIn //------------维护工艺路线---------------- //维护工艺路线 export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data) +//维护工艺路线 +export const searchBomWithPartNo= data => createAPI(`/base/searchBomWithPartNo`,'post',data) //工艺路线明细 export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data) //保存工艺路线 diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js index a14d0fe..cb48304 100644 --- a/src/api/shopOrder/shopOrder.js +++ b/src/api/shopOrder/shopOrder.js @@ -95,6 +95,7 @@ export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopO // 更改生产工单工艺路线 export const shopOrderUpdateRoutingViaRev = data => createAPI('/shopOrder/shopOrderUpdateRoutingViaRev', 'post', data) +export const shopOrderUpdateBomViaRev = data => createAPI('/shopOrder/shopOrderUpdateBomViaRev', 'post', data) // 查询生产通知单信息 export const shopNoticeSearch = data => createAPI('/shopOrder/shopNoticeSearch', 'post', data) diff --git a/src/views/common/theme.vue b/src/views/common/theme.vue index 104361f..3b1e1a6 100644 --- a/src/views/common/theme.vue +++ b/src/views/common/theme.vue @@ -14,7 +14,7 @@ - + 开启 关闭 diff --git a/src/views/modules/print/rePrintPoPart.vue b/src/views/modules/print/rePrintPoPart.vue index 65ba653..b79dc6b 100644 --- a/src/views/modules/print/rePrintPoPart.vue +++ b/src/views/modules/print/rePrintPoPart.vue @@ -89,7 +89,16 @@ - + + @@ -408,7 +417,7 @@ export default { }, mounted() { this.$nextTick(() => { - this.height = window.innerHeight - 160; + this.height = window.innerHeight - 220; }) }, @@ -446,6 +455,16 @@ export default { this.dataListLoading = false }) }, + // 分页处理 + sizeChangeHandle(val) { + this.pageSize = val + this.pageIndex = 1 + this.getMainData() + }, + currentChangeHandle(val) { + this.pageIndex = val + this.getMainData() + }, printLabelModel(){ if(this.selectionDataList.length===0){ this.$message.error('未选择标签!'); diff --git a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue index 5fe5fa1..c36b255 100644 --- a/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue +++ b/src/views/modules/shopOrder/shopOrder/searchShopOrder.vue @@ -80,13 +80,13 @@ - - - - + + + + diff --git a/src/views/modules/shopOrder/shopOrder/shopOrderList.vue b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue new file mode 100644 index 0000000..363654b --- /dev/null +++ b/src/views/modules/shopOrder/shopOrder/shopOrderList.vue @@ -0,0 +1,3234 @@ + + + + + +