educode_sales 1.10.59 → 1.10.71

data/app/views/educode_sales/contracts/_list.html.erb

@@ -141,7 +141,10 @@
   </div>
 </script>
 <script>
-  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect'], function () {
+  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect', 'functions'], function () {
+      var layer = layui.layer;
+      var functions = layui.functions;
+
       var $ = layui.jquery,
           form = layui.form,
           request = layui.request,
@@ -239,267 +242,275 @@
     })
     index_place_list.setValue(gon.place)
 
-
-      var data = form.val("search_form");
-      table = layui.table;
-      var cols_table = [
-          [
-              {
-                  field: 'id',
-                  width: 60,
-                  title: '序号', type: 'numbers',
-                  totalRowText: '合计',
-                  fixed: "left"
-              },
-              {
-                  field: 'number',
-                  width: 120,
-                  title: '编号',
-                  fixed: 'left',
-              },
-              {
-                  field: 'name',
-                  width: 170,
-                  title: '商机名称',
-                  templet: '<div><a href="javascript:void(0);" class="layui-table-link" lay-event="show_business"><span title="{{d.name}}">{{d.name}}</span></a></div>',
-                  fixed: 'left',
-              },
-              {
-                field: 'name',
+    var data = form.val("search_form");
+    table = layui.table;
+    var cols_table = [
+            {
+                field: 'id',
+                width: 60,
+                title: '序号', type: 'numbers',
+                totalRowText: '合计',
+                fixed: "left"
+            },
+            {
+                field: 'number',
                 width: 120,
-                title: '合同名称',
-              },
-              {
-                  field: 'area',
-                  width: 100,
-                  title: '地域',
-              },
-              {
-                  field: 'school',
-                  width: 150,
-                  title: '用户单位',
-                  templet: '#school_name',
-              },
-              {
-                  field: 'property',
-                  width: 150,
-                  title: '客户类型',
-              },
-              {
-                  field: 'department',
-                  width: 150,
-                  title: '部门',
-                  templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
-              },
-              {
-                  field: 'follow_ups_count',
-                  title: '跟进',
-                  width: 60,
-                  templet: '#show_follow',
-                  totalRow: true,
-              },
-              {
-                  field: 'clazz',
-                  width: 80,
-                  title: '类型',
-                  templet: "<div><span title='{{d.clazz}}' class='changed-{{d.clazz_changed}}'>{{d.clazz}}</span></div>",
-              },
-              {
-                  field: 'stage',
-                  width: 90,
-                  title: '阶段',
-              },
-              {
-                field: 'staff_manages',
+                title: '编号',
+                fixed: 'left',
+            },
+            {
+                field: 'bname',
+                width: 170,
+                title: '商机名称',
+                templet: '<div><a href="javascript:void(0);" class="layui-table-link" lay-event="show_business"><span title="{{d.name}}">{{d.name}}</span></a></div>',
+                fixed: 'left',
+            },
+            {
+              field: 'name',
+              width: 120,
+              title: '合同名称',
+            },
+            {
+                field: 'area',
+                width: 100,
+                title: '地域',
+            },
+            {
+                field: 'school',
                 width: 150,
-                title: '销售经理',
-              },
-              {
-                field: 'assign_staffs',
+                title: '用户单位',
+                templet: '#school_name',
+            },
+            {
+                field: 'property',
                 width: 150,
-                title: '售后工程师',
-              },
-              {
-                  field: 'source',
-                  width: 90,
-                  title: '商机来源',
-              },
-              {
-                  field: 'last_follow_person',
-                  width: 100,
-                  title: '最新跟进人',
-              },
-              {
-                  field: 'no_followup_days',
-                  width: 100,
-                  title: '无跟进天数',
-              },
-              {
-                  field: 'created_at',
-                  width: 200,
-                  title: '商机创建时间',
-                  sort: true,
-              },
-              {
-                  field: 'latest_time',
-                  width: 200,
-                  title: '最新跟进时间',
-                  sort: true,
-              },
-              {
-                  field: 'invitation_at',
-                  width: 105,
-                  title: '计划投标时间',
-                  sort: true,
-              },
-              {
-                  field: 'bidded_date',
-                  width: 105,
-                  title: '中标时间',
-                  sort: true,
-              },
-              {
-                  field: 'signed_date',
-                  width: 105,
-                  title: '签单时间',
-                  sort: true,
-              },
-              {
-                  field: 'reception_at',
-                  width: 105,
-                  title: '验收时间',
-                  sort: true,
-              },
-              {
-                  field: 'service_end_time',
-                  width: 200,
-                  title: '服务期',
-                  sort: true,
-              },
-              {
-                  field: 'o_business_deployment',
-                  width: 150,
-                  title: '部署类型',
-                  sort: true,
-              },
-              {
-                  field: 'p_deploy_time',
-                  width: 150,
-                  title: '部署时间',
-                  sort: true,
-              },
-              {
-                  field: 'budget_amount',
-                  width: 105,
-                  title: '预算金额',
-                  totalRow: true,
-                  sort: true,
-              },
-              {
-                  field: 'total_amount',
-                  width: 100,
-                  title: '中标额',
-                  totalRow: true,
-                  sort: true,
-              },
-              {
-                  field: 'actual_amount',
-                  width: 100,
-                  title: '合同额',
-                  totalRow: true,
-                  sort: true,
-              },
-              {
-                  field: 'return_money',
-                  width: 100,
-                  title: '回款',
-                  sort: true,
-                  totalRow: true,
-              },
-              {
-                  field: 'wait_return_money',
-                  width: 100,
-                  title: '待回款',
-                  sort: true,
-                  totalRow: true,
-              },
-              {
-                  field: 'return_money_days',
-                  width: 150,
-                  title: '首次回款周期(天)',
-              },
-              {
-                field: 'divide_rate',
-                width: 160,
-                title: '渠道分成比例',
+                title: '客户类型',
+            },
+            {
+                field: 'department',
+                width: 150,
+                title: '部门',
+                templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
+            },
+            {
+                field: 'follow_ups_count',
+                title: '跟进',
+                width: 60,
+                templet: '#show_follow',
+                totalRow: true,
+            },
+            {
+                field: 'clazz',
+                width: 80,
+                title: '类型',
+                templet: "<div><span title='{{d.clazz}}' class='changed-{{d.clazz_changed}}'>{{d.clazz}}</span></div>",
+            },
+            {
+                field: 'stage',
+                width: 90,
+                title: '阶段',
+            },
+            {
+              field: 'staff_manages',
+              width: 150,
+              title: '销售经理',
+            },
+            {
+              field: 'assign_staffs',
+              width: 150,
+              title: '售后工程师',
+            },
+            {
+                field: 'source',
+                width: 90,
+                title: '商机来源',
+            },
+            {
+                field: 'last_follow_person',
+                width: 100,
+                title: '最新跟进人',
+            },
+            {
+                field: 'no_followup_days',
+                width: 100,
+                title: '无跟进天数',
+            },
+            {
+                field: 'created_at',
+                width: 200,
+                title: '商机创建时间',
                 sort: true,
-              },
-              {
-                field: 'divide_money',
-                width: 160,
-                title: '渠道分成金额',
+            },
+            {
+                field: 'latest_time',
+                width: 200,
+                title: '最新跟进时间',
                 sort: true,
-              },
-              {
-                field: 'place',
-                width: 160,
-                title: '渠道',
-              },
-              {
-                field: 'sale_way',
-                width: 160,
-                title: '销售方式',
-              },
-              {
-                  field: 'year',
-                  width: 105,
-                  title: '所属年度',
-                  sort: true,
-              },
-              {
-                  field: 'followed',
-                  templet:function(d){
-                      if (d.followed==1){
-                          return  '<i class="layui-icon" style="color: goldenrod">&#xe658;</i> '
-                      }
-                      else return ''
-                  },
-                  width: 105,
-                  title: '关注',
-                  align: "center",
-
-              },
-              {
-                   title: '操作',
-                   minWidth: 300,
-                   toolbar: '#currentTableBar',
-                  align: "center",
-                  fixed: 'right'
-              }
-          ]
-      ]
+            },
+            {
+                field: 'invitation_at',
+                width: 105,
+                title: '计划投标时间',
+                sort: true,
+            },
+            {
+                field: 'bidded_date',
+                width: 105,
+                title: '中标时间',
+                sort: true,
+            },
+            {
+                field: 'signed_date',
+                width: 105,
+                title: '签单时间',
+                sort: true,
+            },
+            {
+                field: 'reception_at',
+                width: 105,
+                title: '验收时间',
+                sort: true,
+            },
+            {
+                field: 'service_end_time',
+                width: 200,
+                title: '服务期',
+                sort: true,
+            },
+            {
+                field: 'o_business_deployment',
+                width: 150,
+                title: '部署类型',
+                sort: true,
+            },
+            {
+                field: 'p_deploy_time',
+                width: 150,
+                title: '部署时间',
+                sort: true,
+            },
+            {
+                field: 'budget_amount',
+                width: 105,
+                title: '预算金额',
+                totalRow: true,
+                sort: true,
+            },
+            {
+                field: 'total_amount',
+                width: 100,
+                title: '中标额',
+                totalRow: true,
+                sort: true,
+            },
+            {
+                field: 'actual_amount',
+                width: 100,
+                title: '合同额',
+                totalRow: true,
+                sort: true,
+            },
+            {
+                field: 'return_money',
+                width: 100,
+                title: '回款',
+                sort: true,
+                totalRow: true,
+            },
+            {
+                field: 'wait_return_money',
+                width: 100,
+                title: '待回款',
+                sort: true,
+                totalRow: true,
+            },
+            {
+                field: 'return_money_days',
+                width: 150,
+                title: '首次回款周期(天)',
+            },
+            {
+              field: 'divide_rate',
+              width: 160,
+              title: '渠道分成比例',
+              sort: true,
+            },
+            {
+              field: 'divide_money',
+              width: 160,
+              title: '渠道分成金额',
+              sort: true,
+            },
+            {
+              field: 'place',
+              width: 160,
+              title: '渠道',
+            },
+            {
+              field: 'sale_way',
+              width: 160,
+              title: '销售方式',
+            },
+            {
+                field: 'year',
+                width: 105,
+                title: '所属年度',
+                sort: true,
+            },
+            {
+                field: 'followed',
+                templet:function(d){
+                    if (d.followed==1){
+                        return  '<i class="layui-icon" style="color: goldenrod">&#xe658;</i> '
+                    }
+                    else return ''
+                },
+                width: 105,
+                title: '关注',
+                align: "center",
 
+            },
+            {
+                 title: '操作',
+                 minWidth: 300,
+                 toolbar: '#currentTableBar',
+                align: "center",
+                fixed: 'right'
+            }
+        ];
+    functions.initTableColumnsFilter('contact_table', cols_table);
 
     form.on('submit(show_hide_contract)', function (data) {
       $(".show_item_contract").toggle()
       return false;
     });
-      var contract_table = table.render({
-        elem: '#contact_table',
-       // url: '/missions/contracts',
-        autoSort: false,
-        where: {q: data},
-        defaultToolbar: ['filter'],
-        title: '合同数据表',
-        totalRow: true,//开启合并行
-        cols: cols_table,
-        toolbar: '#toolbar_contract',
-        limit: 20,
-        limits: [10,15,20,30,40,50,60,70,80,90],
-        page: true,
-        skin: 'line',
+    var contract_table = table.render({
+      elem: '#contact_table',
+     // url: '/missions/contracts',
+      autoSort: false,
+      where: {q: data},
+      defaultToolbar: ['filter'],
+      title: '合同数据表',
+      totalRow: true,//开启合并行
+      cols: [cols_table],
+      toolbar: '#toolbar_contract',
+      limit: 20,
+      limits: [10,15,20,30,40,50,60,70,80,90],
+      page: true,
+      skin: 'line',
+      done: function () {
+          var that = this;
+          functions.observerTableColumnFilter(that);
+      }
     });
 
+      // 获取上次的筛选状态
+      var savedFilter = localStorage.getItem('tableFilter.contracts');
+      if (savedFilter) {
+          var filterObj = JSON.parse(savedFilter);
+          table.reload('contact_table', { where: filterObj });
+      }
+
     if (gon.bidded_date) {
       table.reload('contact_table', {
           url: '/missions/contracts',
@@ -582,6 +593,29 @@
           }
       });
 
+      table.on('filter(contact_table)', function (obj) {
+          console.log(obj.event);
+          if (obj.event === 'export') { //导出
+              layer.load(0, {});
+              var data = form.val("search_form");
+              var business_step = [];
+              business_step_list.getValue().forEach(function(d) {
+                  business_step.push(d.value);
+              });
+              data.business_step = business_step.toString();
+              request.authGet("missions/contracts?" + $.param({q:data}), {
+              }, function (res) {
+                  data = res.data;
+                  table.exportFile(contract_table.config.id, data, 'xls');
+                  layer.closeAll('loading');
+              })
+          } else if (obj.event === 'filter') {
+              console.log(11111);
+              var filter = table.filter('contact_table'); // 获取当前的筛选状态
+              localStorage.setItem('tableFilter.contracts', JSON.stringify(filter)); // 保存筛选状态
+          }
+      });
+
       table.on('tool(contact_table)', function (obj) {
           var data = obj.data;
           id = data.id

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

@@ -26,7 +26,7 @@ json.data do
     json.created_at d.created_at.to_s
     json.no_followup_days (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
 
-    json.staff_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
+    json.staff_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user&.real_name}.join("、")) : d.staff&.user&.real_name
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0

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

@@ -12,7 +12,7 @@ json.data do
     json.business d.business.name
     json.business_id d.business.id
     json.rival d.rival || ''
-    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
+    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
     # teacher_ids = d.key_person.pluck(:teacher_id)
     json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
     json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)