issues19 && issues4

src/views/haomo/components/tables/HmComplexTable.vue

@@ -21,6 +21,7 @@
     <!-- 表格 -->
     <el-table :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
               style="width: 100%">
+      <el-table-column type="index" :index="indexMethod"></el-table-column>
       <el-table-column v-for="(column,index) in showColumns" :key="index" align="center" :label="column.name">
         <template slot-scope="scope">
           <span>{{ scope.row[column.code] }}</span>
@@ -204,6 +205,9 @@
       this.getList()
     },
     methods: {
+      indexMethod(index) {
+        return this.listQuery.page_size * (this.listQuery.page_no - 1) + index + 1
+      },
       validate() {
         const self = this
         // this.columns数组元素本身必须是string或者object. 且必须是schema中定义的列
@@ -234,24 +238,18 @@
             self.$set(tmp, 'code', tmp.code.toLowerCase())
             self.showColumns.push(tmp)
           })
-          console.log(self.showColumns)
         } else {
           self.showColumns = JSON.parse(JSON.stringify(self.columns))
-          console.log('1111111')
-          console.log(self.showColumns)
           // 将字符串对象进行替换处理
           _.each(self.showColumns, function(column, index) {
             if (typeof column === 'string') {
               // const tmp = _.keyBy(self.schema['columns'], 'code')[column.toUpperCase()]
               // 王康 修改 2018年02月25日22:58:23
               const tmp = _.keyBy(self.schema['columns'], 'codeCamel')[column]
-              console.log(tmp)
               self.$set(tmp, 'code', tmp.code.toLowerCase())
               self.$set(self.showColumns, index, tmp)
             }
           })
-          console.log('2222222')
-          console.log(self.showColumns)
         }
 
         // 处理过滤条件
@@ -279,6 +277,7 @@
         // 处理过滤条件
         const params = JSON.parse(JSON.stringify(self.listQuery))
         params.filters = self.filterParams
+        params.filters = this.deleteFilter(params.filters)
 
         request(self.schema.modelUnderscorePlural, {
           params: params
@@ -288,6 +287,18 @@
           self.listLoading = false
         })
       },
+      // 删除过滤条件为空的filter
+      deleteFilter(filters) {
+        const newFilters = filters
+        _.forEach(newFilters, function(columns, columnsKey) {
+          _.forEach(newFilters[columnsKey], function(column, columnKey) {
+            if (columns[columnKey][Object.keys(column)] === '%%' || columns[columnKey][Object.keys(column)] === '' || columns[columnKey][Object.keys(column)] === null) {
+              delete (columns[columnKey])
+            }
+          })
+        })
+        return JSON.stringify(newFilters[Object.keys(newFilters)]) === '{}' ? {} : newFilters
+      },
       handleFilter() {
         this.getList()
       },

src/views/haomo/components/tables/index.vue

@@ -3,8 +3,8 @@
     <hm-complex-table :schema="schema['HmUser']"
                       :columns="showUserColumns"
                       :filters="userFilters"></hm-complex-table>
-    <hm-complex-table :schema="schema['Department']"></hm-complex-table>
-    <hm-complex-table :schema="schema['Role']"></hm-complex-table>
+    <!--<hm-complex-table :schema="schema['Department']"></hm-complex-table>-->
+    <!--<hm-complex-table :schema="schema['Role']"></hm-complex-table>-->
   </div>
 </template>
 
@@ -22,10 +22,10 @@
     },
     data() {
       return {
-        showUserColumns: ['mobile', 'loginid'],
+        showUserColumns: ['mobile', 'loginid', 'username', 'email'],
         userFilters: [
           { placeholder: '过滤手机号', 'mobile': { 'like': '' }},
-          { placeholder: '过滤登录Id', 'loginid': { 'like': '3001' }}
+          { placeholder: '过滤用户名', 'username': { 'equalTo': '' }}
         ]
       }
     },

src/views/haomo/schemas/hm_org_schema.js

@@ -2872,13 +2872,13 @@ const ModelSchema = {
       }
     ]
   },
-  'HmUser2': {
-    'model': 'HmUser2',
-    'modelPlural': 'HmUser2S',
-    'modelCamel': 'hmUser2',
-    'modelCamelPlural': 'hmUser2S',
-    'modelUnderscore': 'hm_user2',
-    'modelUnderscorePlural': 'hm_user2S',
+  'HmUser': {
+    'model': 'HmUser',
+    'modelPlural': 'HmUsers',
+    'modelCamel': 'hmUser',
+    'modelCamelPlural': 'hmUsers',
+    'modelUnderscore': 'hm_user',
+    'modelUnderscorePlural': 'hm_users',
     'columns': [
       {
         'id': 'o329',