educode_sales 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea14dcf8c116d91d0a273c02cd36f2d064cc48fe93cfd6024de598db56b0b21b
-  data.tar.gz: 0f796a9a5a15726bf97ccd161b0144d8be7d5b6d10b11f3763047ad4253dbb67
+  metadata.gz: b94517f09287290104a7f5b99842db680f96336a78f7261a7478c4c9d8ca66af
+  data.tar.gz: 9dd809965284e5d22f39ebf18110ad1c54514391d1e2d75fef04c2a686f29ef9
 SHA512:
-  metadata.gz: ddefae214a2fb34bd44c7d9e7a0166ec5fa353b604643d617cba26687c3e806d0617d96b0ae892e366561005e7e133ea8649618eebe44c14f2521804829dc9b7
-  data.tar.gz: 835634d2f2f94ed809a372f299da738d9e45f67ddf9461e5fa5e76a7d0eb0fda73a491f838ffeedb5c1a771ec21c813591cb5d6262d11761728c6daf5599aded
+  metadata.gz: 662c0d5a18f51954d831ce9d935b603d595a9b255325a44f56a2edeb6f7e018a10ee779e3b994a8a3903782a0d9367bc82d16b437eae21e6fa2736721ab419cb
+  data.tar.gz: 573ff431ba910018a90d61a568a4f1cc25ec4ff1667a8222918c560bcdf673e0f9521256f773959bdada669c4efa339d9827cf899ccf5dcef96849ed22ae4471

data/app/controllers/educode_sales/businesses_controller.rb

@@ -384,7 +384,7 @@ module EducodeSales
     end
 
     def daily_paper
