|
@@ -3338,44 +3338,51 @@ export default {
|
|
|
surface: "26",
|
|
|
label: "fLocalcntrno",
|
|
|
name: "库内箱号",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "27",
|
|
|
- label: "fSealno",
|
|
|
- name: "封号",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "28",
|
|
|
- label: "fGoodsval",
|
|
|
- name: "货值",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "29",
|
|
|
- label: "fSerialNumber",
|
|
|
- name: "流水号",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "30",
|
|
|
- label: "remark",
|
|
|
- name: "备注",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "31",
|
|
|
- label: "fElabel",
|
|
|
- name: "电子标签",
|
|
|
- checked: 0,
|
|
|
- width: 100,
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
},
|
|
|
+ {
|
|
|
+ surface: "27",
|
|
|
+ label: "fSealno",
|
|
|
+ name: "封号",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "28",
|
|
|
+ label: "fGoodsval",
|
|
|
+ name: "货值",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "29",
|
|
|
+ label: "fSerialNumber",
|
|
|
+ name: "流水号",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "30",
|
|
|
+ label: "remark",
|
|
|
+ name: "备注",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "31",
|
|
|
+ label: "fElabel",
|
|
|
+ name: "电子标签",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "32",
|
|
|
+ label: "fChargedate",
|
|
|
+ name: "计费日期",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
],
|
|
|
setRowList: [],
|
|
|
getRowList: [],
|
|
@@ -4201,40 +4208,43 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -4306,40 +4316,43 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -4438,40 +4451,43 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -4696,40 +4712,43 @@ export default {
|
|
|
this.form.fGrossweight = this.fGrossweight;
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
- this.form.fProductName = "";
|
|
|
+ this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -4809,40 +4828,43 @@ export default {
|
|
|
// 附件数据
|
|
|
this.form.fQty = this.fQty;
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -4954,40 +4976,43 @@ export default {
|
|
|
// 附件数据
|
|
|
this.form.fQty = this.fQty;
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -5900,40 +5925,43 @@ export default {
|
|
|
"@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
|
|
|
if (status == "zyd") {
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- this.goodsOptions.map((item) => {
|
|
|
- if (e.fGoodsid == item.fId) {
|
|
|
- arr.push(item.fName);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ this.goodsOptions.map((item) => {
|
|
|
+ if (e.fGoodsid == item.fId) {
|
|
|
+ arr.push(item.fName);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fProductName = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fProductName = "";
|
|
|
}
|
|
|
if (this.detailList.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.detailList.map((e) => {
|
|
|
- arr.push(e.fMarks);
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fMarks = arr.join(",");
|
|
|
+ let arr = [];
|
|
|
+ this.detailList.map((e) => {
|
|
|
+ arr.push(e.fMarks);
|
|
|
+ });
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
@@ -6188,16 +6216,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|
|
@@ -6248,16 +6277,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
if (this.CntrTable.length > 0) {
|
|
|
- let arr = [];
|
|
|
- this.CntrTable.map((e) => {
|
|
|
- this.cntrList.map((item) => {
|
|
|
- if (item.fId == e.fCntrid) {
|
|
|
- arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
- }
|
|
|
+ let arr = [];
|
|
|
+ this.CntrTable.map((e) => {
|
|
|
+ this.cntrList.map((item) => {
|
|
|
+ if (item.fId == e.fCntrid) {
|
|
|
+ arr.push(item.fName + "X" + e.fCntrcount);
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
|
|
- });
|
|
|
- arr = [...new Set(arr)];
|
|
|
- this.form.fCntval = arr.join(",");
|
|
|
+ arr = [...new Set(arr)];
|
|
|
+ this.form.fMarks = arr.join(',')
|
|
|
+ this.form.fMarks = this.form.fMarks.slice(0, 100);
|
|
|
} else {
|
|
|
this.form.fCntval = null;
|
|
|
}
|