sunlupeng 1 year ago
parent
commit
e53d42da69

+ 8 - 8
src/views/oa/entry/DataList.vue

@@ -58,22 +58,22 @@
     </el-row>
     </el-row>
 
 
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
-      <el-table-column label="入职人" prop="entryName" min-width="120" />
-      <el-table-column label="部门" prop="deptName" min-width="150" />
-      <el-table-column label="职位" prop="position" min-width="150" />
-      <el-table-column label="员工类型" prop="employeeType" min-width="100">
+      <el-table-column label="入职人" align="center" prop="entryName" min-width="120" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="150" />
+      <el-table-column label="职位" align="center" prop="position" min-width="150" />
+      <el-table-column label="员工类型" align="center" prop="employeeType" min-width="100">
         <template v-slot="scope">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.employeeType"/>
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_TYPE" :value="scope.row.employeeType"/>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="性别" prop="gender" min-width="100">
+      <el-table-column label="性别" align="center" prop="gender" min-width="100">
         <template v-slot="scope">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender"/>
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.gender"/>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="联系电话" prop="contactNumber" min-width="150" />
-      <el-table-column label="入职日期" prop="entryDate" min-width="150" />
-      <el-table-column label="审批状态" prop="auditStatus" min-width="100">
+      <el-table-column label="联系电话" align="center" prop="contactNumber" min-width="150" />
+      <el-table-column label="入职日期" align="center" prop="entryDate" min-width="150" />
+      <el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
         <template v-slot="scope">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
           <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
         </template>
         </template>

+ 12 - 7
src/views/oa/turnJust/DataList.vue

@@ -55,20 +55,25 @@
     </el-row>
     </el-row>
 
 
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
-      <el-table-column label="转正人" prop="loginName" min-width="120" />
-      <el-table-column label="员工编号" prop="loginId" min-width="150" />
-      <el-table-column label="部门" prop="deptId" min-width="150" />
-      <el-table-column label="职位" prop="position" min-width="150" />
-      <el-table-column label="转正日期" prop="conversionDate" min-width="100" />
-      <el-table-column label="审批状态" prop="auditStatus" min-width="150" />
+      <el-table-column label="转正人" align="center" prop="employeeName" min-width="120" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="150" />
+      <el-table-column label="职位" align="center" prop="position" min-width="150" />
+      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="150" />
+      <el-table-column label="转正日期" align="center" prop="conversionDate" min-width="100" />
+      <el-table-column label="转正日期" align="center" prop="entryDate" min-width="100" />
       <el-table-column label="申请人" prop="creator" min-width="150" />
       <el-table-column label="申请人" prop="creator" min-width="150" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="180">
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="180">
         <template v-slot="scope">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
+      <el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="120" />
     </el-table>
     </el-table>
-
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
                 @pagination="getList"/>
 
 

+ 8 - 8
src/views/oa/universal/DataList.vue

@@ -44,22 +44,22 @@
     </el-row>
     </el-row>
 
 
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
     <el-table v-loading="loading" :data="dataList" @row-click="handdle">
-      <el-table-column label="申请人" prop="employeeName" min-width="120" />
-      <el-table-column label="部门" prop="deptName" min-width="150" />
-      <el-table-column label="职位" prop="position" min-width="150" />
-      <el-table-column label="手机号" prop="employeePhone" min-width="150" />
-      <el-table-column label="申请事项标题" prop="title" min-width="150" />
-      <el-table-column label="申请时间" align="center" prop="createTime" min-width="180">
+      <el-table-column label="申请人" align="center" prop="employeeName" min-width="120" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="150" />
+      <el-table-column label="职位" align="center" prop="position" min-width="150" />
+      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="150" />
+      <el-table-column label="申请事项标题" align="center" prop="title" min-width="150" />
+      <el-table-column label="申请时间"  align="center" prop="createTime" min-width="180">
         <template v-slot="scope">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="审批状态" prop="auditStatus" min-width="100">
+      <el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
         <template v-slot="scope">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
           <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="当前处理人" prop="currentAuditEmployeeName" min-width="100" />
+      <el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="100" />
     </el-table>
     </el-table>
 
 
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"