diff --git a/src/pages/modules/semifinished/semi-finished-check-search.vue b/src/pages/modules/semifinished/semi-finished-check-search.vue
index c7282dc..81ab4fd 100644
--- a/src/pages/modules/semifinished/semi-finished-check-search.vue
+++ b/src/pages/modules/semifinished/semi-finished-check-search.vue
@@ -80,7 +80,6 @@
物料规格 |
数量 |
重量(kg) |
- 盘点重量(kg) |
盘点数量 |
是否异常 |
盘点状态 |
diff --git a/src/pages/modules/semifinished/semi-finished-check.vue b/src/pages/modules/semifinished/semi-finished-check.vue
index 889711b..5e34344 100644
--- a/src/pages/modules/semifinished/semi-finished-check.vue
+++ b/src/pages/modules/semifinished/semi-finished-check.vue
@@ -51,9 +51,9 @@
盘点货位 |
物料号 |
物料规格 |
- 数量 |
- 单重(g) |
重量(kg) |
+ 单重(g) |
+ 数量 |
载具号 |
@@ -63,10 +63,10 @@
{{ e.sect_name }} |
{{e.struct_name}} |
{{e.material_code}} |
- {{e.material_name}} |
+ {{e.material_spec}} |
{{e.canuse_qty | numeric(3)}} |
{{ e.unit_weight | numeric(3) }} |
- {{ e.base_qty | numeric(3) }} |
+ {{ e.qty | numeric(3) }} |
{{ e.storagevehicle_code }} |
@@ -101,7 +101,9 @@ export default {
},
activated () {
if (this.$store.getters.materArr.length > 0) {
- this.dataList = [...this.dataList, ...this.$store.getters.materArr]
+ let arr = this.$store.getters.materArr
+ this.removeRepeat(this.dataList, arr)
+ this.dataList = [...this.dataList, ...arr]
this.dataList.map(el => {
let res = accMul(el.canuse_qty, el.unit_weight)
res = accDiv(res, 1000)
@@ -113,6 +115,17 @@ export default {
this._checkGetBcpStor()
},
methods: {
+ // 数组去重
+ removeRepeat (arr1, arr2) {
+ for (let i = 0; i < arr1.length; i++) {
+ for (let j = 0; j < arr2.length; j++) {
+ if (arr1[i].struct_name === arr2[j].struct_name) {
+ arr2.splice(j, 1)
+ j--
+ }
+ }
+ }
+ },
// 仓库下拉框
async _checkGetBcpStor () {
let res = await checkGetBcpStor()
diff --git a/src/pages/modules/semifinished/struct-mater-search.vue b/src/pages/modules/semifinished/struct-mater-search.vue
index 3c1acf0..1902f04 100644
--- a/src/pages/modules/semifinished/struct-mater-search.vue
+++ b/src/pages/modules/semifinished/struct-mater-search.vue
@@ -31,7 +31,7 @@
货位 |
物料编号 |
物料名称 |
- 数量 |
+ 重量 |
单重(g) |
载具号 |