diff --git a/src/views/modules/cross-area-transfer/crossAreaTransfer.vue b/src/views/modules/cross-area-transfer/crossAreaTransfer.vue index b3f4353..e7fa29a 100644 --- a/src/views/modules/cross-area-transfer/crossAreaTransfer.vue +++ b/src/views/modules/cross-area-transfer/crossAreaTransfer.vue @@ -255,16 +255,13 @@ export default { try { this.loading = true - const params = { scanCode: scanCode, transferMode: this.transferMode, site: site, warehouseId: warehouseId } - const { data } = await getCrossAreaTransferInfo(params) - if (data && data.code === 0) { if (this.transferMode === 'label') { this.labelInfo = data.data || {} diff --git a/src/views/modules/label-split-merge/labelSplitMerge.vue b/src/views/modules/label-split-merge/labelSplitMerge.vue index 51a9ae7..e4b6145 100644 --- a/src/views/modules/label-split-merge/labelSplitMerge.vue +++ b/src/views/modules/label-split-merge/labelSplitMerge.vue @@ -80,12 +80,7 @@
- +
@@ -170,7 +165,7 @@ export default { getStockInfoByLabelCode(params).then(({ data }) => { if (data && data.code === 0) { this.currentLabel = data.data; - this.$message.success('获取标签信息成功'); + // this.$message.success('获取标签信息成功'); } else { this.$message.error(data.msg || '未找到该标签的库存信息'); this.currentLabel = {}; @@ -202,17 +197,14 @@ export default { confirmSplit() { const splitQty = parseFloat(this.splitQuantity); const currentQty = parseFloat(this.currentLabel.qtyOnHand); - if (!splitQty || splitQty <= 0) { this.$message.warning('请输入有效的拆分数量'); return; } - if (splitQty >= currentQty) { this.$message.warning('拆分数量必须小于当前数量'); return; } - const params = { site: localStorage.getItem('site'), buNo: this.currentLabel.buNo, @@ -231,9 +223,10 @@ export default { expiredDate: this.currentLabel.expiryDate, orderref1: this.currentLabel.orderref1, orderref2: this.currentLabel.orderref2, - orderref3: this.currentLabel.orderref3 + orderref3: this.currentLabel.orderref3, + status: this.currentLabel.status, + statusTb: this.currentLabel.statusTb }; - splitLabel(params).then(({ data }) => { if (data && data.code === 0) { this.$message.success(`拆分成功!新标签: ${data.data.newLabelCode}`); @@ -313,7 +306,9 @@ export default { batchNo: this.currentLabel.batchNo, locationId: this.currentLabel.locationId, targetQuantity: parseFloat(targetLabel.qtyOnHand), - sourceQuantity: parseFloat(this.currentLabel.qtyOnHand) + sourceQuantity: parseFloat(this.currentLabel.qtyOnHand), + status: this.currentLabel.status, + statusTb: this.currentLabel.statusTb }; mergeLabel(mergeParams).then(({ data }) => { @@ -544,6 +539,20 @@ export default { } .split-input ::v-deep .el-input__inner, + +.numInput /deep/ .el-input__inner{ + text-align: right; +} +/deep/ .inlineNumber input::-webkit-outer-spin-button, +/deep/ .inlineNumber input::-webkit-inner-spin-button { + -webkit-appearance: none; + +} +/deep/ .inlineNumber input[type="number"]{ + -moz-appearance: textfield; + padding-right: 5px !important; +} + .merge-input ::v-deep .el-input__inner { height: 48px; border: 1px solid #17B3A3; diff --git a/src/views/modules/property-change/propertyChange.vue b/src/views/modules/property-change/propertyChange.vue index 57742ee..e29b7ae 100644 --- a/src/views/modules/property-change/propertyChange.vue +++ b/src/views/modules/property-change/propertyChange.vue @@ -31,7 +31,7 @@
标签数量 - {{ stockInfo.labelQuantity || '' }} + {{ stockInfo.qtyOnHand || '' }}