educode_sales 0.9.86 → 0.9.89

data/app/views/educode_sales/sale_trends/_goal_forecast.html.erb

@@ -26,6 +26,12 @@
               <input type="text" class="layui-input forecast_day layui-hide" id="forecast_date_day" name="forecast_date_day" placeholder=" - " value="<%= params[:forecast_date_day] %>" autocomplete="off">
             </div>
           </div>
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">客户类型</label>
+            <div class="layui-input-inline">
+              <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id), params[:property]), { include_blank: true } %>
+            </div>
+          </div>
           <div class="layui-inline">
             <button type="button" id="search_bt" class="forecast_count_bt layui-btn layui-btn-primary" lay-submit lay-filter="search_sales">确定
             </button>
@@ -34,7 +40,7 @@
       </form>
     </div>
     <canvas id="forecast_myChart2" width="960" height="350"></canvas>
-    <!--    <canvas id="forecast_myChart2_1" width="960" height="350" style="margin-top: 30px;display: none"></canvas>-->
+    <canvas id="forecast_myChart2_1" width="960" height="350" style="margin-top: 30px;"></canvas>
   </div>
 </div>
 <script>
@@ -78,21 +84,6 @@
             }
         };
 
-        var res_data = <%=raw @forecast_count_data.to_json %>;
-        var datasets = [];
-        var color = ['#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00'];
-        res_data.datasets.forEach(function (d, i) {
-            datasets.push({
-                label: d.label,
-                type: 'line',
-                data: d.data1,
-                borderColor: color[i],
-                pointRadius: 1,
-                fill: false,
-                lineTension: 0
-            })
-        })
-
         laydate.render({
             type: 'year',
             elem: '#forecast_date_year',
@@ -143,7 +134,19 @@
         var ctx = document.getElementById('forecast_myChart2');
         var forecast_myChart2 = new Chart(ctx, {
             type: 'bar',
-            data: <%=raw @forecast_count_data.to_json %>,
+            data: <%=raw @forecast_count_data_0.to_json %>,
+            options: {
+                elements: {
+                    line: {
+                        tension: 0
+                    }
+                }
+            }
+        });
+        var ctx = document.getElementById('forecast_myChart2_1');
+        var forecast_myChart2_1 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @forecast_count_data_1.to_json %>,
             options: {
                 elements: {
                     line: {

data/app/views/educode_sales/sales_details/_index.html.erb

@@ -0,0 +1,401 @@
+<div class="min-height-table" id="sales_list">
+  <div style="margin: 10px 10px 10px 10px">
+    <form class="layui-form layui-form-pane" lay-filter="search_form">
+      <div class="layui-form-item">
+        <div class="layui-inline">
+          <label class="layui-form-label">合同名称</label>
+          <div class="layui-input-inline">
+            <input type="text" name="name" class="layui-input" value="">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">用户单位</label>
+          <div class="layui-input-inline">
+            <input type="text" name="department" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">签约单位</label>
+          <div class="layui-input-inline">
+            <input type="text" name="signed_department" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">销售经理</label>
+          <div class="layui-input-inline">
+            <%= select_tag "sales_staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
+          </div>
+        </div>
+
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">项目阶段</label>
+          <div class="layui-input-inline">
+            <div id="contract_business_step" style="width: 190px;"></div>
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">区域</label>
+          <div class="layui-input-inline">
+            <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">中标时间</label>
+          <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="bidded_date" name="bidded_date" placeholder=" - " autocomplete="off">
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">签单时间</label>
+          <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="signed_date" name="signed_date" placeholder=" - " autocomplete="off">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+          </button>
+          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_sales_table">搜索
+          </button>
+        </div>
+      </div>
+    </form>
+  </div>
+  <div id="sales_details_table_wraper">
+    <table class="layui-hide" id="sales_details_table" lay-filter="sales_details_table"></table>
+  </div>
+</div>
+
+<script type="text/html" id="currentTableBarSales">
+  <% if can? :add_follow, EducodeSales::Business %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add">添加跟进</a>
+  <% end %>
+  <% if can? :edit_sales_detail, EducodeSales::Business %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :delete_sales_detail, EducodeSales::Business %>
+    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+  <% if can?(:create, EducodeSales::SalePlan) %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_month_plan">添加月计划</a>
+  <% end %>
+  <% if can?(:show_file, EducodeSales::Business) %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="file">附件</a>
+  <% end %>
+  
+</script>
+
+<script type="text/html" id="toolbar_contract">
+  <div class="layui-btn-container">
+    <span class="table-label">销售明细</span>
+  </div>
+</script>
+<script>
+  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown', 'laytpl', 'xmSelect'], function() {
+    var $ = layui.jquery,
+      form = layui.form,
+      request = layui.request,
+      miniPage = layui.miniPage,
+      dropdown = layui.dropdown,
+      xmSelect = layui.xmSelect,
+      laydate = layui.laydate;
+    var openWH = miniPage.getOpenWidthHeight();
+    laydate.render({
+      elem: '#date',
+      range: true
+    });
+
+
+    laydate.render({
+      elem: '#bidded_date',
+      range: true,
+      value: gon.bidded_date
+    });
+    laydate.render({
+      elem: '#signed_date',
+      range: true,
+      value: gon.signed_date
+    });
+
+
+    var business_step_list = xmSelect.render({
+      el: '#contract_business_step',
+      data: gon.business_step
+    })
+
+    var data = form.val("search_form");
+    table = layui.table;
+    var cols_table = [
+      [{
+        field: 'id',
+        width: 60,
+        title: '序号',
+        type: 'numbers',
+        fixed: "left"
+      }, {
+        field: 'number',
+        width: 120,
+        title: '合同编号',
+        fixed: 'left',
+      }, {
+        field: 'name',
+        width: 120,
+        title: '商机名称',
+      }, {
+        field: 'school',
+        width: 180,
+        title: '用户单位',
+      }, {
+        field: 'department',
+        width: 180,
+        title: '部门',
+      }, {
+        field: 'majors',
+        width: 150,
+        title: '专业',
+      }, {
+        field: 'signed_department',
+        title: '签约单位',
+        width: 280,
+      }, {
+        field: 'actual_amount',
+        width: 120,
+        title: '合同金额',
+      }, {
+        field: 'item_clazz',
+        width: 100,
+        title: '销售品目',
+      }, {
+        field: 'brand',
+        width: 150,
+        title: '品牌',
+      }, {
+        field: 'specification',
+        width: 150,
+        title: '规格型号',
+      }, {
+        field: 'unit',
+        width: 90,
+        title: '单位',
+      }, {
+        field: 'amount',
+        width: 100,
+        title: '数量',
+      }, {
+        field: 'total_price',
+        width: 100,
+        title: '金额',
+      }, {
+        field: 'source_method',
+        width: 100,
+        title: '来源方式',
+      }, {
+        field: 'custom_clazz',
+        width: 100,
+        title: '定制类型',
+      }, {
+        field: 'supplier',
+        width: 120,
+        title: '供货商',
+        sort: true,
+      }, {
+        field: 'delivery_date',
+        width: 120,
+        title: '交货时间',
+        sort: true,
+      }, {
+        title: '操作',
+        minWidth: 350,
+        toolbar: '#currentTableBarSales',
+        align: "center",
+        fixed: 'right'
+      }]
+    ]
+
+
+    var sales_details_table = table.render({
+      elem: '#sales_details_table',
+      url: '/missions/sales_details',
+      autoSort: false,
+      where: {
+        q: data
+      },
+      defaultToolbar: ['filter'],
+      title: '销售明细数据表',
+      totalRow: true, //开启合并行
+      cols: cols_table,
+      toolbar: '#toolbar_contract',
+      limit: 20,
+      limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+      page: true,
+      skin: 'line',
+    });
+
+
+    var sort = {},
+      search = data;
+
+    table.on('sort(sales_details_table)', function(obj) {
+      var data = form.val("search_form");
+      sort.field = obj.field;
+      sort.order = obj.type;
+      table.reload('sales_details_table', {
+        url: '/missions/sales_details',
+        initSort: obj,
+        where: {
+          sort: sort,
+          q: search
+        }
+      });
+    })
+
+    // 监听搜索操作
+    form.on('submit(search_sales_table)', function(data) {
+      if (search['clazz']) {
+        data.field['clazz'] = search['clazz']
+      }
+      var business_step = [];
+      business_step_list.getValue().forEach(function(d) {
+        business_step.push(d.value);
+      })
+      data.field.business_step = business_step.toString();
+      search = data.field
+      table.reload('sales_details_table', {
+        url: '/missions/sales_details',
+        page: {
+          curr: 1
+        },
+        where: {
+          q: search,
+          sort: sort
+        }
+      }, 'data');
+
+      return false;
+    });
+
+    form.on('submit(reset_business_search)', function(data) {
+      var field = data.field;
+      form.val('search_form', {
+        name: '',
+        area: '',
+        department: '',
+        business_type: '',
+        business_step: '',
+        place_id: '',
+        bidded_date: '',
+        signed_department: '',
+        signed_date: '',
+        sales_staff_id: '',
+      })
+      business_step_list.setValue([])
+      .setValue([])
+      return false;
+    });
+
+    table.on('tool(sales_details_table)', function(obj) {
+      var data = obj.data;
+      id = data.id
+      if (obj.event === 'add') { // 监听添加操作
+        business_id = data.business_id
+        var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + data.business_id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sale_plan_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,
+          success: function (layero, index) {
+            form.render('select');
+          }
+        });
+        $(window).on("resize", function () {
+          layer.full(sale_plan_index);
+        });
+      } else if (obj.event === 'edit') {
+        var content = miniPage.getHrefContent('/missions/sales_details/' + id + '/edit');
+        var openWH = miniPage.getOpenWidthHeight();
+        name = data.name;
+        sindex = 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,
+          success: function (layero, index) {
+            form.render('select');
+          }
+        });
+        $(window).on("resize", function() {
+          layer.full(sindex);
+        });
+        return false;
+      } else if (obj.event === 'add_month_plan') {
+        id = obj.data.business_id;
+        var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + obj.data.business_id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = 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(sindex);
+        });
+      } else if (obj.event == 'file') {
+        name = obj.data.name;
+        id = obj.data.business_id;
+        var content = miniPage.getHrefContent('/missions/businesses/file?business_id=' + obj.data.business_id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+          title: '商机列表/'+name+'的附件信息',
+          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(sindex);
+        });
+      } else if (obj.event == 'delete') {
+        name = obj.data.name;
+        layer.confirm('确定删除' + data.name, function (index) {
+          request.delete('missions/sales_details/' + data.id, {}, function (res) {
+            layer.close(index);
+            table.reload("sales_details_table")
+          })
+      });
+      }
+    });
+
+
+  });
+</script>
+<style>
+  .layui-table-tool-temp {
+    padding-right: 30px;
+    !important;
+  }
+  
+  .layui-table-fixed .layui-table-body {
+    height: auto!important;
+  }
+  
+  .layui-table-fixed.layui-hide {
+    display: block!important;
+  }
+</style>

