educode_sales 0.9.67 → 0.9.68

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

@@ -0,0 +1,204 @@
+<div class="layui-form layuimini-form">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">年份</label>
+      <div class="layui-input-inline">
+        <input type="text" lay-verify="required" class="layui-input" id="new_year_field" autocomplete="off" name="year">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">选择商机</label>
+      <div class="layui-input-inline" style="width: 400px">
+         <%= select_tag "business_id", options_for_select(@businesses), {"lay-verify": "required", include_blank: true} %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">目标类型</label>
+      <div class="layui-input-inline" style="width: 150px">
+         <%= select_tag "clazz", options_for_select(@clazz), {"lay-verify": "required", include_blank: true} %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <div class="layui-input-inline">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_year_plan">提交</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div>
+  <table class="layui-hide" id="yearTable" lay-filter="yearTable"></table>
+</div>
+<div class="layui-form layuimini-form" style="text-align: center;margin-top:20px;">
+  <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_y_plan">提交</button>
+</div>
+
+<script type="text/html" id="newYearTableBar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-delete" lay-event="delete">删除</a>
+</script>
+<script>
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
+    var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      request = layui.request,
+      laydate = layui.laydate,
+      $ = layui.$;
+      laydate.render({
+        elem: '#new_year_field',
+        type: 'year'
+      });
+    form.render();
+
+    var parentIndex = layer.index;
+
+    form.on('submit(add_year_plan)', function (data) {
+      request.authPost("missions/plans/create_business_info", data.field, function (res) {
+        if (res.success == false) {
+          layer.alert(res.msg)
+        } else {
+          console.log("resss", data.field)
+          table.reload('yearTable', {
+            where: data.field
+          })
+        }
+      })
+      return false;
+    });
+    form.on('submit(add_y_plan)', function (data) {
+      request.authPost("missions/plans/create_sales_plan", {}, function (res) {
+        table.reload('yearPlanTable');
+        layer.close(parent.yindex);
+      })
+    })
+
+    table.render({
+      elem: '#yearTable',
+      url: '/missions/plans/business_infos',
+      height: 400,
+      defaultToolbar: ['filter'],
+      initSort: {
+        field: 'created_at',
+        type: 'desc'
+      },
+      cols: [
+          [
+          {
+          field: 'id',
+          width: 60,
+          title:'序号',
+          type: 'numbers',
+          fixed: 'left'
+        },
+        {
+          field: 'business_name',
+          width: 160,
+          title: '商机名称',
+        },
+        {
+          field: 'school',
+          width: 150,
+          title: '单位'
+        },
+        {
+          field: 'department',
+          width: 150,
+          title: '二级部门'
+        },
+        {
+          field: 'stage',
+          width: 100,
+          title: '阶段',
+        },
+        {
+          field: 'staff_manages',
+          width: 100,
+          title: '销售经理',
+        },
+        {
+          field: 'created_at',
+          width: 180,
+          title: '创建时间',
+        },
+        {
+          field: 'sale_way',
+          width: 100,
+          title: '销售方式',
+        },
+        {
+          field: 'clazz',
+          width: 100,
+          title: '目标类型',
+        },
+        {
+          field: 'budget_amount',
+          width: 100,
+          title: '预算额',
+        },
+        {
+          field: 'plan_bid_on',
+          width: 170,
+          title: '计划投标时间',
+        },
+        {
+          field: 'plan_sign_on',
+          width: 170,
+          title: '计划签单时间',
+        },
+        {
+          field: 'prepayment_plan_on',
+          width: 170,
+          title: '计划回款时间',
+        },
+        {
+          field: 'prepayment_amount',
+          width: 170,
+          title: '计划回款额',
+        },
+        {
+          title: '操作',
+          minWidth: 200,
+          toolbar: '#newYearTableBar',
+          align: "center",
+          fixed: 'right'
+        }
+        ]
+      ],
+      limit: 20,
+      limits: [10,15,20,30,40,50,60,70,80,90],
+      page: true,
+    });
+
+    table.on('tool(yearTable)', function (obj) {
+      var data = obj.data;
+        id = data.id;
+        year = data.year;
+       if (obj.event === 'edit') {
+          content = miniPage.getHrefContent('/missions/plans/edit_bussiness_info?id='+ id);
+          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(index);
+          });
+          return false;
+      } else if (obj.event === 'delete') {
+        layer.confirm('确定删除' + data.business_name + data.clazz, function (index) {
+        request.delete('missions/plans/' + data.id +'/delete_business_info', {}, function (res) {
+            layer.close(index);
+            table.reload("yearTable")
+          })
+        });
+      }
+    })
+  });
+</script>

