diff --git a/mycomponents/balance/moveStatus.vue b/mycomponents/balance/moveStatus.vue
index 0122e4ce..a0c785c5 100644
--- a/mycomponents/balance/moveStatus.vue
+++ b/mycomponents/balance/moveStatus.vue
@@ -1,18 +1,12 @@
-
-
-
- —>
-
-
-
+
+
+
+ —>
+
+
+
@@ -43,6 +37,10 @@
type: String,
default: ''
},
+ showToInventoryStatus: {
+ type: Boolean,
+ default: false
+ },
},
watch: {
diff --git a/mycomponents/qty/balanceQtyEdit.vue b/mycomponents/qty/balanceQtyEdit.vue
index e59f0b90..726c2d80 100644
--- a/mycomponents/qty/balanceQtyEdit.vue
+++ b/mycomponents/qty/balanceQtyEdit.vue
@@ -165,8 +165,11 @@
},
callback() {
let qty = Number(this.allQty);
- this.dataContent.toInventoryStatus = this.inventoryStatus;
this.dataContent.handleQty = qty;
+ if (this.allowEditStatus) //只有编辑了库存状态,才给库存状态赋值
+ {
+ this.dataContent.toInventoryStatus = this.inventoryStatus;
+ }
this.$emit("confirm", qty);
this.closeEditPopup();
},
diff --git a/pages/inventoryMove/coms/comInventoryDetailCard.vue b/pages/inventoryMove/coms/comInventoryDetailCard.vue
index d456c28e..39d33afc 100644
--- a/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -124,8 +124,7 @@
});
},
confirm(qty) {
- // this.editItem.handleQty=qty;
- //this.editItem.qty = qty;
+ this.editItem.handleQty=qty;
this.$emit('updateData')
},
showLocation(item) {
diff --git a/pages/inventoryMove/coms/comMove.vue b/pages/inventoryMove/coms/comMoveRecord.vue
similarity index 97%
rename from pages/inventoryMove/coms/comMove.vue
rename to pages/inventoryMove/coms/comMoveRecord.vue
index 36c83977..07d38a1c 100644
--- a/pages/inventoryMove/coms/comMove.vue
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -147,7 +147,7 @@
methods: {
updateTitle() {
- if (this.businessTypeCode == "InventoryMove") {
+ if (this.businessTypeCode == "Move") {
this.title = "库存转移记录";
this.toInventoryStatus = "OK"
} else if (this.businessTypeCode == "HoldToOk") {
@@ -210,7 +210,7 @@
var itemp = createItemInfo(balance, pack);
let newDetail = createDetailInfo(balance, pack); //
newDetail.inventoryStatus = balance.inventoryStatus;
- newDetail.toInventoryStatus = this.toInventoryStatus
+ newDetail.toInventoryStatus = this.toInventoryStatus;
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
} else {
@@ -358,7 +358,6 @@
return itemList;
},
setParams() {
-
var subList = []
var creator = this.$store.state.user.id
this.detailSource.forEach(item => {
@@ -384,10 +383,10 @@
detail.fromLocationCode = detail.locationCode;
- if (this.businessType != '') {
- detail.toLocationCode = this.toLocationCode;
- detail.toInventoryStatus = this.toInventoryStatus;
- }
+ // if (this.businessType != '') {
+ // detail.toLocationCode = this.toLocationCode;
+ // detail.toInventoryStatus = this.toInventoryStatus;
+ // }
subList.push(detail)
}
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
index 74ddf94b..1241f426 100644
--- a/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -14,10 +14,10 @@
+ :right-options="item.scaned?scanOptions:detailOptions">
+ :isShowLocation="true" :allowEditStatus='allowEditStatus'>
diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue
index 03089c58..ec725afb 100644
--- a/pages/inventoryMove/coms/comMovebalance.vue
+++ b/pages/inventoryMove/coms/comMovebalance.vue
@@ -15,25 +15,10 @@
-
-
-
-
-
+
+
-
-
-
-
@@ -104,38 +89,15 @@
type: String,
default: ""
},
+ allowEditStatus: {
+ type: Boolean,
+ default: false
+ },
},
watch: {
},
methods: {
- copy(){
- // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
- var content = "HPQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty
- this.$copyText(content).then(
- res => {
- uni.showToast({
- title: '复制成功',
- icon: 'none'
- })
- }
- )
- },
- copyPro(){
- // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
- var content = "HMQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty
- this.$copyText(content).then(
- res => {
- uni.showToast({
- title: '复制成功',
- icon: 'none'
- })
- }
- )
- },
- isDevlement(){
- return getApp().globalData.isDevelopment;
- }
}
}
diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue
index 5affa16e..80676816 100644
--- a/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -167,23 +167,23 @@
} else if (this.businessTypeCode == "HoldToOk") {
name = "隔离转合格";
this.toLocationCode = '';
- this.toinventoryStatus = 'Ok';
+ this.toinventoryStatus = 'OK';
} else if (this.businessTypeCode == "HoldToScrap") {
name = "隔离转报废";
- this.toLocationCode = 'Scrap';
- this.toinventoryStatus = 'Scrap';
+ this.toLocationCode = 'SCRAP';
+ this.toinventoryStatus = 'SCRAP';
} else if (this.businessTypeCode == "OkToHold") {
name = "合格转隔离";
- this.toLocationCode = 'Hold';
- this.toinventoryStatus = 'Hold';
+ this.toLocationCode = 'HOLD';
+ this.toinventoryStatus = 'HOLD';
} else if (this.businessTypeCode == "OktoScrap") {
name = "合格转报废";
- this.toLocationCode = 'Scrap';
- this.toinventoryStatus = 'Scrap';
+ this.toLocationCode = 'SCRAP';
+ this.toinventoryStatus = 'SCRAP';
} else if (this.businessTypeCode == "ScrapToHold") {
name = "报废转隔离";
- this.toLocationCode = 'Hold';
- this.toinventoryStatus = 'Hold';
+ this.toLocationCode = 'HOLD';
+ this.toinventoryStatus = 'HOLD';
}
uni.setNavigationBarTitle({
diff --git a/pages/inventoryMove/record/holdToOkRecord.vue b/pages/inventoryMove/record/holdToOkRecord.vue
index 6efc0d0a..72d3dc7b 100644
--- a/pages/inventoryMove/record/holdToOkRecord.vue
+++ b/pages/inventoryMove/record/holdToOkRecord.vue
@@ -1,15 +1,15 @@
-
+