修改

src/views/oa/turnJust/DataList.vue

@@ -2,14 +2,10 @@
   <div class="container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
       <el-form-item label="转正人" prop="employeeName">
-        <el-input v-model="queryParams.loginName" placeholder="转正人" clearable style="width: 250px"
+        <el-input v-model="queryParams.employeeName" placeholder="转正人" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="员工编号" prop="employeeName">
-        <el-input v-model="queryParams.loginId" placeholder="员工编号" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="部门" prop="employeeName">
+      <el-form-item label="部门" prop="deptId">
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
@@ -19,29 +15,31 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="转正日期" prop="employeeName">
-        <el-date-picker style="width: 250px" value-format="yyyy-MM-dd" v-model="queryParams.conversionDate" type="date" placeholder="入职日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="审批状态" prop="auditStatus">
-        <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
-          <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="employeePhone">
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+                  @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="申请人"prop="employeeName">
+      <el-form-item label="转正日期" prop="conversionDate">
+            <el-date-picker v-model="queryParams.conversionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']" />
+          </el-form-item>
+          <el-form-item label="申请人"prop="creator">
         <el-input v-model="queryParams.creator" placeholder="申请人" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
     
-      <el-form-item label="申请时间" prop="employeeName">
-        <el-date-picker
-      v-model="queryParams.createTime"
-      style="width: 250px"
-      type="datetime"
-      value-format="yyyy-MM-dd HH:mm:ss"
-      placeholder="选择申请时间">
-    </el-date-picker>
+      <el-form-item label="申请时间" prop="createTime">
+            <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']" />
+          </el-form-item>
+      <el-form-item label="审批状态" prop="auditStatus">
+        <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
+          <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>
+     
       <el-form-item label="">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -124,10 +122,14 @@ export default {
         pageNo: 1,
         pageSize: 10,
         employeeName: undefined,
+        deptId: undefined,
         position: undefined,
         employeePhone: undefined,
+        conversionDate: [],
+        creator: undefined,
+        createTime: [],
         auditStatus: undefined,
-        createTime: []
+        
       },
     };
   },

src/views/oa/turnJust/detail.vue

@@ -7,12 +7,13 @@
           <div class="field-name">转正人</div>
         </div>
         <div class="field-component">
-          <span :title="form.loginName">{{ form.loginName }}</span>
+          <span :title="form.employeeName">{{ form.employeeName }}</span>
         </div>
       </div>
+     
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
-          <div class="field-name">员工编号</div>
+          <div class="field-name">部门</div>
         </div>
         <div class="field-component">
           <span :title="form.deptName">{{ form.deptName }}</span>
@@ -20,7 +21,7 @@
       </div>
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
-          <div class="field-name">部门</div>
+          <div class="field-name">职位</div>
         </div>
         <div class="field-component">
           <span :title="form.position">{{ form.position }}</span>
@@ -28,10 +29,10 @@
       </div>
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
-          <div class="field-name">职位</div>
+          <div class="field-name">手机号</div>
         </div>
         <div class="field-component">
