另存为，单价、费率文件另存时同名处理变更

modules/pm/facade/pm_facade.js

@@ -484,17 +484,11 @@ async function copyProject(userID, compilationID, data, newProjectID = null, del
         //费率文件、单价文件重名检查
         let feeRate = await feeRateFileModel.findOne({ rootProjectID: originalProperty.rootProjectID, name: feeRateFileName, deleteInfo: null });
         if (feeRate) {//存在重名的文件
-            if (isSaveAs) {
-                throw `费率文件[${feeRateFileName}]已存在，请手工检查数据是否正确。`;
-            }
             feeRateFileName = feeRateFileName + '（' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制）';
         }
         projectMap['copy'].document.property.feeFile.name = feeRateFileName;
         let unitPriceFile = await unitPriceFileModel.findOne({ root_project_id: originalProperty.rootProjectID, name: unitPriceFileName, deleteInfo: null });
         if (unitPriceFile) {//存在重名的文件
-            if (isSaveAs) {
-                throw `单价文件[${unitPriceFileName}]已存在，请手工检查数据是否正确。`;
-            }
             unitPriceFileName = unitPriceFileName + '（' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制）';
         }
         projectMap['copy'].document.property.unitPriceFile.name = unitPriceFileName;

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -69,7 +69,7 @@
                             <!--<input type="radio" class="glj-radio" name="glj" value="allGljs">所有&nbsp;-->&nbsp;
                             <input type="radio" class="glj-radio" name="glj" value="stdGljs">标准&nbsp;&nbsp;
                             <input type="radio" class="glj-radio" name="glj" value="complementaryGljs">补充&nbsp;&nbsp;
-                            <div  class="modal-auto-height" id="componentTreeDiv" style="overflow: hidden">
+                            <div  class="modal-auto-height" id="componentTreeDiv" style="height: 435px; overflow: hidden">
                                 <!--<div class="print-list">-->
                                 <div style="width: 100%; height: 100%; overflow: auto">
                                     <ul id="componentTree" class="ztree"></ul>
@@ -91,7 +91,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="modal-auto-height col-12" style="overflow: hidden" id="componentSheet">
+                                <div class="modal-auto-height col-12" style="height: 420px; overflow: hidden" id="componentSheet">
                                 </div>
                             </div>
                         </div>
@@ -253,19 +253,19 @@
         };
         $(document).ready(function(){
             //解决spreadjs sheet初始化没高度宽度
-            $('#modalCon').width($(window).width()*0.5);
+           /*  $('#modalCon').width($(window).width()*0.5);
             $('#componentTreeDiv').height($(window).height() - 300);
             $("#componentSheet").height($("#componentTreeDiv").height() - 15);
-            $("#componentSheet").width($('#modalCon').width() * 0.63);
+            $("#componentSheet").width($('#modalCon').width() * 0.63); */
             pageOprObj.initPage($("#GLJListSheet")[0], $('#gljComponentSheet')[0], $("#componentSheet")[0]);
         });
         //组成物弹出窗大小设置
-        $(window).resize(function () {
+        /* $(window).resize(function () {
             $('#modalCon').width($(window).width()*0.5);
             $('#componentTreeDiv').height($(window).height() - 300);
             $("#componentSheet").height($("#componentTreeDiv").height()-15);
             $("#componentSheet").width($('#modalCon').width()* 0.63);
-        });
+        }); */
   	</SCRIPT>
 </body>
 <script type="text/javascript">

web/building_saas/complementary_glj_lib/js/glj.js

@@ -3,6 +3,11 @@
  */
 
 $(document).ready(function () {
+    $('#component').on('shown.bs.modal', function () {
+        if (componentOprObj.workBook) {
+            componentOprObj.workBook.refresh();
+        }
+    });
     let moduleName = 'compleGLj';
     SlideResize.loadHorizonWidth(moduleName, [$('#rightResize'), $('#leftResize')], [$('#leftContent'), $('#midContent'), $('#rightContent')], function () {
         refreshALlWorkBook();