-      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("updated_at > ?", Time.now.beginning_of_day).order("updated_at")
+      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("created_at > ?", Time.now.beginning_of_day).order("created_at")
       ab = EducodeSales::Common.where(extras: [EducodeSales::Common::ATYPE, EducodeSales::Common::BTYPE]).pluck(:id)
       business = EducodeSales::FollowUp.joins("
         JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id

data/app/controllers/educode_sales/invoices_controller.rb

@@ -0,0 +1,219 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class InvoicesController < ApplicationController
+
+    def index
+    end
+
+    def apply
+      render layout: false
+    end
+
+    def create_apply
+      business = Business.find(params[:business_id])
+      count = EducodeSales::InvoiceApply.where("created_at > ?", Time.now.beginning_of_day).size + 1
+      invoice_apply = InvoiceApply.find_or_initialize_by(business_id: business.id) do |d|
+        d.number = Time.now.strftime("%y%m%d").gsub("-", "") + rand(10..99).to_s + ("%04d" % count)
+        d.state = '审核中'
+      end
+      invoice_apply.staff = @current_admin
+      invoice_apply.assign_attributes(apply_params)
+      ActiveRecord::Base.transaction do
+        invoice_apply.save!
+        params[:details].each do |d|
+          detail = invoice_apply.invoice_details.new({
+            sale_detail_id: d['id'],
+            specification: d['specification'],
+            business_id: business.id,
+            unit: d['unit'],
+            category: d['category'],
+            state: '待开票',
+            name: d['name'],
+            num: d['num'],
+            price: d['price'],
+            amount: d['amount']})
+            detail.save!
+        end
+      end
+      render_success
+    end
+
+    def details
+      business = Business.find(params[:id])
+      invoice_apply = business.invoice_apply
+      if invoice_apply
+        if params[:state].present?
+          @data = invoice_apply.invoice_details.where(state: params[:state])
+        else
+          @data = invoice_apply.invoice_details
+        end
+      else
+        @data = InvoiceDetail.none
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def sales_details
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          business = Business.find(params[:id])
+          @data = business.sales_details.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def invoice_amount
+      business = Business.find(params[:id])
+      render json: {
+        actual_amount: business&.last_follow_up&.actual_amount,
+        invoice_pass: business&.invoice_details&.sum(:amount),
+        invoice_category: business&.invoice_apply&.category || '',
+        is_tax_rebate: business&.invoice_apply&.is_tax_rebate.to_s,
+        ticket_at: business&.invoice_apply&.ticket_at || '',
+        name: business&.invoice_apply&.name || '',
+        taxpaper_number: business&.invoice_apply&.taxpaper_number || '',
+        address: business&.invoice_apply&.address || '',
+        phone: business&.invoice_apply&.phone || '',
+        bank: business&.invoice_apply&.bank || '',
+        bank_number: business&.invoice_apply&.bank_number || '',
+      }
+    end
+
+
+    def apply_records
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+          @staffs = Staff.joins(:invoice_applys).includes(:user).distinct.map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          @data = InvoiceApply
+
+          unless @current_admin.is_admin?
+            @data = @data.left_joins(business: [last_follow_up: :assign_follow_ups]).where("educode_sales_assign_follow_ups.staff_id = :staff OR educode_sales_invoice_applies.staff_id = :staff", staff: @current_admin.id)
+          end
+
+          if params[:q].present? && params[:q][:payer_name].present?
+            @data = @data.where("payer_name like ?", "%#{params[:q][:payer_name]}%")
+          end
+
+          if params[:q].present? && params[:q][:business].present?
+            @data = @data.joins(:business).where("educode_sales_businesses.name like ?", "%#{params[:q][:business]}%")
+          end
+
+          if params[:q].present? && params[:q][:number].present?
+            @data = @data.where("educode_sales_invoice_applies.number like ?", "%#{params[:q][:number]}%")
+          end
+
+          if params[:q].present? && params[:q][:amount].present?
+            @data = @data.where("educode_sales_invoice_applies.amount = ?", params[:q][:amount])
+          end
+
+          if params[:q].present? && params[:q][:staff_id].present?
+            @data = @data.where("educode_sales_invoice_applies.staff_id = ?", params[:q][:staff_id])
+          end
+
+          if params[:q].present? && params[:q][:created_at].present?
+            date = params[:q][:created_at].split(" - ")
+            @data = @data.where("educode_sales_invoice_applies.created_at > ? AND educode_sales_invoice_applies.created_at < ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @data = @data.joins(:invoices).where("educode_sales_invoices.date_at > ? AND educode_sales_invoices.date_at < ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
+          end
+
+          if params[:q].present? && params[:q][:school].present?
+            @data = @data.joins(business: :school).where("schools.name like ?", "%#{params[:q][:school]}%")
+          end
+
+          if params[:q].present? && params[:q][:invoice_number].present?
+            @data = @data.joins(:invoices).where("educode_sales_invoices.number like ?", "%#{params[:q][:invoice_number]}%")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @data = @data.where("date_at BETWEEN ? AND ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:state].present?
+            if params[:q][:state] == '已认领'
+              @data = @data.having("claim_num > 0")
+            elsif params[:q][:state] == '待认领'
+              @data = @data.having("claim_num = 0 AND business_id IS NOT NULL")
+            elsif params[:q][:state] == '无对应合同'
+              @data = @data.having("claim_num = 0 AND business_id IS NULL")
+            end
+              
+          end
+          if params[:q].present? && params[:q][:amount].present?
+            @data = @data.where(amount: params[:q][:amount])
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @data = @data.order(created_at: :desc)
+          end
+          @data = @data.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def list
+      invoice_apply = InvoiceApply.find(params[:id])
+      @data = invoice_apply.invoices
+      @data = @data.order(created_at: :desc).page(params[:page]).per(params[:limit])
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+      invoice_apply = InvoiceApply.find(params[:invoice_apply_id])
+      invoice = invoice_apply.invoices.new(invoice_params)
+      if invoice.save
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+    def update
+      invoice = Invoice.find(params[:id])
+      if invoice.update(invoice_params)
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+    def destroy
+      invoice = Invoice.find(params[:id])
+      if invoice.destroy
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+
+    private
+    def apply_params
+      params.permit(:category, :is_tax_rebate, :ticket_at, :name, :taxpaper_number, :address, :phone, :bank, :bank_number)
+    end
+
+    def detail_params
+      params.permit(:category, :specification, :unit, :num, :price, :amount)
+    end
+
+    def invoice_params
+      params.permit(:number, :no_tax_amount, :taxt_amount, :amount, :date_at)
+    end
+  end
+end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -87,6 +87,19 @@ module EducodeSales
       end
     end
 
+    def upload
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      rows.times do |r|  #行数
+        next unless ods.row(r+2)[0]
+        business_id = Business.find_by(number: ods.row(r+2)[3].to_s.strip)&.id
+        EducodeSales::MoneyPlanRecord.create(payer_name: ods.row(r+2)[0].to_s.strip, amount: ods.row(r+2)[1].to_s.strip, date_at: ods.row(r+2)[2].to_s.strip, business_id: business_id, staff_id: @current_admin.id) if business_id
+      end
+      
+      render json: { succcess: true}
+    end
+
     def confirm
       money_plan_record = MoneyPlanRecord.find(params[:id])
       money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -235,9 +235,9 @@ module EducodeSales
           if params[:business_count_type] == 'money' || params[:business_count_type].blank?
             data = provinces.map { |province|
               if params[:business_type].blank?
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:budget_amount).round(2)
               else
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).sum(:total_amount).round(2)
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).sum(:budget_amount).round(2)
               end
             }
             if params[:sort_by].present?

