种草--文章审核 新增 用户类型查询条件

@@ -46,6 +46,8 @@
         </input>
         <input class="easyui-combobox" id="source">
         </input>
+        <input class="easyui-combobox" id="userType">
+        </input>
 
         <input class="easyui-textbox" id="publisher">
         </input>
@@ -121,7 +123,18 @@
             textField : "text",
             required:false,
             prompt: "请选择来源",
-            data:[{text:"全部",value:"0"},{text:"用户",value:"1"},{text:"编辑",value:"6"},{text:"资讯",value:"2"},{text:"now",value:"5"},{text:"mars",value:"3"},{text:"晒单",value:"4"}]
+            data:[{text:"全部",value:"0"},{text:"社区",value:"1"},{text:"资讯",value:"2"},{text:"晒单",value:"4"},{text:"now",value:"5"},{text:"mars",value:"3"}]
+        });
+
+        $("#userType").combobox({
+            valueField : "value",
+            textField : "text",
+            required:false,
+            prompt: "请选择用户身份",
+            data:[{text:"全部",value:"0"},{text:"用户",value:"10"},{text: "普通马甲", value: "1"},
+                {text: "编辑", value: "2"}, {text: "官方号", value: "3"},
+                {text: "社区大号", value: "4"}, {text: "品牌号", value: "5"},
+                {text: "外部刷评论马甲", value: "6"}]
         });
 
         $("#searchBtn").linkbutton({
@@ -143,6 +156,7 @@
                     authorUid: $("#publisherUid").textbox("getValue"),
                     articleId: $("#articleId").textbox("getValue"),
                     source: $("#source").combobox("getValue"),
+                    userType: $("#userType").combobox("getValue"),
                     startTimeStr:startTime,
                     endTimeStr:endTime
                 });
@@ -159,7 +173,9 @@
                 authStatus: $("#authStatus").combobox("getValue"),
                 publisher: $("#publisher").textbox("getValue"),
                 articleId: $("#articleId").textbox("getValue"),
-                source: $("#source").textbox("getValue")
+                source: $("#source").textbox("getValue"),
+                userType: $("#userType").textbox("getValue")
+
             },
             url: serverContextPath + "/grassArticle/articleList",
             method: 'POST',
@@ -264,9 +280,40 @@
                             str = "now";
                         }
 
-                        if(rowData.source == '6'){
+
+                        return str;
+                    }
+
+                },{
+                    title: "用户身份",
+                    field: "userType",
+                    width: 20,
+                    align: "left",
+                    formatter: function (value, rowData, rowIndex) {
+                        debugger
+                        var str = '';//不明身份者
+
+                        if(rowData.userType == '10'){
+                            str = "用户";
+                        }
+                        if(rowData.userType == '1'){
+                            str = "普通马甲";
+                        }
+                        if(rowData.userType == '2'){
                             str = "编辑";
                         }
+                        if(rowData.userType == '3'){
+                            str = "官方号";
+                        }
+                        if(rowData.userType == '4'){
+                            str = "社区大号";
+                        }
+                        if(rowData.userType == '5'){
+                            str = "品牌号";
+                        }
+                        if(rowData.userType == '6'){
+                            str = "外部刷评论马甲";
+                        }
                         return str;
                     }