add

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua

@@ -3,7 +3,10 @@ local db = {}
 
 DBOrder.PopListGroup = {
     urgencyLevels = "urgencyLevels", -- 紧急程序
-    templateList = "templateList" -- 订单模板
+    templateList = "templateList", -- 订单模板
+    orderType = "orderType", -- 订单类别
+    orderStatus = "orderStatus", -- 订单状态
+    payOrderStatus = "payOrderStatus" -- 回款订单状态
 }
 
 DBOrder.onGetFilter = function(data)
@@ -41,13 +44,69 @@ DBOrder.onGetFilter = function(data)
             end
         end
     end
+
+    local filterInfor = {}
+    table.insert(filterInfor, {name = "我的订单", value = "0"})
+    table.insert(filterInfor, {name = "我的草稿", value = "1"})
+    db.filters[DBOrder.PopListGroup.orderType] = filterInfor
+    local options = ArrayList()
+    local values = ArrayList()
+    for i, v in ipairs(filterInfor) do
+        options:Add(v.name)
+        values:Add(v.value)
+    end
+    db.filtersPopup[DBOrder.PopListGroup.orderType] = {
+        options = options,
+        values = values
+    }
+
+    filterInfor = {}
+    table.insert(filterInfor, {name = "草稿", value = "-1"})
+    table.insert(filterInfor, {name = "正常工单", value = "0"})
+    table.insert(filterInfor, {name = "回退工单", value = "1"})
+    table.insert(filterInfor, {name = "回退到创建人", value = "2"})
+    table.insert(filterInfor, {name = "正常关闭", value = "3"})
+    table.insert(filterInfor, {name = "未正常关闭", value = "4"})
+    db.filters[DBOrder.PopListGroup.orderStatus] = filterInfor
+    options = ArrayList()
+    values = ArrayList()
+    for i, v in ipairs(filterInfor) do
+        options:Add(v.name)
+        values:Add(v.value)
+    end
+    db.filtersPopup[DBOrder.PopListGroup.orderStatus] = {
+        options = options,
+        values = values
+    }
+
+    filterInfor = {}
+    table.insert(filterInfor, {name = "暂无回款", value = "0"})
+    table.insert(filterInfor, {name = "部分回款", value = "1"})
+    table.insert(filterInfor, {name = "全部回款", value = "2"})
+    db.filters[DBOrder.PopListGroup.payOrderStatus] = filterInfor
+    options = ArrayList()
+    values = ArrayList()
+    for i, v in ipairs(filterInfor) do
+        options:Add(v.name)
+        values:Add(v.value)
+    end
+    db.filtersPopup[DBOrder.PopListGroup.payOrderStatus] = {
+        options = options,
+        values = values
+    }
 end
 
+DBOrder.getFilter = function(popGroup)
+    if popGroup then
+        return db.filters[popGroup]
+    end
+    return db.filters
+end
 DBOrder.getPopupList = function(popGroup)
     if popGroup then
         return db.filtersPopup[popGroup]
     end
-    return db.filters
+    return db.filtersPopup
 end
 
 DBOrder.getFields = function(templateId)

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua

@@ -9,22 +9,54 @@ local db = {}
 local icons = {}
 local poplist = {}
 
-function DBUser.onGetUsers(list)
-    poplist.options = ArrayList()
-    poplist.values = ArrayList()
+DBUser.FilterGroup = {
+    user = "user",
+    group = "group"
+}
+
+function DBUser.onGetUsers(list, groupList)
+    local options = ArrayList()
+    local values = ArrayList()
+    db.filters = {}
+    local name
+    db.filters[DBUser.FilterGroup.user] = {}
     for i, v in ipairs(list) do
-        db[v.loginNo] = v
         if v.loginName == "系统生成" then
-            poplist.options:Add(joinStr(v.loginNo, "_", v.loginName))
+            name = joinStr(v.loginNo, "_", v.loginName)
         else
-            poplist.options:Add(joinStr(v.loginName))
+            name = joinStr(v.loginName)
         end
-        poplist.values:Add(v.loginNo)
+
+        table.insert(db.filters[DBUser.FilterGroup.user], {name = name, value = v.loginNo})
+        db[v.loginNo] = v
+        options:Add(name)
+        values:Add(v.loginNo)
     end
+    poplist[DBUser.FilterGroup.user] = {
+        options = options,
+        values = values
+    }
+    --------------------------------------------
+    local options = ArrayList()
+    local values = ArrayList()
+    db.filters[DBUser.FilterGroup.group] = {}
+    for i, v in ipairs(groupList) do
+        table.insert(db.filters[DBUser.FilterGroup.group], {name = v.name, value = v.id})
+        options:Add(v.name)
+        values:Add(v.id)
+    end
+    poplist[DBUser.FilterGroup.group] = {
+        options = options,
+        values = values
+    }
 end
 
-function DBUser.getPopList()
-    return poplist
+function DBUser.getFilters(group)
+    return db.filters[group]
+end
+
+function DBUser.getPopList(group)
+    return poplist[group]
 end
 
 ---@return _DBUser