PR-41 Формирование заказа Заказчиком

Косметические правки и мелкие доработки

assets/js/build/init_customer_project_create.js

@@ -167,19 +167,26 @@
 	                $realty.hide();
 	            }
 	        });
-	        var sb_realty_top = new _NoTreeSelect2.default($('#sb-realty-top'), { url: url, visible: false });
+	        var sb_realty_top = new _NoTreeSelect2.default($('#sb-realty-top'), { url: url, visible: true });
 	        sb_realty_top.setHeader("Объект");
 	        sb_realty_top.connectSelectedContainer(select_realty);
+	        sb_realty_top.dataPromise.then(function () {
+	            if (!sb_realty_top.dataTree.data.length) sb_realty_top.hide();
+	        });
 	        select_realty.on("add", function (args) {
 	            // console.log("add args = ", args);
+	            console.log('on add');
 	            //TODO: Костыли!!!
+	            $('#checkbox-sb-realty').prop("checked", true);
+	            sb_realty.show();
 	            var id = args[0];
 	            if (id.text) return;
+	            console.log("id = ", id);
 	            var el = sb_realty.dataTree.getElementById(id);
 	            sb_realty_top.$searchInput.val(el.name);
 	            sb_realty_top.selectedEl.id = id;
 	            sb_realty_top.selectedEl.value = el.name;
-	            sb_realty_top.show();
+	            // sb_realty_top.show();
 	            sb_realty.selectedEl.id = id;
 	            sb_realty._fillBoxes();
 	        });
@@ -705,9 +712,6 @@
 	                    binds.push(arg);
 	                    args.splice(args.indexOf(arg), 1);
 	                }
-	                // else {
-	                //     console.log("arg = ", arg);
-	                // }
 	            }
 	        } catch (err) {
 	            _didIteratorError = true;
@@ -915,15 +919,16 @@
 	    }, {
 	        key: '_onclickOptionsElement',
 	        value: function _onclickOptionsElement(e) {
-	            this.selectedEl.id = $(e.target).data("id");
+	            var id = $(e.target).data("id");
+	            this.selectedEl.id = id;
 	            this.selectedEl.value = $(e.target).html();
 	            this.$searchInput.val($(e.target).html());
 
 	            this.$buttonAddOptions.show();
 	            this.$optionsBox.hide();
 
-	            this.selectedContainer.add(this.selectedEl.id);
 	            this.clear();
+	            this.selectedContainer.add(id);
 	            e.preventDefault();
 	            return false;
 	        }

assets/js/src/init_customer_project_create.js

@@ -106,19 +106,22 @@ $(function () {
                 }
             }
         );
-        let sb_realty_top = new NoTreeSelect($('#sb-realty-top'), {url, visible: false});
+        let sb_realty_top = new NoTreeSelect($('#sb-realty-top'), {url, visible: true});
         sb_realty_top.setHeader("Объект");
         sb_realty_top.connectSelectedContainer(select_realty);
+        sb_realty_top.dataPromise.then(function () {
+            if (!sb_realty_top.dataTree.data.length) sb_realty_top.hide();
+        });
         select_realty.on("add", (args)=> {
-            // console.log("add args = ", args);
             //TODO: Костыли!!!
+            $('#checkbox-sb-realty').prop("checked", true);
+            sb_realty.show();
             let id = args[0];
             if (id.text) return;
             let el = sb_realty.dataTree.getElementById(id);
             sb_realty_top.$searchInput.val(el.name);
             sb_realty_top.selectedEl.id = id;
             sb_realty_top.selectedEl.value = el.name;
-            sb_realty_top.show();
             sb_realty.selectedEl.id = id;
             sb_realty._fillBoxes();
         })

assets/lib/proekton-components/js/src/NoTreeSelect.js

@@ -16,15 +16,16 @@ export default class NoTreeSelect extends AbsBaseSelect{
     }
 
     _onclickOptionsElement(e) {
-        this.selectedEl.id = $(e.target).data("id");
+        let id = $(e.target).data("id");
+        this.selectedEl.id = id;
         this.selectedEl.value = $(e.target).html();
         this.$searchInput.val($(e.target).html());
 
         this.$buttonAddOptions.show();
         this.$optionsBox.hide();
 
-        this.selectedContainer.add(this.selectedEl.id);
         this.clear();
+        this.selectedContainer.add(id);
         e.preventDefault();
         return false;
     }

assets/sass/main.sass

@@ -9,7 +9,7 @@ body
 .main-scope
   > .row
     border-right: 1px solid  #{map_get($component_colors, border)}
-    border-left:  1px solid  #{map_get($component_colors, border)}
+    border-left: 1px solid  #{map_get($component_colors, border)}
 
 .main-content
   padding: 43px 25px 40px 25px
@@ -63,4 +63,10 @@ body
   border-bottom: 1px solid  #{map_get($component_colors, border)}
 
 .select-text
-  color: #{map_get($component_colors, select)}
+  color: #{map_get($component_colors, select)}
+
+.slide
+  display: none
+
+.slide.active
+  display: block

projects/templates/customer_project_create.html

@@ -134,7 +134,7 @@
                         </div>
                     </div>
 
-                    <div class="slide active">
+                    <div class="slide">
                         <div style="padding-bottom: 15px" class="row">
                             <div class="col-lg-12">
                                 <div class="header">Способ оплаты</div>