educode_sales 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfb5bbc3cbbe65b1c987c9e1b77bca81d06086e2db8b6c788163fdba557f2ef
-  data.tar.gz: 7e2a1aabfab1f07c614a76d65f33560f6da3e7d05200a819c4d7b905c5d976c3
+  metadata.gz: 10da162d2ac59ca7795046ebe7239e9c3b64851c4b0ea8fb519eaf0667cd78bf
+  data.tar.gz: faf089944ea187641184a31781c809597ca0327eb3b9af8a553391c4d07366b3
 SHA512:
-  metadata.gz: 30bac077609756d5eb7ab205d40f2c3f2b7db4f88797c636038051316c1917af74a88f4cf390878c6b8adc83f4bf4e417d723ef349ecdbfc375a8176e5a3a6a8
-  data.tar.gz: 3b4b074197ba779c5b8f8134e97b1633f6173f8ba7a46232d761b132b123b1ffa1ac39fa1b47d484ce82197d060b02dbde8bf8d07fb9c1c5bff1e783d3b485e6
+  metadata.gz: 17fe4f762532aa69ab8f29e5c9c7f23aca27f0c22ac38fd7570d6a435039dd2a5b344db15104c2e15de9f0032a7e30f2b3c135cad7385bbb961cb3dd7e6eb167
+  data.tar.gz: 69fba60e0c97e2c9fbb1debf1ce4a1fab27527260ee87696b7d5861fa0c0ec6deb500efaa1eeafdebdaa3f19a0713e9ddb64c11317a608850c199e7a4bde78ec

data/app/views/educode_sales/businesses/edit_follow_record.html.erb

@@ -105,7 +105,7 @@
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="z-index: 102">
         <div id="edit_assign_follow" style="width: 512px;"></div>
       </div>
       <div class="layui-inline" style="padding: 9px 15px">

data/app/views/educode_sales/businesses/index.html.erb

@@ -74,8 +74,8 @@
                 </button>
                 <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
                 </button>
-                <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="show_hide">展开/收起
-                </button>
+                <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+                </a>
               </div>
             </div>
           </form>
@@ -551,50 +551,11 @@
               name: '', department: '', staff_id: '', business_type: '', business_step: '',
               place_id: '', date: '', area: '', invitation_at: ''
           })
-            var index_place_list = xmSelect.render({
-                el: '#index_place',
-                model: {
-                    icon: 'hidden',
-                    label: {
-                        type: 'text',
-                        text: {
-                            //左边拼接的字符
-                            left: '',
-                            //右边拼接的字符
-                            right: '',
-                            //中间的分隔符
-                            separator: ', ',
-                        },
-                    }
-                },
-                remoteSearch: true,
-                clickClose: true,
-                delay: 1000,
-                paging: true,
-                radio: true,
-                pageRemote: true,
-                filterable: true,
-                remoteMethod: function (val, cb, show, pageIndex) {
-                    $.ajax( '/missions/sales_place', {
-                        method: 'get',
-                        data: {
-                            q: val,
-                            page: pageIndex
-                        },
-                        dataType: 'json',
-                        success: function (res) {
-                            var data = res.data;
-                            if (res.code == 0) {
-                                cb(res.data, res.count);
-                            } else {
-                                layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
-                            }
+            business_type_list.setValue([])
+            business_step_list.setValue([])
+            index_place_list.setValue([])
 
-                        }
-                    })
-                }
-            })
-          return false;
+            return false;
         });
 
         table.on('toolbar(businesses_table)', function (obj) {

data/app/views/educode_sales/businesses/index.json.jbuilder

@@ -20,7 +20,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
-    json.wait_return_money d.wait_return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source

data/app/views/educode_sales/businesses/new_follow_record.html.erb

@@ -110,7 +110,7 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" >
+      <div class="layui-input-inline" style="z-index: 102">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
        <div class="layui-inline" style="padding: 9px 15px">
@@ -148,7 +148,6 @@
     </div>
   </div>
 </div>
-</div>
 
 <script>
   layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {

data/app/views/educode_sales/places/index.json.jbuilder

@@ -18,7 +18,7 @@ json.data do
     json.businesses_count business_count
     all_businesses_count += business_count
     # json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount - divide_amount").round(2)
-    json.total_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount").round(2)
+    json.total_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("total_amount").round(2)
     json.divide_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("divide_amount").round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)
   end

data/app/views/educode_sales/teachers/index.html.erb

@@ -68,8 +68,8 @@
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
-        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="show_hide">展开/收起
-        </button>
+        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+        </a>
       </div>
     </div>
   </form>

data/app/views/layouts/educode_sales/application.html.erb

@@ -25,6 +25,7 @@
 
 
     <ul class="layui-nav i_class" style="left: 200px">
+      <%= image_tag "educode_sales/logo.png", class: 'header-logo tubiao layui-hide-sm layui-hide-xs' %>
       <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
         <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
       </li>
@@ -214,6 +215,8 @@
                     $("#logout").removeClass('layui-nav-itemed')
                     $("#head_b").removeClass('layui-hide-xs')
                     $("#head_a").removeClass('layui-hide-xs')
+                    $(".tubiao").addClass('layui-hide')
+                    $(".tubiao").addClass('layui-hide-xs')
                 }
 
                 function menuHide(btn) {
@@ -223,6 +226,8 @@
                     $(".i_class").animate({left: '60px'});
                     $("#head_b").addClass('layui-hide-xs')
                     $("#head_a").addClass('layui-hide-xs')
+                    $(".tubiao").removeClass('layui-hide')
+                    $(".tubiao").removeClass('layui-hide-xs')
                 }
             }
         });

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - anke1460