educode_sales 0.3.4 → 0.3.8

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -86,7 +86,7 @@
       var data = obj.data;
       if (obj.event === 'show_follow') {
         id = data.business_id
-        content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + data.business_id);
+        content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
         title: '商机列表/'+ data.business_name + '的跟进记录',
@@ -106,7 +106,7 @@
 
     table.render({
     elem: '#showWeeklyTable',
-    url: '/educode_sales/sale_reports/' + "<%= @sale_report.id%>"+ '/plans',
+    url: '/missions/sale_reports/' + "<%= @sale_report.id%>"+ '/plans',
     defaultToolbar: [],
     cols: [
       [

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -193,7 +193,7 @@
               data[el] = this.value;
               var self = this;
               data['year'] = year;
-              request.post( 'educode_sales/sale_trends/sale_trends',
+              request.post( 'missions/sale_trends/sale_trends',
                 data,
                 function(res) {
                   $("#" + el + "_field").addClass("layui-hide");
@@ -208,7 +208,7 @@
         form.on('select(year)', function(data){
           console.log(data, )
           year = data.value
-          window.location.href = "/educode_sales/sale_trends/trends?year=" + data.value
+          window.location.href = "/missions/sale_trends/trends?year=" + data.value
         })
     
         editForm("chance_money");

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

@@ -10,12 +10,12 @@
 </script>
 <script type="text/html" id="business_a">
   <div class="layui-text">
-   <a href="/educode_sales/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
+   <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
   </div>
 </script>
 <script type="text/html" id="business_b">
   <div class="layui-text">
-    <a href="/educode_sales/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
+    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
   </div>
 </script>
 <script>
@@ -24,7 +24,7 @@
 
     table.render({
       elem: '#table',
-      url: '/educode_sales/sales',
+      url: '/missions/sales',
       cellMinWidth: 80,
       cols: [
         [{
@@ -59,7 +59,6 @@
           }
         ]
       ],
-      height: 700,
       limit: 20,
       page: true
     });

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

@@ -6,7 +6,7 @@ json.data do
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.business_a d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
     json.business_b d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
-    json.goal d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.stage_id in (?)", @step_ids).sum(:total_amount)
+    json.goal d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.stage_id in (?)", @step_ids).sum(:total_amount).round(2)
     json.return_money  d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").sum("educode_sales_businesses.return_money")
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id

data/app/views/educode_sales/sales/operations.html.erb

@@ -30,7 +30,7 @@
 
         table.render({
             elem: '#oper_table',
-            url: '/educode_sales/sales/operations',
+            url: '/missions/sales/operations',
             defaultToolbar: [],
             cols: [
                 [{
@@ -61,7 +61,6 @@
                 },
                 ]
             ],
-            height: 700,
             limit: 20,
             page: true
         });
@@ -72,7 +71,7 @@
             id = data.id
             if (obj.event === 'school') {
                 console.log("aa");
-                var content = miniPage.getHrefContent('/educode_sales/sales/school');
+                var content = miniPage.getHrefContent('/missions/sales/school');
                 var openWH = miniPage.getOpenWidthHeight();
                 staff_id = data.id
                 sindex = layer.open({
@@ -90,7 +89,7 @@
                 });
                 return false;
             } else if (obj.event === 'xschool') {
-                var content = miniPage.getHrefContent('/educode_sales/sales/xschool');
+                var content = miniPage.getHrefContent('/missions/sales/xschool');
                 var openWH = miniPage.getOpenWidthHeight();
                 staff_id = data.id;
                 sindex = layer.open({

data/app/views/educode_sales/sales/school.html.erb

@@ -5,7 +5,7 @@
             table = layui.table
         table.render({
           elem: '#follow_up_schoolTable',
-          url: '/educode_sales/staffs/' + parent.staff_id + "/follow_up_schools",
+          url: '/missions/staffs/' + parent.staff_id + "/follow_up_schools",
           defaultToolbar: [],
           cols: [
             [

data/app/views/educode_sales/sales/trends.html.erb

@@ -186,7 +186,7 @@
               var self = this;
               data['year'] = year;
               console.log(data, $("#years").value, year)
-              request.post( '/educode_sales/sales/sale_trends',
+              request.post( '/missions/sales/sale_trends',
                 data,
                 function(res) {
                   $("#" + el + "_field").addClass("layui-hide");
@@ -202,7 +202,7 @@
         form.on('select(year)', function(data){
           console.log(data, )
           year = data.value
-          window.location.href = "/educode_sales/sales/trends?year=" + data.value
+          window.location.href = "/missions/sales/trends?year=" + data.value
         })
     
         editForm("chance_money");

data/app/views/educode_sales/sales/xschool.html.erb

@@ -7,7 +7,7 @@
             miniPage = layui.miniPage;
         table.render({
             elem: '#follow_up_departmentsTable',
-            url: '/educode_sales/staffs/' + parent.staff_id + "/follow_up_departments",
+            url: '/missions/staffs/' + parent.staff_id + "/follow_up_departments",
             defaultToolbar: [],
             cols: [
               [

data/app/views/educode_sales/sessions/login.html.erb

@@ -67,7 +67,7 @@
       }
      
       $.ajax({
-        url: '/educode_sales/sessions',
+        url: '/missions/sessions',
         method: 'POST',
         dataType: 'json',
         headers: {
@@ -75,7 +75,7 @@
         },
         data: { account: data.username, password: data.password},
         success: function(data){
-          window.location = '/educode_sales';
+          window.location = '/missions';
         },
         error: function(res){
           layer.msg(res.responseJSON.msg);

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

@@ -97,7 +97,7 @@
                 return false;
             }
             data.field['area_ids'] = area_ids;
-            request.authPut("educode_sales/staffs/" + parent.staff_id, data.field, function (res) {
+            request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -24,7 +24,7 @@
     table = layui.table
     table.render({
       elem: '#staff_filter',
-      url: '/educode_sales/staffs',
+      url: '/missions/staffs',
       toolbar: '#staff_topbar',
       defaultToolbar: [],
       cols: [
@@ -72,7 +72,6 @@
           }
         ]
       ],
-      height: 700,
       limit: 20,
       page: true,
       skin: 'line'
@@ -80,7 +79,7 @@
 
     table.on('toolbar(staff_filter)', function (obj) {
       if (obj.event === 'add') { // 监听添加操作
-        var content = miniPage.getHrefContent('/educode_sales/staffs/new');
+        var content = miniPage.getHrefContent('/missions/staffs/new');
         var openWH = miniPage.getOpenWidthHeight();
         index = layer.open({
             title: '添加人员',
@@ -102,7 +101,7 @@
       staff_id = data.id;
       if (obj.event === 'edit') {
 
-        var content = miniPage.getHrefContent('/educode_sales/staffs/' + data.id + '/edit');
+        var content = miniPage.getHrefContent('/missions/staffs/' + data.id + '/edit');
         var openWH = miniPage.getOpenWidthHeight();
 
         index = layer.open({
@@ -121,14 +120,14 @@
         return false;
       } else if (obj.event === 'disable') {
         layer.confirm('确定禁用' + data.name, function (index) {
-          request.delete('educode_sales/staffs/'+ data.id + "/disable", {}, function(res) {
+          request.delete('missions/staffs/'+ data.id + "/disable", {}, function(res) {
             layer.close(index);
             table.reload("staff_filter")
           })
         });
       } else if (obj.event === 'delete') {
         layer.confirm('确定删除' + data.name, function (index) {
-          request.delete('educode_sales/staffs/'+ data.id, {}, function(res) {
+          request.delete('missions/staffs/'+ data.id, {}, function(res) {
             layer.close(index);
             table.reload("staff_filter")
           })

data/app/views/educode_sales/staffs/new.html.erb

@@ -43,7 +43,7 @@
           if (!value) {
             return cb([]);
           }
-          request.get('educode_sales/search_users?q=' + value, {}, function(res) {
+          request.get('missions/search_users?q=' + value, {}, function(res) {
             return cb(res)
           })
         }
@@ -58,7 +58,7 @@
             if (ins.getValue() == "") {
                 return layer.alert("请选择平台用户")
             }
-            request.authPost("educode_sales/staffs", {id: ins.getValue()}, function (res) {
+            request.authPost("missions/staffs", {id: ins.getValue()}, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {

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

@@ -49,7 +49,7 @@
         //监听提交
         form.on('submit(add_course)', function (data) {
             console.log(data.field)
-            request.authPost('educode_sales/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
+            request.authPost('missions/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
@@ -68,7 +68,7 @@
 
         table.render({
             elem: '#coursesTable',
-            url: '/educode_sales/teachers/' + parent.id + "/course_subject",
+            url: '/missions/teachers/' + parent.id + "/course_subject",
             defaultToolbar: [],
             cols: [
                 [
@@ -108,7 +108,7 @@
             var data = obj.data;
             if (obj.event === 'edit') {
                 console.log(data);
-                request.authPut('educode_sales/teachers/' + data.id + '/update_course/', data,
+                request.authPut('missions/teachers/' + data.id + '/update_course/', data,
                     function(res) {
                         if (res.success) {
                             table.reload('coursesTable');
@@ -120,7 +120,7 @@
             } else if (obj.event === 'delete') {
                 console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/teachers/' + data.id + '/delete_course/', {}, function (res) {
+                    request.delete('missions/teachers/' + data.id + '/delete_course/', {}, function (res) {
                         layer.close(index);
                         table.reload("teachers_table")
                         table.reload('coursesTable');

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

@@ -17,7 +17,7 @@
             miniPage = layui.miniPage;
         table.render({
             elem: '#eventTable',
-            url: '/educode_sales/teachers/activities?id=' + parent.teacher_id,
+            url: '/missions/teachers/activities?id=' + parent.teacher_id,
             defaultToolbar: [],
             cols: [
                 [

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

@@ -4,21 +4,28 @@
     <fieldset class="table-search-fieldset">
       <legend>添加关键人</legend>
       <div class="layui-form-item">
+        <div class="layui-input-inline" style="width: 610px;">
         <label class="layui-form-label required">姓名</label>
         <div class="layui-input-block">
           <div class="" id="teacher"></div>
         </div>
+        </div>
+        <div class="layui-input-inline" style="width: 610px;" id="professional_title_div">
+          <p style="padding-top: 6px">关键人未在头歌主站注册时，请先将关键人添加到教师运营列表。
+            <a style="color: #0000FF" href="javascript:void(0);"  id="new_teacher1" >添加老师</a>
+          </p>
+        </div>
       </div>
       <div class="layui-form-item">
         <div class="layui-input-inline" style="width: 300px;">
-          <label class="layui-form-label required">职务</label>
+          <label class="layui-form-label ">职务</label>
           <div class="layui-input-block">
-            <input type="text" name="job" autocomplete="off" lay-verify="required" lay-reqtext="职务不能为空"
+            <input type="text" name="job" autocomplete="off"
               placeholder="请输入职务" class="layui-input" id="add_job" value="<%= @person&.job %>">
           </div>
         </div>
         <div class="layui-input-inline" style="width: 300px;" id="professional_title_div">
-          <label class="layui-form-label required">职称</label>
+          <label class="layui-form-label ">职称</label>
           <div class="layui-input-block">
             <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), class: 'required' %>
           </div>
@@ -32,18 +39,27 @@
           </div>
         </div>
         <div class="layui-input-inline" style="width: 300px;">
-          <label class="layui-form-label required">态度</label>
+          <label class="layui-form-label ">态度</label>
           <div class="layui-input-block">
-            <%= select_tag "attitude_id", options_for_select(@attitudes, @person&.attitude_id), {"lay-verify": "required", include_blank: true} %>
+            <%= select_tag "attitude_id", options_for_select(@attitudes, @person&.attitude_id), {include_blank: true} %>
           </div>
         </div>
       </div>
-      <div class="llayui-form-item">
+      <div class="layui-form-item">
+        <div class="layui-input-inline" style="width: 300px;">
         <label class="layui-form-label">生日</label>
         <div class="layui-input-block" style="width: 190px;">
           <input type="text" class="layui-input" name="birth_date" autocomplete="off" value="<%= @person&.birth_date %>"
             id="birth" placeholder="请选择生日">
         </div>
+        </div>
+        <div class="layui-input-inline" style="width: 300px;">
+          <label class="layui-form-label ">联系方式</label>
+          <div class="layui-input-block">
+            <input type="text" class="layui-input" name="tel" autocomplete="off" value=""
+                   id="tel" placeholder="请输入联系方式">
+          </div>
+        </div>
       </div>
       <div class="layui-form-item layui-form-text m-t-20">
         <label class="layui-form-label">其它信息</label>
@@ -70,8 +86,10 @@
      <select name="attitude_id" lay-filter="select_attitude_id">
        {{# layui.each(gon.attitudes, function(i, data) { }}
          {{# if (data[1] == d.attitude_id) { }}
+       <option value=""></option>
           <option value="{{data[1]}}" selected="{{data[0]}}">{{data[0]}}</option>
          {{# } else { }}
+       <option value=""></option>
           <option value="{{data[1]}}">{{data[0]}}</option>
          {{# }}}
           
@@ -113,7 +131,8 @@
       table = layui.table,
       laytpl = layui.laytpl,
       laydate = layui.laydate,
-      request = layui.request,
+        miniPage = layui.miniPage,
+        request = layui.request,
       selectInput = layui.selectInput,
       $ = layui.$;
 
@@ -122,6 +141,25 @@
       elem: '#birth'
     })
 
+      $(document).on('click','#new_teacher1',function(){
+          var content = miniPage.getHrefContent('/missions/teachers/new');
+          var openWH = miniPage.getOpenWidthHeight();
+          sindex = layer.open({
+              id:"a",
+              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);
+          });
+      });
+
     var user_input = selectInput.render({
       elem: '#teacher',
       name: 'name', // 渲染的input的name值
@@ -138,7 +176,7 @@
         if (!value) {
           return cb([]);
         }
-        request.get('educode_sales/search_teacher?q=' + value, {}, function(res) {
+        request.get('missions/search_teacher?q=' + value, {}, function(res) {
           return cb(res)
         })
       }
@@ -166,7 +204,7 @@
         data.field.name = gon.teacher;
       }
 
-      request.authPost("educode_sales/follow_ups/" + parent.follow_up_id + "/add_keys", data.field, function (res) {
+      request.authPost("missions/follow_ups/" + parent.follow_up_id + "/add_keys", data.field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
@@ -181,7 +219,8 @@
             'birth_date': '',
             'sex': '',
             'attitude_id': '',
-            'remark': ''
+            'remark': '',
+            'tel': ''
           })
         }
       })
@@ -190,7 +229,7 @@
 
     table.render({
       elem: '#key_person',
-      url: '/educode_sales/follow_ups/' + parent.follow_up_id + '/teachers',
+      url: '/missions/follow_ups/' + parent.follow_up_id + '/teachers',
       cols: [
         [{
           field: 'id',
@@ -227,6 +266,12 @@
           templet:function (d) {
             return '<input type="text" class="layui-input layui-input-date" value="'+ (d.birth_date  || '') +'" autocomplete="off">'
           }
+        }, {
+          field: 'tel',
+          width: 200,
+          title: '联系方式',
+          edit: true
+        }, {
         }, {
           field: 'remark',
           width: 200,
@@ -265,7 +310,7 @@
       data.attitude_id = attitude_id;
       data.sex = sex;
       if (obj.event === 'edit') {
-        request.authPut('educode_sales/key_person/' + data.id, data,
+        request.authPut('missions/key_person/' + data.id, data,
           function (res) {
             if (res.success) {
               table.reload('key_person')
@@ -276,7 +321,7 @@
           })
       } else if (obj.event == 'delete') {
         layer.confirm('确定删除关键人' + data.name, function (index) {
-          request.delete('educode_sales/key_person/'+ data.id, {}, function(res) {
+          request.delete('missions/key_person/'+ data.id, {}, function(res) {
             layer.close(index);
             table.reload("key_person")
             table.reload("sale_plan_follow_table")

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

@@ -76,7 +76,7 @@
                 if (!value) {
                     return cb([]);
                 }
-                request.get('educode_sales/search?type=department&q=' + value, {}, function (res) {
+                request.get('missions/search?type=department&q=' + value, {}, function (res) {
                     return cb(res)
                 })
             }
@@ -98,7 +98,7 @@
               if (!value) {
                 return cb([]);
               }
-              request.get('educode_sales/search_edu_teacher?q=' + value, {}, function (res) {
+              request.get('missions/search_edu_teacher?q=' + value, {}, function (res) {
                   console.log(res);
                   return cb(res)
               })
@@ -127,13 +127,15 @@
             }
             data.field.department_id = department_id;
             data.field.user_id = user_id;
-            request.authPut("educode_sales/teachers/"+ parent.teacher_id, data.field, function (res) {
+            request.authPut("missions/teachers/"+ parent.id, data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
                     layer.close(parent.sindex);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('teachers_table')
+                    parent.table.reload('teachers_table', {done: function() {
+                            parent.drowpdwonRender()
+                        }});
                 }
             })
 

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

@@ -65,7 +65,7 @@
         form.render();
 
         form.on('submit(edit_follow_up)', function (data) {
-            request.authPut("educode_sales/teacher_follows/<%= @follow_up.id%>", data.field, function (res) {
+            request.authPut("missions/teacher_follows/<%= @follow_up.id%>", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {