Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

components/page/dataGrid.vue

@@ -61,6 +61,7 @@
         @on-selection-change="selectionChange"
         @on-select="onSelect"
         @on-select-all="allChange"
+        @on-sort-change="sortChange"
         :row-key="rowKey"
         stripe
       ></Table>
@@ -153,6 +154,8 @@ export default {
       search: {
         pageIndex: 1,
         pageSize: 20,
+        sortBy: "id",
+        isDesc:true,
         conditions: [],
       },
       searchConditions: this.search,
@@ -417,6 +420,12 @@ export default {
         }
       });
     },
+    sortChange(column, key, order) {
+      this.search.sortBy = key;
+      this.search.isDesc = order == "desc";
+      this.search.pageIndex = 1;
+      this.load();
+    },
     saveUserconfig() {
       let url = `${window.systemUrl}/config/update`;
       var content = [];
@@ -572,6 +581,7 @@ export default {
       });
       return name;
     },
+
     //批量取消
     cancelBatch() {
       this.footerToolbar = false;

pages/test.vue

@@ -17,8 +17,9 @@
 <template>
   <div class="flex fd test_layout">
     <div>
-      <Menu mode="horizontal" active-name="1">
+      <Menu mode="horizontal" theme="light" active-name="0">
         <div class="layout-assistant">
+          <MenuItem name="0" to="/test/example">基础组件</MenuItem>
           <MenuItem name="1" to="/test/user">人员选择</MenuItem>
           <MenuItem name="2" to="/test/com">异步组件</MenuItem>
           <MenuItem name="4" to="/test/resource">资源选择</MenuItem>

pages/test/example.vue

+<template>
+    <Layout>
+        <Sider hide-trigger :width="250">
+            <Menu class="example_menu" theme="light" active-name="components-tag">
+                <MenuGroup v-for="(group, j) in Menu_item" :key="j" :title="group.title">
+                    <MenuItem v-for="(child, k) in group.children" :key="k" :name="child.name" :to="child.route">
+                    <Icon :type="child.icon" />
+                    {{child.title}}</MenuItem>
+                </MenuGroup>
+            </Menu>
+        </Sider>
+        <Layout>
+            <nuxt-child/>
+        </Layout>
+    </Layout>
+</template>
+<script>
+import exampleRouter from './api'
+export default {
+    head(){
+        return {
+            title: '组件介绍'
+        }
+    },
+    data() {
+        return {
+            Menu_item: exampleRouter,
+        }
+    },
+    created() {
+    },
+    method:{
+        
+    },
+}
+</script>0
+
+

pages/test/example/index.vue

-<style lang="less">
-@import './test.less';
-</style>
 <template>
-    <Layout>
-        <Sider hide-trigger class="after">
-            <Menu class="example_menu" active-name="components-tag">
-                <MenuGroup v-for="(group, j) in Menu_item" :key="j" :title="group.title">
-                    <MenuItem v-for="(child, k) in group.children" :key="k" :name="child.name" :to="child.route">
-                    <Icon :type="child.icon" />
-                    {{child.title}}</MenuItem>
-                </MenuGroup>
-            </Menu>
-        </Sider>
-        <Layout class="example_box">
-            <nuxt-child/>
-        </Layout>
-    </Layout>
+    <div class="main"></div>
 </template>
 <script>
-import exampleRouter from './api'
 export default {
-    layout:'empty',
     head(){
         return {
             title: '组件介绍'
@@ -28,7 +10,6 @@ export default {
     },
     data() {
         return {
-            Menu_item: exampleRouter,
         }
     },
     created() {
@@ -37,6 +18,6 @@ export default {
         
     },
 }
-</script>0
+</script>
 
 

pages/test/example/table/index.vue

+<template>
+  <div class="table">
+    <DataGrid
+      :columns="columns"
+      ref="grid"
+      :action="action"
+      exportTitle="工艺规程"
+    >
+      <template slot="easySearch">
+        <Form ref="formInline" :model="easySearch" inline>
+          <FormItem prop="keys">
+            <Input
+              placeholder="请输入工艺名称/工艺编号"
+              v-width="200"
+              v-model="easySearch.keys.value"
+              clearable
+            />
+          </FormItem>
+          <FormItem>
+            <Button type="primary" @click="search">查询</Button>
+          </FormItem>
+        </Form>
+      </template>
+    </DataGrid>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  data() {
+    return {
+      action: `${systemUrl}/user/paged`,
+      easySearch: {
+        keys: {
+          op: "unicode,name,code",
+          value: null,
+        },
+      },
+       columns: [{
+                    key: "id",
+                    title: "姓名",
+                    align: "left",
+                    width: 200,
+                    sortable:true,
+                    easy: true,
+                    high: true
+                },
+                {
+                    key: "userName",
+                    title: "姓名",
+                    align: "left",
+                    easy: true,
+                    high: true,
+                    tooltip: true,
+                      sortable:true,
+                },
+                 {
+                    key: "cardNo",
+                    title: "姓名",
+                    align: "left",
+                    easy: true,
+                      sortable:true,
+                    high: true,
+                    tooltip: true,
+                },
+               ],
+            
+    };
+  },
+  methods: {
+    search() {
+      this.$refs.grid.reload(this.easySearch);
+    },
+       l(key) {
+            let vkey = "routingHeader" + "." + key;
+            return this.$t(vkey) || key;
+        },
+  },
+};
+</script>
+
+<style lang="less" >
+</style>
\ No newline at end of file

pages/test/index.vue

+<template>
+    <div class="test">
+        hi
+    </div>
+</template>
+
+<script>
+    export default {
+        name: '',
+        data() {
+            return {
+                
+            }
+        }
+    }
+</script>
+
+<style lang="less">
+    
+</style>
\ No newline at end of file