diff --git a/src/api/base/site.js b/src/api/base/site.js index 2d1419e..6b961b2 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -156,3 +156,7 @@ export const addSORoutingResource= data => createAPI(`/base/addSORoutingResource //删除可用机台 export const deleteSORoutingResource= data => createAPI(`/base/deleteSORoutingResource`,'post',data) +// +export const getSORoutingRevNo= data => createAPI(`/base/getSORoutingRevNo`,'post',data) +// +export const updateRevNoData= data => createAPI(`/base/updateRevNoData`,'post',data) diff --git a/src/views/modules/base/maintainProductRouting.vue b/src/views/modules/base/maintainProductRouting.vue index 615c710..c3da466 100644 --- a/src/views/modules/base/maintainProductRouting.vue +++ b/src/views/modules/base/maintainProductRouting.vue @@ -1674,6 +1674,7 @@ this.dataList2=data.rows; } }) + this.$message({ message: '操作成功', type: 'success', diff --git a/src/views/modules/base/referencePartInfo.vue b/src/views/modules/base/referencePartInfo.vue index 75ba620..dc7af98 100644 --- a/src/views/modules/base/referencePartInfo.vue +++ b/src/views/modules/base/referencePartInfo.vue @@ -54,30 +54,30 @@ - + - - {{buttons.customerID}}： - - {{buttons.fGPartNo}}： + + + - - + + {{buttons.customerID}}： + {{buttons.partNo}}： - + @@ -85,16 +85,16 @@ - + + + {{buttons.supplierID}}： - - - + @@ -102,8 +102,6 @@ {{buttons.close}} - - @@ -194,7 +192,7 @@ }, { functionId: this.$route.meta.menuId, - languageValue: '数据维护', + languageValue: '物料参照信息', objectId: 'dataUpdate', objectType: "button", tableId: "6021Table" @@ -318,7 +316,7 @@ download:'导出', settingTable: '设置列表', work:'操作', - dataUpdate:'数据维护', + dataUpdate:'物料参照信息', site:'工厂编码', update:'编辑', delete:'删除', @@ -557,7 +555,17 @@ ], } }, - + watch: { + modelData: { + deep: true, + handler: function (newV, oldV) { + this.modelData.fGPartNo = this.modelData.fGPartNo.toUpperCase() + this.modelData.partNo = this.modelData.partNo.toUpperCase() + this.modelData.supplierID = this.modelData.supplierID.toUpperCase() + this.modelData.customerID = this.modelData.customerID.toUpperCase() + } + } + }, mounted() { this.$nextTick(() => { this.height = window.innerHeight - 140; @@ -671,6 +679,7 @@ } if (this.tagNo === 3){ this.modelData.supplierID = val.SupplierID + this.getSupplierID(); } }, // 获取基础数据列表 @@ -693,7 +702,9 @@ if (val1 === 3){ strVal = this.modelData.supplierID } - this.$refs.baseList.init(val1,strVal) + if(this.modelInputFlag==false) { + this.$refs.baseList.init(val1, strVal) + } }) }, @@ -822,6 +833,7 @@ // this.modelData.fGPartDescription=outList[0].partDescription; this.$set(this.modelData,'fGPartDescription',outList[0].partDescription) }else { + this.modelData.fGPartDescription=''; } }) }, @@ -838,6 +850,8 @@ this.$set(this.modelData,'partDescription',outList[0].partDescription) this.$set(this.modelData,'umid',outList[0].umid) }else { + this.modelData.partDescription=''; + this.modelData.umid=''; } }) }, @@ -853,10 +867,6 @@ this.$set(this.modelData,'supplierName',outList[0].supplierName) }else { this.modelData.supplierName=''; - this.modelData.supplierID=''; - this.$alert('该供应商不存在', '错误', { - confirmButtonText: '确定' - }) } }) }, diff --git a/src/views/modules/base/searchPart.vue b/src/views/modules/base/searchPart.vue deleted file mode 100644 index 9325bca..0000000 --- a/src/views/modules/base/searchPart.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - diff --git a/src/views/modules/base/searchPartNo.vue b/src/views/modules/base/searchPartNo.vue index 0ee1b89..58aaf01 100644 --- a/src/views/modules/base/searchPartNo.vue +++ b/src/views/modules/base/searchPartNo.vue @@ -4,7 +4,8 @@ - + + {{buttons.partNo}}： @@ -85,11 +86,14 @@ + + + diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index e3dfc34..5c7f510 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -317,6 +317,12 @@ :visible.sync="updateProductRouting" > + + + @@ -328,6 +334,8 @@ import comBatchWorkCalendar from "../common/com_batch_work_calendar";/*批量维护工作日历外组件*/ import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/ import comChangeWaitTime from "./com_change_wait_time";/*修改等待派工单的等待时间*/ + + import updateRoutingRev from "../common/updateRoutingRev"; import { getResourceRestList, getShopOrderList, @@ -353,6 +361,7 @@ export default { showWorkCalendarOut: false, showBatchWorkCalendar: false, showSplitScheduleFlag: false, + updateRoutingRev:false, showPartStockFlag: false, showChangeWaitTime: false, scheduleIndex: -1, @@ -1840,6 +1849,7 @@ export default { /*组件*/ components: { + updateRoutingRev, Chooselist,/*列表的组件*/ comSplitSchedule,/* 分批排产的组件 */ comWorkCalendarOut,/*工作日历外组件*/ @@ -2031,6 +2041,21 @@ export default { this.updateProductRouting = true; this.$refs.updateProductRouting.init(tempData); }) + }else if('更改工艺路线版本' === menuName) { + //判断是否选择好了工单 + if (this.currentRoutingRow == null || this.currentRoutingRow == {}) { + //重置按钮 + this.detailMenuButton.updateProductRouting = true; + //返回错误 + this.$message.error('请选择工单!'); + return false; + } + let tempData = {'site': this.pageData.site, 'orderNo': this.currentRoutingRow.orderNo,'partNo': this.currentRoutingRow.partNo}; + //打开组件 需要的数据 展示需要的数据 + this.$nextTick(() => { + this.updateRoutingRev = true; + this.$refs.updateRoutingRev.init(tempData); + }) } }, @@ -2556,6 +2581,9 @@ export default { } }); }, + updateRoutingRevClosed(){ + this.getShopOrderList(); + }, },