youxiw2000 / bsthLineProfiles · Commits

Commit a0126ad404e5d60d5ec1363a1836895563af6c8c

Authored by yiming
1 parent b59d5b18
build: skipped

bf

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @a0126ad
... ... @@ -568,8 +568,8 @@
568 568 console.log(bsthTLineNew)
569 569 if (bsthTLineNew != null) {
570 570 for (let i in bsthTLineOld) {
571   - var o = bsthTLineOld[i] == null ? '' : bsthTLineOld[i];
572   - var n = bsthTLineNew[i] == null ? '' : bsthTLineNew[i];
  571 + var o = bsthTLineOld[i] == null ? '' : $.trim(bsthTLineOld[i]).replace(/[\r\n]/g,"");
  572 + var n = bsthTLineNew[i] == null ? '' : $.trim(bsthTLineNew[i]).replace(/[\r\n]/g,"");
573 573 if (o != n) {
574 574 i = i == 'fcompany' ? 'fCompany' : i;
575 575 i = i == 'plineId' ? 'pLineId' : i;
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @a0126ad
... ... @@ -583,11 +583,13 @@
583 583 var bsthTLineNew = data[1];
584 584 if (bsthTLineNew != null) {
585 585 for (let i in bsthTLineOld) {
586   - var o = bsthTLineOld[i] == null ? '' : bsthTLineOld[i];
587   - var n = bsthTLineNew[i] == null ? '' : bsthTLineNew[i];
  586 + var o = bsthTLineOld[i] == null ? '' : $.trim(bsthTLineOld[i]).replace(/[\r\n]/g,"");
  587 + var n = bsthTLineNew[i] == null ? '' : $.trim(bsthTLineNew[i]).replace(/[\r\n]/g,"");
588 588 if (o != n) {
589 589 i = i == 'fcompany' ? 'fCompany' : i;
590 590 i = i == 'plineId' ? 'pLineId' : i;
  591 + console.log(o);
  592 + console.log(n);
591 593 var input = document.getElementsByName(i)[0];
592 594 if (input != undefined) {
593 595 input.style.color = 'red'
... ...