diff --git a/src/views/TechnologyCenter/BOMMaintain/index.vue b/src/views/TechnologyCenter/BOMMaintain/index.vue
index 924c4522..ef4b7957 100644
--- a/src/views/TechnologyCenter/BOMMaintain/index.vue
+++ b/src/views/TechnologyCenter/BOMMaintain/index.vue
@@ -1360,6 +1360,7 @@ export default {
const NumberData4 = []
const NumberData5 = []
const NumberData6 = []
+ const NumberData7 = []
this.multipleSelection_variable1 = this.multipleSelection1
this.multipleSelection1 = []
for (let i = 0; i < this.multipleSelection_variable1.length; i++) {
@@ -1370,6 +1371,7 @@ export default {
NumberData4[i] = parseInt(this.multipleSelection_variable1[i].物料流水号)
NumberData5[i] = parseInt(this.multipleSelection_variable1[i].零件类型)
NumberData6[i] = parseInt(this.multipleSelection_variable1[i].订单流水号)
+ NumberData7[i] = this.multipleSelection_variable1[i].数量
}
var param = []
param[0] = ['流水号组', NumberData]
@@ -1379,6 +1381,7 @@ export default {
param[4] = ['物料流水号组', NumberData4]
param[5] = ['零件类型组', NumberData5]
param[6] = ['订单流水号组', NumberData6]
+ param[7] = ['数量组', NumberData7]
var Data = this.CreateData('12', 'PDM_零件明细表_基本件_删除数据_全部', param)
this.ExecDatabase(Data).then(response => {
if (response.data[0].result === '1') {
diff --git a/src/views/WarehouseManagement/WarehouseSummary/index.vue b/src/views/WarehouseManagement/WarehouseSummary/index.vue
index f5a35e59..c49c54b3 100644
--- a/src/views/WarehouseManagement/WarehouseSummary/index.vue
+++ b/src/views/WarehouseManagement/WarehouseSummary/index.vue
@@ -4,25 +4,25 @@
仓储汇总
-
+
{{ statistics.待入库 }}
待入库
-
+
{{ statistics.待出库 }}
待出库
-
+
{{ statistics.可出库 }}
可出库
-
+
{{ statistics.变更BOM }}
变更BOM
@@ -30,25 +30,25 @@
-
+
{{ statistics.补货中 }}
补货中
-
+
{{ statistics.生产中 }}
生产中
-
+
{{ statistics.待投产 }}
待投产
-
+
{{ statistics.采购中 }}
采购中
@@ -239,7 +239,7 @@ export default {
this.ExecDatabase(Data).then(response => {
let count = 0
response.data.forEach(item => {
- if (item.状态 === '待审核' || item.状态 === '审核中') {
+ if (item.状态 !=='已入库') {
count++
}
})
@@ -402,15 +402,14 @@ export default {
var param = []
var Data = this.CreateData('11', 'BOM变更记录_查询', param)
this.ExecDatabase(Data).then(response => {
- this.detailData = response.data.filter(item => item.状态 === '待审核' || item.状态 === '审核中')
+ this.detailData = response.data.filter(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: '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' }
+ { prop: '数量', label: '数量', width: '100px', align: 'center' }
]
this.loading = false
})