educode_sales 0.9.79 → 0.9.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35598f2024ca7c1f138093b0fcd9dce947d35d35ebb6a96f4b943c808c52c85
-  data.tar.gz: a7e7602b92b9050a05fba0e97904ba1689fe0becb716ce81a9593db50c7668f9
+  metadata.gz: 2a02f50d9c3e88bb55ba6352183871b6e80eaabd42e2f32640043cc140255560
+  data.tar.gz: 6fd1ff6c5df5d5b53c72399e370c0c15bb37da1fae1e8a6f1bd626da81d8ddf1
 SHA512:
-  metadata.gz: b765e6ce6015e1253d0352cda77169bc34c1b43d60fd6eac60975099a15d9459eee2fae17f1f81adbd52cb50f99c6ef40b619426e1b9c5b7df769da6c6b87ba0
-  data.tar.gz: e4df5cae9dfe1a18e38ad5a8fade16aa9e73d710d31515c8ec8faa24253a07a4d9aaba78c76ce2732d297577caa0aaab58d3d350736834cec467dfe4d426be49
+  metadata.gz: a41df2eb05cc02587e6c4d4fa800b5e1048f01f3e1c53498c2f6dc61d1dbd6bcf13188eeab9d0e14d0b0da4f52f553b593ad1f4394613c416f4fa89caec3c9d5
+  data.tar.gz: 04a3399b18c8cb0b62c016591be00a668996b5c4a62434ab913d511564ea1cb7666e2af1a2197c9fd8dcaef85e7292a5c6c2d473105f379d8868fb8d0abaabc5

data/app/controllers/educode_sales/businesses_controller.rb

@@ -315,6 +315,8 @@ module EducodeSales
              
           end
 
+          @business_count = @businesses.distinct.count
+          
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -325,7 +327,6 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-          @business_count = @businesses.distinct.count
           # mysql -select
           watch_sql = " "
           unless @current_admin.is_admin?

data/app/controllers/educode_sales/contracts_controller.rb

@@ -233,6 +233,15 @@ module EducodeSales
       @business = Business.find(params[:id])
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      signed_department = @last_follow_up.signed_department
+      if signed_department
+        gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
+        gon.value = signed_department.id
+      else
+        gon.department = {}
+        gon.value = ''
+      end
+     
       render layout: false
     end
 

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

@@ -113,7 +113,11 @@
 
 </script>
 
-
+<script type="text/html" id="toolbar_contract">
+  <div class="layui-btn-container">
+    <span class="table-label">合同列表</span>
+  </div>
+</script>
 <script>
   layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect'], function () {
       var $ = layui.jquery,
@@ -441,15 +445,15 @@
       return false;
     });
       var business_table = table.render({
-          elem: '#contact_table',
-          url: '/missions/contracts',
-          autoSort: false,
-          where: {q: data},
-          defaultToolbar: ['filter'],
-          title: '合同数据表',
-          totalRow: true,//开启合并行
-          cols: cols_table,
-
+        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,

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

@@ -103,20 +103,20 @@
     <div class="layui-inline">
         <label class="layui-form-label">计划签单时间：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-        <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off">
+        <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off" value="<%= @last_follow_up&.plan_signed_date %>">
         </div>
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">中标后：</label>
         <div class="layui-input-inline" style="line-height: 38px;width:60px;">
-          <input type="text" class="layui-input" name="bidded_days" autocomplete="off">
+          <input type="text" class="layui-input" name="bidded_days" autocomplete="off" value="<%= @last_follow_up&.bidded_days %>">
         </div>
         <div class="layui-form-mid layui-word-aux">天</div>
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">实际签单时间：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-        <input type="text" class="layui-input date" name="signed_date" autocomplete="off">
+        <input type="text" class="layui-input date" name="signed_date" autocomplete="off" value="<%= @last_follow_up&.signed_date %>">
         </div>
     </div>
     <div class="layui-inline">
@@ -600,21 +600,22 @@
             });
         })
 
-
-        var add_department_select = selectInput.render({
+         var signed_department_id = gon.value;
+         var add_department_select = selectInput.render({
             elem: '#add_department',
-            name: 'signed_departmen', // 渲染的input的name值
+            name: 'signed_department', // 渲染的input的name值
             layFilter: 'test', //同layui form参数lay-filter
           //  layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
             layReqText: '请填写文本', //同layui form参数lay-ReqText
-            initValue: '', // 渲染初始化默认值
+            initValue: gon.value, // 渲染初始化默认值
             hasSelectIcon: false,
             placeholder: '请输入头歌平台上单位部门', // 渲染的inputplaceholder值
-            data: [],
+            data: [gon.department],
             remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
             remoteMethod: function (value, cb) { // 远程搜索的回调函数
               if (!value) {
+                signed_department_id = "";
                 return cb([]);
               }
               request.get('missions/search?type=department&q=' + value, {}, function (res) {
@@ -626,7 +627,7 @@
         form.on('submit(add_follow_up)', function (data) {
             $(".submit-btn").addClass("layui-hide");
             data.field.business_id = "<%= @business.id %>";
-            data.field.signed_department_id = add_department_select.getValue(),
+            data.field.signed_department_id = add_department_select.getValue() || signed_department_id;
             Rails.ajax({
                 url: "/missions/contracts/add_follow_ups",
                 type: 'POST',

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

@@ -16,5 +16,5 @@
   <%= yield %>
 </div>
 <div class="footer">
-  ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官网</a>
+  ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官方网站</a>
 </div>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.79'
+  VERSION = '0.9.81'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.79
+  version: 0.9.81
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -670,7 +671,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -685,8 +686,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []