|
|
@@ -231,7 +231,10 @@
|
|
|
//如果废品回用的批次领料部门是当前计划的领料部门，则加到lotList
|
|
|
lotList.value = res.rows
|
|
|
batchNoList.value = [res.rows[0]];
|
|
|
- isWasteRecyclingFlag.value = false
|
|
|
+ isWasteRecyclingFlag.value = true
|
|
|
+ if(batchNoList.value[0].isWasteRecycling == 0) {
|
|
|
+ isWasteRecyclingFlag.value = false
|
|
|
+ }
|
|
|
dayWork.value.lotId = batchNoList.value[0].id;
|
|
|
dayWork.value.lotCode = batchNoList.value[0].lotCode;
|
|
|
if (dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId) {
|
|
|
@@ -283,6 +286,7 @@
|
|
|
// }
|
|
|
function getFurnaceInfo(data) {
|
|
|
if (data.isWasteRecycling == 0) {
|
|
|
+ isWasteRecyclingFlag.value = true
|
|
|
let token = 'Bearer ' + getToken();
|
|
|
let header = {
|
|
|
Authorization: token
|
|
|
@@ -315,6 +319,7 @@
|
|
|
}
|
|
|
})
|
|
|
} else {
|
|
|
+ isWasteRecyclingFlag.value = false
|
|
|
furnaceInfo.value.furnaceNumber = "废品回用"
|
|
|
dayWork.value.furnaceNoInfo = furnaceInfo.value
|
|
|
basicInfo.value = dayWork.value.furnaceNoInfo
|
|
|
@@ -332,9 +337,10 @@
|
|
|
for (let i = 0; i < lotList.value.length; i++) {
|
|
|
if (lotList.value[i].lotCode == lotCode) {
|
|
|
batchNoList.value = [lotList.value[i]];
|
|
|
+ console.log(batchNoList.value)
|
|
|
dayWork.value.lotId = lotList.value[i].id;
|
|
|
dayWork.value.lotCode = lotList.value[i].lotCode;
|
|
|
- if (batchNoList.value.isWasteRecycling == 1) {
|
|
|
+ if (batchNoList.value[0].isWasteRecycling == 1) {
|
|
|
isWasteRecyclingFlag.value = false
|
|
|
uni.showToast({
|
|
|
icon: "none",
|
