|
|
@@ -152,6 +152,9 @@ export default {
|
|
|
let r = spl.find(f => f.code == i.code);
|
|
|
if (r) {
|
|
|
i.num_id = r._id;
|
|
|
+ if (r.jynum) i.jynum = Number(r.jynum);
|
|
|
+ if (r.cynum) i.cynum = Number(r.cynum);
|
|
|
+ if (r.mznum) i.mznum = Number(r.mznum);
|
|
|
i.num = r.num;
|
|
|
}
|
|
|
return i;
|
|
|
@@ -184,12 +187,12 @@ export default {
|
|
|
let nowrow = 0;
|
|
|
if (row[type]) nowrow = row[type];
|
|
|
const total = this.computeTotal(index, type);
|
|
|
- if (index == 0) {
|
|
|
- console.log('nextmaxnum-----' + this.nextmaxnum);
|
|
|
- console.log('total-----' + total);
|
|
|
- console.log('nowrow-----' + nowrow);
|
|
|
- console.log(this.nextmaxnum - total - nowrow);
|
|
|
- }
|
|
|
+ // if (index == 0) {
|
|
|
+ // console.log('nextmaxnum-----' + this.nextmaxnum);
|
|
|
+ // console.log('total-----' + total);
|
|
|
+ // console.log('nowrow-----' + nowrow);
|
|
|
+ // console.log(this.nextmaxnum - total - nowrow);
|
|
|
+ // }
|
|
|
return this.nextmaxnum - total + nowrow;
|
|
|
},
|
|
|
computeTotal() {
|
