TASK #4011

modules/pm/controllers/pm_controller.js

@@ -375,6 +375,10 @@ module.exports = {
             sessionCompilation.ration_valuation : [];
         rationValuation = await engineeringLibModel.getLib(rationValuation);
 
+        if (sessionCompilation.name === '四川养护(2013)') {
+            billValuation = rationValuation;
+        }
+
         let absoluteUrl = compilationData.overWriteUrl ? request.app.locals.rootDir + compilationData.overWriteUrl : request.app.locals.rootDir;
         let overWriteUrl = fs.existsSync(absoluteUrl) && fs.statSync(absoluteUrl).isFile() ? compilationData.overWriteUrl : null;
         //欢迎页显示控制

web/building_saas/pm/html/project-management.html

@@ -359,7 +359,12 @@
                                     <input type="radio" value="estimation" id="radioEstimation" name="valuation_type" class="custom-control-input">
                                     <label class="custom-control-label" checked for="radioEstimation">估算</label>
                                 </div>
-                            <% } else { %>
+                            <% } else if (compilationName.includes('四川养护(2013)')) { %>
+                                <div class="custom-control custom-radio custom-control-inline">
+                                    <input type="radio" value="ration" id="radioRation" name="valuation_type" class="custom-control-input">
+                                    <label class="custom-control-label" checked for="radioRation">工程量清单</label>
+                                </div>
+                            <% } else {%>
                                 <div class="custom-control custom-radio custom-control-inline">
                                     <input type="radio" value="bill" id="radioBill" name="valuation_type" class="custom-control-input">
                                     <label class="custom-control-label" <%= (compilationName.includes('公路造价')) ? '' : 'checked' %> for="radioBill">预算</label>

web/building_saas/pm/js/pm_newMain.js

@@ -2596,7 +2596,11 @@ function initProjectOptSet($target) {
                                 ${_getOptionDivDomStr(ESTIMATION, "valuation-type", "估算", "type-suggestion", true)}
                                 ` : ``
                             }
-                            ${(COMPILATION_NAME !== '内蒙古高速公路日常养护估算(2021)') ? `
+                            ${ (COMPILATION_NAME.includes('四川养护(2013)')) ? `
+                                ${_getOptionDivDomStr(BOQ, "valuation-type", "工程量清单", "type-boq", true)}
+                                ` : ``
+                            }
+                            ${(COMPILATION_NAME !== '内蒙古高速公路日常养护估算(2021)' && COMPILATION_NAME !== '四川养护(2013)') ? `
                                 ${_getOptionDivDomStr(BUDGET, "valuation-type", "预算", "type-budget", !COMPILATION_NAME.includes('公路造价'))}
                                 ${_getOptionDivDomStr(BOQ, "valuation-type", "工程量清单", "type-boq", false)}
                                 ` : ``

web/building_saas/report/html/rpt_select_projects.html

@@ -17,14 +17,15 @@
                     <div class="row">
                         <div class="col-md-12">
                             <!-- <label >汇总最低层次</label>
-                            <select id="summaryTypeOptions" name="summaryTypeOptions">
-                                <option>项</option>
-                                <option>目</option>
-                                <option>节</option>
-                                <option>细目</option>
-                                <option>最底层</option>
+                            <select id="summaryTypeOptions" name="summaryTypeOptions" onchange="changeSummaryBillsLv(this)">
+                                <option value="[0,1]">项</option>
+                                <option value="[0,1,2]">目</option>
+                                <option value="[0,1,2,3]">节</option>
+                                <option value="[0,1,2,3,4]">细目</option>
+                                <option value="[]">最底层</option>
                             </select>
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -->
+
                             <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                             <a id="divReqBillSummary" style="display:none" onclick="zTreeOprObj.requestBillsSummaryRpt()" class="btn btn-primary" data-dismiss="modal">确定</a>
                             <a id="divReqGljSummary" style="display:none" onclick="zTreeOprObj.requestGljSummaryRpt()" class="btn btn-primary" data-dismiss="modal" >确定</a>
@@ -32,6 +33,7 @@
                             <a id="divReqCommonSummaryMultiExcel" style="display:none" onclick="zTreeOprObj.requestSumAndNormalRptForMultiExcel()" class="btn btn-primary" data-dismiss="modal">确定</a>
                             <a id="divReqCommonSummaryPDF" style="display:none" onclick="zTreeOprObj.requestSumAndNormalRptForPDF_Ex()" class="btn btn-primary" data-dismiss="modal">确定</a>
                             <a id="divReqCustomSelect" style="display:none" onclick="zTreeOprObj.requestNormalReportAfterSelection()" class="btn btn-primary" data-dismiss="modal">确定</a>
+                            <!-- <a id="divReqCustomSelectAsync" style="display:none" onclick="zTreeOprObj.requestNormalReportAfterSelection()" class="btn btn-primary" data-dismiss="modal">Async确定</a> -->
                         </div>
                     </div>
                 </div>

web/building_saas/report/js/rpt_main.js

@@ -438,7 +438,7 @@ let zTreeOprObj = {
             }
         );
     },
-    requestPrjFolderCommon: function () {
+    requestPrjFolderCommon: function (params = null) {
         let me = zTreeOprObj;
         hintBox.waitBox();
         $.ajax({
@@ -466,6 +466,9 @@ let zTreeOprObj = {
                     // me.prjFolderTreeObj = $.fn.zTree.init($("#prjFolderTree"), rpt_prj_folder_setting, selectedProjects);
                     me.prjFolderTreeObj = $.fn.zTree.init($("#prjFolderTree"), rpt_prj_folder_setting, topItem);
                     me.prjFolderTreeObj.expandAll(true);
+                    if (params) {
+                        // 配合async用
+                    }
                 } else {
                     alert('error: ' + result.message);
                 }
@@ -484,6 +487,8 @@ let zTreeOprObj = {
         $("#divReqCommonSummaryMultiExcel")[0].style.display = "none";
         $("#divReqCommonSummaryPDF")[0].style.display = "none";
         $("#divReqCustomSelect")[0].style.display = "none";
+        $('#summaryTypeOptions')[0].selectedIndex = 4;
+        zTreeOprObj.summaryBillsLv = [];
         me.requestPrjFolderCommon();
     },
     requestPrjFolderForGljSummary: function () {
@@ -494,6 +499,8 @@ let zTreeOprObj = {
         $("#divReqCommonSummaryMultiExcel")[0].style.display = "none";
         $("#divReqCommonSummaryPDF")[0].style.display = "none";
         $("#divReqCustomSelect")[0].style.display = "none";
+        $('#summaryTypeOptions')[0].selectedIndex = 4;
+        zTreeOprObj.summaryBillsLv = [];
         me.requestPrjFolderCommon();
     },
     requestPrjFolderForNormalSummary: function () {
@@ -504,6 +511,8 @@ let zTreeOprObj = {
         $("#divReqCommonSummaryMultiExcel")[0].style.display = "none";
         $("#divReqCommonSummaryPDF")[0].style.display = "none";
         $("#divReqCustomSelect")[0].style.display = "";
+        $('#summaryTypeOptions')[0].selectedIndex = 4;
+        zTreeOprObj.summaryBillsLv = [];
         me.requestPrjFolderCommon();
     },
     requestBillsSummaryRpt: function () {
@@ -1369,9 +1378,43 @@ function activeBranchAfterPrjSelection(idStr) {
     $("#divReqCommonSummaryPDF")[0].style.display = "none";
     $("#divReqCustomSelect")[0].style.display = "none";
     $(`#${idStr}`)[0].style.display = "";
+    $('#summaryTypeOptions')[0].selectedIndex = 4;
     zTreeOprObj.summaryBillsLv = [];
 }
 
-function changeSummaryBillsLv(newLv) {
-    zTreeOprObj.summaryBillsLv = newLv;
+function changeSummaryBillsLv(dom) {
+    // console.log(dom[dom.selectedIndex].value);
+    zTreeOprObj.summaryBillsLv = JSON.parse(dom[dom.selectedIndex].value);
+}
+
+async function selectPrjs(params) {
+    $("#divReqBillSummary")[0].style.display = "none";
+    $("#divReqGljSummary")[0].style.display = "none";
+    $("#divReqCommonSummaryExcel")[0].style.display = "none";
+    $("#divReqCommonSummaryMultiExcel")[0].style.display = "none";
+    $("#divReqCommonSummaryPDF")[0].style.display = "none";
+    $("#divReqCustomSelect")[0].style.display = "none";
+    $("#divReqCustomSelectAsync")[0].style.display = "";
+    zTreeOprObj.requestPrjFolderCommon(params);
+    // const select = await confirmSelectPrjs(params);
+}
+
+function confirmSelectPrjs(params) {
+    const promise = new Promise(function (resolve, reject) {
+        // init(gather_select.custom_define, customSelects.stageFlow, gather_select, rptName, resolve, reject);
+        let me = zTreeOprObj;
+        if (me.currentNode) {
+            let treeNode = me.currentNode;
+            let pageSize = rptControlObj.getCurrentPageSize();
+            params.pageSize = pageSize;
+            params.rpt_tpl_id = treeNode.refId;
+            params.prj_id = projectObj.project.projectInfo.ID;
+            params.custCfg = me.reportPageCfg;
+            params.prj_ids = rptControlObj._getRefPrjIdsByRptNode(treeNode);
+            resolve(true);
+        } else {
+            resolve(false);
+        }
+   });
+    return promise;
 }