educode_sales 1.0.2 → 1.0.4

data/app/models/educode_sales/money_plan.rb

@@ -1,15 +1,42 @@
 module EducodeSales
   class MoneyPlan < ApplicationRecord
     belongs_to :staff
+    belongs_to :business
     belongs_to :follow_up, counter_cache: true
 
+    has_many :money_plan_claims
+
     # todo 1 :实际回款 0:计划回款
     enum clazz: ['计划回款', '实际回款']
+    enum category: ['预收款', '交付款', '验收款', '质保金']
 
     after_save :update_return_money
     after_destroy :update_return_money
 
 
+    def return_period
+      if self.date_at && self.business&.last_follow_up&.signed_date
+        signed_date = self.business&.last_follow_up&.signed_date
+        month = (self.date_at.year - signed_date.year) * 12 + self.date_at.month - signed_date.month - (self.date_at.day >= signed_date.day ? 0 : 1)
+        if month <= 3
+          '3个月内'
+        elsif month <= 6
+          '4-6个月内'
+        elsif month <= 9
+          '7-9个月'
+        elsif month <= 12
+          '10-12个月'
+        elsif month <= 24
+          '1-2年'
+        elsif month <= 36
+          '2-3年'
+        end
+      else
+        ''
+      end
+    end
+
+
     private
 
     def update_return_money

data/app/models/educode_sales/money_plan_claim.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class MoneyPlanClaim < ApplicationRecord
+    belongs_to :money_plan
+    belongs_to :money_plan_record
+    belongs_to :staff
+  end
+end

data/app/models/educode_sales/money_plan_record.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class MoneyPlanRecord < ApplicationRecord
+    belongs_to :staff
+    belongs_to :business, optional: true
+    has_many :money_plan_claims
+  end
+end

data/app/models/educode_sales/staff.rb

@@ -27,6 +27,8 @@ module EducodeSales
 
     has_many :business_infos, dependent: :destroy
 
+    has_many :invoice_applys, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }

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

@@ -1,6 +1,6 @@
 <%= Gon::Base.render_data %>
 <div class="layuimini-main edit-table">
-  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_plan_box">
+  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_plan_box" style="display:none;">
     <fieldset class="table-search-fieldset">
       <legend>添加回款计划</legend>
       <div class="layui-form-item">

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @teachers do |d|
     json.id d.id
-    json.name d.teacher.name
+    json.name d.name
     json.professional_title d.professional_title
     json.job d.job
     json.attitude_id d.attitude_id.present? ? d.attitude_id : ''

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

