Merge branch 'master' of git.linkerplus.com:huangwf/Property-admin

# Conflicts:
#	src/router/index.js

src/pages/Letter/index.vue

@@ -0,0 +1,79 @@
+// 收信记录
+<template>
+  <el-table
+    :data="tableData"
+    border
+    style="width: 100%">
+    <el-table-column
+      prop="address"
+      label="发布人"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="标题"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="date"
+      label="时间"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="zip"
+      label="类型"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="提前终止日期"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="收租方式"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="租金单价(/月)"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="备注"
+      >
+    </el-table-column>
+    <el-table-column
+      label="操作"
+      >
+      <template scope="">
+        <el-button type="text" size="small">编辑</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        tableData: [{
+          date: '2016-05-02',
+          name: '1001',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: '-',
+          remarks: '11111'
+        }]
+      }
+    }
+  }
+</script>

src/pages/Parking/index.vue

@@ -0,0 +1,74 @@
+//车位区域管理
+<template>
+  <el-table
+    :data="tableData"
+    border
+    style="width: 100%">
+    <el-table-column
+      prop="address"
+      label="区域名称"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="租赁单价"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="province"
+      label="管理费"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="city"
+      label="车位数量"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="date"
+      label="充值类型"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="zip"
+      label="状态"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="remarks"
+      label="备注"
+      >
+    </el-table-column>
+    <el-table-column
+      label="操作"
+      >
+      <template scope="">
+        <el-button type="text" size="small">编辑</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        tableData: [{
+          date: '2016-05-02',
+          name: '1001',
+          province: '上海',
+          city: '普陀区',
+          address: '上海市普陀区金沙江路 1518 弄',
+          zip: '-',
+          remarks: '11111'
+        }]
+      }
+    }
+  }
+</script>

src/pages/Staff/StaffInfo/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-row type="flex" justify="end">
+        <el-col :md="2" :xs="24" class="left-align">
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">新增</el-button>
+        </el-col>
+        <el-col :md="22" :xs="24" style="flost: right">
+          <el-input v-model="search" :placeholder="'搜索'" style="width: 200px;" clearable />
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">查询</el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column prop="data1" label="用户" ></el-table-column>
+      <el-table-column prop="data2" label="昵称" ></el-table-column>
+      <el-table-column prop="data3" label="所属" ></el-table-column>
+      <el-table-column prop="data4" label="账号类型" ></el-table-column>
+      <el-table-column prop="data5" label="用户组" ></el-table-column>
+      <el-table-column prop="data6" label="最后登录时间" ></el-table-column>
+      <el-table-column prop="data7" label="登录次数" ></el-table-column>
+      <el-table-column prop="data8" label="状态" ></el-table-column>
+      <el-table-column label="操作" >
+        <template scope="scope">
+          <el-button type="text" size="small" @click="handleClick(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        search: null,
+        tableData: [{
+          data1: '小明',
+          data2: '小明',
+          data3: '上海',
+          data4: '小区',
+          data5: '财务',
+          data6: '2019-11-06 17:12',
+          data7: 23,
+          data8: '正常'
+        }]
+      }
+    },
+
+    methods: {
+      handleClick(val) {}
+    }
+  }
+</script>

src/pages/Staff/StaffJurisdiction/index.vue

@@ -0,0 +1,52 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-row type="flex" justify="end">
+        <el-col :md="2" :xs="24" class="left-align">
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">新增</el-button>
+        </el-col>
+        <el-col :md="22" :xs="24" style="flost: right">
+          <el-input v-model="search" :placeholder="'搜索'" style="width: 200px;" clearable />
+          <el-button class="filter-item blue-black" type="primary" icon="el-icon-search">查询</el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%">
+      <el-table-column prop="data1" label="用户" ></el-table-column>
+      <el-table-column prop="data2" label="拥有权限" ></el-table-column>
+      <el-table-column label="操作" >
+        <template scope="scope">
+          <el-button type="text" size="small" @click="handleClick(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  export default {
+    methods: {
+      handleClick(row) {
+        console.log(row);
+      }
+    },
+
+    data() {
+      return {
+        search: null,
+        tableData: [{
+          data1: '小明',
+          data2: '财务新增、财务删除、财务修改、财务查询'
+        }]
+      }
+    },
+
+    methods: {
+      handleClick(val) {}
+    }
+  }
+</script>

src/router/index.js

@@ -60,6 +60,10 @@ import DataDictionary           from '@/pages/System/DataDictionary'
 import OperationLog             from '@/pages/System/OperationLog'                                      // 操作日志
 
 import Complaints from '@/pages/Complaints/index'
+import StaffInfo from '@/pages/Staff/StaffInfo/index'
+import ParKing from '@/pages/ParKing/index' //停车位
+import StaffJurisdiction from '@/pages/Staff/StaffJurisdiction/index'
+import Letter from '@/pages/Letter/index' //收信记录
 
 import Vehicle from '@/pages/Vehicle/index'                                     //车辆管理
 import Architecture from '@/pages/Architecture/index'                                     //房屋架构
@@ -302,6 +306,20 @@ export default new Router({
                         ContainerView: Architecture
                     }
                 },
+                // 员工信息
+                {
+                    path: '/StaffInfo',
+                    components: {
+                        ContainerView: StaffInfo
+                    }
+                },
+                // 员工权限管理
+                {
+                    path: '/StaffJurisdiction',
+                    components: {
+                        ContainerView: StaffJurisdiction
+                    }
+                },
                 // 消防巡查
                 {
                     path: '/FireInspection',
@@ -322,7 +340,7 @@ export default new Router({
                     components: {
                         ContainerView: Cleaning
                     }
-                },
+                }
             ]
         }
     ]

static/api/viewAPI.json

@@ -266,6 +266,21 @@
                     "breadcrumb": [ "车辆管理" ]
                 }
             ]
+        }, {
+            "titleName": "员工管理",
+            "iconClass": "settings_applications",
+            "middleLink": [
+                {
+                    "titleName" : "员工信息",
+                    "url"       : "StaffInfo",
+                    "breadcrumb": [ "员工信息" ]
+                },
+                {
+                    "titleName" : "员工权限管理",
+                    "url"       : "StaffJurisdiction",
+                    "breadcrumb": [ "员工权限管理" ]
+                }
+            ]
         }, {
             "titleName": "房屋架构",
             "iconClass": "settings_applications",