educode_sales 1.0.2 → 1.0.4

data/config/routes.rb

@@ -19,11 +19,27 @@ EducodeSales::Engine.routes.draw do
   get :filter, to: "application#filter"
   get :search_activity, to: "home#search_activity"
   get :search_customer, to: "home#search_customer"
-
+  get :search_contracts, to: "home#search_contracts"
+  get :search_money_plans, to: "home#search_money_plans"
 
   resources :sessions do
   end
 
+  resources :invoices do
+    collection do
+      get :apply_records
+      get :apply
+      get :details
+      get :invoice_amount
+      post :create_apply
+      post :add_invoice
+      get :list
+    end
+    member do
+      get :sales_details
+    end
+  end
+  
   resources :sales_details do
     collection do
       post :upload
@@ -62,6 +78,21 @@ EducodeSales::Engine.routes.draw do
   resources :customer_follows do
   end
   resources :money_plans do
+    collection do
+      get :list
+      get :add
+    end
+  end
+
+  resources :money_plan_records do
+    collection do
+      get :add
+      get :confirm_plan
+      post :upload
+    end
+    member do
+      post :confirm
+    end
   end
 
   resources :customers do

data/db/migrate/20230527150102_add_category_to_educode_sales_money_plans.rb

@@ -0,0 +1,7 @@
+class AddCategoryToEducodeSalesMoneyPlans < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_money_plans, :category, :integer
+    add_column :educode_sales_money_plans, :payment_clause, :string
+    add_column :educode_sales_money_plans, :business_id, :integer
+  end
+end

data/db/migrate/20230528115654_create_educode_sales_money_plan_records.rb

@@ -0,0 +1,13 @@
+class CreateEducodeSalesMoneyPlanRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_money_plan_records do |t|
+      t.references :business
+      t.date :date_at
+      t.float :amount
+      t.string :payer_name
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230529022020_create_educode_sales_money_plan_claims.rb

@@ -0,0 +1,12 @@
+class CreateEducodeSalesMoneyPlanClaims < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_money_plan_claims do |t|
+      t.references :money_plan
+      t.references :money_plan_record
+      t.references :staff
+      t.float :amount
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230531144834_create_educode_sales_invoice_applies.rb

@@ -0,0 +1,25 @@
+class CreateEducodeSalesInvoiceApplies < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_invoice_applies do |t|
+      t.string :number, comment: "开票申请编号"
+      t.references :business
+      t.references :staff
+      t.float :amount, comment: "已开票金额"
+      t.integer :invoices_count, comment: "发票数量"
+      t.integer :delivery, comment: "送达方式"
+      t.date :ticket_at, comment: "出票需求时间"
+      t.date :passed_at, comment: "开票时间"
+      t.integer :state, comment: "开票状态"
+      t.integer :category, comment: "发票类型"
+      t.boolean :is_tax_rebate, default: false
+      t.string :name, comment: "开票信息名称"
+      t.string :taxpaper_number, comment: "纳税人标识号"
+      t.string :address, comment: "地址"
+      t.string :phone, comment: "电话"
+      t.string :bank_number, comment: "银行账号"
+      t.string :bank, comment: "开户行"
+      t.integer :take_ticket_id, comment: "领票人"
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230601011835_create_educode_sales_invoices.rb

@@ -0,0 +1,14 @@
+class CreateEducodeSalesInvoices < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_invoices do |t|
+      t.string :number, comment: "发票号码"
+      t.float :no_tax_amount, comment: "未税金额"
+      t.float :taxt_amount, comment: "税额"
+      t.float :amount, comment: "发票金额"
+      t.date :date_at, comment: "开票日期"
+      t.references :invoice_apply
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230601011943_create_educode_sales_invoice_details.rb

@@ -0,0 +1,20 @@
+class CreateEducodeSalesInvoiceDetails < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_invoice_details do |t|
+      t.references :invoice_apply
+      t.references :business
+      t.references :sale_detail
+      t.integer :num, comment: "数量"
+      t.string :specification, comment: "规格"
+      t.string :unit, comment: "单位"
+      t.float :price, comment: "单价"
+      t.integer :category, comment: "类别：软件，硬件"
+      t.string :name, comment: "名称"
+      t.float :amount, comment: "金额"
+      t.integer :state, comment: "开票状态：已开票"
+
+      t.timestamps
+    end
+
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,8 +156,10 @@ files:
 - app/controllers/educode_sales/idea_recycles_controller.rb
 - app/controllers/educode_sales/ideas_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
+- app/controllers/educode_sales/invoices_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
 - app/controllers/educode_sales/logs_controller.rb
+- app/controllers/educode_sales/money_plan_records_controller.rb
 - app/controllers/educode_sales/money_plans_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
@@ -223,10 +225,15 @@ files:
 - app/models/educode_sales/idea.rb
 - app/models/educode_sales/idea_follow.rb
 - app/models/educode_sales/idea_history.rb
+- app/models/educode_sales/invoice.rb
+- app/models/educode_sales/invoice_apply.rb
+- app/models/educode_sales/invoice_detail.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/login_history.rb
 - app/models/educode_sales/market_area.rb
 - app/models/educode_sales/money_plan.rb
+- app/models/educode_sales/money_plan_claim.rb
+- app/models/educode_sales/money_plan_record.rb
 - app/models/educode_sales/operation_plan.rb
 - app/models/educode_sales/operation_report.rb
 - app/models/educode_sales/operation_trend.rb
@@ -356,9 +363,11 @@ files:
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_activity.json.jbuilder
+- app/views/educode_sales/home/search_contracts.json.jbuilder
 - app/views/educode_sales/home/search_customer.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
 - app/views/educode_sales/home/search_edu_user.json.jbuilder
