From c6fd16350612b8aef7a04bfbebf6ee3c591a88ae Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 22 十月 2025 17:43:44 +0800
Subject: [PATCH] 调整物料下发和取消下发
---
pages/product/WorkshopOrderIssued/index.vue | 4 ++++
pages/product/WorkshopOrderCancellationIssued/index.vue | 28 ++++++++++++++--------------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/pages/product/WorkshopOrderCancellationIssued/index.vue b/pages/product/WorkshopOrderCancellationIssued/index.vue
index e50244c..af53612 100644
--- a/pages/product/WorkshopOrderCancellationIssued/index.vue
+++ b/pages/product/WorkshopOrderCancellationIssued/index.vue
@@ -114,10 +114,10 @@
</view>
<view class="row-list">
<view class="_label">
- <view class="_label-name">鍙栨秷涓嬪彂鏁伴噺锛�</view>
+ <view class="_label-name">鍙栨秷鏁伴噺锛�</view>
</view>
<view class="_content">
- {{ item.suppliedQuantity }}
+ {{ item.stockQuantity }}
</view>
</view>
</view>
@@ -133,6 +133,7 @@
:show-confirm-button="true"
@confirm="confirm"
@cancel="cancel"
+
>
<view class="popup-content">
<view class="packing-registration-param">
@@ -181,12 +182,12 @@
</view>
<view class="packing-registration-param-item param-extra">
<view class="packing-registration-param-item-left">
- <text class="item-one">鍙栨秷涓嬪彂鏁伴噺</text>
+ <text class="item-one">鍙栨秷鏁伴噺</text>
</view>
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="modalList.returnQuantity"
+ v-model="modalList.stockQuantity"
/>
</view>
</view>
@@ -323,8 +324,8 @@
this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
return;
}
- if (!this.modalList.returnQuantity) {
- this.$u.toast("璇疯緭鍏ュ彇娑堜笅鍙戞暟閲�");
+ if (!this.modalList.stockQuantity) {
+ this.$u.toast("璇疯緭鍏ュ彇娑堟暟閲�");
this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
return;
}
@@ -337,8 +338,8 @@
this.$u.toast("鎻愪氦鎴愬姛");
this.showModal = false;
const obj = {
- suppliedQuantity: this.modalList.suppliedQuantity,
- outBatchNo: this.modalList.returnQuantity,
+ stockQuantity: this.modalList.stockQuantity,
+ outBatchNo: this.modalList.outBatchNo,
};
this.hasScanSnList.push(obj);
}
@@ -406,12 +407,11 @@
},
// 鎵爜鍚庢暟鎹洖鏄�
scanHandle(val) {
- const { outBatchNo } = val;
- const { workstationId, operationTaskId } = this.registerInfo;
+ const { BN } = val;
+ const { id } = this.registerInfo;
const obj = {
- outBatchNo: outBatchNo,
- feedingWorkstationId: workstationId,
- operationTaskId: operationTaskId,
+ outBatchNo: BN,
+ moId: id,
};
this.getReturnInfo(obj);
// this.$u.api.WorkshopOrderCancellationIssued.checkReturnPartPDA(obj).then(
@@ -483,7 +483,7 @@
}
.packing-registration-param-view {
- height: 450rpx;
+ height: 200rpx;
background-color: #fff;
border-radius: 10rpx;
padding: 0rpx 23rpx;
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index e017de1..51c7221 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/pages/product/WorkshopOrderIssued/index.vue
@@ -230,6 +230,7 @@
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
},
// 涓嬪彂璁板綍鍒楄〃
hasScanSnList: [],
@@ -370,6 +371,7 @@
compNo(val) {
this.registerInfo.partNo = val.partNo;
this.registerInfo.partName = val.partName;
+ this.registerInfo.ifsLineItemNo = val.ifsLineItemNo;
},
// 璁㈠崟鍙峰洖鏄�
setNo(val) {
@@ -382,6 +384,7 @@
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
}),
(this.machineList = []);
this.machineIndex = null;
@@ -439,6 +442,7 @@
console.log("res", res);
if (res.code === 0) {
(res.data.workstationId = workstationId), (this.modalList = res.data);
+ this.modalList.ifsLineItemNo = this.registerInfo.ifsLineItemNo;
this.showModal = true;
}
});
--
Gitblit v1.9.3