|
@@ -10,6 +10,7 @@ let rptSignatureHelper = {
|
|
|
currentSelectedESignAccDom: null,
|
|
|
currentSelectedESignAccIdx: -1,
|
|
|
currentSelectedESignAccName: null,
|
|
|
+ currentSelectedESignParentDivId: '',
|
|
|
originalRoleRelList: [],
|
|
|
buildSelectableAccount: function () {
|
|
|
//PRJ_ACCOUNT_LIST
|
|
@@ -123,13 +124,18 @@ let rptSignatureHelper = {
|
|
|
rptSignatureHelper.cleanOldSignature(rptSignatureHelper.currentSelectedESignAccName);
|
|
|
// 2.1 dom element
|
|
|
const elementsStrArr = [];
|
|
|
+ let dftDate = _getSignDateByAllScenarios(userAcc.id);
|
|
|
+ if (dftDate !== '' && dftDate.length > 20) {
|
|
|
+ dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
|
|
|
+ }
|
|
|
if (directAcc) {
|
|
|
rptSignatureHelper.pushDomElementByUser(elementsStrArr, userAcc.name, userAcc.role);
|
|
|
// 还有ROLE_REL_LIST
|
|
|
let roleRelObj = {};
|
|
|
roleRelObj.signature_name = rptSignatureHelper.currentSelectedESignAccName;
|
|
|
roleRelObj.sign_path = dftSignSrc;
|
|
|
- roleRelObj.sign_date = '';
|
|
|
+ // roleRelObj.sign_date = '';
|
|
|
+ roleRelObj.sign_date = dftDate;
|
|
|
roleRelObj.sign_date_format = 'yyyy年M月d日';
|
|
|
roleRelObj.user_name = userAcc.name;
|
|
|
roleRelObj.acc_id = userAcc.id;
|
|
@@ -143,7 +149,8 @@ let rptSignatureHelper = {
|
|
|
let roleRelObj = {};
|
|
|
roleRelObj.signature_name = rptSignatureHelper.currentSelectedESignAccName;
|
|
|
roleRelObj.sign_path = dftSignSrc;
|
|
|
- roleRelObj.sign_date = '';
|
|
|
+ // roleRelObj.sign_date = '';
|
|
|
+ roleRelObj.sign_date = dftDate;
|
|
|
roleRelObj.sign_date_format = 'yyyy年M月d日';
|
|
|
roleRelObj.user_name = userAcc.name;
|
|
|
roleRelObj.acc_id = userAcc.id;
|
|
@@ -191,6 +198,7 @@ let rptSignatureHelper = {
|
|
|
// let body = $('#eSignatureBodyDiv');
|
|
|
if (pageRst !== null) {
|
|
|
let body = $('#' + signatureDivId);
|
|
|
+ rptSignatureHelper.currentSelectedESignParentDivId = signatureDivId;
|
|
|
body.empty();
|
|
|
const signature_cells = [];
|
|
|
const singatureNameArr = [];
|
|
@@ -282,7 +290,7 @@ let rptSignatureHelper = {
|
|
|
// rptSignatureHelper.pushDatePickerDom(elementsStrArr);
|
|
|
},
|
|
|
pushDatePickerDom: function (elementsStrArr, userAccId) {
|
|
|
- let idSuffixStr = 'dtp_' + rptSignatureHelper.currentSelectedESignAccName;
|
|
|
+ let idSuffixStr = 'dtp_' + rptSignatureHelper.currentSelectedESignAccName + '_' + rptSignatureHelper.currentSelectedESignParentDivId;
|
|
|
elementsStrArr.push('<div class="">');
|
|
|
// 日期控件存在页面高度不过高无法选中bug,先不用
|
|
|
// elementsStrArr.push('<input id="' + idSuffixStr + '" class="datepicker-here form-control form-control-sm mt-0" placeholder="选择签名日期" data-language="zh" data-position="right bottom" type="text" readonly="true"');
|