educode_sales 0.9.75 → 0.9.77

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

@@ -94,7 +94,7 @@
     <div class="layui-inline">
         <label class="layui-form-label">项目资金来源：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-          <%= select_tag "o_business_deployment", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
+          <%= select_tag "funding_source", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
         </div>
     </div>
     <br>
@@ -120,7 +120,7 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label required" style="width:100px;">签约单位：</label>
+        <label class="layui-form-label" style="width:100px;">签约单位：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
          <div id="add_department" style="width: 200px"></div>
         </div>
@@ -330,10 +330,10 @@
         </div>
         <div class="layui-form-mid layui-word-aux">年</div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-top:25px;">
+    <div class="layui-form-item layui-form-text required" style="margin-top:25px;">
       <label class="layui-form-label">最新根据记录：</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder=" " class="layui-textarea"></textarea>
+        <textarea name="content" placeholder=" " class="layui-textarea" lay-verify="required"></textarea>
       </div>
     </div>
     <div class="layui-form-item m-t-20">
@@ -601,9 +601,9 @@
         })
 
 
-        var add_department = selectInput.render({
+        var add_department_select = selectInput.render({
             elem: '#add_department',
-            name: 'signed_department_id', // 渲染的input的name值
+            name: 'signed_departmen', // 渲染的input的name值
             layFilter: 'test', //同layui form参数lay-filter
           //  layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
@@ -624,19 +624,9 @@
           });
 
         form.on('submit(add_follow_up)', function (data) {
-            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
-                if (data.field.service_time.length == 0) {
-                    layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
-                    return false;
-                }
-                if (data.field.o_business_deployment === ''){
-                    layer.msg('请选择部署类型', {time: 2000, icon: 2, shade: 0.01});
-                    return false // 退出添加该条记录
-                }
-            }
             $(".submit-btn").addClass("layui-hide");
-      
             data.field.business_id = "<%= @business.id %>";
+            data.field.signed_department_id = add_department_select.getValue(),
             Rails.ajax({
                 url: "/missions/contracts/add_follow_ups",
                 type: 'POST',
@@ -649,7 +639,7 @@
                     if (res.success == false) {
                         layer.alert(res.msg)
                     } else {
-                       
+                        layer.close(new_follow_index);
                     }
                 }
             })

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

@@ -28,6 +28,17 @@ EducodeSales::Engine.routes.draw do
       get :list
       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/20230501034307_create_educode_sales_follow_up_trends.rb

@@ -0,0 +1,12 @@
+class CreateEducodeSalesFollowUpTrends < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_follow_up_trends do |t|
+      t.references :follow_up
+      t.integer :clazz
+      t.text :content
+      t.references :staff
+
+      t.timestamps
+    end
+  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.75'
+  VERSION = '0.9.77'
 end