Merge remote-tracking branch 'origin/main'

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

@@ -63,8 +63,10 @@
 
     <el-table v-loading="loading" :data="templateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" />
-      <el-table-column label="模板名称" align="center" prop="temName" />
+<!--      <el-table-column label="主键ID" align="center" prop="id" />-->
+      <el-table-column label="模板名称" align="center" prop="temName" :show-overflow-tooltip="true" min-width="120"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="110"/>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -111,6 +113,9 @@
             <el-table-column label="考核项名称" align="center" prop="itemName" />
           </el-table>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>