data/app/views/educode_sales/sales_details/index.js.erb

@@ -0,0 +1 @@
+$("#sales_list_wraper").html("<%= j render 'index' %>");

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

@@ -71,10 +71,6 @@
               <dd><a href="/missions/contracts/product_list" class="<%= current?('layui-this', product_list_contracts_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>产品目录</a>
               </dd>
             <% end %>
-            <% if can? :read_sales_detail, EducodeSales::Business %>
-            <dd><a href="/missions/sales_details" class="<%= current?('layui-this', sales_details_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售明细</a>
-            </dd>
-            <% end %>
             <% if can? :read, EducodeSales::MoneyPlan %>
               <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
               </dd>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.86'
+  VERSION = '0.9.89'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.86
+  version: 0.9.89
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -539,8 +539,10 @@ files:
 - app/views/educode_sales/sales/school.html.erb
 - app/views/educode_sales/sales/trends.html.erb
 - app/views/educode_sales/sales/xschool.html.erb
+- app/views/educode_sales/sales_details/_index.html.erb
 - app/views/educode_sales/sales_details/edit.html.erb
 - app/views/educode_sales/sales_details/index.html.erb
+- app/views/educode_sales/sales_details/index.js.erb
 - app/views/educode_sales/sales_details/index.json.jbuilder
 - app/views/educode_sales/sessions/login.html.erb
 - app/views/educode_sales/staffs/edit.html.erb