educode_sales 1.0.2 → 1.0.3

data/app/views/educode_sales/money_plans/{index.html.erb → _index.html.erb}

@@ -1,36 +1,18 @@
-<div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
+<div style="margin: 10px 10px 10px 10px" id="money_plan_list">
+  <form class="layui-form layui-form-pane" lay-filter="search_plans">
     <div class="layui-form-item">
       <div class="layui-inline">
-        <label class="layui-form-label">所属商机</label>
+        <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>
+        <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>
@@ -40,45 +22,44 @@
     </div>
   </form>
 </div>
-
-<script type="text/html" id="toolbarDemo">
-  <div class="layui-btn-container">
-    <span class="table-label">回款计划</span>
-  </div>
+<script type="text/html" id="toolbar_money_plan">
+  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;" lay-event="addMoney">添加回款计划</button>
 </script>
 
-<table class="layui-hide" id="place" lay-filter="place"></table>
+<table class="layui-hide" id="money_plan_table" lay-filter="money_plan_table"></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 type="text/html" id="currentTableBarmoney_plan">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add">开票申请</a>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">催款提醒</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;
-
+        table = layui.table;
 
         laydate.render({
             elem: '#date',
             range: true
         });
 
+
+
         table.render({
-            elem: '#place',
+            elem: '#money_plan_table',
             url: '/missions/money_plans',
-            toolbar: '#toolbarDemo',
-            totalRow: true,
+            toolbar: '#toolbar_money_plan',
             defaultToolbar: ['filter'],
             initSort: {
                 field: 'date_at' //排序字段，对应 cols 设定的各字段名
@@ -90,42 +71,85 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
-                        totalRowText:'本页/总计'
                     },
                     {
-                        field: 'date_at',
+                      field: 'number',
+                      width: 120,
+                      title: '合同编号'
+                    },
+                    {
+                      field: 'business_name',
+                      width: 150,
+                      title: '合同名称'
+                    },
+                    {
+                        field: 'school',
+                        width: 180,
+                        title: '客户名称'
+                    },
+                    {
+                        field: 'staff_manages',
                         width: 120,
-                        sort: true,
-                        title: '回款时间'
+                        title: '销售经理'
+                    },
+                    {
+                      field: 'category',
+                      width: 120,
+                      title: '回款类别',
                     },
                     {
                         field: 'amount',
-                        width: 200,
+                        width: 120,
                         sort: true,
-                        totalRow:true,
-                        title: '回款金额',
+                        title: '金额',
                     },
                     {
-                        field: 'clazz',
+                        field: 'rate',
                         width: 100,
-                        title: '状态',
+                        title: '比例',
                     },
                     {
-                        field: 'business',
-                        title: '所属商机',
-                        templet: "#business",
-
+                        field: 'payment_clause',
+                        width: 200,
+                        title: '付款条款',
                     },
                     {
-                        field: 'school',
-                        title: '单位',
-                        templet: "#school",
+                      field: 'date_at',
+                      width: 150,
+                      title: '计划回款时间',
+                    },
+                    {
+                      field: 'return_period',
+                      width: 120,
+                      title: '回款周期',
+                    },
+                    {
+                        field: 'state',
+                        width: 100,
+                        title: '回款状态',
+                    },
+                    {
+                        field: 'stage',
+                        width: 100,
+                        title: '阶段',
                     },
                     {
-                        field: 'staff',
-                        width: 90,
-                        title: '负责人',
+                        field: 'accounts_state',
+                        width: 150,
+                        title: '应收款类型',
                     },
+                    {
+                      field: 'busireceipt_state',
+                      width: 120,
+                      title: '开票状态',
+                  },
+                  {
+                    title: '操作',
+                    minWidth: 200,
+                    toolbar: '#currentTableBarmoney_plan',
+                    align: "center",
+                    fixed: 'right'
+                  }
                 ]
             ],
             limit: 20,
@@ -134,10 +158,10 @@
         });
 
         var sort = {}, search = {};
