Merge branch 'master' of http://git.taauav.net/gitadmin/jndz_admin_web

src/views/system/dept/index.vue

@@ -27,6 +27,11 @@
         <el-table-column label="部门名称" show-overflow-tooltip min-width="200">
           <template slot-scope="{row}">{{ row.name }}</template>
         </el-table-column>
+        <el-table-column label="部门类型" width="100px" align="center">
+          <template slot-scope="{row}">
+            <el-tag :type="['primary','success'][row.type-1]" size="mini">{{ ['考核部门', '被考核部门'][row.type-1] }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="note" label="备注" min-width="200" align="center"/>
         <el-table-column prop="sort" label="排序" width="60px" align="center"/>
         <el-table-column label="创建时间" show-overflow-tooltip min-width="160" align="center">
@@ -53,6 +58,12 @@
         <el-form-item label="部门名称:" prop="name">
           <el-input v-model="form.name" placeholder="请输入部门名称" clearable/>
         </el-form-item>
+        <el-form-item label="部门类型:">
+          <el-radio-group v-model="form.type">
+            <el-radio :label="1">考核部门</el-radio>
+            <el-radio :label="2">被考核部门</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="排序号:" prop="sort">
           <el-input-number v-model="form.sort" controls-position="right" :min="0"
                             placeholder="请输入排序号" class="ele-fluid ele-text-left"/>