签名日期保留时分秒 + TASK #4343

app/public/report/js/rpt_signature.js

@@ -17,6 +17,22 @@ let rptSignatureHelper = {
     currentSelectedESignAccName: null,
     currentSelectedESignParentDivId: '',
     originalRoleRelList: [],
+    collapseExpandTreeNode: (dom) => {
+        // alert(dom.className);
+        if (dom.className === 'fa fa-caret-down') {
+            dom.className = 'fa fa-caret-right';
+            const doms = $($(dom).parent()).nextAll();
+            for (let idx = 0; idx < doms.length; idx++) {
+                doms[idx].style.display = 'none';
+            }
+        } else {
+            dom.className = 'fa fa-caret-down';
+            const doms = $($(dom).parent()).nextAll();
+            for (let idx = 0; idx < doms.length; idx++) {
+                doms[idx].style.display = '';
+            }
+        }
+    },
     buildSelectableAccount: function () {
         //PRJ_ACCOUNT_LIST
         //1. 清理所有选择项
@@ -49,7 +65,7 @@ let rptSignatureHelper = {
                     keyIdx = prj_accounts.length - 1;
                     //这里先push一些 html prefix，在后面统一在push html suffix
                     prj_accounts[keyIdx].push('<ul class="list-group">');
-                    prj_accounts[keyIdx].push('<li class="px-2 text-muted"><i class="fa fa-caret-down"></i> ' + companyKey + '</li>');
+                    prj_accounts[keyIdx].push('<li class="px-2 text-muted"><i class="fa fa-caret-down" onclick="rptSignatureHelper.collapseExpandTreeNode(this)"></i> ' + companyKey + '</li>');
                     prj_sel_option_accounts[keyIdx].push('<optgroup label=" ' + companyKey + '">');
                 }
                 //push item
@@ -132,7 +148,7 @@ let rptSignatureHelper = {
             // 2.1 dom element
             const elementsStrArr = [];
             let dftDate = _getSignDateByAllScenarios(userAcc.id);
-            if (dftDate !== '' && dftDate.length > 20) {
+            if (dftDate !== '' && dftDate.length >= 10) {
                 // dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
                 dftDate = new Date(dftDate); // 不Format,保留时分秒
             } else if (dftDate === '') {
@@ -817,6 +833,13 @@ let rptSignatureHelper = {
                 const role_rel = currRoleRelList[rridx];
                 if (role_rel.sign_date === undefined || role_rel.sign_date ===  null || role_rel.sign_date ===  '') {
                     let dftDate = _getSignDateByAllScenarios(role_rel.acc_id);
+                    if (dftDate !== '' && dftDate.length >= 10) {
+                        // dftDate = (new Date(dftDate)).Format('yyyy-MM-dd');
+                        dftDate = new Date(dftDate); // 不Format,保留时分秒
+                    } else if (dftDate === '') {
+                        // dftDate = (new Date()).Format('yyyy-MM-dd');
+                        dftDate = new Date();
+                    }
                     role_rel.sign_date = dftDate;
                     if (isMergeOrgAlso) {
                         rptSignatureHelper.originalRoleRelList[rridx].sign_date = dftDate;