-        table.on('sort(place)', function (obj) {
+        table.on('sort(money_plan_table)', function (obj) {
             sort.field = obj.field;
             sort.order = obj.type;
-            table.reload('place', {
+            table.reload('money_plan_table', {
                 initSort: obj,
                 where: {
                     sort: sort,
@@ -149,7 +173,7 @@
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
             search = data.field
-            table.reload('place', {
+            table.reload('money_plan_table', {
                 page: {
                     curr: 1
                 },
@@ -172,10 +196,31 @@
             return false;
         });
 
-        table.on('tool(place)', function (obj) {
+        table.on('toolbar(money_plan_table)', function ( obj) {
+          console.log(111)
+          if (obj.event == 'addMoney') {
+            var content = miniPage.getHrefContent('/missions/money_plans/add')
+            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);
+            });
+          }
+        })
+
+        table.on('tool(money_plan_table)', function (obj) {
             var data = obj.data;
             id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
+            if (obj.event === 'add_money_plan') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 show_index = layer.open({
@@ -216,7 +261,16 @@
     });
 </script>
 <style>
-    .layui-table-tool-temp{
-        padding-right: 0px; !important;
-    }
+  .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/money_plans/add.html.erb

@@ -0,0 +1,147 @@
+<div style="padding:10px">
+    <div class="layui-form layuimini-form" lay-filter="searchform">
+      <div class="layui-form-item">
+        <label class="layui-form-label required" style="width: 80px !important;">合同名称：</label>
+        <div class="layui-input-inline">
+          <div id="business" style="width:600px;"></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 "category[0]", options_for_select(EducodeSales::MoneyPlan.categories.keys), { 'lay-filter': 'category', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label required" style="width:50px;">金额：</label>
+          <div class="layui-input-inline">
+          <input type="text" name="amount[0]" value="" class="layui-input" lay-verify="required">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label required" style="width: 110px;">计划回款时间：</label>
+          <div class="layui-input-inline">
+            <input type="text" name="date_at[0]" value="" class="layui-input" lay-verify="required" id="date_at">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">付款条件：</label>
+          <div class="layui-input-inline">
+          <input type="text" name="payment_clause[0]" value="" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline">
+         <button class="layui-btn" id="addInput">+</button>
+        </div>
+      </div>
+      <div id="wraper"></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>
+</div>
+<script type="text/html" id="input_wraper">
+  <div class="layui-form-item">
+    <div class="layui-inline">
+        <label class="layui-form-label required">回款类别：</label>
+        <div class="layui-input-inline">
+            <%= select_tag "category[{{d.num}}]", options_for_select(EducodeSales::MoneyPlan.categories.keys), { 'lay-filter': 'category', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label required" style="width:50px;">金额：</label>
+        <div class="layui-input-inline">
+        <input type="text" name="amount[{{d.num}}]" value="" class="layui-input" lay-verify="required">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label required" style="width: 110px;">计划回款时间：</label>
+        <div class="layui-input-inline">
+        <input type="text" name="date_at[{{d.num}}]" value="" class="layui-input date_{{d.num}}" lay-verify="required">
+        </div>
+    </div>
+    <div class="layui-inline">
+        <label class="layui-form-label">付款条件：</label>
+        <div class="layui-input-inline">
+        <input type="text" name="payment_clause[{{d.num}}]" value="" class="layui-input">
+        </div>
+    </div>
+  </div>
+</script>
+
+  <script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate', 'selectInput'], function() {
+      var form = layui.form,
+        layer = layui.layer,
+        table = layui.table,
+        laydate = layui.laydate,
+        laytpl = layui.laytpl,
+        request = layui.request,
+        selectInput = layui.selectInput,
+        $ = layui.$;
+      form.render();
+
+      laydate.render({
+        elem: '#date_at',
+      });
+
+
+      var business_id =  "";
+      var business_select = selectInput.render({
+         elem: '#business',
+         name: 'bussiness_name', // 渲染的input的name值
+         layFilter: 'test', //同layui form参数lay-filter
+         layVerType: 'tips', // 同layui form参数lay-verType
+         layReqText: '请填写文本', //同layui form参数lay-ReqText
+         hasSelectIcon: false,
+         placeholder: '请输入合同名称', // 渲染的inputplaceholder值
+         remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+         remoteMethod: function (value, cb) { // 远程搜索的回调函数
+           if (!value) {
+            business_id = "";
+             return cb([]);
+           }
+           request.get('missions/search_contracts?q=' + value, {}, function (res) {
+            if (res.data.length == 0) {
+              business_select.emptyValue();
+              return cb([])
+            }
+             return cb(res)
+           })
+         }
+       });
+
+    
+      var num = 0;
+      $("#addInput").on("click", function() {
+        num += 1;
+        var getTpl = input_wraper.innerHTML, view = document.getElementById('wraper');
+        laytpl(getTpl).render({num: num}, function(html){
+          $(view).append(html);
+        });
+        form.render();
+        laydate.render({
+          elem: '.date_' + num,
+        });
+      })
+
+
+      form.on('submit(saveBtn)', function(data) {
+        data.field.num = num;
+        data.field.business_id = business_select.getValue() || business_id;
+        if (data.field.business_id == '') {
+          layer.msg('请选择合同')
+          return false;
+        }
+        request.post("missions/money_plans/", data.field, function(res) {
+          layer.close(parent.sindex)
+           parent.table.reload('money_plan_table')
+        })
+        return false;
+      });
+    });
+  </script>

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

@@ -2,20 +2,53 @@ total_amount = 0
 json.data do
   json.array! @money_plans do |d|
     json.id d.id
+    json.business_name d.business.name
     json.date_at (d&.date_at&.to_s(:date) || "")
     json.amount d.amount
-    total_amount += d.amount
     json.clazz d.clazz
-    json.business d.follow_up.business.name
-    json.business_id d.follow_up.business.id
-    json.school School.find(d.follow_up.business.school_id).name
-    json.school_id School.find(d.follow_up.business.school_id).id
+    json.business d.business.name
+    json.business_id d.business.id
+    json.school d.business.school.name
+    json.school_id d.business.school_id
     json.staff d.staff.user.real_name
+    json.number d.business.number
+    json.category d.category || ''
+    json.payment_clause d.payment_clause
+    json.stage d.business&.last_follow_up&.stage&.name || ''
+    json.return_period d.return_period
+    json.signed_date d.business&.last_follow_up&.signed_date
+    json.actual_amount d.business&.last_follow_up&.actual_amount
+    json.rate d.business&.last_follow_up&.actual_amount ? (d.amount / d.business.last_follow_up.actual_amount * 100.0).round(2) : ''
+    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
+    if d['claim_num'] > 0
+      json.state '已回款'
+    elsif d['claim_num'] == 0 && d.date_at < Time.now
+      json.state '正常'
+    else
+      json.state '已逾期'
+    end
+    if d['claim_num'] > 0
+      json.accounts_state ''
+    else
+      case d.business&.last_follow_up&.stage&.name
+      when '已中标'
+        json.accounts_state '中标应收款'
+      when '已签单'
+        json.accounts_state '合同应收款'
+      when '已部署'
+        json.accounts_state '部署应收款'
+      when '已验收'
+        json.accounts_state '验收应收款'
+      when '已回款'
+        json.accounts_state '质保金'
+      when '已开票'
+        json.accounts_state '开票应收款'
+      end
+      
+    end
+    
   end
 end
 
-json.totalRow do
-  json.amount total_amount.round(2).to_s + '/' + @total_amount.round(2).to_s
-end
 json.code 0
 json.count @money_plans.total_count

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

@@ -0,0 +1,55 @@
+<%= Gon::Base.render_data %>
+<div class="layui-tab" lay-filter="money_plan_tab">
+    <ul class="layui-tab-title">
+        <li class="layui-this">回款计划</li>
+        <li class="">回款记录</li>
+        <li class="">开票记录</li>
+    </ul>
+    <div class="layui-tab-content">
+        <div class="layui-tab-item layui-show">
+            <%=render 'index' %>
+        </div>
+        <div class="layui-tab-item">
+          <div id="monley_plan_record_wraper"></div>
+        </div>
+        <div class="layui-tab-item">
+          <div id="invoice_wraper"></div>
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'element'], function() {
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            dropdown = layui.dropdown,
+            miniPage = layui.miniPage,
+            element = layui.element,
+            laydate = layui.laydate;
+        var laydate = layui.laydate;
+
+
+
+        element.render();
+        element.on('tab(money_plan_tab)', function(data) {
+          if (data.index == 1 && $("#money_plan_record").length == 0) {
+            loadPage('/missions/money_plan_records')
+          } else if (data.index == 2 && $("#invoice_wraper").length == 0) {
+          }
+        });
+
+
+        function loadPage(url) {
+          var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+          Rails.ajax({
+            url: url,
+            type: 'GET',
+            dataType: "script",
+            success: function (res) {
+              layer.close(layer_index);
+            }
+          });
+        }
+    })
+</script>

data/app/views/educode_sales/sales_details/edit.html.erb

@@ -45,6 +45,12 @@
             <input type="text" name="delivery_date" value="<%= @sale_detail.delivery_date %>" class="layui-input" lay-verify="required" id="delivery_date">
           </div>
         </div>
+        <div class="layui-inline">
+          <label class="layui-form-label required">知识产权归属：</label>
+          <div class="layui-input-inline">
+            <%= select_tag "proprietorship", options_for_select(EducodeSales::SalesDetail.proprietorships.keys, @sale_detail.proprietorship), { 'lay-filter': 'proprietorship', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+          </div>
+        </div>
       </div>
       <div class="layui-form-item">
         <div class="layui-input-block">

data/app/views/educode_sales/teachers/add_keys.html.erb

@@ -160,7 +160,7 @@
           });
       });
 
-    var user_input = selectInput.render({
+     user_input = selectInput.render({
       elem: '#teacher',
       name: 'name', // 渲染的input的name值
       layFilter: 'teacher',
@@ -201,7 +201,7 @@
     form.on('submit(add_keys)', function (data) {
       data.field.name = user_input.getValue()
       if (data.field.name == "") {
-        data.field.name = gon.teacher;
+        data.field.name = $("#"+user_input._input).val() // gon.teacher;
       }
 
       request.authPost("missions/follow_ups/" + parent.follow_up_id + "/add_keys", data.field, function (res) {

data/app/views/layouts/educode_sales/application.html.erb

@@ -72,7 +72,7 @@
               </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><a href="/missions/money_plans/list" class="<%= current?('layui-this', list_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>
             <% end %>
             <% if can? :read, EducodeSales::Customer %>

data/config/routes.rb

@@ -19,7 +19,8 @@ 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
@@ -62,6 +63,20 @@ 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
+    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/lib/educode_sales/version.rb

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