data/app/views/educode_sales/plans/plan_business_infos.json.jbuilder

@@ -0,0 +1,42 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.clazz EducodeSales::SalePlan::CLAZZ_NAME.invert[d.clazz]
+    json.year d.year
+    json.business_name d.business.name
+    json.department d.business.department&.name
+    json.school d.business.department&.school&.name
+    json.stage d.business.last_follow_up&.stage&.name
+    json.staff_manages d.business.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
+    json.created_at d.created_at.to_s
+    json.sale_way d.business.last_follow_up&.place&.name.present? ? '渠道' : '直销'
+    json.budget_amount d.business&.last_follow_up ? d.business.last_follow_up.budget_amount.to_f.round(2)  : 0
+    json.plan_bid_on d.plan_bid_on
+    json.plan_sign_on d.plan_sign_on
+    json.bidded_amount d.bidded_amount
+    json.plan_sign_on d.plan_sign_on
+    json.actual_sign_on d.actual_sign_on
+    json.sign_amount d.sign_amount
+    json.plan_deploy_on d.plan_deploy_on
+    json.actual_deploy_on d.actual_deploy_on
+    json.plan_check_on d.plan_check_on
+    json.actual_check_on d.actual_check_on
+    json.prepayment_plan_on d.prepayment_plan_on
+    json.prepayment_actual_on d.prepayment_actual_on
+    json.prepayment_amount d.prepayment_amount
+    json.check_fee_plan_on d.check_fee_plan_on
+    json.check_fee_actual_on d.check_fee_actual_on
+    json.check_fee d.check_fee
+    json.qa_plan_on d.qa_plan_on
+    json.qa_actual_on d.qa_actual_on
+    json.qa_amount d.qa_amount
+    json.account_receivable d.account_receivable
+    json.account_receivable_clazz d.account_receivable_clazz
+    json.invoice_amount d.invoice_amount
+
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/plans/years_plan.json.jbuilder

@@ -0,0 +1,17 @@
+json.data do
+  json.array! @sale_plans do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.clazz EducodeSales::SalePlan::CLAZZ_NAME.invert[d.clazz]
+    json.year d.year
+    json.target_money d['annual'] || 0
+    json.plan_money  d['budget_amounts']&.round(2) || 0
+    json.minimum_money d['annual'].present? ?  (d['annual'].to_f * 0.8).round(2) : 0
+    json.finish_money 0
+    json.finish_rate 0
+    json.updated_at d.updated_at.to_s
+  end
+end
+
+json.code 0
+json.count @sale_plans.total_count

data/app/views/educode_sales/recycles/_monthly.html.erb

@@ -1,6 +1,6 @@
 <script type="text/html" id="toolbarDemo4">
   <div class="layui-btn-container">
-    <span class="table-label">周报列表</span>
+    <span class="table-label">月报列表</span>
   </div>
 </script>
 

data/app/views/educode_sales/recycles/_yearPlan.html.erb

