Browse Source

add column

abiao 2 years ago
parent
commit
ec110d1714

+ 1 - 1
app/models/employ.rb

@@ -16,7 +16,7 @@ class Employ < ActiveRecord::Base
     navigation_label '食堂管理'
     weight -500
     list do
-      filters [:mobile]
+      filters [:mobile,:wx_user_id,:user_name]
       field :id
       field :user_name
       field :mobile

+ 20 - 1
app/models/employ_static_food.rb

@@ -5,13 +5,14 @@ class EmployStaticFood < ActiveRecord::Base
 
   TYPE_ENUM = [["早餐",1],["中餐",2],["晚餐",3]]
   SINGLE_ENUM = [["预订",false],["单点",true]]
+  STATUS_ENUM = [["待用餐",1],["已用餐",2],["已过期",3]]
 
 
   rails_admin do
     navigation_label '食堂管理'
     weight -498
     list do
-      filters [:source]
+      filters [:source,:employ_id,:employ_name,:food_date]
       field :id
       field :employ_id
       field :employ_name
@@ -36,6 +37,12 @@ class EmployStaticFood < ActiveRecord::Base
           SINGLE_ENUM
         end
       end
+      field :status, :enum do
+        filterable true
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :cancel_nums
       field :created_at
       # field :updated_at
@@ -65,6 +72,12 @@ class EmployStaticFood < ActiveRecord::Base
           SINGLE_ENUM
         end
       end
+      field :status, :enum do
+        filterable true
+        enum do
+          STATUS_ENUM
+        end
+      end
       field :cancel_nums
       field :created_at
       field :updated_at
@@ -79,6 +92,12 @@ class EmployStaticFood < ActiveRecord::Base
           TYPE_ENUM
         end
       end
+      field :status, :enum do
+        filterable true
+        enum do
+          STATUS_ENUM
+        end
+      end
     end
   end
 end

+ 7 - 1
app/models/static_food.rb

@@ -11,7 +11,7 @@ class StaticFood < ActiveRecord::Base
     navigation_label '食堂管理'
     weight -499
     list do
-      filters [:source]
+      filters [:source,:food_date]
       field :id
       field :food_date
       field :source, :enum do
@@ -20,7 +20,10 @@ class StaticFood < ActiveRecord::Base
           TYPE_ENUM
         end
       end
+      field :pre_nums
+      field :sinlge_nums
       field :nums
+      field :total
       field :created_at
       # field :updated_at
     end
@@ -33,7 +36,10 @@ class StaticFood < ActiveRecord::Base
           TYPE_ENUM
         end
       end
+      field :pre_nums
+      field :sinlge_nums
       field :nums
+      field :total
       field :created_at
       field :updated_at
     end

+ 4 - 1
config/locales/models/static_food.yml

@@ -6,6 +6,9 @@ zh-CN:
       static_food:
         food_date: 日期
         source:  类型
-        nums:  数量
+        pre_nums:  预计数量
+        single_nums:  单订数量
+        nums:  总数量
+        total:  总金额
         created_at: 创建时间
         updated_at: 更新时间