Merge remote-tracking branch 'origin/yuekuo' into zhoulingpo

# Conflicts:
#	src/router/modules/userCenter.js
#	src/views/Report/ReportList.vue
#	src/views/Report/ReportManager.vue
#	src/views/userCenter/processCenter.vue

src/views/userCenter/processCenter.vue

@@ -1,123 +1,104 @@
 <template>
-    <div class="centerBox content-height">
+    <div class="content">
         <div class="title">
             <span>流程中心</span>
         </div>
-        <div class="search">
-          <el-row>
-            <el-col :span="20">
-              <div class="search-box-left">
-                <div class="">
-                  <label>流程编号:</label>
-                  <el-input v-model="form.id" placeholder="请输入流程编号"></el-input>
-                </div>
-                <div class="">
-                  <label>流程名称:</label>
-                  <el-input v-model="form.name" placeholder="请输入流程名称"></el-input>
-                </div>
-              </div>
-            </el-col>
-            <el-col :span="4" align="right">
-              <div class="search-box-right">
+        <div class="searchForm">
+            <div class="item">
+                <div>流程编号：</div>
+                <el-input v-model="form.id" ></el-input>
+            </div>
+            <div class="item">
+                <div>流程名称：</div>
+                <el-input v-model="form.name"></el-input>
+            </div>
+            <div class="item">
                 <el-button type="primary"  @click="search">查询</el-button>
                 <el-button type="" @click="reset">重置</el-button>
-              </div>
-            </el-col>
-          </el-row>
+            </div>
         </div>
         <div class="tabs">
-            <tabs />
+            <tabs :tableData="tableData"/>
         </div>
     </div>
 </template>
 
 <script>
 import tabs from '../userCenter/processCenter/tabs.vue'
-export default {
-  name: 'processCenter',
-  components: {
-    tabs
-  },
-  data () {
-    return {
-      form: {}
-    }
-  },
-  created () {
-
-  },
-  mounted () {
-
-  },
-  methods: {
-    // 查询
-    search () {
-      // this.$api.processCenter.search({})
+    export default {
+        name:'processCenter',
+        components:{
+          tabs
+        },
+        data() {
+            return {
+                form: {},
+                tableData:[]
+            }
+        },
+        created () {
+            ;
+        },
+        mounted () {
+        this.$bus.$on('clearForm',()=>{
+            this.form={}
+        });
     },
-    // 重置
-    reset () {
-      this.form = {}
-      // this.$api.processCenter.reset({})
+        methods: {
+            //查询
+            search() {
+                this.$bus.$emit('getSearchItem',this.form)
+                // this.$api.processCenter.search({})
+                this.tableData=[{createTime:'1999-10-1'}]
+            },
+            //重置
+            reset(){
+                this.form={}
+                this.$forceUpdate()
+                this.$bus.$emit('getSearchItem',this.form)
+                this.tableData=[{createTime:'3000-10-1'}]
+                // this.$api.processCenter.reset({})
+            }
+        },
     }
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-.centerBox{
-  background-color: #fff;
-  height: 100%;
-  width: 100%;
+.content{
+    min-height: calc(100vh - 60px - 20px);
+    box-shadow: 0 6px 11px 0 rgba(163, 163, 163, 0.2);
+    border-radius: 6px;
+    background: #FFFFFF;
     .title {
         border-bottom: 1px solid #EBEEF5;
         height: 42px;
         line-height: 42px;
-         margin: 0 18px 0 22px;
+        margin: 0 18px 0 22px;
+
         span {
             font-size: 16px;
             font-weight: 600;
             color: #262626;
         }
     }
-  .search {
-    .search-box-left {
-      padding-top: 20px;
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-
-      label {
-        font-size: 14px;
-        font-weight: 400;
-        color: #595959;
-        margin-right: 5px;
-        padding-left: 22px;
-      }
-
-      ::v-deep .el-input {
-        width: 167px;
-        margin-right: 5px;
-      }
-      @media screen and (max-width: 1366px) {
-        ::v-deep .el-input {
-          width: 135px;
-          margin-right: 5px;
+    .searchForm{
+        width: 1200px;
+        display: flex;
+        align-items: center;
+        margin: 20px 0 0 22px;
+        .item{
+        width: 300px;
+        display: flex;
+        align-items: center;
         }
-      }
-    }
-    .search-box-right {
-      padding-top: 20px;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      padding-right: 14px;
-    }
 
-  }
+    }
     .tabs{
-        margin: 20px 20px  5px;
+        margin: 20px 0 0 13px;
     }
 
 }
-
+::v-deep .el-input{
+    width: 200px;
+}
 </style>