@@ -0,0 +1,118 @@
+<script type="text/html" id="toolbarDemo6">
+  <div class="layui-btn-container">
+    <span class="table-label">年计划列表</span>
+  </div>
+</script>
+
+<table class="layui-hide" id="yearPlan" lay-filter="yearPlan"></table>
+
+<script type="text/html" id="currentTableBar6">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="restore">还原</a>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+        table.render({
+            elem: '#yearPlan',
+            url: '/missions/recycles/yearPlan',
+            toolbar: '#toolbarDemo6',
+            totalRow:true,
+            defaultToolbar: [],
+            cols: [
+              [
+                {
+                    field: 'id',
+                    width: 60,
+                    title:'序号',type: 'numbers',
+                },
+                {
+                    field: 'name',
+                    width: 90,
+                    title: '姓名'
+                },
+                {
+                    field: 'year',
+                    width: 90,
+                    title: '年度',
+                },
+                {
+                    field: 'plan',
+                    title: '计划内容'
+                },
+                {
+                    field: 'update_at',
+                    width: 160,
+                    title: '更新时间',
+                    sort: true,
+                },
+                {
+                    field: 'deleter',
+                    width: 90,
+                    title: '删除人',
+                },
+                {
+                    field: 'delete_time',
+                    width: 160,
+                    title: '删除时间',
+                    sort: true,
+                },
+                {
+                    title: '操作',
+                    width: 120,
+                    toolbar: '#currentTableBar6',
+                    align: "center"
+                }
+              ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(yearPlan)', function (obj) {
+          sort.field = obj.field;
+          sort.order = obj.type;
+          table.reload('yearPlan', {
+            initSort: obj,
+            where: {
+              sort: sort,
+              q: search
+            }
+          });
+        })
+
+
+        table.on('tool(yearPlan)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'restore') {
+              layer.confirm('确定恢复' + data.name, function (index) {
+                request.get('missions/recycles/' + data.id + '/restore_plans', {}, function (res) {
+                  layer.close(index);
+                  table.reload("yearPlan")
+                })
+              });
+            } else if (obj.event === 'delete') {
+              layer.confirm('确定删除' + data.name, function (index) {
+                request.delete('missions/recycles/' + data.id, {}, function (res) {
+                    layer.close(index);
+                    table.reload("yearPlan")
+                })
+              });
+            }
+        });
+
+    });
+</script>

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

@@ -5,6 +5,7 @@
     <li data="weekly">周报</li>
     <li data="month">月计划</li>
     <li data="monthly">月报</li>
+    <li data="year">年计划</li>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item   layui-show">
@@ -22,6 +23,9 @@
     <div class="layui-tab-item">
       <%= render 'monthly' %>
     </div>
+    <div class="layui-tab-item">
+      <%= render 'yearPlan' %>
+    </div>
   </div>
 </div>
 
@@ -30,29 +34,29 @@
     var $ = layui.jquery,
       table = layui.table,
       element = layui.element;
