修改

src/api/oa/renew.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 创建流程
 export function create(data) {
   return request({
-    url: '/bpm/oa-renewal/commit',
+    url: '/bpm/oa-renew/commit',
     method: 'post',
     data: data
   })
@@ -11,7 +11,7 @@ export function create(data) {
 //驳回或撤回后再次提交通用用事项审批流程信息
 export function reCommit(data) {
   return request({
-    url: '/bpm/oa-renewal/reCommit',
+    url: '/bpm/oa-renew/reCommit',
     method: 'post',
     data: data
   })
@@ -19,7 +19,7 @@ export function reCommit(data) {
 // 暂存数据保存
 export function save(data) {
   return request({
-    url: '/bpm/oa-renewal/staging',
+    url: '/bpm/oa-renew/staging',
     method: 'post',
     data: data
   })
@@ -27,7 +27,7 @@ export function save(data) {
 // 暂存数据删除
 export function deleteById(id) {
   return request({
-    url: 'bpm/oa-renewal/delete?id=' + id,
+    url: 'bpm/oa-renew/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -35,7 +35,7 @@ export function deleteById(id) {
 // 关闭审批流程信息
 export function closeById(id) {
   return request({
-    url: '/bpm/oa-renewal/close?id=' + id,
+    url: '/bpm/oa-renew/close?id=' + id,
     method: 'delete'
   })
 }
@@ -43,7 +43,7 @@ export function closeById(id) {
 // 获得详情
 export function getDetail(id) {
   return request({
-    url: '/bpm/oa-renewal/get?id=' + id,
+    url: '/bpm/oa-renew/get?id=' + id,
     method: 'get'
   })
 }
@@ -51,7 +51,7 @@ export function getDetail(id) {
 // 获得列表
 export function getListData(query) {
   return request({
-    url: '/bpm/oa-renewal/page',
+    url: '/bpm/oa-renew/page',
     method: 'get',
     params: query
   })
@@ -59,7 +59,7 @@ export function getListData(query) {
 // 导出列表
 export function exportList(query) {
   return request({
-    url: '/bpm/oa-renewal/export-excel',
+    url: '/bpm/oa-renew/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
@@ -69,7 +69,7 @@ export function exportList(query) {
 //审批同意通用事项审批流程信息
 export function agree(data) {
   return request({
-    url: '/bpm/oa-renewal/agree',
+    url: '/bpm/oa-renew/agree',
     method: 'post',
     data: data
   })
@@ -78,7 +78,7 @@ export function agree(data) {
 //驳回通用事项审批流程信息
 export function disagree(data) {
   return request({
-    url: '/bpm/oa-renewal/disagree',
+    url: '/bpm/oa-renew/disagree',
     method: 'post',
     data: data
   })
@@ -87,7 +87,7 @@ export function disagree(data) {
 //撤回通用事项审批流程信息
 export function revocation(data) {
   return request({
-    url: '/bpm/oa-renewal/revocation',
+    url: '/bpm/oa-renew/revocation',
     method: 'post',
     data: data
   })

src/views/oa/conversion/DataList.vue

@@ -61,7 +61,7 @@
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="入职日期" align="center" prop="entryDate" min-width="100" />
       <el-table-column label="转正日期" align="center" prop="conversionDate" min-width="100" />
-      <el-table-column label="申请人" prop="creator" min-width="80" />
+      <el-table-column label="申请人" align="center" prop="applyEmployeeName" min-width="80" />
       <el-table-column label="申请时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/oa/renew/DataList.vue

@@ -53,9 +53,9 @@
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
-      <el-table-column label="续签开始日期" prop="renewContractStartDate" min-width="100" />
-      <el-table-column label="续签结束日期" prop="renewContractEndDate" min-width="100" />
-      <el-table-column label="申请人" prop="creator" min-width="80" />
+      <el-table-column label="续签开始日期" align="center" prop="renewContractStartDate" min-width="100" />
+      <el-table-column label="续签结束日期" align="center" prop="renewContractEndDate" min-width="100" />
+      <el-table-column label="申请人" align="center" prop="applyEmployeeName" min-width="80" />
       <el-table-column label="申请时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/oa/renew/edit.vue

@@ -24,10 +24,8 @@
         <el-input v-model="form.oldContractEndDate" placeholder='原合同结束日期' disabled></el-input>
 
       </el-form-item>
-      <el-form-item label="续签合同期限" prop="renewPeriod">
-        <el-select v-model="form.renewPeriod" placeholder="请选择" style="width: 100%;">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
+      <el-form-item label="续签合同期限(月)" prop="renewPeriod">
+        <el-input v-model="form.renewPeriod" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='续签合同期限'></el-input>
       </el-form-item>
       <el-form-item label="续签开始日期" prop="renewContractStartDate">
         <el-date-picker value-format="yyyy-MM-dd" v-model="form.renewContractStartDate" type="date" placeholder="选择日期"
@@ -184,7 +182,7 @@ export default {
           { required: true, message: '请选择' },
         ],
         renewPeriod: [
-          { required: true, message: '请选择', trigger: 'change' }
+          { required: true, message: '请输入', trigger: 'change' }
         ],
         renewContractStartDate: [
           { required: true, message: '请选择日期', trigger: 'change' }