educode_sales 0.5.1 → 0.5.5

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

@@ -35,7 +35,7 @@
         <div class="layui-inline">
           <label class="layui-form-label">渠道名称</label>
           <div class="layui-input-inline">
-            <%= select_tag "place_id", options_for_select(EducodeSales::Place.pluck(:name, :id)), { include_blank: true } %>
+            <%= select_tag "place_id", options_for_select(EducodeSales::Place.pluck(:name, :id),params[:place_id]), { include_blank: true } %>
           </div>
         </div>
         <div class="layui-inline">
@@ -194,6 +194,13 @@
                   totalRow: true,
                 sort: true
               },
+              {
+                field: 'actual_amount',
+                width: 100,
+                title: '合同额',
+                  totalRow: true,
+                sort: true
+              },
               {
                 field: 'return_money',
                 width: 100,
@@ -614,4 +621,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -17,6 +17,7 @@ json.data do
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
     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.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

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

@@ -90,14 +90,14 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成</label>
+      <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 10000">
+      <div class="layui-input-inline" style="z-index: 100">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
        <div class="layui-inline" style="padding: 9px 15px">

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

@@ -75,7 +75,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_amount %>
+        <%= @follow_up.divide_amount %>万
       </div>
     </div>
     <div class="ayui-form-item">

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

@@ -49,4 +49,9 @@
 
     })
   })
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

data/app/views/educode_sales/operation_reports/audit.html.erb

@@ -64,9 +64,11 @@
     <%end %>
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::OperationReport) || (can? :level2_audit, EducodeSales::OperationReport) || (can? :level3_audit, EducodeSales::OperationReport) %>
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
       </button>
+      <%end %>
     </div>
   </div>
 </form>
