educode_sales 0.9.76 → 0.9.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6bd4aff88d498d4b416ae1a654e7e0d391a1438b3dc3358ab9d0c44e843355
-  data.tar.gz: 3b83113b2949c8b7ea4faf3b029a367ecf994b6a42492b67111c5b6bb6539eb6
+  metadata.gz: b3c38e0feb88d220e6ec75559d93b49c38d308dd939efbb54f37b1afb106a28f
+  data.tar.gz: d9daee968f4335493daf6ffd1efaab8769cbb0d71c2d2869f84f1d074aea7a3f
 SHA512:
-  metadata.gz: 99d66d74810cd737a62330d5b69782fbcf3c26a9e087fb7859c53f37c6eb5187f03f2692afd67f23060be03c3baa397e0928da12202d3d59b55314844fac6dc0
-  data.tar.gz: f997afa839cf458d0bbcdbedf8aa4a564c512499092c4cc9597449d9c8a9b39e3d1825f3a45ac1f777a453b9467da4fbf698b743a86804c06d010de81170cd86
+  metadata.gz: a092214b3fe5caa3b0767a87a9eb936911d98d57b489a4e6da26c0c0b2e3c848bfdce972648fc4cda518fd42d7a1a688fb97eb1cac07c5cab9885fbda3548d87
+  data.tar.gz: 2ef105b4bf305ef64d4c310522bcb451cfa08c3c034eda3db3552c4473d268967994d58979b1359cf2b614b41d95cedac6466d1b7f5419d32132b06ea2d994a2

data/app/controllers/educode_sales/contracts_controller.rb

@@ -9,7 +9,6 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
           @staffs = staffs.map { |d| [d.user.real_name, d.id]}
-          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
 
@@ -241,7 +240,7 @@ module EducodeSales
       contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
       @follow_ups = FollowUp.joins("
         JOIN educode_sales_businesses ON educode_sales_follow_ups.business_id = educode_sales_businesses.id
-      ").joins(:follow_up_trends).where("educode_sales_follow_ups.stage_id in (?)", contract_ids).select("educode_sales_follow_ups.*, educode_sales_follow_up_trends.clazz, educode_sales_follow_up_trends.content")
+      ").joins(:follow_up_trends).where("educode_sales_follow_ups.stage_id in (?)", contract_ids).select("educode_sales_follow_ups.*, educode_sales_follow_up_trends.clazz, educode_sales_follow_up_trends.content, educode_sales_follow_up_trends.id AS trend_id")
 
       if @current_admin.is_admin?
         @follow_ups = @follow_ups
@@ -367,14 +366,19 @@ module EducodeSales
     def product_list
       respond_to do |format|
         format.html do
-         
-        end
-        format.js do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
           @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: false}
+          end
         end
         format.json do
+          @product_catalogs = ProductCatalog
+          @product_catalogs = @product_catalogs.where("name like ?", "%#{params[:q][:name]}%") if params[:q] && params[:q][:name].present?
+          @product_catalogs = @product_catalogs.where(item_clazz: params[:q][:item_clazz]) if params[:q] && params[:q][:item_clazz].present?
+          @product_catalogs = @product_catalogs.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -387,9 +391,58 @@ module EducodeSales
       render_success
     end
 
+    def new_product
+      render layout: false
+    end
+
+    def product_catalog
+      product_catalog = ProductCatalog.new(product_up_params)
+      if product_catalog.save
+        render_success
+      else
+        render_failure product_catalog
+      end
+    end
+
+    def update_product_catalog
+      product_catalog = ProductCatalog.find(params[:id])
+      if product_catalog.update(product_up_params)
+        render_success
+      else
+        render_failure product_catalog
+      end
+    end
+
+    def edit_product
+      @product_catalog = ProductCatalog.find(params[:id])
+      render layout: false
+    end
+
+    def show_follow_record
+      @follow_up = FollowUp.find(params[:follow_up_id])
+      @business = Business.find(@follow_up.business_id)
+      @show_follow_recored_deployment = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.to_h.invert[@follow_up.o_business_deployment]
+
+      @trend = FollowUpTrend.find(params[:trend_id])
+
+      id = @follow_up.id
+      @follow_ups = @business.follow_ups
+      ids = @follow_ups.ids
+      size = ids.size
+      ids = ids.reverse
+      index = ids.index(id)
+      @next_id = (index != size - 1 && size > 1) ? ids[index + 1] : 0
+      @pre_id = (index != 0 && size > 1) ? ids[index - 1] : 0
+      render layout: false
+    end
+
     private
     def follow_up_params
       params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source)
     end
