diff --git a/src/views/SalesManagement/OrderInquiry/index.vue b/src/views/SalesManagement/OrderInquiry/index.vue index 45aea1c4..f358fecb 100644 --- a/src/views/SalesManagement/OrderInquiry/index.vue +++ b/src/views/SalesManagement/OrderInquiry/index.vue @@ -3197,7 +3197,7 @@ export default { }) }, selectable1(row) { - return row.图纸 !== null && row.是否投产 === 0 && row.是否后增 === 1 + return row.图纸 !== null && row.是否后增 === 1 }, handleSelectionChange1(val) { this.BOMSelection = val diff --git a/src/views/SalesManagement/OrderRelease/index.vue b/src/views/SalesManagement/OrderRelease/index.vue index 8d49b550..edd5801a 100644 --- a/src/views/SalesManagement/OrderRelease/index.vue +++ b/src/views/SalesManagement/OrderRelease/index.vue @@ -1651,7 +1651,7 @@ export default { } }, selectable1(row) { - return row.图纸 !== null && row.是否投产 === 0 + return row.图纸 !== null }, handleSelectionChange1(val) { this.BOMSelection = val @@ -1981,11 +1981,6 @@ export default { this.multipleSelection = this.multipleSelection1 return } - if (this.multipleSelection1[i].是否投产 === 0 && this.multipleSelection1[i].自制件数 > 0 && !(row.采购 === true || row.仓库 === true) && this.multipleSelection1[i].是否滑台 !== 1 && this.multipleSelection1[i].是否滑台 !== 2 && this.multipleSelection1[i].物料流水号 === 0) { - this.$message.warning(`${this.multipleSelection1[i].产品名称},该部件中的自制BOM未投产!`) - this.multipleSelection = this.multipleSelection1 - return - } this.groupNum[i] = this.multipleSelection1[i].组件流水号 } } @@ -2005,11 +2000,6 @@ export default { this.multipleSelection = this.multipleSelection1 return } - if (this.multipleSelection1[i].是否投产 === 0 && this.multipleSelection1[i].自制件数 > 0 && !(row.采购 === true || row.仓库 === true) && this.multipleSelection1[i].是否滑台 !== 1 && this.multipleSelection1[i].是否滑台 !== 2 && this.multipleSelection1[i].物料流水号 === 0) { - this.$message.warning(`${this.multipleSelection1[i].产品名称},该部件中的自制BOM未投产!`) - this.multipleSelection = this.multipleSelection1 - return - } } } if (Number(row.订单类型) === 3) { diff --git a/src/views/WarehouseManagement/WarehouseSummary/index.vue b/src/views/WarehouseManagement/WarehouseSummary/index.vue index 66a0a885..f5a35e59 100644 --- a/src/views/WarehouseManagement/WarehouseSummary/index.vue +++ b/src/views/WarehouseManagement/WarehouseSummary/index.vue @@ -10,18 +10,24 @@
待入库
- +
{{ statistics.待出库 }}
待出库
- +
{{ statistics.可出库 }}
可出库
+ + +
{{ statistics.变更BOM }}
+
变更BOM
+
+
@@ -88,6 +94,7 @@ export default { 待入库: 0, 待出库: 0, 可出库: 0, + 变更BOM: 0, 补货中: 0, 生产中: 0, 待投产: 0, @@ -134,6 +141,9 @@ export default { // 可出库数据:待出库数据的基础上又库存的数量 this.getAvailableOutStorage() + // 变更BOM数据:BOM变更记录中待审核的数量 + this.getBOMChange() + // 补货中数据:补货件查询组件中状态已到以外的订单数量 this.getReplenishing() @@ -222,6 +232,21 @@ export default { }) }, + // 获取变更BOM数据 + getBOMChange() { + var param = [] + var Data = this.CreateData('11', 'BOM变更记录_查询', param) + this.ExecDatabase(Data).then(response => { + let count = 0 + response.data.forEach(item => { + if (item.状态 === '待审核' || item.状态 === '审核中') { + count++ + } + }) + this.statistics.变更BOM = count + }) + }, + // 获取补货中数据 getReplenishing() { let count = 0 @@ -297,6 +322,9 @@ export default { case '可出库': this.getAvailableOutStorageDetail() break + case '变更BOM': + this.getBOMChangeDetail() + break case '补货中': this.getReplenishingDetail() break @@ -369,6 +397,25 @@ export default { }) }, + // 获取变更BOM详情 + getBOMChangeDetail() { + var param = [] + var Data = this.CreateData('11', 'BOM变更记录_查询', param) + this.ExecDatabase(Data).then(response => { + this.detailData = response.data.filter(item => item.状态 === '待审核' || item.状态 === '审核中') + this.detailColumns = [ + { prop: '变更单号', label: '变更单号', width: '150px', align: 'center' }, + { prop: '产品名称', label: '产品名称', width: '150px', align: 'center' }, + { prop: '图号或型号', label: '图号或型号', width: '150px', align: 'center' }, + { prop: '变更类型', label: '变更类型', width: '120px', align: 'center' }, + { prop: '状态', label: '状态', width: '100px', align: 'center' }, + { prop: '申请人', label: '申请人', width: '100px', align: 'center' }, + { prop: '申请日期', label: '申请日期', width: '150px', align: 'center' } + ] + this.loading = false + }) + }, + // 获取补货中详情 getReplenishingDetail() { var param = []