-    element.on('tab(sale_tab)', function (data) {
-      var status = $(this).attr('data')
-      switch (status) {
-        case 'week':
-           $("#week_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-           $("#week_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-          break;
-        case 'weekly':
-          $("#sales_weelky_table .layui-table-fixed-r")[0].classList.remove('layui-hide');
-          $("#sales_weelky_table .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-          break;
-        ;
-        case 'monthly':
-          $("#monthly_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-          $("#monthly_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-          break;
-        case 'month':
-          $("#month_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-          $("#month_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-          break;
-      }
+    // element.on('tab(sale_tab)', function (data) {
+    //   var status = $(this).attr('data')
+    //   switch (status) {
+    //     case 'week':
+    //        $("#week_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+    //        $("#week_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+    //       break;
+    //     case 'weekly':
+    //       $("#sales_weelky_table .layui-table-fixed-r")[0].classList.remove('layui-hide');
+    //       $("#sales_weelky_table .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+    //       break;
+    //     ;
+    //     case 'monthly':
+    //       $("#monthly_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+    //       $("#monthly_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+    //       break;
+    //     case 'month':
+    //       $("#month_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+    //       $("#month_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+    //       break;
+    //   }
      
           
-    })
+    // })
   })
  </script>

data/app/views/educode_sales/recycles/monthPlan.json.jbuilder

@@ -1,6 +1,5 @@
 json.data do
   json.array! @monthPlans do |d|
-    next if EducodeSales::SalePlan.unscoped.find(d.source_id).weekly.present?
     json.id d.id
     json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
     json.month EducodeSales::SalePlan.unscoped.find(d.source_id).month.strftime("%Y-%m")

data/app/views/educode_sales/recycles/yearPlan.json.jbuilder

@@ -0,0 +1,14 @@
+json.data do
+  json.array! @plans do |d|
+    json.id d.id
+    json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
+    json.year  EducodeSales::SalePlan.unscoped.find(d.source_id).year
+    json.plan EducodeSales::SalePlan.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SalePlan.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @plans.total_count

data/config/routes.rb

@@ -143,6 +143,7 @@ EducodeSales::Engine.routes.draw do
       get :monthPlan
       get :weekPlan
       get :business
+      get :yearPlan
     end
     member do
       get :restore_plans
@@ -167,6 +168,20 @@ EducodeSales::Engine.routes.draw do
       get :edit_monthly
       get :my_week
       get :my_month
+      get  :new_year
+      get :years_plan
+      post :create_business_info
+      get :business_infos
+      get :edit_bussiness_info
+      post :update_business_info
+      post :create_sales_plan
+      get :edit_year_plan
+      get :plan_business_infos
+      get :edit_bussiness_info_extra
+      post :update_business_info_extra
+    end
+    member do
+      delete :delete_business_info
     end
   end
 
@@ -267,10 +282,14 @@ EducodeSales::Engine.routes.draw do
       get :show_teachers
       get :new_follow_up
       get :follow_ups
+      post :add_advise
+      get :upload_file
     end
     member do
       get :show_schools
       post :follow_up
+      put :update_advise
+      get :files
     end
   end
 

data/db/migrate/20230330141213_create_educode_sales_activity_follow_ups.rb

@@ -21,5 +21,11 @@ class CreateEducodeSalesActivityFollowUps < ActiveRecord::Migration[5.2]
     EducodeSales::Permission.find_or_create_by(name: '添加跟进记录', subject: 'ActivityFollowUp', action: 'create', clazz: 'activity')
     EducodeSales::Permission.find_or_create_by(name: '团队建议', subject: 'ActivityFollowUp', action: 'advise', clazz: 'activity')
     # EducodeSales::Permission.find_or_create_by(name: '附件', subject: 'ActivityFollowUp', action: 'upload', clazz: 'activity')
+
+
+    EducodeSales::Permission.find_or_create_by(name: '上传文件', subject: 'Activity', action: 'upload_file', clazz: 'activity')
+    EducodeSales::Permission.find_or_create_by(name: '下载附件', subject: 'Activity', action: 'download_file', clazz: 'activity')
+    EducodeSales::Permission.find_or_create_by(name: '删除附件', subject: 'Activity', action: 'delete_file', clazz: 'activity')
+    EducodeSales::Permission.find_or_create_by(name: '查看附件', subject: 'Activity', action: 'show_file', clazz: 'activity')
   end
 end

data/db/migrate/20230405074036_add_year_to_sale_plans.rb

@@ -0,0 +1,38 @@
+class AddYearToSalePlans < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_sale_plans, :year, :string
+    add_column :educode_sales_sale_plans, :clazz, :integer
+
+    create_table :educode_sales_business_infos do |t|
+      t.references :business
+      t.references :staff
+      t.references :sale_plan
+      t.string :year, comment: '年份'
+      t.integer :clazz, comment: '目标类型'
+      t.date :plan_bid_on, comment: '计划投标时间'
+      t.date :actual_bidded_on, comment: '实际投标时间'
+      t.float :bidded_amount, comment: '中标额'
+      t.date :plan_sign_on, comment: '计划签单时间'
+      t.date :actual_sign_on, comment: '实际签单时间'
+      t.float :sign_amount, comment: '签单额'
+      t.date :plan_deploy_on, comment: '计划部署时间'
+      t.date :actual_deploy_on, comment: '实际部署时间'
+      t.date :plan_check_on, comment: '计划验收时间'
+      t.date :actual_check_on, comment: '实际验收时间'
+      t.date :prepayment_plan_on, comment: '预收款计划回款时间'
+      t.date :prepayment_actual_on, comment: '预收款实际回款时间'
+      t.float :prepayment_amount, comment: '预收款'
+      t.date :check_fee_plan_on, comment: '验收款计划回款时间'
+      t.date :check_fee_actual_on, comment: '验收款实际回款时间'
+      t.float :check_fee, comment: '验收款'
+      t.date :qa_plan_on, comment: '质保金计划回款时间'
+      t.date :qa_actual_on, comment: '质保金实际回款时间'
+      t.float :qa_amount, comment: '质保金'
+      t.float :account_receivable, comment: '应收款'
+      t.integer :account_receivable_clazz, comment: '应收款类型'
+      t.float :invoice_amount, comment: '开票金额'
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.67'
+  VERSION = '0.9.68'
 end