tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Chen Lily
2023-06-05 10:10:22 +08:00
parent 9da1c4cf30
commit 634e8b71ab
18 changed files with 367 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Site/Inspection/js/modules/inspects/editinspection.js
View File

@@ -113,10 +113,10 @@
_this.loading && _this.loading.fadeOut(100);
return;
}
if (q.QuestionType === Question.types.AssetStatus) {
a.Result = a.Comment;
a.Comment = "";
}
//if (q.QuestionType === Question.types.AssetStatus) {
// a.Result = a.Comment;
// a.Comment = "";
//}
answers.push(a);
}

22
Site/Inspection/js/modules/inspects/editquestion.js
View File

@@ -852,15 +852,15 @@
content.append('<div style="clear: both"></div>');
cnt = $('<div style="margin: 6px 0 0 0px"></div>');
var divComment = $('<div style="padding: 6px 0"></div>');
var comment = $('<textarea class="form-control" style="width: 100%; box-sizing: border-box; height: 70px" placeholder="Comment"></textarea>');
comment.attr('maxlength', 500);
var divResult = $('<div style="padding: 6px 0"></div>');
var rst = $('<textarea class="form-control" style="width: 100%; box-sizing: border-box; height: 70px"></textarea>');
rst.attr('maxlength', 500);
if (answer && answer.Result) {
comment.val(answer.Result);
rst.val(answer.Result);
}
this.ui.comment = comment;
divComment.append(comment);
cnt.append(divComment);
this.ui.assetstatusresult = rst;
divResult.append(rst);
cnt.append(divResult);
content.append(cnt);
return content;
@@ -874,12 +874,8 @@
items.push(item);
}
answer.SelectedItems = items;
if (items.length > 0) {
answer.Result = items.map(function (i) { return i.Value || i.Text }).join('\n');
//answer.SeverityLevel = items[0].SeverityLevel;
} else {
answer.Result = '';
}
answer.Result = this.ui.assetstatusresult.val();
return answer;
};
assetStatusQuestion.prototype.focus = function () {