diff --git a/src/views/modules/common/com_part_stock.vue b/src/views/modules/common/com_part_stock.vue index fdca8bd..9f92246 100644 --- a/src/views/modules/common/com_part_stock.vue +++ b/src/views/modules/common/com_part_stock.vue @@ -28,6 +28,7 @@
@@ -261,6 +262,20 @@ export default { this.$emit('update:visible', false); }, + /*添加定制的css类*/ + customerCellClassName({row, column, rowIndex, columnIndex}) { + if(column.property == 'onOrder'){ + return 'customer-number-cell'; + } + }, + + /*添加定制的cess样式*/ + customerCellStyle({row, column, rowIndex, columnIndex}) { + if(column.property == 'onOrder'){ + return 'padding: 0px 0px;'; + } + }, + //刷新当前卷的时间数据 refreshPageTable(){ getOrderPartStockedQty(this.pageData).then(({data}) => { diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index 1bafc93..3a308d2 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -48,6 +48,7 @@ diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 023a460..f5889c6 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -107,6 +107,8 @@ 取消生产已排料 + 查看物料库存
刀模已发 @@ -192,6 +194,11 @@ + + + + @@ -220,7 +227,9 @@ import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派 import changePackaging from "./otherReport/change_packaging";/*结束派工的组件*/ import createRecheck from './com_create_recheck' import Com_split_schedule from "../schedule/com_split_schedule"; -import comSplitOrderReport from './com_split_order_report';/*分切报工*/ +import comSplitOrderReport from './com_split_order_report'; +import comPartStock from "../common/com_part_stock";/*展示物料库存的组件*/ +/*分切报工*/ export default { data() { @@ -235,6 +244,7 @@ export default { fqcRollShowReportFlag: false, showFinishScheduleFlag: false, changePackagingFlag: false, + showPartStockFlag: false, searchData: { site: this.$store.state.user.site, resourceId: '', @@ -1088,6 +1098,7 @@ export default { canceledRepairSOFlagButton: false, canceledAllPrdButton: false, createRecheckButton: false, + partStockFlag: true,/*查看物料库存*/ } } }, @@ -1102,6 +1113,7 @@ export default { fqcSplitRollReport, /*FQC分卷*/ createRecheck,/*创建重检派工单*/ changePackaging, /*换包装*/ + comPartStock,/*展示物料库存的组件*/ }, mounted() { @@ -1144,6 +1156,7 @@ export default { } this.menuButton.canceledAllPrdButton = false this.menuButton.createRecheckButton = false + this.menuButton.partStockFlag = false; // 判断是否具有该页面权限 let menList = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]').filter(item => item.path == 'shopOrder-shopOrder/shopOrder') if (menList.length > 0) { @@ -1317,6 +1330,23 @@ export default { } }) } + + if('查看物料库存' === val){ + //判断是否选择好了工单 + if(this.currentRow == null || this.currentRow == {}){ + //重置按钮 + this.menuButton.partStockFlag = true; + //返回错误 + this.$message.error('请选择派工单!'); + return false; + } + let tempData = {'site': this.currentRow.site, 'orderNo': this.currentRow.orderNo}; + //打开组件 需要的数据 展示需要的数据 + this.$nextTick(() => { + this.showPartStockFlag = true; + this.$refs.comPartStock.init(tempData); + }) + } // 关闭 if ('1' == val) { //调用提示的方法