|
@@ -3308,6 +3308,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -3320,9 +3322,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fProductName = arr.join(",");
|
|
this.form.fProductName = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fProductName = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fProductName = null;
|
|
|
|
+ }
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
this.detailList.map((e) => {
|
|
this.detailList.map((e) => {
|
|
@@ -3330,9 +3332,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fMarks = arr.join(",");
|
|
this.form.fMarks = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fMarks = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fMarks = null;
|
|
|
|
+ }
|
|
if (this.detailList.length == 0) {
|
|
if (this.detailList.length == 0) {
|
|
this.form.fNetweight = 0;
|
|
this.form.fNetweight = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
@@ -3398,6 +3400,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -3410,9 +3414,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fProductName = arr.join(",");
|
|
this.form.fProductName = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fProductName = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fProductName = null;
|
|
|
|
+ }
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
this.detailList.map((e) => {
|
|
this.detailList.map((e) => {
|
|
@@ -3420,9 +3424,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fMarks = arr.join(",");
|
|
this.form.fMarks = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fMarks = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fMarks = null;
|
|
|
|
+ }
|
|
if (this.detailList.length == 0) {
|
|
if (this.detailList.length == 0) {
|
|
this.form.fNetweight = 0;
|
|
this.form.fNetweight = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
@@ -3487,6 +3491,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -3499,9 +3505,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fProductName = arr.join(",");
|
|
this.form.fProductName = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fProductName = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fProductName = null;
|
|
|
|
+ }
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
this.detailList.map((e) => {
|
|
this.detailList.map((e) => {
|
|
@@ -3509,9 +3515,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fMarks = arr.join(",");
|
|
this.form.fMarks = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fMarks = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fMarks = null;
|
|
|
|
+ }
|
|
if (this.detailList.length == 0) {
|
|
if (this.detailList.length == 0) {
|
|
this.form.fNetweight = 0;
|
|
this.form.fNetweight = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
this.form.fPlanvolumn = 0;
|
|
@@ -3717,6 +3723,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -3729,7 +3737,7 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fProductName = arr.join(",");
|
|
this.form.fProductName = arr.join(",");
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
this.form.fProductName = null;
|
|
this.form.fProductName = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
@@ -3739,7 +3747,7 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fMarks = arr.join(",");
|
|
this.form.fMarks = arr.join(",");
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
this.form.fMarks = null;
|
|
this.form.fMarks = null;
|
|
}
|
|
}
|
|
let formData = new window.FormData();
|
|
let formData = new window.FormData();
|
|
@@ -3804,6 +3812,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -4574,6 +4584,8 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fCntval = arr.join(",");
|
|
this.form.fCntval = arr.join(",");
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fCntval = null;
|
|
}
|
|
}
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
@@ -4586,9 +4598,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fProductName = arr.join(",");
|
|
this.form.fProductName = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fProductName = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fProductName = null;
|
|
|
|
+ }
|
|
if (this.detailList.length > 0) {
|
|
if (this.detailList.length > 0) {
|
|
let arr = [];
|
|
let arr = [];
|
|
this.detailList.map((e) => {
|
|
this.detailList.map((e) => {
|
|
@@ -4596,9 +4608,9 @@ export default {
|
|
});
|
|
});
|
|
arr = [...new Set(arr)];
|
|
arr = [...new Set(arr)];
|
|
this.form.fMarks = arr.join(",");
|
|
this.form.fMarks = arr.join(",");
|
|
- }else {
|
|
|
|
- this.form.fMarks = null;
|
|
|
|
- }
|
|
|
|
|
|
+ } else {
|
|
|
|
+ this.form.fMarks = null;
|
|
|
|
+ }
|
|
this.form.fBillingway = this.form.fFeetUnit;
|
|
this.form.fBillingway = this.form.fFeetUnit;
|
|
if (this.detailList.length == 0) {
|
|
if (this.detailList.length == 0) {
|
|
this.form.fNetweight = 0;
|
|
this.form.fNetweight = 0;
|