@@ -475,7 +475,7 @@
       sort.field = obj.field;
       sort.order = obj.type;
       table.reload('contact_table', {
-          url: '/missions/businesses',
+          url: '/missions/contracts',
         initSort: obj,
         where: {
             sort: sort,

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

@@ -15,7 +15,7 @@ json.data do
     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
     # teacher_ids = d.key_person.pluck(:teacher_id)
     json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
-    json.key_people d.key_person.map { |d| d.teacher.name }.join("、")# key_people(teacher_ids)
+    json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)
 
   end
 end

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @teachers do |d|
     json.id d.id
-    json.name d.teacher.name
+    json.name d.name
     json.professional_title d.professional_title
     json.job d.job
     json.attitude_id d.attitude_id.present? ? d.attitude_id : ''

data/app/views/educode_sales/home/search_contracts.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name "#{d.number} / #{d.department&.school&.name.to_s}#{d.department&.name.to_s} / #{d.name} / #{d.last_follow_up&.actual_amount}万"
+  end
+end
+json.count @data.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/home/search_money_plans.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name "#{d.business.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 / #{d.date_at.to_s(:date)}"
+  end
+end
+json.count @data.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/invoices/_apply_records.html.erb

@@ -0,0 +1,276 @@
+<div style="margin: 10px 10px 10px 10px" id="invoice_apply">
+  <form class="layui-form layui-form-pane" lay-filter="submit_apply">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">开票申请号</label>
+        <div class="layui-input-inline">
+          <input type="text" name="number" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">合同名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="business" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">客户名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="school" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">发票号码</label>
+        <div class="layui-input-inline">
+          <input type="text" name="invoice_number" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">开票金额</label>
+        <div class="layui-input-inline">
+          <input type="text" name="amount" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label required">申请人</label>
+        <div class="layui-input-inline">
+          <%= select_tag "staff_id", options_for_select(@staffs), { 'lay-filter': 'state',  include_blank: true,  "lay-search": "" } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">申请日期</label>
+        <div class="layui-input-inline">
+          <input type="text" name="created_at" class="layui-input" id="date">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">开票日期</label>
+        <div class="layui-input-inline">
+          <input type="text" name="date_at" class="layui-input" id="passed_at">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search_record">重置</button>
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="submit_apply">搜 索</button>
+      </div>
+    </div>
+  </form>
+</div>
+<script type="text/html" id="apply_tool">
+  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;" lay-event="apply_invoice">开票申请</button>
+</script>
+
+<table class="layui-hide" id="apply_invoice_table" lay-filter="apply_invoice_table"></table>
+
+<script type="text/html" id="invoice_num">
+  <a href="javascript:void(0);" lay-event="invoices_count" class="layui-table-link">{{ d.invoices_count }}</a>
+</script>
+<script type="text/html" id="apply_toolbar">
+  <!-- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="audit">审核</a> -->
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="invoice">提交发票信息</a>
+</script>
+
+<script>
+  layui.use(['form', 'table', 'miniPage', 'element', 'request'], function() {
+    var $ = layui.jquery,
+      form = layui.form,
+      request = layui.request,
+      miniPage = layui.miniPage;
+    laydate = layui.laydate;
+    table = layui.table;
+    laydate.render({
+      elem: '#date',
+      range: true
+    });
+    laydate.render({
+      elem: '#passed_at',
+      range: true
+    });
+    form.render();
+    table.render({
+      elem: '#apply_invoice_table',
+      url: '/missions/invoices/apply_records',
+      toolbar: '#apply_tool',
+      defaultToolbar: ['filter'],
+      initSort: {
+        field: 'created_at',
+        type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+      },
+      cols: [
+        [{
+          field: 'id',
+          width: 80,
+          title: '序号',
+          type: 'numbers',
+        }, {
+          field: 'number',
+          width: 180,
+          title: '开票申请号'
+        }, {
+          field: 'business_number',
+          width: 150,
+          title: '合同编号'
+        }, {
+          field: 'business_name',
+          width: 180,
+          title: '合同名称'
+        }, {
+          field: 'school',
+          width: 180,
+          title: '客户名称'
+        }, {
+          field: 'staff',
+          width: 120,
+          title: '申请人',
+        }, {
+          field: 'created_at',
+          width: 220,
+          title: '申请日期',
+        }, {
+          field: 'amount',
+          width: 120,
+          title: '开票金额',
+        }, {
+          field: 'state',
+          width: 120,
+          title: '开票状态',
+        },  {
+          field: 'invoices_count',
+          width: 120,
+          title: '发票信息',
+          templet: "#invoice_num"
+        },  {
+          field: 'take_ticket',
+          width: 120,
+          title: '领票人',
+        }, {
+          field: 'delivery',
+          width: 120,
+          title: '送达方式',
+        },  {
+          title: '操作',
+          minWidth: 200,
+          toolbar: '#apply_toolbar',
+          align: "center",
+          fixed: 'right'
+        }]
+      ],
+      limit: 20,
+      limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+      page: true
+    });
+    var sort = {},
+      search = {};
+    table.on('sort(apply_invoice_table)', function(obj) {
+        sort.field = obj.field;
+        sort.order = obj.type;
+        table.reload('apply_invoice_table', {
+          initSort: obj,
+          where: {
+            sort: sort,
+            q: search
+          }
+        });
+      })
+      // 监听搜索操作
+    form.on('submit(submit_apply)', function(data) {
+      search = data.field
+      table.reload('apply_invoice_table', {
+        page: {
+          curr: 1
+        },
+        where: {
+          q: search,
+          sort: sort
+        }
+      }, 'data');
+      return false;
+    });
+    form.on('submit(reset_business_search_record)', function(data) {
+      var field = data.field;
+      form.val('submit_apply', {
+        area: "",
+        date: "",
+        staff_id: "",
+        clazz: "",
+        professional_title: "",
+        school: "",
+        business: ""
+      });
+      return false;
+    });
+    table.on('toolbar(apply_invoice_table)', function(obj) {
+      if (obj.event == 'apply_invoice') {
+        var content = miniPage.getHrefContent('/missions/invoices/apply')
+        var openWH = miniPage.getOpenWidthHeight();
+        business_id = "";
+        sindex = layer.open({
+          title: '开票申请',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content
+        });
+        $(window).on("resize", function() {
+          layer.full(sindex);
+        });
+      }
+    })
+    table.on('tool(apply_invoice_table)', function(obj) {
+      var data = obj.data;
+      id = data.id;
+      state = data.state;
+      if (obj.event === 'confirm') { // 监听添加操作
+        var content = miniPage.getHrefContent('/missions/money_plan_records/confirm_plan?id=' + id)
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+          title: '认领回款',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content
+        });
+        $(window).on("resize", function() {
+          layer.full(sindex);
+        });
+      } else if (obj.event === 'invoices_count' || obj.event == 'invoice') {
+        invoice_apply_id = id;
+        var content = miniPage.getHrefContent('/missions/invoices/new')
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+          title: '添加发票',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content
+        });
+        $(window).on("resize", function() {
+          layer.full(sindex);
+        });
+      }
+    });
+  });
+</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>