Merge branch 'personnelPerformance' into dev

src/views/system/classificationAssess/index.vue

@@ -48,7 +48,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编码" align="center" prop="code" />
       <el-table-column label="考核指标名称" align="center" prop="name" />
-      <el-table-column label="所属分类" align="center" prop="categoryName" />
+      <el-table-column label="一级分类" align="center" prop="categoryNameOne" />
+      <el-table-column label="二级分类" align="center" prop="categoryName" />
       <el-table-column label="分值" align="center" prop="score" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="事病假" align="center" prop="leaveType" />
@@ -87,13 +88,13 @@
         <el-form-item label="考核指标名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入考核指标名称" />
         </el-form-item>
-        <el-form-item label="所属分类" prop="categoryCode">
+        <el-form-item label="二级分类" prop="categoryCode">
           <el-tree-select v-model="form.categoryCode" :data="enableCategoryOptions"
-            :props="{ value: 'code', label: 'name', children: 'children' }" value-key="id" placeholder="请选择所属分类"
+            :props="{ value: 'code', label: 'name', children: 'children' }" value-key="id" placeholder="请选择二级分类"
             @node-click="handleNodeClick" />
         </el-form-item>
         <el-form-item label="分值" prop="score">
-          <el-input-number v-model="form.score" :min="0" :precision="2" placeholder="请输入分值" style="width: 100%" />
+          <el-input-number v-model="form.score"  :precision="2" placeholder="请输入分值" style="width: 100%" />
         </el-form-item>