修改

src/views/oa/universal/DataList.vue

@@ -2,51 +2,33 @@
   <div class="container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
       <el-form-item label="申请人">
-        <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="部门">
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位">
-        <el-select v-model="queryParams.position" filterable allow-create default-first-option placeholder="请选择"
+        <el-select v-model="queryParams.position" placeholder="请选择"
         style="width: 250px">
           <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="员工类型">
-        <el-select v-model="queryParams.employeeType" placeholder="员工类型" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="性别">
-        <el-select v-model="queryParams.gender" placeholder="性别" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="手机号">
-        <el-input v-model="queryParams.contactNumber" placeholder="手机号" clearable style="width: 250px"
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <!-- <el-form-item label="入职日期">
-        <el-date-picker style="width: 250px" value-format="yyyy-MM-dd" v-model="queryParams.startDate" type="date" placeholder="入职日期">
-        </el-date-picker>
-      </el-form-item> -->
       <el-form-item label="审批状态">
         <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-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>
+      <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="">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -80,11 +62,11 @@
                 @pagination="getList"/>
 
     <!-- 修改 -->
-    <el-dialog title="通用审批(修改)" :visible.sync="openEdit" width="800px" append-to-body>
+    <el-dialog title="通用审批(修改)" :visible.sync="openEdit" width="800px">
       <edit :id="id"></edit>
     </el-dialog>
     <!-- 详情 -->
-    <el-dialog title="通用审批(详情)" :visible.sync="openDetail" width="800px" append-to-body>
+    <el-dialog title="通用审批(详情)" :visible.sync="openDetail" width="800px">
       <detail :id="id"></detail>
     </el-dialog>
   </div>

src/views/oa/universal/detail.vue

@@ -185,9 +185,19 @@ export default {
     };
   },
   created() {
-    this.entryId = this.id || this.$route.query.id;
-    console.log(this.entryId);
-    this.getDetail();
+    // this.entryId = this.id || this.$route.query.id;
+    // console.log(this.entryId);
+    // this.getDetail();
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        // console.log(val);
+        this.entryId = val;
+        this.getDetail();
+      }
+    }
   },
   methods: {
     handleEdit() {
@@ -275,6 +285,7 @@ export default {
     getDetail() {
       getDetail(this.entryId).then(response => {
         this.form = response.data;
+        this.tasks = response.data.auditRecordList;
       });
     },
   }

src/views/oa/universal/edit.vue

@@ -134,6 +134,14 @@ export default {
     this.getUser();
     this.getDeptList();
   },
+  // watch: {
+  //   id: {
+  //     immediate: true,
+  //     handler(val) {
+  //       this.getDetail();
+  //     }
+  //   }
+  // },
   methods: {
     getUser() {
       getUserProfile().then(response => {