-          <span :title="form.employeeTypeName">{{ form.employeeTypeName }}</span>
+          <span :title="form.employeePhone">{{ form.employeePhone }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -92,7 +93,9 @@
           <div class="field-name">附件</div>
         </div>
         <div class="field-component">
-          <span style="color: #5094d5;cursor: pointer;">附件1</span>
+          <div v-for="(item, index) in form.fileList" :key="index">
+            <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+          </div>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">

src/views/oa/turnJust/edit.vue

@@ -1,42 +1,41 @@
 <template>
   <div class="container">
     <el-form :model="form" label-position="top" :rules="rules" ref="form" label-width="80px">
-      <el-form-item label="转正人" prop="loginName">
-        <el-input v-model="form.loginName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+      <el-form-item label="转正人" prop="employeeName">
+        <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
       </el-form-item>
-      <el-form-item label="员工编号">
-        <el-input v-model="form.loginId" placeholder='员工编号' disabled></el-input>
+      <el-form-item label="转正人Id" style="display: none;">
+        <el-input v-model="form.employeeId" placeholder='转正人Id' disabled></el-input>
       </el-form-item>
       <el-form-item label="部门">
-        <el-input v-model="form.deptId" placeholder='部门' disabled></el-input>
-
+        <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
       </el-form-item>
       <el-form-item label="职位">
         <el-input v-model="form.position" placeholder='职位' disabled></el-input>
-
       </el-form-item>
-      <el-form-item label="入职日期" prop="entryDate">
+       <el-form-item label="手机号">
+        <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+      </el-form-item>
+      <el-form-item label="入职日期">
         <el-input v-model="form.entryDate" placeholder='入职日期' disabled></el-input>
-
       </el-form-item>
-      <el-form-item label="试用期结束日期" prop="probationEndDate">
+      <el-form-item label="试用期结束日期">
         <el-input v-model="form.probationEndDate" placeholder='试用期结束日期' disabled></el-input>
-
       </el-form-item>
       <el-form-item label="转正日期" prop="conversionDate">
-        <el-date-picker value-format="yyyy-MM-dd" v-model="form.conversionDate" type="date" placeholder="转正日期"
+        <el-date-picker value-format="yyyy-MM-dd" v-model="form.conversionDate" type="date" placeholder="请选择转正日期"
           style="width: 100%;">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="转正申请理由" prop="conversionReason">
-        <el-input maxlength="500" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
-          placeholder='转正申请理由'></el-input>
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
+          placeholder='请填写转正申请理由'></el-input>
       </el-form-item>
 
 
       <el-form-item label="工作总结">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workSummary"
-          placeholder='工作总结'></el-input>
+          placeholder='请填写工作总结'></el-input>
       </el-form-item>
 
       <el-form-item label="附件">
@@ -46,7 +45,7 @@
         </el-upload>
       </el-form-item>
       <el-form-item label="备注">
-        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks" placeholder="请输入备注" />
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks" placeholder="请填写备注" />
       </el-form-item>
       <el-form-item label="审批人" prop="peopleList">
         <el-input type="textarea" v-model="form.peopleList" style="display: none;" />
@@ -148,10 +147,11 @@ export default {
       deptOptions: [],
       nikeNamelist: [],
       form: {
-        loginName: undefined,
-        loginId: undefined,
-        deptId: undefined,
+        employeeName: undefined,
+        employeeId: undefined,
+        deptName: undefined,
         position: undefined,
+        employeePhone:undefined,
         entryDate: undefined,
 
         probationEndDate: undefined,
@@ -166,15 +166,9 @@ export default {
 
 
       rules: {
-        loginName: [
+        employeeName: [
           { required: true, message: '请选择', trigger: 'change' },
         ],
-        entryDate: [
-          { required: true, message: '请选择日期', trigger: 'change' }
-        ],
-        probationEndDate: [
-          { required: true, message: '请选择日期', trigger: 'change' }
-        ],
         conversionDate: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
@@ -206,7 +200,7 @@ export default {
         if(val){
           this.getDetail(val);
         }else{
-          this.getUser();
+          // this.getUser();
         }
       }
     }
@@ -429,8 +423,8 @@ export default {
     },
     submitSingle(userNamelist, nikeNamelist,userIdList) {
       console.log(userNamelist);
-      console.log(nikeNamelist);
-      this.form.loginName = userIdList.join();
+      this.form.employeeName = nikeNamelist.join();
+      this.form.employeeId = userIdList.join();
       this.singlePeopleOpen = false;
     },
     getTimelineItemIcon(item) {

src/views/oa/universal/DataList.vue

@@ -115,6 +115,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         employeeName: undefined,
+        deptId: undefined,
         position: undefined,
         employeePhone: undefined,
         auditStatus: undefined,

src/views/oa/universal/detail.vue

@@ -33,7 +33,7 @@
           <div class="field-name">手机号</div>
         </div>
         <div class="field-component">
-          <span :title="form.contactNumber">{{ form.employeePhone }}</span>
+          <span :title="form.employeePhone">{{ form.employeePhone }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">