data/app/controllers/educode_sales/staffs_controller.rb

@@ -33,7 +33,7 @@ module EducodeSales
 
     def create
       user = User.find(params[:id])
-      staff = Staff.new(user_id: user.id)
+      staff = Staff.new(user_id: user.id, name: params[:name])
       params[:current_admin] = @current_admin.id
       if staff.save
         impressionist(staff, params)
@@ -83,7 +83,7 @@ module EducodeSales
 
     def update
       staff = Staff.find(params[:id])
-      staff.assign_attributes(role_id: params[:role_id], job_type: params[:job_type], enabled_at: params[:enabled_at])
+      staff.assign_attributes(role_id: params[:role_id], job_type: params[:job_type], enabled_at: params[:enabled_at], name: params[:name])
       staff.expired_at = staff.enabled_at.months_since(params[:month].to_i)
       commons = []
       params[:area_ids].to_s.split(",").each do |d|

data/app/models/educode_sales/business.rb

@@ -20,6 +20,10 @@ module EducodeSales
     has_many :business_histories, dependent: :destroy
     has_many :money_plans
 
+    has_one :invoice_apply
+    has_many :invoice_details
+    has_many :sales_details
+
     belongs_to :school
 
     belongs_to :sourcable, :polymorphic => true, optional: true

data/app/models/educode_sales/invoice.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class Invoice < ApplicationRecord
+    belongs_to :invoice_apply, counter_cache: true
+  end
+end

data/app/models/educode_sales/invoice_apply.rb

@@ -0,0 +1,12 @@
+module EducodeSales
+  class InvoiceApply < ApplicationRecord
+    belongs_to :business
+    belongs_to :staff
+    belongs_to :take_ticket, class_name: 'Staff', optional: true
+    has_many :invoice_details
+    has_many :invoices
+
+    enum category: ['纸质专用发票', '纸质普通发票', '电子普通发票']
+    enum state: ['审核中', '已开票']
+  end
+end

data/app/models/educode_sales/invoice_detail.rb

@@ -0,0 +1,10 @@
+module EducodeSales
+  class InvoiceDetail < ApplicationRecord
+    belongs_to :invoice_apply, optional: true
+    belongs_to :sale_detail, class_name: 'SalesDetail'
+    belongs_to :business
+
+    enum category: ['软件', '技术服务', '硬件', '装修服务', '咨询服务', '会议服务']
+    enum state: ['待开票', '已开票']
+  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/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/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>