+- app/views/educode_sales/home/search_money_plans.json.jbuilder
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
@@ -420,10 +429,26 @@ files:
 - app/views/educode_sales/ideas/show_teachers.html.erb
 - app/views/educode_sales/ideas/unfinish_plans.json.jbuilder
 - app/views/educode_sales/ideas/upload_file.html.erb
+- app/views/educode_sales/invoices/_apply_records.html.erb
+- app/views/educode_sales/invoices/apply.html.erb
+- app/views/educode_sales/invoices/apply_records.js.erb
+- app/views/educode_sales/invoices/apply_records.json.jbuilder
+- app/views/educode_sales/invoices/details.json.jbuilder
+- app/views/educode_sales/invoices/list.json.jbuilder
+- app/views/educode_sales/invoices/new.html.erb
+- app/views/educode_sales/invoices/sales_details.html.erb
+- app/views/educode_sales/invoices/sales_details.json.jbuilder
 - app/views/educode_sales/logs/index.html.erb
 - app/views/educode_sales/logs/index.json.jbuilder
-- app/views/educode_sales/money_plans/index.html.erb
+- app/views/educode_sales/money_plan_records/_index.html.erb
+- app/views/educode_sales/money_plan_records/add.html.erb
+- app/views/educode_sales/money_plan_records/confirm_plan.html.erb
+- app/views/educode_sales/money_plan_records/index.js.erb
+- app/views/educode_sales/money_plan_records/index.json.jbuilder
+- app/views/educode_sales/money_plans/_index.html.erb
+- app/views/educode_sales/money_plans/add.html.erb
 - app/views/educode_sales/money_plans/index.json.jbuilder
+- app/views/educode_sales/money_plans/list.html.erb
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
 - app/views/educode_sales/operation_plans/_monthly.html.erb
 - app/views/educode_sales/operation_plans/_weekPlan.html.erb
@@ -685,6 +710,12 @@ files:
 - db/migrate/20230510144317_create_educode_sales_sales_details.rb
 - db/migrate/20230520023902_add_activity_educode_sales_business.rb
 - db/migrate/20230523115007_add_proprietorship_educode_sales_sales_details.rb
+- db/migrate/20230527150102_add_category_to_educode_sales_money_plans.rb
+- db/migrate/20230528115654_create_educode_sales_money_plan_records.rb
+- db/migrate/20230529022020_create_educode_sales_money_plan_claims.rb
+- db/migrate/20230531144834_create_educode_sales_invoice_applies.rb
+- db/migrate/20230601011835_create_educode_sales_invoices.rb
+- db/migrate/20230601011943_create_educode_sales_invoice_details.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -708,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.

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

@@ -1,222 +0,0 @@
-<div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
-    <div class="layui-form-item">
-      <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">
-          <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">状态</label>
-        <div class="layui-input-inline">
-          <%= select_tag "clazz", options_for_select(['实际回款','计划回款']), {  include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">回款时间</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="date" name="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" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
-        </button>
-      </div>
-    </div>
-  </form>
-</div>
-
-<script type="text/html" id="toolbarDemo">
-  <div class="layui-btn-container">
-    <span class="table-label">回款计划</span>
-  </div>
-</script>
-
-<table class="layui-hide" id="place" lay-filter="place"></table>
-
-<script type="text/html" id="currentTableBar">
-</script>
-<script type="text/html" id="business">
-  <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
-</script>
-
-<script type="text/html" id="school">
-  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</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;
-        laydate = layui.laydate;
-
-
-        laydate.render({
-            elem: '#date',
-            range: true
-        });
-
-        table.render({
-            elem: '#place',
-            url: '/missions/money_plans',
-            toolbar: '#toolbarDemo',
-            totalRow: true,
-            defaultToolbar: ['filter'],
-            initSort: {
-                field: 'date_at' //排序字段，对应 cols 设定的各字段名
-                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
-            },
-            cols: [
-                [
-                    {
-                        field: 'id',
-                        width: 80,
-                        title:'序号',type: 'numbers',
-                        totalRowText:'本页/总计'
-                    },
-                    {
-                        field: 'date_at',
-                        width: 120,
-                        sort: true,
-                        title: '回款时间'
-                    },
-                    {
-                        field: 'amount',
-                        width: 200,
-                        sort: true,
-                        totalRow:true,
-                        title: '回款金额',
-                    },
-                    {
-                        field: 'clazz',
-                        width: 100,
-                        title: '状态',
-                    },
-                    {
-                        field: 'business',
-                        title: '所属商机',
-                        templet: "#business",
-
-                    },
-                    {
-                        field: 'school',
-                        title: '单位',
-                        templet: "#school",
-                    },
-                    {
-                        field: 'staff',
-                        width: 90,
-                        title: '负责人',
-                    },
-                ]
-            ],
-            limit: 20,
-            limits: [10,15,20,30,40,50,60,70,80,90],
-            page: true
-        });
-
-        var sort = {}, search = {};
-        table.on('sort(place)', function (obj) {
-            sort.field = obj.field;
-            sort.order = obj.type;
-            table.reload('place', {
-                initSort: obj,
-                where: {
-                    sort: sort,
-                    q: search
-                }
-            });
-        })
-
-        // 监听搜索操作
-        form.on('submit(search_teachers)', function (data) {
-            search = data.field
-            table.reload('place', {
-                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_teachers', {
-                area: "",
-                date: "",
-                staff_id: "",
-                clazz: "",
-                professional_title: "",
-                school: "",
-                business: ""
-            });
-            return false;
-        });
-
-        table.on('tool(place)', 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);
-                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') {
-                console.log(data);
-                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 + '的跟进记录',
-                    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);
-                });
-            }
-        });
-
-    });
-</script>
-<style>
-    .layui-table-tool-temp{
-        padding-right: 0px; !important;
-    }
-</style>