Pārlūkot izejas kodu

搜索出定额套用后,不关闭搜索窗口,直接双击造价书中定额编号反向定位,应自动关闭搜索窗口,定位到对应定额

zhongzewei 6 gadi atpakaļ
vecāks
revīzija
d77ee765a2

+ 3 - 7
web/building_saas/main/js/views/project_property_display_view.js

@@ -24,15 +24,11 @@ let projDisplayView = {
         if (this.datas == null) {
             return;
         }
-       // let autoHeight = $('#autoHeight').prop('checked');
-        let billsAutoHeight =  $("#billsAutoHeight").prop("checked");
-        let rationAutoHeight =  $("#rationAutoHeight").prop("checked");
-        let disPlayMainMaterial = $('#disPlayMainMaterial').prop('checked');
-        if (this.datas.rationAutoHeight !== rationAutoHeight || this.datas.billsAutoHeight !== billsAutoHeight || this.datas.disPlayMainMaterial !== disPlayMainMaterial) {
+        let billsAutoHeight = $("#billsAutoHeight").prop("checked");
+        let rationAutoHeight = $("#rationAutoHeight").prop("checked");
+        if (this.datas.rationAutoHeight !== rationAutoHeight || this.datas.billsAutoHeight !== billsAutoHeight) {
             this.datas.billsAutoHeight = billsAutoHeight;
             this.datas.rationAutoHeight = rationAutoHeight;
-            this.datas.disPlayMainMaterial = disPlayMainMaterial;
-            // let updateData = {sourceType: 'properties', updateType: 'update', updateData: {ID: projectID, 'property.displaySetting':this.datas}};
             properties['property.displaySetting'] = this.datas;
         }
     }

+ 1 - 0
web/building_saas/main/js/views/project_view.js

@@ -2322,6 +2322,7 @@ $('#property_default').click(function () {
     });
 });
 $('#property_ok').click(function () {
+    debugger;
     let project = projectObj.project,
         projectID = project.ID(),
 

+ 3 - 0
web/building_saas/main/js/views/std_ration_lib.js

@@ -344,6 +344,9 @@ var rationLibObj = {
     },
     locateAtRation: function(libID, code){
         let me = rationLibObj;
+        if ($('#rationSearchResult').is(':visible')) {
+            $('#rationSearchResult a').click();
+        }
         //查找定额,以确定定额所在章节节点
         let firstLibID = projectObj.project.projectInfo.engineeringInfo.ration_lib.length > 0 ?
                         projectObj.project.projectInfo.engineeringInfo.ration_lib[0].id : null;