educode_sales 0.9.98 → 0.9.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc83991c421ec745be1b0b4e1b78bd38327b29c3463e1ed43e0253a602305ffa
-  data.tar.gz: 237c8dfda5375b0ca1fdf8672361890f2acbb2054fa974b089d41de26fbbb130
+  metadata.gz: 8d3b1f62cddc62c5e2d319320a0b53622d8c610a565923613fee6cf6cedcacb9
+  data.tar.gz: 882b25401c7319bed2b1de0eca8e331a58ed46976ea6d1fff5425758ddd6ced5
 SHA512:
-  metadata.gz: 5798c8ef35a26bbd366b2ff2e5fcca79a16d55984ba9a13ae4a2d9b2161bdd1bd45bd285b914f8b9bfa11c1e10b3f4d1d7114fb18c086065562f85afe71cfbaf
-  data.tar.gz: 2469abce54faa1b52c5431a276ee01752829fb3e399c1831f6d33a84ef5b52aed43abb6980baf679afd3fd3d00dbc5a032ef4eb5157cf77469b7527c71de575b
+  metadata.gz: 866d6f020e66dd334e039e2ac2cb67a059f03712c3ad92cd632a249d96f7076661238d7b418ca9eab87907954f81a01dea8508df86bf12169fe91f7540d151ae
+  data.tar.gz: e0559ef009cbf4b4e0b718d00783d2d513a0ef8722831065e7b42d654c48f143c1411f6617252aae4a8b20d681e6687061a771a58ddbc1fee01967159b897cea

data/app/controllers/educode_sales/contracts_controller.rb

@@ -496,11 +496,9 @@ module EducodeSales
       xlsx = Roo::Spreadsheet.open(params[:file])
       ods = xlsx.sheet(0)
       rows = ods.last_row - 1
-      i = 0
       rows.times do |r|  #行数
-        i += 1
-        next unless ods.row(r+1)[0]
-        EducodeSales::ProductCatalog.create(name: ods.row(r+1)[0].to_s.strip, item_clazz: ods.row(r+1)[1].to_s.strip, brand: ods.row(r+1)[2].to_s.strip, specification: ods.row(r+1)[3].to_s.strip, unit: ods.row(r+1)[4].to_s.strip, param: ods.row(r+1)[5].to_s.strip, source_method: ods.row(r+1)[6].to_s.strip, supplier: ods.row(r+1)[7].to_s.strip)
+        next unless ods.row(r+2)[0]
+        EducodeSales::ProductCatalog.create(name: ods.row(r+2)[0].to_s.strip, item_clazz: ods.row(r+2)[1].to_s.strip, brand: ods.row(r+2)[2].to_s.strip, specification: ods.row(r+2)[3].to_s.strip, unit: ods.row(r+2)[4].to_s.strip, param: ods.row(r+2)[5].to_s.strip, source_method: ods.row(r+2)[6].to_s.strip, supplier: ods.row(r+2)[7].to_s.strip)
       end
       
       render json: { succcess: true}

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -131,6 +131,28 @@ module EducodeSales
       end
     end
 
+    def upload
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      rows.times do |r|  #行数
+        next unless ods.row(r+2)[0]
+        business = EducodeSales::Business.find_by(number: ods.row(r+2)[0].to_s.strip)
+        product_catalog = EducodeSales::ProductCatalog.find_by(item_clazz: ods.row(r+2)[7].to_s.strip, 
+        brand: ods.row(r+2)[8].to_s.strip, 
+        specification: ods.row(r+2)[9].to_s.strip, 
+        unit: ods.row(r+2)[10].to_s.strip,
+        source_method: ods.row(r+2)[14].to_s.strip,
+        supplier:  ods.row(r+2)[16].to_s.strip)
+        if business.present? && product_catalog.present?
+          SalesDetail.create(staff_id: @current_admin.id, business_id: business.id, product_catalog_id: product_catalog.id, price: ods.row(r+2)[12].to_s.strip, amount: ods.row(r+2)[11].to_s.strip, total_price: ods.row(r+2)[13].to_s.strip, custom_clazz: ods.row(r+2)[15].to_s.strip, delivery_date: ods.row(r+2)[17].to_s.strip)
+        end
+      end
+      
+      render json: { succcess: true}
+    end
+
+
     private
 
     def sales_detail_params

data/app/models/educode_sales/user_stat_service.rb

@@ -21,7 +21,7 @@ module EducodeSales
       department_years_2 = {} #department_users(2)
 
       years = {}
-      (2018..Time.current.year).each do |d|
+      (2014..Time.current.year).each do |d|
         years[d] = {
           'year' => d,
           'user_1' => (user_years_1[d.to_s] || 0) + (years[d-1] && years[d-1]['user_1']).to_i,

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

@@ -84,19 +84,18 @@
   
 </script>
 
-<script type="text/html" id="toolbar_contract">
-  <div class="layui-btn-container">
-    <span class="table-label">销售明细</span>
-  </div>
+<script type="text/html" id="toolbar_sales">
+  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="upload_sales_btn" style="margin-left: 20px;">批量导入销售明细</button>
 </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', 'upload'], function() {
     var $ = layui.jquery,
       form = layui.form,
       request = layui.request,
       miniPage = layui.miniPage,
       dropdown = layui.dropdown,
       xmSelect = layui.xmSelect,
+      upload = layui.upload,
       laydate = layui.laydate;
     var openWH = miniPage.getOpenWidthHeight();
     laydate.render({
@@ -181,6 +180,10 @@
         width: 100,
         title: '数量',
       }, {
+        field: 'price',
+        width: 100,
+        title: '单价',
+      },{
         field: 'total_price',
         width: 100,
         title: '金额',
@@ -223,14 +226,42 @@
       title: '销售明细数据表',
       totalRow: true, //开启合并行
       cols: cols_table,
-      toolbar: '#toolbar_contract',
+      toolbar: '#toolbar_sales',
       limit: 20,
       limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
       page: true,
       skin: 'line',
+      done: function() {
+        if ($('#upload_sales_btn').length > 0) {
+          uploadSales();
+        }
+      }
     });
 
-
+    function uploadSales() {
+      upload.render({
+          elem: '#upload_sales_btn'
+          ,url: '/missions/sales_details/upload'
+          ,accept: 'file' //普通文件
+          ,acceptMime: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel'
+          ,headers: {
+          'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+          }
+          ,before: function(obj){ 
+          layer.load(); 
+          }
+          ,done: function(res){
+              layer.msg('导入成功');
+              table.reload('sales_details_table');
+              layer.closeAll('loading'); //关闭loading
+          }
+          ,error: function(index, upload){
+              table.reload('file');
+              layer.closeAll('loading'); //关闭loading
+              layer.alert('导入失败，请检查文件格式')
+          }
+      });
+    }
     var sort = {},
       search = data;
 

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

@@ -20,6 +20,7 @@ json.data do
     json.specification d.product_catalog.specification
     json.unit d.product_catalog.unit
     json.amount d.amount
+    json.price d.price
     json.total_price d.total_price
     json.source_method d.product_catalog.source_method
     json.custom_clazz d.custom_clazz

data/config/routes.rb

@@ -25,6 +25,9 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :sales_details do
+    collection do
+      post :upload
+    end
   end
 
   resources :contracts do

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.98'
+  VERSION = '0.9.99'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.98
+  version: 0.9.99
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -705,7 +705,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.0
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.