调价

web/building_saas/main/js/views/tender_price_view.js

@@ -509,6 +509,14 @@ $(function () {
                 delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
                 $('#gljPriceTenderCoe').val(1);
             }
+
+            if ($('#cbShowTenderFields').prop("checked") == false){
+              $('#cbShowTenderFields').prop("checked", true);
+              projectObj.project.saveProperty('tenderSetting.showTenderFields', true);
+              projectObj.project.property.tenderSetting.showTenderFields = true;
+              gljCol.showTenderFields(true, true);
+            }
+
             tender_obj.showTenderData();
             projectObj.project.projectGLJ.calcQuantity();
             // 刷新造价书界面的相关显示。刷新放在这里是为了切换UI时体验更流畅。
@@ -537,9 +545,30 @@ $(function () {
         // datas.push({type:ModuleNames.project,data:{'ID' : projectObj.project.ID(),'property.hasTender': false}});
         me.updateTenderData(datas,function () {
             // me.refreshTenderTreeByDatas(datas);
-            $('#calcTender').trigger('click');
-        });
+          let callback = function () {
+            if (projectObj.project.property.needRestoreGgljPriceTenderCoe){         // 入库存储，清理标记，刷新UI显示
+              projectObj.project.saveProperty('tenderSetting.gljPriceTenderCoe', 1);
+              delete projectObj.project.property.needRestoreGgljPriceTenderCoe;
+              $('#gljPriceTenderCoe').val(1);
+            }
+
+            if ($('#cbShowTenderFields').prop("checked") == true){
+              $('#cbShowTenderFields').prop("checked", false);
+              projectObj.project.saveProperty('tenderSetting.showTenderFields', false);
+              projectObj.project.property.tenderSetting.showTenderFields = false;
+              gljCol.showTenderFields(false, true);
+            }
 
+            tender_obj.showTenderData();
+            projectObj.project.projectGLJ.calcQuantity();
+            // 刷新造价书界面的相关显示。刷新放在这里是为了切换UI时体验更流畅。
+            if($('#linkJSCX').hasClass('active'))
+              calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected, 2)
+            if($('#linkGLJ').hasClass('active'))
+              gljOprObj.refreshView();
+          };
+          projectObj.project.calcProgram.doTenderCalc(callback);
+        });
     });
 
     $('#cbShowTenderFields').on('click', function () {