创建时间添加

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

@@ -85,7 +85,8 @@
 
     <el-table v-loading="loading" :data="employeeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column label="主键" align="center" prop="id" fixed/>
+<!--      <el-table-column label="主键" align="center" prop="id" fixed/>-->
+      <el-table-column label="工号" align="center" prop="wordId" fixed/>
       <el-table-column label="所属部门" align="center" prop="deptId" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="部门名称" align="center" prop="deptName" :show-overflow-tooltip="true" min-width="120"/>
       <el-table-column label="职工姓名" align="center" prop="empName" :show-overflow-tooltip="true" min-width="120"/>
@@ -95,7 +96,6 @@
         </template>
       </el-table-column>
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="工号" align="center" prop="wordId" />
       <el-table-column label="身份" align="center" prop="position" />
       <el-table-column label="附件" align="center" prop="docs" width="120">
         <template slot-scope="scope">
@@ -149,28 +149,28 @@
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="工号" prop="wordId">
+              <el-input v-model="form.wordId" placeholder="请输入工号" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="所属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属部门" :show-count="true" @select="changeDept"/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="职工姓名" prop="empName">
               <el-input v-model="form.empName" placeholder="请输入职工姓名" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="年龄" prop="age">
               <el-input v-model="form.age" placeholder="请输入年龄" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="工号" prop="wordId">
-              <el-input v-model="form.wordId" placeholder="请输入工号" />
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row :gutter="10">
           <el-col :span="12">

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

@@ -71,10 +71,11 @@
 
     <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="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="type" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="110"/>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

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

@@ -92,10 +92,11 @@
 
     <el-table v-loading="loading" :data="pingceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" fixed/>
-      <el-table-column label="主键" align="center" prop="id" />
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="考核任务名称" align="center" prop="pcTitle" />
       <el-table-column label="考核任务描述" align="center" prop="pcDescription" />
       <el-table-column label="模板名称" align="center" prop="templateName" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="110"/>
       <el-table-column label="考核任务状态" align="center" prop="state">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.kh_state" :value="scope.row.state"/>
@@ -1087,6 +1088,21 @@ export default {
           }).then(response2 => {
             let pcSetUpList = [];
             response2.data.items.forEach((item,index) => {
+              if (item.vote===null){
+                item.vote={...this.voteInitData}
+                item.vote.khitemId = item.id;
+                item.vote.khitemName = item.itemName;
+                item.vote.khitemTypeid = item.typeId;
+                item.vote.pingceId = this.pcSetUp.pingceId;
+                item.vote.pingceName = this.pcSetUp.pingceName;
+                item.vote.voteTitle = item.itemName;
+                if(item.typeId===2){
+                  item.vote.maxNum = 100;
+                }
+                if(item.typeId===3){
+                  item.vote.maxNum = 10;
+                }
+              }
               if(index=== this.pcSetUp.xzhIndex ){
                 item.vote['voteEmps'] = voteEmps;
               }

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

@@ -63,8 +63,9 @@
 
     <el-table v-loading="loading" :data="typeList" @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="主键ID" align="center" prop="id" />-->
       <el-table-column label="类型名称" align="center" prop="name" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="110"/>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">