|
@@ -344,9 +344,15 @@ let rptSignatureHelper = {
|
|
|
// 2. 日期
|
|
|
elementsStrArr.push('<div class="col-6">');
|
|
|
let dftDate = '';
|
|
|
- if (userAcc) dftDate = _getSignDateByAllScenarios(userAcc.id);
|
|
|
- if (dftDate !== '' && dftDate.length > 20) {
|
|
|
- dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
|
|
|
+ if (role_rel.sign_date !== '' && role_rel.sign_date.length > 20) {
|
|
|
+ dftDate = (new Date(role_rel.sign_date)).Format('yyyy-MM-dd');
|
|
|
+ } else if (role_rel.sign_date instanceof Date){
|
|
|
+ dftDate = role_rel.sign_date.Format('yyyy-MM-dd');
|
|
|
+ } else {
|
|
|
+ if (userAcc) dftDate = _getSignDateByAllScenarios(userAcc.id);
|
|
|
+ if (dftDate !== '' && dftDate.length > 20) {
|
|
|
+ dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
|
|
|
+ }
|
|
|
}
|
|
|
elementsStrArr.push('<div class="input-group input-group-sm margin-inputbox">');
|
|
|
elementsStrArr.push(' <div class="input-group-prepend">');
|