考核项 修改

ruoyi-ui/src/views/kaohe/items/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="考核名称" prop="itemName">
+      <el-form-item label="考核项名称" prop="itemName">
         <el-input
           v-model="queryParams.itemName"
-          placeholder="请输入考核名称"
+          placeholder="请输入考核项名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="考核类型Id" prop="typeId">
+<!--      <el-form-item label="考核类型Id" prop="typeId">
         <el-input
           v-model="queryParams.typeId"
           placeholder="请输入考核类型Id"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -72,8 +72,8 @@
     <el-table v-loading="loading" :data="itemsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="考核名称" align="center" prop="itemName" />
-      <el-table-column label="考核类型Id" align="center" prop="typeId" />
+      <el-table-column label="考核项名称" align="center" prop="itemName" />
+<!--      <el-table-column label="考核类型Id" align="center" prop="typeId" />-->
       <el-table-column label="考核类型" align="center" prop="type" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -105,10 +105,10 @@
     />
 
     <!-- 添加或修改考核项对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="考核名称" prop="itemName">
-          <el-input v-model="form.itemName" placeholder="请输入考核名称" />
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="考核项名称" prop="itemName">
+          <el-input v-model="form.itemName" placeholder="请输入考核项名称" />
         </el-form-item>
 <!--        <el-form-item label="考核类型Id" prop="typeId">
           <el-input v-model="form.typeId" placeholder="请输入考核类型Id" />
@@ -130,7 +130,7 @@
 
 
     <!-- 选择考核类型 -->
-    <el-dialog title="双击选择考核类型" :visible.sync="type.open" width="900px" append-to-body>
+    <el-dialog title="双击选择考核类型" :visible.sync="type.open" width="600px" append-to-body>
       <div>
         <el-form :model="type.queryParams" :inline="true" label-width="70px">
           <el-form-item label="类型名称" prop="name" style="margin-bottom: 10px">
@@ -147,7 +147,7 @@
         </el-form>
 
         <el-table border v-loading="type.loading" :data="type.list" @row-dblclick="typeRowChange">
-          <el-table-column label="主键ID" align="center" prop="id" />
+<!--          <el-table-column label="主键ID" align="center" prop="id" />-->
           <el-table-column label="类型名称" align="center" prop="name" />
           <el-table-column label="备注" align="center" prop="remark" />
         </el-table>
@@ -209,7 +209,10 @@ export default {
       // 表单校验
       rules: {
         itemName: [
-          { required: true, message: "考核名称不能为空", trigger: "blur" }
+          { required: true, message: "考核项名称不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "考核类型不能为空", trigger: "blur" }
         ],
       },
       /** 选择考核类型*/