@@ -91,7 +93,7 @@
     rate.render({
       elem: '#weekStar4',
       half: true,
-      value: "<%= @sale_report.level1_score %>",
+      value: parseFloat("<%= @sale_report.level1_score || 0%>"),
       length: 5,
       choose: function(value){
         level1_score = value
@@ -100,7 +102,7 @@
     rate.render({
       elem: '#weekStar5',
       half: true,
-      value: "<%= @sale_report.level2_score %>",
+      value: parseFloat("<%= @sale_report.level2_score || 0%>"),
       length: 5,
       choose: function(value){
         level2_score = value
@@ -109,7 +111,7 @@
     rate.render({
       elem: '#weekStar6',
       half: true,
-      value: "<%= @sale_report.level3_score %>",
+      value: parseFloat("<%= @sale_report.level3_score || 0%>"),
       length: 5,
       choose: function(value){
         level3_score = value

data/app/views/educode_sales/operation_reports/show.html.erb

@@ -84,28 +84,25 @@
             $ = layui.jquery,
             miniPage = layui.miniPage,
             request = layui.request;
-        table = layui.table;
+        table = layui.table
 
         rate.render({
             elem: '#weekStar4',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level1_score %>",
-            length: "<%= @sale_report.level1_score %>"
+            value: parseFloat("<%= @sale_report.level1_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level2_score %>",
-            length: "<%= @sale_report.level2_score %>"
+            value: parseFloat("<%= @sale_report.level2_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level3_score %>",
-            length: "<%= @sale_report.level3_score %>"
+            value: parseFloat("<%= @sale_report.level3_score || 0%>"),
         })
 
 

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

@@ -17,6 +17,11 @@
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
 </script>
+<script type="text/html" id="business_a">
+  <div class="layui-text">
+    <a href="/missions/businesses?place_id={{d.id}}">{{d.businesses_count}}</a>
+  </div>
+</script>
 
 <script type="text/html" id="showchance">
   <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
@@ -56,20 +61,25 @@
                   {
                       field: 'businesses_count',
                       width: 120,
-                      totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                      title: '商机'
+                      totalRow: true,
+                      sort: true,
+                      title: '商机',
+                      templet: "#business_a",
+
                   },
                   {
                       field: 'amount',
                       width: 120,
                       totalRow:true,
-                      title: '中标'
+                      sort: true,
+                      title: '中标金额'
                   },
                   {
                       field: 'return_mount',
                       width: 120,
                       totalRow:true,
-                      title: '回款',
+                      sort: true,
+                      title: '回款金额',
                   },
                   {
                       title: '操作',
@@ -146,4 +156,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+</style>

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

@@ -1,13 +1,29 @@
+all_businesses_count = 0
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
     json.id d.id
     json.name d.name
-    json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
+    # json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area_id '全国'
+      else
+        json.area_id  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area_id  ''
+    end
+    business_count = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
+    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(:profit_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
 end
 
+json.totalRow do
+  json.businesses_count all_businesses_count.to_s
+end
 json.code 0
 json.count @places.total_count

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

@@ -51,4 +51,9 @@
           
     })
   })
- </script>
+ </script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -8,6 +8,7 @@
   </div>
 </script>
 <script type="text/html" id="role_bar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="rename">重命名</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
 </script>
@@ -35,7 +36,6 @@
           field: 'name',
           title: '角色',
           width: 120,
-            edit: 'text'
         }, {
           field: 'permissions',
           title: '模块浏览权限',
@@ -124,6 +124,24 @@
           layer.full(index);
         });
         return false;
+      }else if (obj.event === 'rename') {
+          id = data.id
+          var content = miniPage.getHrefContent('/missions/roles/rename?id='+id);
+          var openWH = miniPage.getOpenWidthHeight();
+          rename_index = layer.open({
+              title: '重命名',
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content,
+          });
+          $(window).on("resize", function () {
+              layer.full(index);
+          });
+          return false;
       } else if (obj.event === 'delete') {
         layer.confirm('确定删除' + data.name, function (index) {
           request.delete('missions/roles/'+ data.id, {}, function(res) {

data/app/views/educode_sales/roles/rename.html.erb

@@ -0,0 +1,50 @@
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">角色名称</label>
+      <div class="layui-input-block" style="line-height: 36px;">
+        <input type="text" name="name" id="name" required lay-verify="required" autocomplete="off"
+               class="layui-input" value="<%=@name %>">
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 30px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="submits">提交
+      </button>
+    </div>
+  </div>
+</form>
+
+
+<script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            transfer = layui.transfer,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+        //监听提交
+        form.on('submit(submits)', function (data) {
+            console.log(data);
+            request.authPut('missions/roles/' + parent.id + '/update_role/', data.field,
+                function(res) {
+                    if (res.success) {
+                        table.reload('role');
+                        layer.close(parent.rename_index)
+                    } else {
+                        layer.alert(res.msg)
+                    }
+
+                })
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -71,9 +71,11 @@
 
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::SaleReport) || (can? :level2_audit, EducodeSales::SaleReport) || (can? :level3_audit, EducodeSales::SaleReport) %>
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
       </button>
+      <% end %>
     </div>
   </div>
 </form>
@@ -98,7 +100,7 @@
     rate.render({
       elem: '#weekStar4',
       half: true,
-      value: "<%= @sale_report.level1_score %>",
+        value: parseFloat("<%= @sale_report.level1_score || 0%>"),
       length: 5,
       choose: function(value){
         level1_score = value
@@ -107,7 +109,7 @@
     rate.render({
       elem: '#weekStar5',
       half: true,
-      value: "<%= @sale_report.level2_score %>",
+        value: parseFloat("<%= @sale_report.level2_score || 0%>"),
       length: 5,
       choose: function(value){
         level2_score = value
@@ -116,7 +118,7 @@
     rate.render({
       elem: '#weekStar6',
       half: true,
-      value: "<%= @sale_report.level3_score %>",
+        value: parseFloat("<%= @sale_report.level3_score || 0%>"),
       length: 5,
       choose: function(value){
         level3_score = value

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -84,22 +84,19 @@
       elem: '#weekStar4',
       half: true,
       readonly: true,
-      value: "<%= @sale_report.level1_score %>",
-      length: "<%= @sale_report.level1_score %>"
+        value: parseFloat("<%= @sale_report.level1_score || 0%>"),
     })
     rate.render({
       elem: '#weekStar5',
       half: true,
       readonly: true,
-      value: "<%= @sale_report.level2_score %>",
-      length: "<%= @sale_report.level2_score %>"
+        value: parseFloat("<%= @sale_report.level2_score || 0%> "),
     })
     rate.render({
       elem: '#weekStar6',
       half: true,
       readonly: true,
-      value: "<%= @sale_report.level3_score %>",
-      length: "<%= @sale_report.level3_score %>"
+        value: parseFloat("<%= @sale_report.level3_score || 0%>"),
     })
 
     table.on('tool(showWeeklyTable)', function (obj) {