仓库报表

src/views/upms/user/User.vue

@@ -33,6 +33,18 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="角色">
+                  <a-select v-model="queryParam.roleId" placeholder="请选择">
+                    <a-select-option
+                      v-for="(item,index) in roleList"
+                      :key="index"
+                      :label="item.roleName"
+                      :value="item.roleId">{{ item.roleName }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6 || 24" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -175,20 +187,20 @@ export default {
           dataIndex: 'lastLoginTime',
           sorter: true
         }, */
-/*        {
+        /*        {
           title: '身份',
           dataIndex: 'identityType',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.identityTypeMap, text)
           }
-        },*/
-        /*{
+        }, */
+        /* {
           title: '职务',
           dataIndex: 'jobType',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.jobTypeMap, text)
           }
-        },*/
+        }, */
         {
           title: '操作',
           dataIndex: 'action',