+
+    def product_up_params
+      params.permit(:name, :item_clazz, :brand, :specification, :unit, :param, :source_method, :supplier)
+    end
   end
 end

data/app/models/educode_sales/product_catalog.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class ProductCatalog < ApplicationRecord
+
+    enum item_clazz: %w(平台 课程 硬件 技术服务 培训服务 咨询服务 云服务 装修服务 其他)
+    enum source_method: %w(自研 在研 待研 外购)
+  end
+end

data/app/views/educode_sales/contracts/_follows.html.erb

@@ -63,7 +63,7 @@
   </div>
 </script>
 <script type="text/html" id="currentTableBar_follows">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">详情</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show_detail">详情</a>
     <% if can?(:advise, EducodeSales::Business) %>
       <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">团队建议</a>
     <% end %>
@@ -201,15 +201,6 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
-            // table.reload('businesses_table', {
-            //     page: {
-            //         curr: 1
-            //     },
-            //     where: {q: search, sort: sort}
-            // }, 'data');
-            // form.val('search_form', {
-            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
-            // })
             return false;
         });
 
@@ -246,29 +237,11 @@
         table.on('tool(contract_follows_table)', function (obj) {
             var data = obj.data;
             id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
+            if (obj.event === 'show_detail') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/contracts/show_follow_record?follow_up_id=' + data.id + "&trend_id=" + data.trend_id);
                 var openWH = miniPage.getOpenWidthHeight();
                 show_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);
-                });
-            }  else if (obj.event === 'business') {
-                business_id = data.business_id
-                business_name = data.business
-                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
-                openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
-                    title: '商机列表/' + data.business + '的跟进记录',
+                    title: '查看合同动态',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

data/app/views/educode_sales/contracts/edit_product.html.erb

@@ -0,0 +1,85 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">产品名称：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="name" value="<%= @product_catalog.name %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">销售品目：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "item_clazz", options_for_select(EducodeSales::ProductCatalog.item_clazzs.keys, @product_catalog.item_clazz), { 'lay-filter': 'item_clazz', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">品牌：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="brand" value="<%= @product_catalog.brand %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">规格型号：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="specification" value="<%= @product_catalog.specification %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">单位：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="unit" value="<%= @product_catalog.unit %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">参数：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="param" value="<%= @product_catalog.param %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">来源方式：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "source_method", options_for_select(EducodeSales::ProductCatalog.source_methods.keys, @product_catalog.source_method), { 'lay-filter': 'source_method', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">供应商：</label>
+            <div class="layui-input-inline">
+                 <input type="text" name="supplier" value="<%= @product_catalog.supplier %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function() {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+        form.render();
+
+        form.on('submit(saveBtn)', function(data) {
+            request.put("missions/contracts/"+ parent.id + "/update_product_catalog", data.field, function(res) {
+                layer.close(parent.edit_production_index)
+                parent.table.reload('contact_product_table')
+            })
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/contracts/follow_ups.json.jbuilder

@@ -5,6 +5,7 @@ json.data do
     json.stage d.stage.name
     json.staff d.staff.user.real_name
     json.clazz EducodeSales::FollowUpTrend.clazzs.invert[d['clazz']]
+    json.trend_id d['trend_id']
     json.description d['content']
     json.school d.business.department&.school&.name
     json.school_id d.business.department&.school&.id

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

@@ -3,7 +3,6 @@
     <ul class="layui-tab-title">
         <li class="layui-this follows_li">跟进动态</li>
         <li class="contracts_list_li">合同列表</li>
-        <li class="contracts_product_li">产品目录</li>
     </ul>
     <div class="layui-tab-content">
         <div class="layui-tab-item follows_div layui-show">
@@ -12,9 +11,6 @@
         <div class="layui-tab-item contracts_list_div">
           <div id="contract_list_wraper"></div>
         </div>
-        <div class="layui-tab-item contracts_product_div">
-          <div id="contract_product_wraper"></div>
-        </div>
     </div>
 </div>
 
@@ -35,8 +31,6 @@
         element.on('tab(contract_tab)', function(data) {
           if (data.index == 1 && $("#contract_list").length == 0) {
             loadPage('/missions/contracts/list')
-          } else if (data.index == 2 && $("#product_list").length == 0) {
-            loadPage('/missions/contracts/product_list')
           }
         });
 

data/app/views/educode_sales/contracts/new_product.html.erb

@@ -0,0 +1,85 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">产品名称：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="name" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">销售品目：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "item_clazz", options_for_select(EducodeSales::ProductCatalog.item_clazzs.keys), { 'lay-filter': 'item_clazz', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">品牌：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="brand" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">规格型号：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="specification" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">单位：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="unit" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">参数：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="param" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">来源方式：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "source_method", options_for_select(EducodeSales::ProductCatalog.source_methods.keys), { 'lay-filter': 'source_method', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">供应商：</label>
+            <div class="layui-input-inline">
+                 <input type="text" name="supplier" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function() {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+        form.render();
+
+        form.on('submit(saveBtn)', function(data) {
+            request.post("missions/contracts/product_catalog", data.field, function(res) {
+                layer.close(parent.add_product_index)
+                parent.table.reload('contact_product_table')
+            })
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/contracts/product_list.html.erb

@@ -0,0 +1,232 @@
+<%= Gon::Base.render_data %>
+<div class="min-height-table" id="product_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">
+                        <%= select_tag "item_clazz", options_for_select(EducodeSales::ProductCatalog.item_clazzs.keys), { 'lay-filter': 'item_clazz', include_blank: true , "lay-search": "" } %>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <button type="reset" class="layui-btn layui-btn-primary" lay-submit
+                        lay-filter="reset_prodct_form">重置
+                    </button>
+                    <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit
+                        lay-filter="search_product_form">搜索
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div id="contact_table_wraper">
+        <table class="layui-hide" id="contact_product_table" lay-filter="contact_product_table"></table>
+    </div>
+</div>
+
+<script type="text/html" id="currentTableBarProduct">
+    <% if can? :update_product_catalog, EducodeSales::Business %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit_product">编辑</a>
+    <% end %>
+</script>
+
+<script type="text/html" id="toolbar">
+    <% if can? :new_product_catalog, EducodeSales::Business %>
+    <a class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="add_product">添加产品目录</a>
+    <% end %>
+</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();
+            var data = form.val("search_form");
+            table = layui.table;
+            var cols_table = [
+                [{
+                        field: 'id',
+                        width: 60,
+                        title: '序号',
+                        fixed: "left"
+                    },
+                    {
+                        field: 'name',
+                        width: 120,
+                        title: '产品名称',
+                    },
+                    {
+                        field: 'item_clazz',
+                        width: 150,
+                        title: '销售品目',
+                    },
+                    {
+                        field: 'brand',
+                        width: 150,
+                        title: '品牌',
+                    },
+                    {
+                        field: 'specification',
+                        width: 150,
+                        title: '规格型号',
+                    },
+                    {
+                        field: 'unit',
+                        width: 150,
+                        title: '单位',
+                    },
+                    {
+                        field: 'param',
+                        width: 150,
+                        title: '参数',
+                    },
+                    {
+                        field: 'source_method',
+                        width: 150,
+                        title: '来源方式',
+                    },
+                    {
+                        field: 'supplier',
+                        width: 150,
+                        title: '供货商',
+                    },
+                    {
+                        title: '操作',
+                        minWidth: 100,
+                        toolbar: '#currentTableBarProduct',
+                        align: "center",
+                        fixed: 'right'
+                    }
+                ]
+            ]
+            var business_table = table.render({
+                elem: '#contact_product_table',
+                url: '/missions/contracts/product_list',
+                autoSort: false,
+                toolbar: '#toolbar',
+                where: {
+                    q: data
+                },
+                defaultToolbar: [],
+                title: '产品目录表',
+                cols: cols_table,
+                limit: 20,
+                limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+                page: true,
+                skin: 'line',
+            });
+            var sort = {},
+                search = data;
+            table.on('sort(contact_product_table)', function(obj) {
+                var data = form.val("search_form");
+                sort.field = obj.field;
+                sort.order = obj.type;
+                table.reload('contact_product_table', {
+                    url: '/missions/contracts/product_list',
+                    initSort: obj,
+                    where: {
+                        sort: sort,
+                        q: search
+                    }
+                });
+            })
+            // 监听搜索操作
+            form.on('submit(search_product_form)', function(data) {
+                if (search['clazz']) {
+                    data.field['clazz'] = search['clazz']
+                }
+                search = data.field
+                table.reload('contact_product_table', {
+                    url: '/missions/contracts/product_list',
+                    page: {
+                        curr: 1
+                    },
+                    where: {
+                        q: search,
+                        sort: sort
+                    }
+                }, 'data');
+                return false;
+            });
+            form.on('submit(reset_prodct_form)', function(data) {
+                var field = data.field;
+                form.val('search_form', {
+                    name: '',
+                    item_clazz: ''
+                })
+                return false;
+            });
+            table.on('toolbar(contact_product_table)', function(obj) {
+                var openWH = miniPage.getOpenWidthHeight();
+                var content = miniPage.getHrefContent('/missions/contracts/new_product');
+                if (obj.event == 'add_product') {
+                    add_product_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(add_product_index);
+                    });
+                }
+            })
+            table.on('tool(contact_product_table)', function(obj) {
+                id = obj.data.id;
+                if (obj.event === 'edit_product') { // 监听添加操作
+                    var content = miniPage.getHrefContent('/missions/contracts/' + id +'/edit_product');
+                    var openWH = miniPage.getOpenWidthHeight();
+                    edit_production_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(edit_production_index);
+                    });
+                }
+            });
+        });
+</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/contracts/product_list.json.jbuilder

@@ -0,0 +1,16 @@
+json.data do
+  json.array! @product_catalogs do |d|
+    json.id d.id
+    json.name d.name
+    json.item_clazz d.item_clazz
+    json.brand d.brand
+    json.specification d.specification
+    json.unit d.unit
+    json.param d.param
+    json.source_method d.source_method
+    json.supplier d.supplier
+  end
+end
+
+json.code 0
+json.count @product_catalogs.total_count

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

@@ -0,0 +1,169 @@
+<h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
+<form class="layui-form form-value">
+  <div class="layui-form-item" style="padding: 10px 25px 0;">
+    <div class="layui-inline">
+      <label class="layui-form-label">单位：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.business.department&.school&.name %>
+      </div>
+    </div>
+    <%if @follow_up.business.number.present?%>
+      <div class="layui-inline">
+        <label class="layui-form-label">编号：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up.business.number %>
+        </div>
+      </div>
+    <%end %>
+    <div class="layui-inline">
+      <label class="layui-form-label">部门：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.business.department&.name %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">项目类型：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.clazz.name %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">项目阶段：</label>
+      <div class="layui-input-inline">
+         <%= @follow_up.stage.name %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">招标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.invitation_at.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.bidded_date.to_s %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.signed_date.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">验收时间：</label>
+      <div class="layui-input-inline">
+        <%= @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">
+        <label class="layui-form-label">服务期：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
+        </div>
+      </div>
+    <%end %>
+    <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label">部署类型：</label>
+        <div class="layui-input-inline">
+          <%=@show_follow_recored_deployment%>
+        </div>
+      </div>
+    <% end %>
+    <br>
+
+    <div class="layui-inline">
+      <label class="layui-form-label">中标额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.total_amount.to_f.round(6) %>万
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">合同额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.actual_amount.to_f.round(6) %>万
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">渠道：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.place&.name %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">渠道分成：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.divide_amount.to_f.round(6) %>万
+      </div>
+    </div>
+    <br/>
+    <div class="layui-inline">
+      <label class="layui-form-label">预算金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.budget_amount.to_f.round(6) %>万
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">分成比例：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.divide_rate.to_f.round(2) %>%
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属年度：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up&.year %>年
+        </div>
+      </div>
+    </div>
+     <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">项目资金来源：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up&.funding_source %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">签约单位：</label>
+        <div class="layui-input-inline" style="width: 300px">
+            <%= @follow_up.signed_department&.school&.name || '' %>
+        </div>
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label" style="width: 150px;">售后工程师：</label>
+      <div class="layui-input-inline">
+        <%= @business.assign_staffs.map{|d| d.staff.user.full_name}.join("、") %>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label"><%= @trend.clazz %>：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @trend.content %></pre>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">时间：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.created_at.to_s %></pre>
+      </div>
+    </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">跟进人：</label>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.staff.user.real_name %></pre>
+      </div>
+    </div>
+  </div>
+</form>
+

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

@@ -5,7 +5,7 @@ json.data do
     json.stage d.stage.name
     json.staff d.staff.user.real_name
     json.description d.description
-    json.advise d.advise
+    json.advise d.advise || ''
     json.school d.business.department&.school&.name
     json.school_id d.business.department&.school&.id
     json.created_at d.created_at.to_s

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

@@ -67,6 +67,10 @@
               <dd><a href="/missions/contracts" class="<%= current?('layui-this', 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_product_catalog, EducodeSales::Business %>
+              <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, 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/config/routes.rb

@@ -29,11 +29,16 @@ EducodeSales::Engine.routes.draw do
       get :new_follow_up
       post :add_follow_ups
       get :product_list
+      get :new_product
+      post :product_catalog
+      get :show_follow_record
     end
     member do
       post :advise
       get :assign
       post :assign_staff
+      get :edit_product
+      put :update_product_catalog
     end
   end
 

data/db/migrate/20230502142912_create_educode_sales_product_catalogs.rb

@@ -0,0 +1,20 @@
+class CreateEducodeSalesProductCatalogs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_product_catalogs do |t|
+      t.string :name
+      t.integer :item_clazz
+      t.string :brand
+      t.string :specification
+      t.string :unit
+      t.text :param
+      t.integer :source_method
+      t.string :supplier
+
+      t.timestamps
+    end
+
+    EducodeSales::Permission.find_or_create_by(name: '查看产品目录', subject: 'Business', action: 'read_product_catalog', clazz: 'contract')
+    EducodeSales::Permission.find_or_create_by(name: '添加产品目录', subject: 'Business', action: 'new_product_catalog', clazz: 'contract')
+    EducodeSales::Permission.find_or_create_by(name: '编辑产品目录', subject: 'Business', action: 'update_product_catalog', clazz: 'contract')
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.76'
+  VERSION = '0.9.77'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.76
+  version: 0.9.77
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -231,6 +231,7 @@ files:
 - app/models/educode_sales/permission.rb
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
+- app/models/educode_sales/product_catalog.rb
 - app/models/educode_sales/project.rb
 - app/models/educode_sales/recycle.rb
 - app/models/educode_sales/result.rb
@@ -307,14 +308,17 @@ files:
 - app/views/educode_sales/commons/show.json.jbuilder
 - app/views/educode_sales/contracts/_follows.html.erb
 - app/views/educode_sales/contracts/_list.html.erb
-- app/views/educode_sales/contracts/_product_list.html.erb
 - app/views/educode_sales/contracts/assign.html.erb
+- app/views/educode_sales/contracts/edit_product.html.erb
 - app/views/educode_sales/contracts/follow_ups.json.jbuilder
 - app/views/educode_sales/contracts/index.html.erb
 - app/views/educode_sales/contracts/index.json.jbuilder
 - app/views/educode_sales/contracts/list.js.erb
 - app/views/educode_sales/contracts/new_follow_up.html.erb
-- app/views/educode_sales/contracts/product_list.js.erb
+- app/views/educode_sales/contracts/new_product.html.erb
+- app/views/educode_sales/contracts/product_list.html.erb
+- app/views/educode_sales/contracts/product_list.json.jbuilder
+- app/views/educode_sales/contracts/show_follow_record.html.erb
 - app/views/educode_sales/customers/edit.html.erb
 - app/views/educode_sales/customers/edit_department.html.erb
 - app/views/educode_sales/customers/edit_follow_record.html.erb
@@ -657,6 +661,7 @@ files:
 - db/migrate/20230430121335_add_permissions_for_ideas.rb
 - db/migrate/20230430134710_create_educode_sales_assign_staffs.rb
 - db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb
+- db/migrate/20230502142912_create_educode_sales_product_catalogs.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb

data/app/views/educode_sales/contracts/_product_list.html.erb

@@ -1,358 +0,0 @@
-<div class="min-height-table" id="product_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" value="" class="layui-input">
-          </div>
-        </div>
-        <div class="layui-inline">
-            <label class="layui-form-label">签约单位</label>
-            <div class="layui-input-inline">
-            <input type="text" name="assign_department" value="" 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">
-            <%= 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">
-            <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">
-            <div id="contract_index_place" style="width: 190px;"></div>
-          </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_bussiness_contract">搜索
-          </button>
-        </div>
-      </div>
-    </form>
-  </div>
-  <div id="contact_table_wraper">
-    <table class="layui-hide" id="contact_product_table" lay-filter="contact_product_table"></table>
-  </div>
-</div>
-
-<script type="text/html" id="currentTableBarProduct">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_product">添加销售目录</a>
-</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: '#invitation_at',
-        range: true
-      });
-
-      laydate.render({
-        elem: '#bidded_date',
-        range: true,
-        value: gon.bidded_date
-      });
-      laydate.render({
-        elem: '#signed_date',
-        range: true,
-        value: gon.signed_date
-      });
-
-      laydate.render({
-        elem: '#date_at',
-        range: true,
-        value: gon.date_at
-      });
-
-
-      var business_type_list = xmSelect.render({
-        el: '#contract_business_type',
-        data: gon.business_type
-      })
-
-
-      var business_step_list = xmSelect.render({
-        el: '#contract_business_step',
-        data: gon.business_step
-      })
-
-      var index_place_list = xmSelect.render({
-        el: '#contract_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});
-                }
-              }
-            })
-        }
-    })
-    index_place_list.setValue(gon.place)
-
-
-      var data = form.val("search_form");
-      table = layui.table;
-      var cols_table = [
-          [
-              {
-                  field: 'id',
-                  width: 60,
-                  title: '序号', type: 'numbers',
-                  totalRowText: '合计',
-                  fixed: "left"
-              },
-              {
-                  field: 'number',
-                  width: 120,
-                  title: '编号',
-                  fixed: 'left',
-              },
-              {
-                field: 'name',
-                width: 120,
-                title: '合同名称',
-              },
-              {
-                  field: 'area',
-                  width: 100,
-                  title: '地域',
-              },
-              {
-                  field: 'school',
-                  width: 150,
-                  title: '用户单位',
-                  templet: '#school_name',
-              },
-              {
-                  field: 'property',
-                  width: 150,
-                  title: '客户类型',
-              },
-              {
-                  field: 'department',
-                  width: 150,
-                  title: '部门',
-                  templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
-              },
-              {
-                field: 'item_clazz',
-                width: 150,
-                title: '销售品目',
-              },
-              {
-                field: 'brand',
-                width: 150,
-                title: '品牌',
-              },
-              {
-                field: 'specification',
-                width: 150,
-                title: '规格',
-              },
-              {
-                field: 'supplier',
-                width: 150,
-                title: '供货商',
-              }
-          ]
-      ]
-
-      var business_table = table.render({
-          elem: '#contact_product_table',
-          url: '/missions/contracts',
-          autoSort: false,
-          where: {q: data},
-          defaultToolbar: ['filter'],
-          title: '合同数据表',
-          totalRow: true,//开启合并行
-          cols: cols_table,
-
-        limit: 20,
-        limits: [10,15,20,30,40,50,60,70,80,90],
-        page: true,
-        skin: 'line',
-    });
-
-
-    var sort = {}, search = data;
-
-    table.on('sort(contact_product_table)', function (obj) {
-      var data = form.val("search_form");
-      sort.field = obj.field;
-      sort.order = obj.type;
-      table.reload('contact_product_table', {
-          url: '/missions/businesses',
-        initSort: obj,
-        where: {
-            sort: sort,
-            q: search
-        }
-      });
-    })
-
-    // 监听搜索操作
-    form.on('submit(search_bussiness_contract)', function (data) {
-      if (search['clazz']) {
-        data.field['clazz'] = search['clazz']
-      }
-      search = data.field
-      table.reload('contact_product_table', {
-        url: '/missions/contracts',
-        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: '', department: '', staff_id: '', business_type: '', business_step: '',
-          place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: ''
-      })
-      business_type_list.setValue([])
-      business_step_list.setValue([])
-      index_place_list.setValue([])
-      return false;
-    });
-
-      table.on('tool(contact_product_table)', function (obj) {
-          var data = obj.data;
-          id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
-            business_id = data.id
-            var content = miniPage.getHrefContent('/missions/contracts/new_follow_up?id=' + data.id);
-            var openWH = miniPage.getOpenWidthHeight();
-            new_follow_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(new_follow_index);
-            });
-          } else if (obj.event === 'assign') {
-              var content = miniPage.getHrefContent('/missions/contracts/' + id + '/assign');
-              var openWH = miniPage.getOpenWidthHeight();
-              name = data.name;
-              sindex = layer.open({
-                  title: '指派合同【' + name + "】售后工程师",
-                  type: 1,
-                  shade: 0.2,
-                  maxmin: true,
-                  shadeClose: true,
-                  area: ['600px', '600px'],
-                  content: content
-              });
-              $(window).on("resize", function () {
-                  layer.full(sindex);
-              });
-              return false;
-          } 
-        });
-     
-  
-  });
-</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/contracts/product_list.js.erb

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