add depart manage function

app/models/balance_order.rb

@@ -6,6 +6,8 @@ class BalanceOrder < ActiveRecord::Base
   belongs_to :wx_user
   validates :order_id,:user_id,:total_price,presence: true
   after_create :update_paied_time
+  belongs_to :depart_record, :foreign_key => :depart
+
   def update_paied_time
     self.paied_at = Time.now.to_i
     self.save
@@ -62,11 +64,11 @@ class BalanceOrder < ActiveRecord::Base
       field :created_at
       field :updated_at
       field :balance_bank_card_no
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
+      field :depart do
+        visible false
+        filterable true
       end
+      field :depart_record
       field :remark
     end
 
@@ -98,11 +100,11 @@ class BalanceOrder < ActiveRecord::Base
       end
       field :balance_bank_card_no
       field :remark
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
+      field :depart do
+        visible false
+        filterable true
       end
+      field :depart_record
       field :created_at
     end
 
@@ -125,11 +127,7 @@ class BalanceOrder < ActiveRecord::Base
       end
       field :state
       field :balance_bank_card_no
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
-      end
+      field :depart
       field :remark
     end
   end

app/models/depart.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
-class Depart < ActiveRecord::Base
+class DepartRecord < ActiveRecord::Base
   has_paper_trail
-  self.table_name = "departs"
+  self.table_name = "depart_records"
   belongs_to :wx_user, :foreign_key => :wx_user_id
 
   rails_admin do

app/models/order.rb

@@ -7,6 +7,8 @@ class Order < ActiveRecord::Base
     validates_presence_of :user_id,:total_price,:order_id
     #belongs_to :user, :foreign_key => :user_id
     belongs_to :wx_user, :foreign_key => :wx_user_id
+    belongs_to :depart_record, :foreign_key => :depart
+
     has_many :order_details
     before_save :before_save
     #after_update :after_update
@@ -206,11 +208,11 @@ class Order < ActiveRecord::Base
             end
             #field :order_details
             field :remark
-            field :depart, :enum do
-                enum do
-                    DEPART_ENUM
-                end
+            field :depart do
+                visible false
+                filterable true
             end
+            field :depart_record
             field :created_at do
                 visible false
             end
@@ -262,11 +264,11 @@ class Order < ActiveRecord::Base
             field :order_remark
             field :dispatch_time
             field :receive_time
-            field :depart, :enum do
-                enum do
-                    DEPART_ENUM
-                end
+            field :depart do
+                visible false
+                filterable true
             end
+            field :depart_record
             field :order_details
             field :created_at
             field :updated_at
@@ -313,11 +315,7 @@ class Order < ActiveRecord::Base
             field :remark
             field :order_remark
             field :dispatch_time
-            field :depart, :enum do
-                enum do
-                    DEPART_ENUM
-                end
-            end
+            field :depart
          end
 
         export do

app/models/shop_application.rb

@@ -3,6 +3,7 @@ class ShopApplication < ActiveRecord::Base
   has_paper_trail
   self.table_name = "shop_applications"
   DEPART_ENUM= [["部门1",1], ["部门2",2], ["部门3", 3], ["部门4", 4], ["部门5", 5]]
+  belongs_to :depart_record, :foreign_key => :depart
 
   IMG_STORE_PATH = "shop"
 
@@ -31,11 +32,11 @@ class ShopApplication < ActiveRecord::Base
       field :status
       field :remark
       field :pass_time
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
+      field :depart do
+        visible false
+        filterable true
       end
+      field :depart_record
       field :created_at
       field :updated_at
     end
@@ -52,11 +53,8 @@ class ShopApplication < ActiveRecord::Base
       field :status
       field :remark
       field :pass_time
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
-      end
+      field :depart
+      field :depart_record
       field :created_at
       field :updated_at
     end

app/models/wx_user.rb

@@ -7,6 +7,8 @@ class WxUser < ActiveRecord::Base
   belongs_to :user
   #has_many :channel_qrcode_results, :foreign_key => :mp_openid
   belongs_to :parent_signup_channel, :foreign_key => :channel_qrcode_id
+  belongs_to :depart_record, :foreign_key => :depart
+
   validates_presence_of :nickname, :unionid
   #belongs_to :channel_qrcode
   attr_accessor :invite, :v_head, :intro_user
@@ -133,11 +135,11 @@ class WxUser < ActiveRecord::Base
       end
       field :sale_group
       field :sale_group_sum
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
+      field :depart do
+        visible false
+        filterable true
       end
+      field :depart_record
       # field :channel_qrcode_id
       field :created_at
     end
@@ -201,11 +203,11 @@ class WxUser < ActiveRecord::Base
       field :parent_signup_channel
       field :sale_group
       field :sale_group_sum
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
+      field :depart do
+        visible false
+        filterable true
       end
+      field :depart_record
       field :created_at
     end
 
@@ -248,11 +250,7 @@ class WxUser < ActiveRecord::Base
           RANK_ENUM
         end
       end
-      field :depart, :enum do
-        enum do
-          DEPART_ENUM
-        end
-      end
+      field :depart
     end
   end
   def get_head_img

config/locales/models/balance_order.yml

@@ -20,4 +20,5 @@ zh-CN:
         created_at: 创建时间
         updated_at: 更新时间        
         balance_bank_card_no: 充值银行卡
-        depart: 部门
+        depart: 部门
+        depart_record: 部门

config/locales/models/depart.yml

@@ -1,9 +1,9 @@
 zh-CN:
   activerecord:
     models:
-      depart: 部门管理
+      depart_record: 部门管理
     attributes:
-      depart:
+      depart_record:
         id: 部门ID
         wx_user: 微信会员
         wx_user_id: 微信ID

config/locales/models/order.yml

@@ -46,3 +46,4 @@ zh-CN:
        created_at: 创建时间
        updated_at: 修改时间
        depart: 部门
+       depart_record: 部门

config/locales/models/shop_application.yml

@@ -18,3 +18,4 @@ zh-CN:
         created_at: 创建时间
         updated_at: 更新时间
         depart: 部门
+        depart_record: 部门

config/locales/models/wx_user.yml

@@ -41,4 +41,5 @@ zh-CN:
         gzhLastConversationTime: 最近会话时间
         sale_group: 当月业绩
         sale_group_sum: 上月业绩
-        depart: 部门
+        depart: 部门
+        depart_record: 部门

db/migrate/20201222114999_create_departs.rb

@@ -1,8 +1,8 @@
 # encoding:utf-8
-class CreateDeparts < ActiveRecord::Migration
+class CreateDepartRecords < ActiveRecord::Migration
   def up
     #部门管理
-    create_table :departs do |t|
+    create_table :depart_records do |t|
       #微信ID
       t.column :wx_user_id, :integer,:null=>false, :default => 0
       #部门名称
@@ -13,11 +13,11 @@ class CreateDeparts < ActiveRecord::Migration
       t.column :remark,:string
       t.timestamps
     end
-    add_index :departs, :wx_user_id
+    add_index :depart_records, :wx_user_id
   end
 
   def down
-    drop_table :departs
+    drop_table :depart_records
   end
 
 end