educode_sales 0.9.45 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 490547dd6002957fc97b49d5944e48b43476036a6f9090689c457ebdf0ad2167
-  data.tar.gz: e82a58a5dfdc42d2ad607f6c702a643ed3a91227a42771fdada0034b823340e9
+  metadata.gz: 7444b7d61d8ff5a5677b765e4d0580a49a3b425de52ffec51e0f4bce62b5d125
+  data.tar.gz: 2752a018874ad957014ceff871ee1ef7cb77d8ea0300c0da9a1112344c579d51
 SHA512:
-  metadata.gz: 42827e0c0a5c605af5bd4ecd2dd4dd82faed892a6697d3c8c684c6d4dd4a3c96e9c67e94e7fe20eedd68c6545dad6ab5a8e66b02f39a3f2048fa8afa0b994f0c
-  data.tar.gz: 25005c073e6b4f7bf406d6950907a3fe2a95fb68a14d45ade420a663a31d29795292e168614e61501f48c08e53d8b888ba72adac3fffb05bd299b0121d7a7237
+  metadata.gz: 5a4e87f3e97aa8604d7656e36e044943129e6ee19414bc5a2ba2d6d5d1f8150797d9a0cd0e254693f74535cde2d1f9aa9eb27027cdb2f6dfae548c3bd1276435
+  data.tar.gz: 05c6ce1070251dd40fb903ef901517228ebaddaa7690d84ac94f141768e6c065c0c31b7785d0eea71dc9aacba98ff548fb699b6a595a5877056c9b2a308c84d4

data/app/controllers/educode_sales/customers_controller.rb

@@ -33,6 +33,25 @@ module EducodeSales
       render_success
     end
 
+    def majors
+      department = Department.find(params[:id])
+      @majors = department.department_majors
+    end
+
+    def major
+      department = Department.find(params[:id])
+      major = department.department_majors.new(name: params[:name])
+      if major.save
+        render_success
+      else
+        render_failure major
+      end
+    end
+
+    def new_major
+      render layout: false
+    end
+
     def index
       authorize! :read, Customer
       respond_to do |format|
@@ -137,6 +156,26 @@ module EducodeSales
       end
     end
 
+    def update_major
+      department = Department.find(params[:id])
+      major = department.department_majors.find(params[:major_id])
+      if major.update(name: params[:name])
+        render_success
+      else
+        render_failure major
+      end
+    end
+
+    def delete_major
+      department = Department.find(params[:id])
+      major = department.department_majors.find(params[:major_id])
+      if major.destroy
+        render_success
+      else
+        render_failure major
+      end
+    end
+
     def give
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }

data/app/views/educode_sales/customers/edit_department.html.erb

@@ -16,7 +16,24 @@
       </div>
     </div>
   </form>
+  <div>
+    <table class="layui-hide" id="major_table" lay-filter="major_table"></table>
+  </div>
 </div>
+<script type="text/html" id="add_major">
+  <div class="layui-btn-container">
+    <span class="table-label">专业列表</span>
+    <% if can? :create_department, EducodeSales::Customer %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加专业</button>
+    <% end %>
+  </div>
+</script>
+<script type="text/html" id="tab_major">
+  <% if can? :update_department, EducodeSales::Customer %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs layui-btn-danger data-count-delete" lay-event="del">删除</a>
+ <% end %>
+</script>
 
 <script>
 
@@ -50,5 +67,106 @@
             })
             return false;
         });
+
+        table.render({
+          elem: '#major_table',
+          url: '/missions/customers/majors?id=' + parent.department_id ,
+          toolbar: '#add_major',
+          defaultToolbar: [],
+          cols: [
+            [
+              {
+                field: 'id',
+                width: 100,
+                title:'序号',type: 'numbers',
+              },
+              {
+                field: 'name',
+                title: '专业',
+              },
+              {
+                title: '操作',
+                width: 190,
+                toolbar: '#tab_major',
+                align: "center",
+                fixed: 'right'
+              }
+            ]
+          ],
+      });
+
+      table.on('toolbar(major_table)', function (obj) {
+        if (obj.event === 'add') {
+          department_id = parent.department_id;
+            var content = miniPage.getHrefContent('/missions/customers/new_major?id=' + parent.department_id);
+            var openWH = miniPage.getOpenWidthHeight();
+            new_major_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,
+              success: function (layero, index) {
+                form.render('select');
+              }
+            });
+            $(window).on("resize", function () {
+              layer.full(index);
+            });
+        }
     });
+    table.on('tool(major_table)', function (obj) {
+      if (obj.event == 'edit') { 
+        var index = layer.open({
+          title: '修改专业名称',
+          closeBtn: 0,
+          type: 1,
+          area: '400px;',
+          id: 'LAY_layuipro',
+          content: '<div class="layui-form" lay-filter="edit_data" style="padding: 20px;"><input autocomplete="off" type="text" name="name" lay-verify="required" class="layui-input" value="' + obj.data.name +'"/></div>' ,
+          btn: ['保存', '取消'],
+            btn1: function(index, l) {
+              if (l.find("input").val().trim() == '') {
+                layer.msg('名称不能为空')
+                return false;
+              } else {
+                  request.authPut("missions/customers/" + parent.department_id + "/update_major", {name: l.find("input").val().trim(), major_id: obj.data.id}, function(res) {
+                  if (res.success == false) {
+                    layer.alert(res.msg);
+                  } else {
+                    table.reload('major_table');
+                    parent.table.reload('sale_plan_follow_table');
+                    layer.close(index);
+                  }
+                })
+              }
+              
+              return false
+            },
+            btn2: function(index, l) {
+              layer.close(index)
+            }
+        });
+      } else if (obj.event == 'del') {
+        var index = layer.open({
+          content: '确定删除该专业 ' + obj.data.name + ' 吗',
+          yes: function(index, layero){
+            request.authDelete("missions/customers/" + parent.department_id  + "/delete_major?major_id=" + obj.data.id, {}, function(res) {
+              if (res.success == false) {
+                layer.alert(res.msg)
+              } else {
+                table.reload('major_table');
+                parent.table.reload('sale_plan_follow_table');
+                layer.close(index);
+              }
+            })
+          }
+        });  
+      }
+    })
+     
+  });
 </script>

data/app/views/educode_sales/customers/majors.json.jbuilder

@@ -0,0 +1,10 @@
+json.data do
+  i = 0
+  json.array! @majors do |d|
+    json.num i + 1
+    json.id d.id
+    json.name d.name
+  end
+end
+json.code 0
+json.count @majors.size

data/app/views/educode_sales/customers/new_major.html.erb

@@ -0,0 +1,40 @@
+<div class="layuimini-main">
+  <form class="layui-form  layuimini-form">
+    <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-form-item" style="padding: 25px">
+      <div class="layui-inline">
+        <label class="layui-form-label required">专业名称</label>
+        <div class="layui-input-block" style="width: 300px;">
+          <input type="text" name="name" required lay-verify="required" autocomplete="off" placeholder="请输入" class="layui-input" >
+        </div>
+      </div>
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_major_btn">提交</button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+      var form = layui.form,
+        request = layui.request,
+        $ = layui.$;
+
+      form.on('submit(add_major_btn)', function (data) {
+        data.field.school_id = parent.school_id
+        request.authPost("missions/customers/"+ parent.department_id +"/major", data.field, function (res) {
+            if (res.success === false) {
+                layer.alert(res.msg)
+            } else {
+              layer.close(parent.new_department_index); //关闭所有层
+              parent.table.reload('major_table');
+              parent.table.reload('sale_plan_follow_table');
+              layer.close(parent.new_major_index);
+            }
+        })
+        return false;
+      });
+    });
+</script>

data/app/views/educode_sales/customers/show_department.json.jbuilder

@@ -4,6 +4,7 @@ json.data do
     # json.created_at d.created_at.to_s
     # json.staff d.staff.user.real_name
     json.department d.name
+    json.department_major d.department_majors.pluck(:name).join("、")
     # json.content d.content
     # json.is_latest d.id == @latest.id
   end

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -51,6 +51,11 @@
                         {
                             field: 'department',
                             title: '学院/部门',
+                            width: 200,
+                        },
+                        {
+                          field: 'department_major',
+                          title: '专业',
                         },
                         {
                             title: '操作',
@@ -131,7 +136,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'edit') {
-                department_id = obj.data.id
+                department_id = obj.data.id;
                 content = miniPage.getHrefContent('/missions/customers/edit_department?id='+ obj.data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 edit_index1 = layer.open({

data/config/routes.rb

@@ -38,6 +38,8 @@ EducodeSales::Engine.routes.draw do
       get :edit_department
       get :give
       post :batch_update_school_tags
+      get :majors
+      get :new_major
     end
 
     member do
@@ -45,6 +47,9 @@ EducodeSales::Engine.routes.draw do
       put :update_follow_up
       post :create_department
       put :update_department
+      post :major
+      put :update_major
+      delete :delete_major
     end
   end
 

data/db/migrate/20230215141612_add_mobile_to_teachers.rb

@@ -0,0 +1,5 @@
+class AddMobileToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :mobile, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.45'
+  VERSION = '0.9.46'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.45
+  version: 0.9.46
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -274,9 +274,11 @@ files:
 - app/views/educode_sales/customers/give.html.erb
 - app/views/educode_sales/customers/index.html.erb
 - app/views/educode_sales/customers/index.json.jbuilder
+- app/views/educode_sales/customers/majors.json.jbuilder
 - app/views/educode_sales/customers/new.html.erb
 - app/views/educode_sales/customers/new_department.html.erb
 - app/views/educode_sales/customers/new_follow_record.html.erb
+- app/views/educode_sales/customers/new_major.html.erb
 - app/views/educode_sales/customers/show_department.json.jbuilder
 - app/views/educode_sales/customers/show_follow.html.erb
 - app/views/educode_sales/customers/show_follow.json.jbuilder
@@ -493,6 +495,7 @@ files:
 - db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
 - db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb
 - db/migrate/20230209102302_create_educode_sales_staff_permissions.rb
+- db/migrate/20230215141612_add_mobile_to_teachers.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb