educode_sales 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565c9656e2f938ea497976746eea936425f163faef8574462612e127b456d061
-  data.tar.gz: 3d22e09fdde3d3e708ba6c3080071dff56b4bc0dd527795b7c78cfe2470ca36d
+  metadata.gz: f598f6270d0f4b4c89a91f53fbbe0cbabfae9ebd812237c71d4a0b9e9e121638
+  data.tar.gz: 2b3d7fa2b258f2128358d1ebecfbb97f88a7c0eefb3b5e1daf5677891afc0a92
 SHA512:
-  metadata.gz: 8059f2626c2a827dda2326eef38f7230b786955dac4440a1b798527c1c067d6619e637ecba870af77614dfa772ace3a47a4e0e0aee03ead3d429aaf93925de98
-  data.tar.gz: 7b61dfea68623101d87c1e4116e4bcd5db8e08a28fbe24aba1cd234565617f5b8cc90005534279ce42858152def2a62cf5c0ed6651f515866776a60c5b79d802
+  metadata.gz: 7671cd5fd92f1d5486b2d38ba893f42eb81ca4974d9a697493b008692e4b683a079a24fc7baabf791014e546cf7ee0a9ffe36836bf3620ee51fac116b6ec5d38
+  data.tar.gz: 953e60619120b2c41bf880c92a6ea5f2e7389c833dbee0d38e3a791565c490ed3a81b1962985adc0e85e3a6c58c1a74249e69d7ec29a1ae01b02fc235e237792

data/app/assets/stylesheets/educode_sales/layuimini.css

@@ -37,7 +37,7 @@
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this,
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this a {
   background-color: #1aa094 !important;
-} */
+}
 
 
 /**头部样式 */

data/app/controllers/educode_sales/businesses_controller.rb

@@ -597,10 +597,10 @@ module EducodeSales
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ")
-
         end
       end
     end
+
     #关注接口
     def following
       if brs=follow_business(@current_admin.user_id,params[:business_id])
@@ -642,7 +642,7 @@ module EducodeSales
     end
 
     def followed
-      if brs=follow_business(@current_admin.user_id,params[:business_id])
+      if follow_business(@current_admin.user_id,params[:business_id])
         render json: {msg:'确定取消关注？'}
       else
         render json: {msg:'确定关注？'}
@@ -664,7 +664,7 @@ module EducodeSales
       EduSetting.get(name)
     end
 
-    def follow_business(user_id,business_id)
+    def  follow_business(user_id,business_id)
       BusinessRelationShip.where(user_id:user_id,business_id:business_id).first
     end
   end

data/app/models/educode_sales/business.rb

@@ -23,10 +23,5 @@ module EducodeSales
       self.follow_ups.update_all(deleted_at: Time.now)
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
-
-
-
-
-
   end
 end

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

@@ -7,7 +7,7 @@
       <li data="assessments" > 考核指标设置</li>
     <%end %>
   </ul>
-    <div class="layuimini-main min-height-table"></div>
+  <!--<div class="layuimini-main min-height-table"></div>-->
   <div class="layui-tab-content">
     <%if can?(:show_result, EducodeSales::AssessmentsSetting) %>
       <div class="layui-tab-item  layui-show">

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

@@ -5,7 +5,7 @@
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item follows_div layui-show">
-<!--      跟进动态-->
+<!--跟进动态-->
       <%=render 'follows' %>
     </div>
     <div class="layui-tab-item businesses_list_div">
@@ -431,10 +431,8 @@
                     field: 'followed',
                     templet:function(d){
                         if (d.followed==1){
-
                             return  '<i class="layui-icon" style="color: goldenrod">&#xe658;</i> '
                         }
-
                         else return ''
                     },
                     width: 105,
@@ -452,6 +450,7 @@
                 }
             ]
         ]
+
         var business_table = table.render({
             elem: '#businesses_table',
             url: '/missions/businesses',
@@ -472,13 +471,13 @@
               drowpdwonRender()
             export_drowpdwonRender()
           }
-
       });
 
       var dropmenu = gon.menus;
       var dropmenu2=JSON.parse(JSON.stringify(dropmenu));
       var export_dropmenu = gon.export_menus;
-      dropmenu2[dropmenu2.findIndex(function (elem){return elem.title.includes("关注")})].title="取消关注";
+      dropmenu2[dropmenu2.findIndex(function (elem)
+      {return elem.title.includes("关注")})].title="取消关注";
 
       drowpdwonRender = function() {
         dropdown.render({
@@ -695,10 +694,8 @@
                                url: '/missions/businesses/following',
                                data: {business_id:id},
                                success: function (da) {
-
                                    layer.msg(da.msg,{icon: da.code==200? 1:2})
                                    table.reload("businesses_table")
-
                                },
                                error:function (da){
                                    alert('请求错误')
@@ -840,7 +837,6 @@
             form.val('search_follows', {
                 name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
             })
-
           return false;
         });
 
@@ -848,6 +844,7 @@
             $(".show_item").toggle()
             return false;
         });
+
         form.on('submit(reset_business_search)', function (data) {
             var field = data.field;
             form.val('search_form', {
@@ -860,7 +857,7 @@
 
             return false;
         });
-        table.on('toolbar(businesses_table)', function (obj) {
+        table.on('toolbar(businesses_table)', function ( obj) {
             switch (obj.event) {
                 case 'LAYTABLE_COLS':
                     layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(objs) {

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

@@ -30,7 +30,7 @@
 </div>
 <script>
     document.getElementById("inputFocus").focus();
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
@@ -85,10 +85,7 @@
           parent.table.reload('businesses_table')
         }
       })
-
-
       return false;
     });
-
   });
 </script>

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

@@ -74,12 +74,14 @@
         <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + " - " + @last_follow_up.service_end_time.to_s) : '' %>">
       </div>
     </div>
+
     <div class="layui-inline deployment_type layui-hide">
       <label class="layui-form-label required">部署类型</label>
       <div class="layui-input-inline">
-        <%= select_tag "o_business_deployment", options_for_select(@deployment_type, nil ), class: 'required' %>
+        <%= select_tag "o_business_deployment", options_for_select(@deployment_type, @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
     </div>
+
     <br class="service_show layui-hide">
     <div class="layui-inline">
       <label class="layui-form-label">总额(万)</label>
@@ -317,8 +319,6 @@
                     parent.table.reload('teachers_table')
                 }
             })
-
-
             return false;
         });
 

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

@@ -52,6 +52,7 @@
         <%= @follow_up.reception_at.to_s %>
       </div>
     </div>
+
     <br>
     <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
       <div class="layui-inline">
@@ -70,6 +71,7 @@
       </div>
     <% end %>
     <br>
+
     <div class="layui-inline">
       <label class="layui-form-label">总额：</label>
       <div class="layui-input-inline">
@@ -137,7 +139,6 @@
 </form>
 <div  style=" text-align:center;">
   <div class="layui-btn-group">
-
     <%if @pre_id != 0 %>
     <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
     <%else %>

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

@@ -41,8 +41,6 @@
                     parent.table.reload('unfinish_table')
                 }
             })
-
-
             return false;
         });
 

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

@@ -241,4 +241,4 @@
     .layui-table-tool-temp{
         padding-right: 0px; !important;
     }
-</style>
+</style>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails