chenshilong 6 lat temu
rodzic
commit
ba34f01d10

+ 9 - 9
web/building_saas/main/html/main.html

@@ -1760,7 +1760,7 @@
         </div>
     </div>
     <!--弹出 生成组价模板-->
-    <div class="modal fade" id="zujiamb" data-backdrop="static">
+    <div class="modal fade" id="div_createBlocks" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
@@ -1789,7 +1789,7 @@
         </div>
     </div>
     <!--弹出 匹配原则-->
-    <div class="modal fade" id="blockAdjustOptions" data-backdrop="static">
+    <div class="modal fade" id="div_cloneOptions" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
@@ -1804,15 +1804,15 @@
                         <div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="clone_option_code" value="option1" checked>
-                                <label class="form-check-label" for="inlinecheckbox1">项目编码(前9位)</label>
+                                <label class="form-check-label" for="clone_option_code">项目编码(前9位)</label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="clone_option_name" value="option2">
-                                <label class="form-check-label" for="inlinecheckbox2">项目名称</label>
+                                <label class="form-check-label" for="clone_option_name">项目名称</label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="clone_option_unit" value="option3" checked>
-                                <label class="form-check-label" for="inlinecheckbox3">单位</label>
+                                <label class="form-check-label" for="clone_option_unit">单位</label>
                             </div>
                         </div>
                     </div>
@@ -1821,11 +1821,11 @@
                         <div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="radio" name="rationQuantity" id="clone_option_quantity" value="option1" checked>
-                                <label class="form-check-label" for="inlineRadio21">根据含量计算定额工程量</label>
+                                <label class="form-check-label" for="clone_option_quantity">根据含量计算定额工程量</label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="radio" name="rationQuantity" id="clone_option_zeroQuantity" value="option2">
-                                <label class="form-check-label" for="inlineRadio22">含量和定额工程量为零</label>
+                                <label class="form-check-label" for="clone_option_zeroQuantity">含量和定额工程量为零</label>
                             </div>
                         </div>
                     </div>
@@ -1834,11 +1834,11 @@
                         <div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="radio" name="rationCover" id="clone_option_noCover" value="option3" checked>
-                                <label class="form-check-label" for="inlineRadio33">跳过不覆盖</label>
+                                <label class="form-check-label" for="clone_option_noCover">跳过不覆盖</label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="radio" name="rationCover" id="clone_option_overwriteRations" value="option2">
-                                <label class="form-check-label" for="inlineRadio32">直接覆盖</label>
+                                <label class="form-check-label" for="clone_option_overwriteRations">直接覆盖</label>
                             </div>
                         </div>
                     </div>

+ 1 - 1
web/building_saas/main/js/views/block_lib.js

@@ -533,7 +533,7 @@ var blockLibObj = {
     onCellDoubleClick: function (sender, args) {
         let projectNode = projectObj.project.mainTree.selected;
         if (!calcTools.isLeafBill(projectNode)) return;
-        $("#blockAdjustOptions").modal({show: true});
+        $("#div_cloneOptions").modal({show: true});
     },
     oneToOneClone: function (projectNode, block, options) {
         // if (options.overwriteRations)

+ 9 - 9
web/building_saas/main/js/views/project_view.js

@@ -1512,7 +1512,7 @@ var projectObj = {
                         if (!$("#kmbk").is(":visible")){
                             $('#blockLibTab').click()
                         };
-                        $("#zujiamb").modal({show: true});
+                        $("#div_createBlocks").modal({show: true});
                     },
                     visible: function(key, opt){
                         return G_SHOW_BLOCK_LIB;
@@ -2934,7 +2934,7 @@ $(function () {
 
     });
 
-    $("#zujiamb").on('show.bs.modal', function(){
+    $("#div_createBlocks").on('show.bs.modal', function(){
         function getBlockCategoriesHtml(Categories) {
             let result = '';
             if (Categories.length <= 0) return result;
@@ -2950,12 +2950,12 @@ $(function () {
         $("#select_block_category")[0].selectedIndex = 0;
     });
 
-    $("#blockAdjustOptions").on('show.bs.modal', function(){
-
-    });
-
-    $("#zujiamb").on('show.bs.modal', function(){
-
+    $("#div_cloneOptions").on('show.bs.modal', function(){
+        $('#clone_option_code').prop("checked", true);
+        $('#clone_option_name').prop("checked", false);
+        $('#clone_option_unit').prop("checked", true);
+        $('#clone_option_quantity').prop("checked", true);
+        $('#clone_option_noCover').prop("checked", true);
     });
 
     $("#btn_block_createBlocks").click(function () {
@@ -3001,7 +3001,7 @@ $(function () {
 
         createBlocks(selected, cID);
         blockLibObj.loadDetailDatas(blockLibObj.mainTree.selected);
-        $("#zujiamb").modal("hide");
+        $("#div_createBlocks").modal("hide");
     });
 
     $("#btn_block_clone_ok").click(function () {