fix:人员管理列表新增时间字段

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -57,12 +57,17 @@
                   <el-form-item label="状态">
                     <el-select
                       size="small"
-                      style="width:200px"
-                      clearable 
+                      style="width: 200px"
+                      clearable
                       v-model="queryFrom.status"
                       placeholder="请选择"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -92,8 +97,8 @@
             :button8Name="'审核'"
             :button8Status="'入司待审核'"
             @handleButton8="handleTableEdit"
-             @handleButton3="handleTableEdit1"
-              :button3Name="'详情'"
+            @handleButton3="handleTableEdit1"
+            :button3Name="'详情'"
           ></kt-common-table>
           <!-- 
             @handleButton1="handleTableEdit"
@@ -227,8 +232,17 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -241,7 +255,11 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail" isDisabled></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            isDisabled
+          ></userDetail>
           <!-- <el-form :rules="formDataRules"
             :model="formDataDetail"
             ref="formDataDetail"
@@ -490,14 +508,18 @@
             label-width="130px"
             size="small"
           >
-            <peopleImage :dataForm="dataForm" :carfrontImg="true" :dialogVisible="dialogVisible"></peopleImage>
+            <peopleImage
+              :dataForm="dataForm"
+              :carfrontImg="true"
+              :dialogVisible="dialogVisible"
+            ></peopleImage>
           </el-form>
           <div style="text-align: right">
             <el-button size="small" type="primary" @click="nextStep('2')"
               >上一步</el-button
             >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="primary"
               style="background-color: #0ec216; border: 1px solid #0ec216"
@@ -505,7 +527,7 @@
               >审核通过</el-button
             >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="danger"
               style="background-color: #de504c; border: 1px solid #de504c"
@@ -519,14 +541,26 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    
+
     <!-- 驳回理由 -->
-    <el-dialog title="驳回" width="40%" :visible.sync="showRemark"  @close="closeDialogOut">
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
       <el-form>
         <el-form-item label="备注" prop="remark">
-          <el-input style="width: 30vw;" v-model="formDataDetail.remark" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
-            show-word-limit></el-input>
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -534,8 +568,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -543,22 +575,22 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
-import mixa from '../mixin' 
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:2 //树分类过滤参数
-})
+  treeTypeNum: 2, //树分类过滤参数
+});
 export default {
   components: {
     tree,
     KtCommonTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
-      showRemark: false,    // 驳回弹窗
+      showRemark: false, // 驳回弹窗
       activeName: "1",
       pageData: {
         pageNum: 1,
@@ -611,6 +643,18 @@ export default {
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -633,37 +677,39 @@ export default {
         DX_00: "",
       },
       //影像上传列表
-      imagesIdList:[],
+      imagesIdList: [],
     };
   },
-  created() {
-  },
+  created() {},
   methods: {
     handleSubOut() {
-      if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$refs.formDataDetail.validate((valid) => {
+        if (valid) {
+          this.$api.user
+            .getApprovalNotPass({
+              userId: this.formData.id,
+              reason: this.formDataDetail.remark,
+            })
+            .then((result) => {
+              if (result.code == 200 && result.data) {
+                this.$message({
+                  message: "审核已驳回",
+                  type: "success",
+                });
+                this.findPage();
+                this.closeDialogOut();
+                this.dialogVisible = false;
+              }
+            });
         }
-        this.$refs.formDataDetail.validate(valid => {
-          if (valid) {
-            this.$api.user
-              .getApprovalNotPass({ userId: this.formData.id, reason: this.formDataDetail.remark })
-              .then(result => {
-                if (result.code == 200 && result.data) {
-                  this.$message({
-                    message: "审核已驳回",
-                    type: "success"
-                  });
-                  this.findPage();
-                  this.closeDialogOut()
-                  this.dialogVisible = false;
-                }
-              });
-          }
-        });
+      });
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
@@ -732,7 +778,7 @@ export default {
                 (ele) => ele.value == val.status
               ).label;
             }
-            val.roleId=val.roleName
+            val.roleId = val.roleName;
           });
           this.pageResult = res.data;
         });
@@ -760,21 +806,23 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
         }
-      })
+      });
       this.dialogTitle = "详情";
       this.dialogVisible = true;
     },
@@ -786,16 +834,16 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-      }
+      };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
           res.data.sysUser.status += "";
           this.formData = res.data.sysUser;
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
           this.formDataDetail = res.data.sysUserInfo
             ? res.data.sysUserInfo
@@ -824,11 +872,11 @@ export default {
           }
         });
       } else {
-        this.showRemark = true
-        return
-        if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+        this.showRemark = true;
+        return;
+        if (!this.formDataDetail.remark) {
+          this.$message.error("请在详细信息填写驳回原因");
+          return;
         }
         this.$refs.formDataDetail.validate((valid) => {
           if (valid) {
@@ -878,16 +926,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -897,20 +945,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Agent/AgentManage.vue

@@ -254,7 +254,10 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail"></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+          ></userDetail>
           <!-- <el-form
             :model="formDataDetail"
             :rules="formDataRulesDetail"
@@ -564,7 +567,11 @@
             <el-button
               size="small"
               type="primary"
-              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              style="
+                background-color: #eaedf1;
+                border: 1px solid #eaedf1;
+                color: #2d4d89;
+              "
               @click="closeDialog"
               >取消</el-button
             >
@@ -578,8 +585,13 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    
-    <el-dialog title="离司" width="40%" :visible.sync="showOut"  @close="closeDialogOut">
+
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
       <div>
         <el-form>
           <el-form-item label="离职时间" prop="logoutTime">
@@ -590,8 +602,8 @@
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="离职表:" style="width: 50%">
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
             <el-upload
               class="avatar-uploader"
               action=""
@@ -611,7 +623,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 
@@ -621,7 +632,7 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
 import { validateSfz } from "../../../utils/validate.js";
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
 import mixa from "../mixin";
 const mixin = new mixa({
   treeTypeNum: 2, //树分类过滤参数
@@ -632,16 +643,16 @@ export default {
     tree,
     templateTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
   mixins: [mixin],
   data() {
     return {
-      showOut: false,     // 离司
-      logoutTime: '', // 离司 离职时间
-      logoutImg: '',   // 离司 图片
-      logoutImgId: '',
-      lineId: '',
+      showOut: false, // 离司
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
       leaderOptions: [],
       activeName: "1",
       isShow: true,
@@ -653,7 +664,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       },
       //影像上传列表
       imagesIdList: [],
@@ -721,6 +732,17 @@ export default {
             label: "来源",
             type: "text",
           },
+          {
+            prop: "submitTime",
+            label: "提交时间",
+            type: "text",
+          },
+          {
+            prop: "approveTime",
+            label: "审核时间",
+            type: "text",
+          },
+
           {
             prop: "status",
             label: "状态",
@@ -730,7 +752,7 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
-        operationWidth: "150",
+        operationWidth: "220",
         optBtns: [
           {
             type: "primary",
@@ -747,7 +769,7 @@ export default {
             perm: "sys:agent:edit",
             icon: "fa fa-edit",
             hide: (row) => {
-              return row.status == '正常'
+              return row.status == "正常";
             },
             click: (row, index) => {
               return this.handleOut(row);
@@ -815,33 +837,34 @@ export default {
     this.searchLeaderFun();
   },
   methods: {
-    
     handleSubOut() {
-      if (this.logoutTime == '') {
-        this.$message.error('请选择时间')
-        return
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
       }
-      if (this.logoutImgId == '') {
-        this.$message.error('请上传离职表')
-        return
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
       }
       let subData = {
-        esmUserImageVo: [{
-          imageId: this.logoutImgId,
-          type: 'LZ_01'
-        }],
-        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: { id: this.lineId, logoutTime: this.logoutTime },
         sysUserInfo: {},
-      }
+      };
       this.$api.user.departApply(subData).then((res) => {
         if (res.code == 200) {
-          this.$message.success(res.msg)
-          this.findPage()
-          this.closeDialogOut()
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     },
     // 上传图片的方法Start
     beforeAvatarUpload(file) {
@@ -870,19 +893,19 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          this.logoutImgId = res.data.id
+          this.logoutImgId = res.data.id;
         }
       });
     },
     closeDialogOut() {
-      this.showOut = false
+      this.showOut = false;
     },
     // 离司
     handleOut(data) {
-      this.lineId = data.userId
-      this.showOut = true
+      this.lineId = data.userId;
+      this.showOut = true;
     },
     async searchLeaderFun() {
       await this.$api.user.findHxUserList().then((res) => {
@@ -1299,16 +1322,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -1318,20 +1341,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Player/PlayerExamine.vue

@@ -57,12 +57,17 @@
                   <el-form-item label="状态">
                     <el-select
                       size="small"
-                      style="width:200px"
-                      clearable 
+                      style="width: 200px"
+                      clearable
                       v-model="queryFrom.status"
                       placeholder="请选择"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -92,8 +97,8 @@
             :button8Name="'审核'"
             :button8Status="'入司待审核'"
             @handleButton8="handleTableEdit"
-             @handleButton3="handleTableEdit1"
-              :button3Name="'详情'"
+            @handleButton3="handleTableEdit1"
+            :button3Name="'详情'"
           ></kt-common-table>
           <!-- 
             @handleButton1="handleTableEdit"
@@ -245,27 +250,49 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
           <div style="text-align: right">
-            <el-button size="small" type="primary" @click="nextStep('3')">下一步</el-button>
+            <el-button size="small" type="primary" @click="nextStep('3')"
+              >下一步</el-button
+            >
           </div>
         </el-tab-pane>
-        
+
         <el-tab-pane label="影像资料" name="3">
-          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true"
-           label-width="130px" size="small">
-           <peopleImage :dataForm="dataForm" :dialogVisible="dialogVisible" :carfrontImg="true"></peopleImage>
+          <el-form
+            :model="formDataDetail"
+            ref="formDataDetail"
+            :inline="true"
+            label-width="130px"
+            size="small"
+          >
+            <peopleImage
+              :dataForm="dataForm"
+              :dialogVisible="dialogVisible"
+              :carfrontImg="true"
+            ></peopleImage>
           </el-form>
-          <div style="text-align: right;">
-            <el-button size="small" type="primary" @click="nextStep('1')">上一步</el-button>
+          <div style="text-align: right">
+            <el-button size="small" type="primary" @click="nextStep('1')"
+              >上一步</el-button
+            >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="primary"
               style="background-color: #0ec216; border: 1px solid #0ec216"
@@ -273,7 +300,7 @@
               >审核通过</el-button
             >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="danger"
               style="background-color: #de504c; border: 1px solid #de504c"
@@ -287,14 +314,26 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    
+
     <!-- 驳回理由 -->
-    <el-dialog title="驳回" width="40%" :visible.sync="showRemark"  @close="closeDialogOut">
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
       <el-form>
         <el-form-item label="备注" prop="remark">
-          <el-input style="width: 30vw;" v-model="formDataDetail.remark" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
-            show-word-limit></el-input>
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -302,8 +341,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -311,20 +348,20 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import mixa from '../mixin' 
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:1 //树分类过滤参数
-})
+  treeTypeNum: 1, //树分类过滤参数
+});
 export default {
   components: {
     tree,
     KtCommonTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
-      showRemark: false,    // 驳回弹窗
+      showRemark: false, // 驳回弹窗
       activeName: "1",
       pageData: {
         pageNum: 1,
@@ -377,6 +414,18 @@ export default {
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -400,33 +449,35 @@ export default {
         LZ_01: "",
       },
       //影像上传列表
-      imagesIdList:[],
+      imagesIdList: [],
     };
   },
-  created() {
-  },
+  created() {},
   methods: {
     handleSubOut() {
-      if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
-        }
-        this.$api.user
-          .getApprovalNotPass({ userId: this.formData.id, reason: this.formDataDetail.remark })
-          .then(result => {
-            if (result.code == 200 && result.data) {
-              this.$message({
-                message: "审核已驳回",
-                type: "success"
-              });
-              this.findPage();
-              this.closeDialogOut()
-              this.dialogVisible = false;
-            }
-          });
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$api.user
+        .getApprovalNotPass({
+          userId: this.formData.id,
+          reason: this.formDataDetail.remark,
+        })
+        .then((result) => {
+          if (result.code == 200 && result.data) {
+            this.$message({
+              message: "审核已驳回",
+              type: "success",
+            });
+            this.findPage();
+            this.closeDialogOut();
+            this.dialogVisible = false;
+          }
+        });
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
@@ -496,15 +547,15 @@ export default {
                 (ele) => ele.value == val.status
               ).label;
             }
-            val.roleId=val.roleName
+            val.roleId = val.roleName;
           });
           let datas = {
             content: res.data.records,
             pageNum: res.data.current,
             pageSize: res.data.size,
             totalPages: res.data.pages,
-            totalSize: res.data.total
-          }
+            totalSize: res.data.total,
+          };
           this.pageResult = datas;
         });
     },
@@ -531,23 +582,25 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo && res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo && res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
         }
-          this.dialogTitle = "详情";
-          this.dialogVisible = true;
-      })
+        this.dialogTitle = "详情";
+        this.dialogVisible = true;
+      });
     },
     handleTableEdit(params) {
       this.dataForm = {
@@ -558,16 +611,16 @@ export default {
         YP_00: "",
         DX_00: "",
         LZ_01: "",
-      }
+      };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
           res.data.sysUser.status += "";
           this.formData = res.data.sysUser;
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
           this.formDataDetail = res.data.sysUserInfo
             ? res.data.sysUserInfo
@@ -596,11 +649,11 @@ export default {
           }
         });
       } else {
-        this.showRemark = true
-        return
-        if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+        this.showRemark = true;
+        return;
+        if (!this.formDataDetail.remark) {
+          this.$message.error("请在详细信息填写驳回原因");
+          return;
         }
         this.$refs.formDataDetail.validate((valid) => {
           if (valid) {
@@ -650,16 +703,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
   transform: translateX(0) !important;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
@@ -670,20 +723,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Player/PlayerExamineTeam.vue

@@ -64,12 +64,17 @@
                   <el-form-item label="状态">
                     <el-select
                       size="small"
-                      style="width:200px"
-                      clearable 
+                      style="width: 200px"
+                      clearable
                       v-model="queryFrom.status"
                       placeholder="请选择"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -99,8 +104,8 @@
             :button8Name="'审核'"
             :button8Status="'入司待审核'"
             @handleButton8="handleTableEdit"
-             @handleButton3="handleTableEdit1"
-              :button3Name="'详情'"
+            @handleButton3="handleTableEdit1"
+            :button3Name="'详情'"
           ></kt-common-table>
           <!-- 
             @handleButton1="handleTableEdit"
@@ -234,8 +239,17 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -248,7 +262,11 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail" isDisabled></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            isDisabled
+          ></userDetail>
           <!-- <el-form
             :rules="formDataRules"
             :model="formDataDetail"
@@ -498,14 +516,18 @@
             label-width="130px"
             size="small"
           >
-            <peopleImage :dataForm="dataForm" :carfrontImg="true" :dialogVisible="dialogVisible"></peopleImage>
+            <peopleImage
+              :dataForm="dataForm"
+              :carfrontImg="true"
+              :dialogVisible="dialogVisible"
+            ></peopleImage>
           </el-form>
           <div style="text-align: right">
             <el-button size="small" type="primary" @click="nextStep('2')"
               >上一步</el-button
             >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="primary"
               style="background-color: #0ec216; border: 1px solid #0ec216"
@@ -513,7 +535,7 @@
               >审核通过</el-button
             >
             <el-button
-               v-show="dialogTitle == '审核代理人'"
+              v-show="dialogTitle == '审核代理人'"
               size="mini"
               type="danger"
               style="background-color: #de504c; border: 1px solid #de504c"
@@ -527,14 +549,26 @@
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    
+
     <!-- 驳回理由 -->
-    <el-dialog title="驳回" width="40%" :visible.sync="showRemark"  @close="closeDialogOut">
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
       <el-form>
         <el-form-item label="备注" prop="remark">
-          <el-input style="width: 30vw;" v-model="formDataDetail.remark" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
-            show-word-limit></el-input>
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -542,8 +576,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
-
   </div>
 </template>
 
@@ -551,22 +583,22 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
-import mixa from '../mixin' 
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:1 //树分类过滤参数
-})
+  treeTypeNum: 1, //树分类过滤参数
+});
 export default {
   components: {
     tree,
     KtCommonTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
-      showRemark: false,    // 驳回弹窗
+      showRemark: false, // 驳回弹窗
       activeName: "1",
       pageData: {
         pageNum: 1,
@@ -619,6 +651,18 @@ export default {
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -641,7 +685,7 @@ export default {
         DX_00: "",
       },
       //影像上传列表
-      imagesIdList:[],
+      imagesIdList: [],
     };
   },
   created() {
@@ -649,30 +693,33 @@ export default {
   },
   methods: {
     handleSubOut() {
-      if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$refs.formDataDetail.validate((valid) => {
+        if (valid) {
+          this.$api.user
+            .getApprovalNotPass({
+              userId: this.formData.id,
+              reason: this.formDataDetail.remark,
+            })
+            .then((result) => {
+              if (result.code == 200 && result.data) {
+                this.$message({
+                  message: "审核已驳回",
+                  type: "success",
+                });
+                this.findPage();
+                this.closeDialogOut();
+                this.dialogVisible = false;
+              }
+            });
         }
-        this.$refs.formDataDetail.validate(valid => {
-          if (valid) {
-            this.$api.user
-              .getApprovalNotPass({ userId: this.formData.id, reason: this.formDataDetail.remark })
-              .then(result => {
-                if (result.code == 200 && result.data) {
-                  this.$message({
-                    message: "审核已驳回",
-                    type: "success"
-                  });
-                  this.findPage();
-                  this.closeDialogOut()
-                  this.dialogVisible = false;
-                }
-              });
-          }
-        });
+      });
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
@@ -742,15 +789,15 @@ export default {
                 (ele) => ele.value == val.status
               ).label;
             }
-            val.roleId=val.roleName
+            val.roleId = val.roleName;
           });
           let datas = {
             content: res.data.records,
             pageNum: res.data.current,
             pageSize: res.data.size,
             totalPages: res.data.pages,
-            totalSize: res.data.total
-          }
+            totalSize: res.data.total,
+          };
           this.pageResult = datas;
         });
     },
@@ -777,21 +824,23 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
         }
-      })
+      });
       this.dialogTitle = "详情";
       this.dialogVisible = true;
     },
@@ -803,16 +852,16 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-      }
+      };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
           res.data.sysUser.status += "";
           this.formData = res.data.sysUser;
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
           this.formDataDetail = res.data.sysUserInfo
             ? res.data.sysUserInfo
@@ -841,11 +890,11 @@ export default {
           }
         });
       } else {
-        this.showRemark = true
-        return
-        if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+        this.showRemark = true;
+        return;
+        if (!this.formDataDetail.remark) {
+          this.$message.error("请在详细信息填写驳回原因");
+          return;
         }
         this.$refs.formDataDetail.validate((valid) => {
           if (valid) {
@@ -895,16 +944,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -914,20 +963,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Player/PlayerManage.vue

@@ -134,7 +134,7 @@
                   <el-input
                     v-model="formData.identity"
                     :maxlength="18"
-                    ></el-input>
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -256,7 +256,11 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item label="驳回信息" prop="referrerName">
-                  <el-input type="textarea" v-model="formData.approvalOpinion" disabled></el-input>
+                  <el-input
+                    type="textarea"
+                    v-model="formData.approvalOpinion"
+                    disabled
+                  ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -267,7 +271,7 @@
             >
           </div>
         </el-tab-pane>
-        
+
         <el-tab-pane label="影像资料" name="3">
           <el-form
             :model="formDataDetail"
@@ -286,7 +290,11 @@
             <el-button
               size="small"
               type="primary"
-              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              style="
+                background-color: #eaedf1;
+                border: 1px solid #eaedf1;
+                color: #2d4d89;
+              "
               @click="closeDialog"
               >取消</el-button
             >
@@ -301,8 +309,12 @@
       </el-tabs>
     </el-dialog>
 
-    
-    <el-dialog title="离司" width="40%" :visible.sync="showOut"  @close="closeDialogOut">
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
       <div>
         <el-form>
           <el-form-item label="离职时间" prop="logoutTime">
@@ -313,8 +325,8 @@
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="离职表:" style="width: 50%">
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
             <el-upload
               class="avatar-uploader"
               action=""
@@ -357,11 +369,11 @@ export default {
   mixins: [mixin],
   data() {
     return {
-      showOut: false,     // 离司
-      logoutTime: '', // 离司 离职时间
-      logoutImg: '',   // 离司 图片
-      logoutImgId: '',
-      lineId: '',
+      showOut: false, // 离司
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
       activeName: "1", //弹框tab索引
       isShow: true, //密码是否显示
       formList: [
@@ -427,6 +439,18 @@ export default {
             label: "来源",
             type: "text",
           },
+          {
+            prop: "submitTime",
+            label: "提交时间",
+            type: "text",
+            minWidth: 100,
+          },
+          {
+            prop: "approveTime",
+            label: "审核时间",
+            type: "text",
+            minWidth: 100,
+          },
           {
             prop: "status",
             label: "状态",
@@ -436,7 +460,7 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
-        operationWidth: "150",
+        operationWidth: "220",
         optBtns: [
           {
             type: "primary",
@@ -453,7 +477,7 @@ export default {
             perm: "sys:agent:edit",
             icon: "fa fa-edit",
             hide: (row) => {
-              return row.status == '正常'
+              return row.status == "正常";
             },
             click: (row, index) => {
               return this.handleOut(row);
@@ -482,7 +506,8 @@ export default {
             trigger: "blur",
           },
         ],
-        identity: [{ required: true, message: "请填写身份证号" },
+        identity: [
+          { required: true, message: "请填写身份证号" },
           { validator: validateSfz },
         ],
         name: [{ required: true, message: "请填写名称", trigger: "blur" }],
@@ -513,7 +538,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       },
       //影像上传列表
       imagesIdList: [],
@@ -531,31 +556,33 @@ export default {
   },
   methods: {
     handleSubOut() {
-      if (this.logoutTime == '') {
-        this.$message.error('请选择时间')
-        return
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
       }
-      if (this.logoutImgId == '') {
-        this.$message.error('请上传离职表')
-        return
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
       }
       let subData = {
-        esmUserImageVo: [{
-          imageId: this.logoutImgId,
-          type: 'LZ_01'
-        }],
-        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: { id: this.lineId, logoutTime: this.logoutTime },
         sysUserInfo: {},
-      }
+      };
       this.$api.user.departApply(subData).then((res) => {
         if (res.code == 200) {
-          this.$message.success(res.msg)
-          this.findPage()
-          this.closeDialogOut()
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     },
     // 上传图片的方法Start
     beforeAvatarUpload(file) {
@@ -584,19 +611,19 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          this.logoutImgId = res.data.id
+          this.logoutImgId = res.data.id;
         }
       });
     },
     closeDialogOut() {
-      this.showOut = false
+      this.showOut = false;
     },
     // 离司
     handleOut(data) {
-      this.lineId = data.userId
-      this.showOut = true
+      this.lineId = data.userId;
+      this.showOut = true;
     },
     searchLeaderFun() {
       this.$api.user.findHxUserList().then((res) => {
@@ -706,7 +733,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.imagesIdList = [];
       this.activeName = "1";
@@ -809,9 +836,10 @@ export default {
             }
             if (this.dialogTitle == "新增渠道信息") {
               this.$api.user
-                .saveUserInfo({ sysUser: this.formData,
+                .saveUserInfo({
+                  sysUser: this.formData,
                   esmUserImageVo: this.imagesIdList,
-                 })
+                })
                 .then((res) => {
                   if (res.code == 200) {
                     this.$message({
@@ -831,9 +859,10 @@ export default {
                 });
             } else {
               this.$api.user
-                .updateUserInfo(this.formData.id, { sysUser: this.formData,
+                .updateUserInfo(this.formData.id, {
+                  sysUser: this.formData,
                   esmUserImageVo: this.imagesIdList,
-                 })
+                })
                 .then((res) => {
                   if (res.code == 200) {
                     this.$message({
@@ -926,16 +955,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
   transform: translateX(0) !important;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
@@ -946,20 +975,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -127,8 +127,8 @@
                   <el-input
                     v-model="formData.identity"
                     :maxlength="18"
-                    ></el-input>
-                    <!-- @change="identityChange" -->
+                  ></el-input>
+                  <!-- @change="identityChange" -->
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -236,7 +236,10 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail"></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+          ></userDetail>
           <!-- <el-form
             :model="formDataDetail"
             :rules="formDataRulesDetail"
@@ -527,7 +530,7 @@
             >
           </div>
         </el-tab-pane>
-        
+
         <el-tab-pane label="影像资料" name="3">
           <el-form
             :model="formDataDetail"
@@ -546,7 +549,11 @@
             <el-button
               size="small"
               type="primary"
-              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              style="
+                background-color: #eaedf1;
+                border: 1px solid #eaedf1;
+                color: #2d4d89;
+              "
               @click="closeDialog"
               >取消</el-button
             >
@@ -561,8 +568,12 @@
       </el-tabs>
     </el-dialog>
 
-    
-    <el-dialog title="离司" width="40%" :visible.sync="showOut"  @close="closeDialogOut">
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
       <div>
         <el-form>
           <el-form-item label="离职时间" prop="logoutTime">
@@ -573,8 +584,8 @@
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="离职表:" style="width: 50%">
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
             <el-upload
               class="avatar-uploader"
               action=""
@@ -594,7 +605,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 
@@ -603,7 +613,7 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
 import { validateSfz } from "../../../utils/validate.js";
 import mixa from "../mixin";
 const mixin = new mixa({
@@ -615,7 +625,7 @@ export default {
     tree,
     templateTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
   mixins: [mixin],
   data() {
@@ -628,15 +638,15 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       },
       //影像上传列表
       imagesIdList: [],
-      showOut: false,     // 离司
-      logoutTime: '', // 离司 离职时间
-      logoutImg: '',   // 离司 图片
-      logoutImgId: '',
-      lineId: '',
+      showOut: false, // 离司
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
       searchLeaderOptions: [],
       leaderOptions: [],
       activeName: "1", //弹框tab索引
@@ -695,6 +705,18 @@ export default {
             label: "来源",
             type: "text",
           },
+          {
+            prop: "submitTime",
+            label: "提交时间",
+            type: "text",
+            minWidth: 100,
+          },
+          {
+            prop: "approveTime",
+            label: "审核时间",
+            type: "text",
+            minWidth: 100,
+          },
           {
             prop: "status",
             label: "状态",
@@ -704,7 +726,7 @@ export default {
         loading: true,
         isPaginationShow: true,
         isShowIndex: true,
-        operationWidth: "150",
+        operationWidth: "220",
         optBtns: [
           {
             type: "primary",
@@ -721,7 +743,7 @@ export default {
             perm: "sys:agent:edit",
             icon: "fa fa-edit",
             hide: (row) => {
-              return row.status == '正常'
+              return row.status == "正常";
             },
             click: (row, index) => {
               return this.handleOut(row);
@@ -750,7 +772,8 @@ export default {
             trigger: "blur",
           },
         ],
-        identity: [{ required: true, message: "请填写身份证号" },
+        identity: [
+          { required: true, message: "请填写身份证号" },
           { validator: validateSfz },
         ],
         name: [{ required: true, message: "请填写名称", trigger: "blur" }],
@@ -774,7 +797,7 @@ export default {
       dialogPassword: true, //密码是否显示明文
       // postOption:[],
       formDataDetail: {
-        birthday: ''
+        birthday: "",
       },
       formDataRulesDetail: {},
     };
@@ -791,31 +814,33 @@ export default {
   },
   methods: {
     handleSubOut() {
-      if (this.logoutTime == '') {
-        this.$message.error('请选择时间')
-        return
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
       }
-      if (this.logoutImgId == '') {
-        this.$message.error('请上传离职表')
-        return
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
       }
       let subData = {
-        esmUserImageVo: [{
-          imageId: this.logoutImgId,
-          type: 'LZ_01'
-        }],
-        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: { id: this.lineId, logoutTime: this.logoutTime },
         sysUserInfo: {},
-      }
+      };
       this.$api.user.departApply(subData).then((res) => {
         if (res.code == 200) {
-          this.$message.success(res.msg)
-          this.findPage()
-          this.closeDialogOut()
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     },
     // 上传图片的方法Start
     beforeAvatarUpload(file) {
@@ -844,19 +869,19 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          this.logoutImgId = res.data.id
+          this.logoutImgId = res.data.id;
         }
       });
     },
     closeDialogOut() {
-      this.showOut = false
+      this.showOut = false;
     },
     // 离司
     handleOut(data) {
-      this.lineId = data.userId
-      this.showOut = true
+      this.lineId = data.userId;
+      this.showOut = true;
     },
     searchLeaderFun() {
       this.$api.user.findHxUserList().then((res) => {
@@ -899,7 +924,7 @@ export default {
       }
     },
     identityChange(iden) {
-      return
+      return;
       let sex = null;
       let birth = null;
       let myDate = new Date();
@@ -1027,7 +1052,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.imagesIdList = [];
       this.activeName = "1";
@@ -1247,16 +1272,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -1266,20 +1291,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Staff/StaffExamine.vue

@@ -6,8 +6,13 @@
         <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
             <!-- 左侧树形结构 -->
-            <el-tree :data="ztreeNodes" :props="{ children: 'children', label: 'name' }" node-key="id"
-              :default-expanded-keys="['9']" @node-click="onZTreeClick"></el-tree>
+            <el-tree
+              :data="ztreeNodes"
+              :props="{ children: 'children', label: 'name' }"
+              node-key="id"
+              :default-expanded-keys="['9']"
+              @node-click="onZTreeClick"
+            ></el-tree>
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -20,82 +25,141 @@
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="工号">
-                    <el-input clearable size="small" placeholder="工号" v-model="queryFrom.userId"></el-input>
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="工号"
+                      v-model="queryFrom.userId"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="姓名">
-                    <el-input clearable size="small" placeholder="姓名" v-model="queryFrom.name"></el-input>
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="姓名"
+                      v-model="queryFrom.name"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="手机号">
-                    <el-input clearable size="small" placeholder="手机号" v-model="queryFrom.mobile"></el-input>
+                    <el-input
+                      clearable
+                      size="small"
+                      placeholder="手机号"
+                      v-model="queryFrom.mobile"
+                    ></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="状态">
                     <el-select
-                      style="width:200px"
-                      clearable 
+                      style="width: 200px"
+                      clearable
                       v-model="queryFrom.status"
                       placeholder="请选择"
                       size="small"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="">
-                    <el-button size="small" type="primary" @click="queryStaffInfo">查询</el-button>
+                    <el-button
+                      size="small"
+                      type="primary"
+                      @click="queryStaffInfo"
+                      >查询</el-button
+                    >
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </el-row>
 
-          <kt-common-table permsButton1="sys:backline:examine" :data="pageResult" :columns="columns" :button3Name="'详情'"
+          <kt-common-table
+            permsButton1="sys:backline:examine"
+            :data="pageResult"
+            :columns="columns"
+            :button3Name="'详情'"
             :button7Name="'审核'"
             :button7Status="'离司待审核'"
             @handleButton7="handleTableEdit"
             :button8Name="'审核'"
             :button8Status="'入司待审核'"
             @handleButton8="handleTableEdit"
-            :showBatchDelete="false" @findPage="findPage" @handleButton3="handleTableEdit1">
+            :showBatchDelete="false"
+            @findPage="findPage"
+            @handleButton3="handleTableEdit1"
+          >
           </kt-common-table>
-
         </SplitArea>
         <!-- 右侧列表页面End -->
       </Split>
     </el-main>
-    <el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
-      :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
-      <el-tabs v-model="activeName" >
+    <el-dialog
+      :title="dialogTitle"
+      width="60%"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :before-close="handleDialogBefore"
+      @close="closeDialog"
+      v-dialogDrag
+    >
+      <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="1">
-          <el-form :model="formData" disabled ref="formData" :inline="true" @keyup.enter.native="nextStep('1')"
-            label-width="110px" size="small">
+          <el-form
+            :model="formData"
+            disabled
+            ref="formData"
+            :inline="true"
+            @keyup.enter.native="nextStep('1')"
+            label-width="110px"
+            size="small"
+          >
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构部门">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.pdeptId" clearable
-                    :show-all-levels="false" :props="{
+                  <el-cascader
+                    style="width: 200px"
+                    :options="ztreeNodes"
+                    v-model="formData.pdeptId"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{
                       value: 'id',
                       label: 'name',
                       checkStrictly: true,
-                    }" @change="handleChange">
-                  </el-cascader>
-                </el-form-item></el-col>
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader> </el-form-item
+              ></el-col>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable
-                    :show-all-levels="false" :props="{
+                  <el-cascader
+                    style="width: 200px"
+                    :options="ztreeNodes"
+                    v-model="formData.deptId"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{
                       value: 'id',
                       label: 'name',
                       checkStrictly: true,
-                    }" @change="handleChange">
-                  </el-cascader>
-                </el-form-item></el-col>
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader> </el-form-item
+              ></el-col>
               <el-col :span="8">
                 <el-form-item label="员工工号" prop="id">
                   <el-input v-model="formData.id" disabled></el-input>
@@ -108,7 +172,10 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
-                  <el-input v-model="formData.identity" :maxlength="18"></el-input>
+                  <el-input
+                    v-model="formData.identity"
+                    :maxlength="18"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -118,40 +185,77 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="密码" prop="password">
-                  <el-input style="width:200px" v-model="formData.password" autocomplete="new-password"
-                    show-password></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formData.password"
+                    autocomplete="new-password"
+                    show-password
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
-                  <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
-                    <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
-                      :key="val.id"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.status"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in user_statusoptions"
+                      :label="val.label"
+                      :value="val.value"
+                      :key="val.id"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="角色" prop="roleId">
-                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择" disabled>
-                    <el-option v-for="val in roles" :label="val.name" :value="val.id + ''" :key="val.id"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.roleId"
+                    placeholder="请选择"
+                    disabled
+                  >
+                    <el-option
+                      v-for="val in roles"
+                      :label="val.name"
+                      :value="val.id + ''"
+                      :key="val.id"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <div style="text-align: right;">
-            <el-button size="small" type="primary" @click="nextStep('2')">下一步</el-button>
+          <div style="text-align: right">
+            <el-button size="small" type="primary" @click="nextStep('2')"
+              >下一步</el-button
+            >
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail" isDisabled></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            isDisabled
+          ></userDetail>
           <!-- <el-form :model="formDataDetail" :rules="formDataRules" ref="formDataDetail" :inline="true"
             label-width="110px" size="small">
             <el-row>
@@ -323,38 +427,76 @@
               </el-col>
             </el-row>
           </el-form> -->
-          <div style="text-align: right;">
-            <div style="text-align: right;">
-              <el-button size="small" type="primary" @click="nextStep('1')">上一步</el-button>
-              <el-button size="small" type="primary" @click="nextStep('3')">下一步</el-button>
+          <div style="text-align: right">
+            <div style="text-align: right">
+              <el-button size="small" type="primary" @click="nextStep('1')"
+                >上一步</el-button
+              >
+              <el-button size="small" type="primary" @click="nextStep('3')"
+                >下一步</el-button
+              >
             </div>
           </div>
         </el-tab-pane>
         <el-tab-pane label="影像资料" name="3">
-          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true"
-           label-width="130px" size="small">
-           <peopleImage :dataForm="dataForm" :dialogVisible="dialogVisible" :carfrontImg="true"></peopleImage>
+          <el-form
+            :model="formDataDetail"
+            ref="formDataDetail"
+            :inline="true"
+            label-width="130px"
+            size="small"
+          >
+            <peopleImage
+              :dataForm="dataForm"
+              :dialogVisible="dialogVisible"
+              :carfrontImg="true"
+            ></peopleImage>
           </el-form>
-          <div style="text-align: right;">
-            <el-button v-show="dialogTitle == '审核后线人员'" size="mini" type="primary" style="background-color: #0ec216; border: 1px solid #0ec216"
-              @click="submitForm(1)">审核通过</el-button>
-            <el-button v-show="dialogTitle == '审核后线人员'" size="mini" type="danger" style="background-color: #de504c; border: 1px solid #de504c"
-              @click="submitForm(2)">审核驳回</el-button>
-            <el-button size="small" type="primary" @click="closeDialog">取消</el-button>
-            <div style="text-align: right;">
-            </div>
+          <div style="text-align: right">
+            <el-button
+              v-show="dialogTitle == '审核后线人员'"
+              size="mini"
+              type="primary"
+              style="background-color: #0ec216; border: 1px solid #0ec216"
+              @click="submitForm(1)"
+              >审核通过</el-button
+            >
+            <el-button
+              v-show="dialogTitle == '审核后线人员'"
+              size="mini"
+              type="danger"
+              style="background-color: #de504c; border: 1px solid #de504c"
+              @click="submitForm(2)"
+              >审核驳回</el-button
+            >
+            <el-button size="small" type="primary" @click="closeDialog"
+              >取消</el-button
+            >
+            <div style="text-align: right"></div>
           </div>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
 
     <!-- 驳回理由 -->
-    <el-dialog title="驳回" width="40%" :visible.sync="showRemark"  @close="closeDialogOut">
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
       <el-form>
         <el-form-item label="备注" prop="remark">
-          <el-input style="width: 30vw;" v-model="formDataDetail.remark" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
-            show-word-limit></el-input>
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -362,32 +504,31 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
-import mixa from '../mixin' 
+import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:null
-})
+  treeTypeNum: null,
+});
 
 export default {
   components: {
     tree,
     KtCommonTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
-      showRemark: false,    // 驳回弹窗
-      activeName: '1',
+      showRemark: false, // 驳回弹窗
+      activeName: "1",
       //56个民族
       //影像资料
       dataForm: {
@@ -402,10 +543,10 @@ export default {
       pageData: {
         pageNum: 1,
         pageSize: 20,
-        deptId: JSON.parse(localStorage.getItem('user_data')).deptId,
-        userId: '',
-        realName: '',
-        mobile: '',
+        deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+        userId: "",
+        realName: "",
+        mobile: "",
       },
       formData: {},
       formDataRules: {
@@ -448,6 +589,18 @@ export default {
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -466,47 +619,49 @@ export default {
   created() {
     this.getDictItems("user_status");
   },
-  mounted() {
-  },
+  mounted() {},
   methods: {
     handleSubOut() {
-      if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$refs.formDataDetail.validate((valid) => {
+        if (valid) {
+          this.$api.user
+            .getApprovalNotPass({
+              userId: this.formData.id,
+              reason: this.formDataDetail.remark,
+            })
+            .then((result) => {
+              if (result.code == 200 && result.data) {
+                this.$message({
+                  message: "审核已驳回",
+                  type: "success",
+                });
+                this.findPage();
+                this.closeDialogOut();
+                this.dialogVisible = false;
+              }
+            });
         }
-        this.$refs.formDataDetail.validate(valid => {
-          if (valid) {
-            this.$api.user
-              .getApprovalNotPass({ userId: this.formData.id, reason: this.formDataDetail.remark })
-              .then(result => {
-                if (result.code == 200 && result.data) {
-                  this.$message({
-                    message: "审核已驳回",
-                    type: "success"
-                  });
-                  this.findPage();
-                  this.closeDialogOut()
-                  this.dialogVisible = false;
-                }
-              });
-          }
-        });
+      });
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     // 下一步
     nextStep(num) {
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          this.activeName = num
+          this.activeName = num;
         }
       });
     },
     // 查询Start
     queryStaffInfo() {
-      this.pageData.realName = this.queryFrom.name
-      this.pageData.mobile = this.queryFrom.mobile
+      this.pageData.realName = this.queryFrom.name;
+      this.pageData.mobile = this.queryFrom.mobile;
       this.pageData.userId = this.queryFrom.userId;
       this.pageData.status = this.queryFrom.status;
       this.findPage();
@@ -526,7 +681,6 @@ export default {
       this.findPage();
       this.formData.deptId = [];
       this.platform(treeId);
-
     },
     platform(array) {
       if (!array.parent) {
@@ -542,7 +696,7 @@ export default {
         .then((_) => {
           done();
         })
-        .catch((_) => { });
+        .catch((_) => {});
     },
     // 右侧列表的方法Start
     findPage(data) {
@@ -557,22 +711,30 @@ export default {
         name: this.pageData.realName,
         userId: this.pageData.userId,
         status: this.pageData.status,
-        roleId: '22',
-      }
+        roleId: "22",
+      };
       this.$api.user
-        .findPage({ dto, pageNum: this.pageData.pageNum, pageSize: this.pageData.pageSize })
+        .findPage({
+          dto,
+          pageNum: this.pageData.pageNum,
+          pageSize: this.pageData.pageSize,
+        })
         .then((res) => {
-          res.data.content.forEach(val => {
-            if (val.sex && val.sex !== '' && val.sex !== null) {
-              val.sex = this.sexoptions.find(ele => ele.value == val.sex).label
+          res.data.content.forEach((val) => {
+            if (val.sex && val.sex !== "" && val.sex !== null) {
+              val.sex = this.sexoptions.find(
+                (ele) => ele.value == val.sex
+              ).label;
             }
-            if (val.status && val.status !== '' && val.status !== null) {
-              val.status = this.user_statusoptions.find(ele => ele.value == val.status).label
+            if (val.status && val.status !== "" && val.status !== null) {
+              val.status = this.user_statusoptions.find(
+                (ele) => ele.value == val.status
+              ).label;
             }
-            val.roleId=val.roleName
-          })
+            val.roleId = val.roleName;
+          });
           this.pageResult = res.data;
-        })
+        });
     },
     closeDialog() {
       this.$refs["formData"].resetFields();
@@ -601,21 +763,23 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
         }
-      })
+      });
       this.dialogTitle = "详情";
       this.dialogVisible = true;
     },
@@ -628,21 +792,23 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
         if (res.code == 200) {
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
         }
-      })
+      });
       this.dialogTitle = "审核后线人员";
       this.dialogVisible = true;
     },
@@ -655,21 +821,21 @@ export default {
     //审核提交
     submitForm(type) {
       if (type == 1) {
-        this.$api.user.getApprovalPass(this.formData.id).then(result => {
+        this.$api.user.getApprovalPass(this.formData.id).then((result) => {
           if (result.code == 200 && result.data) {
             this.$message({
               message: "审核已通过",
-              type: "success"
+              type: "success",
             });
             this.findPage();
             this.dialogVisible = false;
           }
         });
       } else {
-        this.showRemark = true
-        return
+        this.showRemark = true;
+        return;
       }
-    }
+    },
   },
 };
 </script>
@@ -697,16 +863,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -716,20 +882,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/Staff/StaffManage.vue

@@ -36,11 +36,7 @@
         <SplitArea :size="rightSplitWidth">
           <!-- 筛选区域Start -->
           <el-row class="queryFrom">
-            <el-form
-              ref="queryFormRef"
-              :model="pageData"
-              label-width="80px"
-            >
+            <el-form ref="queryFormRef" :model="pageData" label-width="80px">
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="工号">
@@ -112,7 +108,9 @@
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="">
-                    <el-button type="primary" @click="queryStaffInfo"
+                    <el-button
+                      type="primary"
+                      @click="queryStaffInfo"
                       size="small"
                       >查询</el-button
                     >
@@ -150,7 +148,7 @@
       @close="closeDialog"
       v-dialogDrag
     >
-      <el-tabs v-model="activeName" :before-leave="beforeTabLeave" >
+      <el-tabs v-model="activeName" :before-leave="beforeTabLeave">
         <el-tab-pane label="基本信息" name="1">
           <el-form
             :model="formData"
@@ -244,7 +242,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
-                  <el-select disabled
+                  <el-select
+                    disabled
                     @change="statusChange"
                     style="width: 200px"
                     v-model="formData.status"
@@ -284,7 +283,7 @@
                     placeholder="请选择"
                     clearable
                     popper-class="select-prop"
-              >
+                  >
                     <el-option
                       v-for="val in postOption"
                       :label="val.postName"
@@ -303,7 +302,7 @@
                     v-model="formData.leaderId"
                     placeholder="请选择"
                     popper-class="select-prop"
-              >
+                  >
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
@@ -327,8 +326,11 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail"></userDetail>
-          
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+          ></userDetail>
+
           <div style="text-align: right">
             <el-button size="small" type="primary" @click="activeName = '1'"
               >上一步</el-button
@@ -356,7 +358,11 @@
             <el-button
               size="small"
               type="primary"
-              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              style="
+                background-color: #eaedf1;
+                border: 1px solid #eaedf1;
+                color: #2d4d89;
+              "
               @click="closeDialog"
               >取消</el-button
             >
@@ -371,7 +377,12 @@
       </el-tabs>
     </el-dialog>
 
-    <el-dialog title="离司" width="40%" :visible.sync="showOut"  @close="closeDialogOut">
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
       <div>
         <el-form>
           <el-form-item label="离职时间" prop="logoutTime">
@@ -382,8 +393,8 @@
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="离职表:" style="width: 50%">
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
             <el-upload
               class="avatar-uploader"
               action=""
@@ -412,7 +423,7 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
 import mixa from "../mixin";
 const mixin = new mixa({
   treeTypeNum: null,
@@ -423,15 +434,15 @@ export default {
     tree,
     KtCommonTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
   mixins: [mixin],
   data() {
     return {
-      logoutTime: '', // 离司 离职时间
-      logoutImg: '',   // 离司 图片
-      logoutImgId: '',
-      lineId: '',
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
       activeName: "1",
       isShow: true,
       //56个民族
@@ -521,6 +532,18 @@ export default {
           label: "岗位",
           minWidth: 120,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -541,7 +564,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       },
       //影像上传列表
       imagesIdList: [],
@@ -570,31 +593,33 @@ export default {
   },
   methods: {
     handleSubOut() {
-      if (this.logoutTime == '') {
-        this.$message.error('请选择时间')
-        return
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
       }
-      if (this.logoutImgId == '') {
-        this.$message.error('请上传离职表')
-        return
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
       }
       let subData = {
-        esmUserImageVo: [{
-          imageId: this.logoutImgId,
-          type: 'LZ_01'
-        }],
-        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: { id: this.lineId, logoutTime: this.logoutTime },
         sysUserInfo: {},
-      }
+      };
       this.$api.user.departApply(subData).then((res) => {
         if (res.code == 200) {
-          this.$message.success(res.msg)
-          this.findPage()
-          this.closeDialogOut()
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     },
     // 上传图片的方法Start
     beforeAvatarUpload(file) {
@@ -623,18 +648,18 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          this.logoutImgId = res.data.id
+          this.logoutImgId = res.data.id;
         }
       });
     },
     closeDialogOut() {
-      this.showOut = false
+      this.showOut = false;
     },
     handleButton7(data) {
-      this.lineId = data.row.userId
-      this.showOut = true
+      this.lineId = data.row.userId;
+      this.showOut = true;
     },
     searchLeaderFun() {
       this.$api.user.findHxUserList().then((res) => {
@@ -1094,16 +1119,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -1113,20 +1138,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -56,13 +56,18 @@
                 <el-col :span="5">
                   <el-form-item label="状态">
                     <el-select
-                      style="width:200px"
-                      clearable 
+                      style="width: 200px"
+                      clearable
                       v-model="queryFrom.status"
                       placeholder="请选择"
                       size="small"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    >
+                      <el-option
+                        v-for="val in user_statusoptions"
+                        :label="val.label"
+                        :value="val.value"
+                        :key="val.id"
+                      ></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -80,55 +85,82 @@
             </el-form>
           </el-row>
 
-            <kt-common-table
-               permsButton1="sys:team:examine"
-              :data="pageResult"
-              :columns="columns"
-              :showBatchDelete="false"
-              @findPage="findPage"
-              @handleButton3="handleTableEdit1"
-              :button3Name="'详情'"
-              :button7Name="'审核'"
-              :button7Status="'离司待审核'"
-              @handleButton7="handleTableEdit"
-              :button8Name="'审核'"
-              :button8Status="'入司待审核'"
-              @handleButton8="handleTableEdit"
-            >
-            </kt-common-table>
-         
+          <kt-common-table
+            permsButton1="sys:team:examine"
+            :data="pageResult"
+            :columns="columns"
+            :showBatchDelete="false"
+            @findPage="findPage"
+            @handleButton3="handleTableEdit1"
+            :button3Name="'详情'"
+            :button7Name="'审核'"
+            :button7Status="'离司待审核'"
+            @handleButton7="handleTableEdit"
+            :button8Name="'审核'"
+            :button8Status="'入司待审核'"
+            @handleButton8="handleTableEdit"
+          >
+          </kt-common-table>
         </SplitArea>
         <!-- 右侧列表页面End -->
       </Split>
     </el-main>
 
-    <el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
-      :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
+    <el-dialog
+      :title="dialogTitle"
+      width="60%"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :before-close="handleDialogBefore"
+      @close="closeDialog"
+      v-dialogDrag
+    >
       <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="1">
-          <el-form :model="formData" disabled  ref="formData" :inline="true" @keyup.enter.native="nextStep()"
-            label-width="110px" size="small">
+          <el-form
+            :model="formData"
+            disabled
+            ref="formData"
+            :inline="true"
+            @keyup.enter.native="nextStep()"
+            label-width="110px"
+            size="small"
+          >
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.pdeptId" clearable
-                    :show-all-levels="false" :props="{
+                  <el-cascader
+                    style="width: 200px"
+                    :options="ztreeNodes"
+                    v-model="formData.pdeptId"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{
                       value: 'id',
                       label: 'name',
                       checkStrictly: true,
-                    }" @change="handleChange">
-                  </el-cascader>
-                </el-form-item></el-col>
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader> </el-form-item
+              ></el-col>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable
-                    :show-all-levels="false" :props="{
+                  <el-cascader
+                    style="width: 200px"
+                    :options="ztreeNodes"
+                    v-model="formData.deptId"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{
                       value: 'id',
                       label: 'name',
                       checkStrictly: true,
-                    }" @change="handleChange">
-                  </el-cascader>
-                </el-form-item></el-col>
+                    }"
+                    @change="handleChange"
+                  >
+                  </el-cascader> </el-form-item
+              ></el-col>
               <el-col :span="8">
                 <el-form-item label="员工工号" prop="id">
                   <el-input v-model="formData.id" disabled></el-input>
@@ -141,7 +173,10 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
-                  <el-input v-model="formData.identity" :maxlength="18"></el-input>
+                  <el-input
+                    v-model="formData.identity"
+                    :maxlength="18"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -151,40 +186,77 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="密码" prop="password">
-                  <el-input style="width:200px" v-model="formData.password" autocomplete="new-password"
-                    show-password></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formData.password"
+                    autocomplete="new-password"
+                    show-password
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
-                  <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
-                    <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
-                      :key="val.id"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.status"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in user_statusoptions"
+                      :label="val.label"
+                      :value="val.value"
+                      :key="val.id"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="角色" prop="roleId">
-                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择" disabled>
-                    <el-option v-for="val in roles" :label="val.name" :value="val.id + ''" :key="val.id"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.roleId"
+                    placeholder="请选择"
+                    disabled
+                  >
+                    <el-option
+                      v-for="val in roles"
+                      :label="val.name"
+                      :value="val.id + ''"
+                      :key="val.id"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
-          <div style="text-align: right;">
-            <el-button size="small" type="primary" @click="nextStep">下一步</el-button>
+          <div style="text-align: right">
+            <el-button size="small" type="primary" @click="nextStep"
+              >下一步</el-button
+            >
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail" isDisabled></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+            isDisabled
+          ></userDetail>
           <!-- <el-form :rules="formDataRules" :model="formDataDetail" ref="formDataDetail" :inline="true"
             @keyup.enter.native="submitForml('提交审核')" label-width="110px" size="small">
             <el-row>
@@ -339,17 +411,30 @@
           </el-col>
         </el-row>
       </el-form> -->
-          <div style="text-align: right;">
-            <el-button size="small" type="primary" @click="nextStep('1')">上一步</el-button>
-            <el-button size="small" type="primary" @click="nextStep('3')">下一步</el-button>
+          <div style="text-align: right">
+            <el-button size="small" type="primary" @click="nextStep('1')"
+              >上一步</el-button
+            >
+            <el-button size="small" type="primary" @click="nextStep('3')"
+              >下一步</el-button
+            >
           </div>
         </el-tab-pane>
         <el-tab-pane label="影像资料" name="3">
-          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true"
-           label-width="130px" size="small">
-           <peopleImage :dataForm="dataForm" :dialogVisible="dialogVisible" :carfrontImg="true"></peopleImage>
+          <el-form
+            :model="formDataDetail"
+            ref="formDataDetail"
+            :inline="true"
+            label-width="130px"
+            size="small"
+          >
+            <peopleImage
+              :dataForm="dataForm"
+              :dialogVisible="dialogVisible"
+              :carfrontImg="true"
+            ></peopleImage>
           </el-form>
-          <div style="text-align: right;">
+          <div style="text-align: right">
             <el-button
               v-show="dialogTitle == '审核团队长'"
               size="mini"
@@ -366,24 +451,32 @@
               @click="submitForm(2)"
               >审核驳回</el-button
             >
-            <el-button
-              size="small"
-              type="primary"
-              @click="closeDialog"
+            <el-button size="small" type="primary" @click="closeDialog"
               >取消</el-button
             >
           </div>
         </el-tab-pane>
       </el-tabs>
-
     </el-dialog>
     <!-- 驳回理由 -->
-    <el-dialog title="驳回" width="40%" :visible.sync="showRemark"  @close="closeDialogOut">
+    <el-dialog
+      title="驳回"
+      width="40%"
+      :visible.sync="showRemark"
+      @close="closeDialogOut"
+    >
       <el-form>
         <el-form-item label="备注" prop="remark">
-          <el-input style="width: 30vw;" v-model="formDataDetail.remark" type="textarea"
-            :autosize="{ minRows: 4, maxRows: 6 }" placeholder="请输入内容" prop="remark" maxlength="200"
-            show-word-limit></el-input>
+          <el-input
+            style="width: 30vw"
+            v-model="formDataDetail.remark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            placeholder="请输入内容"
+            prop="remark"
+            maxlength="200"
+            show-word-limit
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer">
@@ -391,31 +484,29 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
-
   </div>
 </template>
 
 <script>
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
-import mixa from '../mixin' 
+import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:2 //树分类过滤参数
-})
+  treeTypeNum: 2, //树分类过滤参数
+});
 export default {
   components: {
     tree,
     KtCommonTable,
     peopleImage,
-    userDetail
+    userDetail,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
-      showRemark: false,    // 驳回弹窗
+      showRemark: false, // 驳回弹窗
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -426,21 +517,21 @@ export default {
         DX_00: "",
         LZ_01: "",
       },
-      activeName: '1',
-      pageData:{
+      activeName: "1",
+      pageData: {
         pageNum: 1,
         pageSize: 20,
-        deptId:JSON.parse(localStorage.getItem('user_data')).deptId  ,
-        userId:'',
-        realName:'',
-        mobile:'',
+        deptId: JSON.parse(localStorage.getItem("user_data")).deptId,
+        userId: "",
+        realName: "",
+        mobile: "",
       },
-      formData:{},
-      roles:[],
-      formDataRules:{
+      formData: {},
+      roles: [],
+      formDataRules: {
         remark: [{ required: true, message: "请填写备注", trigger: "blur" }],
-        },
-        formDataDetail: {},
+      },
+      formDataDetail: {},
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
@@ -461,7 +552,7 @@ export default {
         },
 
         { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
-      
+
         { prop: "userId", label: "工号", minWidth: 80, sortable: false },
         { prop: "name", label: "姓名", minWidth: 120, sortable: false },
         {
@@ -471,12 +562,24 @@ export default {
           sortable: false,
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
-          {
+        {
           prop: "roleId",
           label: "角色",
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -493,38 +596,41 @@ export default {
   },
   created() {
     this.$api.role.findAll().then((res) => {
-      this.roles = res.data
-    })
+      this.roles = res.data;
+    });
   },
   methods: {
     handleSubOut() {
-      if(!this.formDataDetail.remark){
-          this.$message.error('请在详细信息填写驳回原因')
-          return
+      if (!this.formDataDetail.remark) {
+        this.$message.error("请在详细信息填写驳回原因");
+        return;
+      }
+      this.$refs.formDataDetail.validate((valid) => {
+        if (valid) {
+          this.$api.user
+            .getApprovalNotPass({
+              userId: this.formData.id,
+              reason: this.formDataDetail.remark,
+            })
+            .then((result) => {
+              if (result.code == 200 && result.data) {
+                this.$message({
+                  message: "审核已驳回",
+                  type: "success",
+                });
+                this.findPage();
+                this.closeDialogOut();
+                this.dialogVisible = false;
+              }
+            });
         }
-        this.$refs.formDataDetail.validate(valid => {
-          if (valid) {
-            this.$api.user
-              .getApprovalNotPass({ userId: this.formData.id, reason: this.formDataDetail.remark })
-              .then(result => {
-                if (result.code == 200 && result.data) {
-                  this.$message({
-                    message: "审核已驳回",
-                    type: "success"
-                  });
-                  this.findPage();
-                  this.closeDialogOut()
-                  this.dialogVisible = false;
-                }
-              });
-          }
-        });
+      });
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     closeDialogOut() {
-      this.showRemark = false
+      this.showRemark = false;
     },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
@@ -537,21 +643,20 @@ export default {
     },
     // 查询Start
     queryStaffInfo() {
-        this.pageData.realName=this.queryFrom.name
-        this.pageData.mobile=this.queryFrom.mobile
-        this.pageData.userId = this.queryFrom.userId;
-        this.pageData.status = this.queryFrom.status;
+      this.pageData.realName = this.queryFrom.name;
+      this.pageData.mobile = this.queryFrom.mobile;
+      this.pageData.userId = this.queryFrom.userId;
+      this.pageData.status = this.queryFrom.status;
       this.findPage();
     },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
       this.pageData.deptId = this.currentTreeNode.id;
-      this.pageData.pageNum =1;
+      this.pageData.pageNum = 1;
       this.findPage();
       this.formData.deptId = [];
       this.platform(treeId);
-      
     },
     platform(array) {
       if (!array.parent) {
@@ -560,7 +665,7 @@ export default {
       this.formData.deptId.unshift(array.data.id);
       this.platform(array.parent);
     },
-    
+
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
@@ -568,28 +673,36 @@ export default {
         this.pageData.pageNum = data.pageRequest.pageNum;
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
-       let dto={
-        deptId:this.pageData.deptId,
-        mobile:this.pageData.mobile,
-        name:this.pageData.realName,
-        userId:this.pageData.userId,
+      let dto = {
+        deptId: this.pageData.deptId,
+        mobile: this.pageData.mobile,
+        name: this.pageData.realName,
+        userId: this.pageData.userId,
         status: this.pageData.status,
-        roleId:'21',
-      }
+        roleId: "21",
+      };
       this.$api.user
-        .findPage({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
+        .findPage({
+          dto,
+          pageNum: this.pageData.pageNum,
+          pageSize: this.pageData.pageSize,
+        })
         .then((res) => {
-          res.data.content.forEach(val=>{
-            if(val.sex&& val.sex!==''&& val.sex!==null){
-              val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
+          res.data.content.forEach((val) => {
+            if (val.sex && val.sex !== "" && val.sex !== null) {
+              val.sex = this.sexoptions.find(
+                (ele) => ele.value == val.sex
+              ).label;
             }
-            if(val.status&& val.status!==''&& val.status!==null){
-              val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
+            if (val.status && val.status !== "" && val.status !== null) {
+              val.status = this.user_statusoptions.find(
+                (ele) => ele.value == val.status
+              ).label;
             }
-            val.roleId=val.roleName
-          })
+            val.roleId = val.roleName;
+          });
           this.pageResult = res.data;
-        })
+        });
     },
     closeDialog() {
       this.$refs["formData"].resetFields();
@@ -598,8 +711,8 @@ export default {
       }
       this.dialogVisible = false;
     },
-   // 新增或修改的弹出框Start
-   getDictItems(typeName) {
+    // 新增或修改的弹出框Start
+    getDictItems(typeName) {
       //--数据字典--
       this.$api.dict
         .findByLableName(typeName)
@@ -610,7 +723,7 @@ export default {
           this[typeName + "options"] = [];
         });
     },
-    handleTableEdit1(params){
+    handleTableEdit1(params) {
       this.dataForm = {
         SFZ_01: "",
         SFZ_02: "",
@@ -618,26 +731,28 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
-        if(res.code==200){
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+        if (res.code == 200) {
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-          this.formData = res.data.sysUser
-          this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
-          this.formData.password = ''
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
+          this.formData.password = "";
         }
-      })
+      });
       this.dialogTitle = "详情";
       this.dialogVisible = true;
     },
-    handleTableEdit(params){
+    handleTableEdit(params) {
       this.dataForm = {
         SFZ_01: "",
         SFZ_02: "",
@@ -645,32 +760,33 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.$api.user.getUserDatail(params.row.userId).then((res) => {
-        if(res.code==200){
-          res.data.sysUser.status += ''
-          if(res.data.esmUserImageVo.length > 0) {
-            res.data.esmUserImageVo.forEach(item=>{
-              item.path = process.env.BASE_URL + item.path
-              this.dataForm[item.type]=item.path
-            })
+        if (res.code == 200) {
+          res.data.sysUser.status += "";
+          if (res.data.esmUserImageVo.length > 0) {
+            res.data.esmUserImageVo.forEach((item) => {
+              item.path = process.env.BASE_URL + item.path;
+              this.dataForm[item.type] = item.path;
+            });
           }
-        this.formData = res.data.sysUser
-        this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
-        this.formData.password = ''
-        
+          this.formData = res.data.sysUser;
+          this.formDataDetail = res.data.sysUserInfo
+            ? res.data.sysUserInfo
+            : {};
+          this.formData.password = "";
         }
-      })
+      });
       this.dialogTitle = "审核团队长";
       this.dialogVisible = true;
     },
-     // 下一步
-     nextStep() {
+    // 下一步
+    nextStep() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
-          this.activeName = '2'
-          // this.formData.deptIdCom= this.formData.deptId 
+          this.activeName = "2";
+          // this.formData.deptIdCom= this.formData.deptId
           // this.formData.deptId =  this.formData.deptId.at(-1);
           // if (this.formData.referrerId) {
           //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
@@ -688,38 +804,41 @@ export default {
           // });
         }
       });
-  },
-     //联级选择器触发事件
-     handleChange(val) {
+    },
+    //联级选择器触发事件
+    handleChange(val) {
       if (val.length !== 0) {
         this.formData.deptId = val.at(-1);
       }
     },
     submitForm(type) {
       if (type == 1) {
-        this.$api.user.getApprovalPass(this.formData.id).then(result => {
+        this.$api.user.getApprovalPass(this.formData.id).then((result) => {
           if (result.code == 200 && result.data) {
             this.$message({
               message: "审核已通过",
-              type: "success"
+              type: "success",
             });
             this.findPage();
             this.dialogVisible = false;
           }
         });
       } else {
-        this.showRemark = true
+        this.showRemark = true;
 
-        return
-        this.$refs.formDataDetail.validate(valid => {
+        return;
+        this.$refs.formDataDetail.validate((valid) => {
           if (valid) {
             this.$api.user
-              .getApprovalNotPass({ userId: this.formData.id,reason:this.formDataDetail.remark })
-              .then(result => {
+              .getApprovalNotPass({
+                userId: this.formData.id,
+                reason: this.formDataDetail.remark,
+              })
+              .then((result) => {
                 if (result.code == 200 && result.data) {
                   this.$message({
                     message: "审核已驳回",
-                    type: "success"
+                    type: "success",
                   });
                   this.findPage();
                   this.dialogVisible = false;
@@ -728,7 +847,7 @@ export default {
           }
         });
       }
-    }
+    },
   },
 };
 </script>
@@ -756,16 +875,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -775,20 +894,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -278,7 +278,7 @@
                     v-model="formData.positionId"
                     placeholder="请选择"
                     popper-class="select-prop"
-                    >
+                  >
                     <el-option
                       v-for="val in postOption"
                       :label="val.postName"
@@ -297,7 +297,7 @@
                     v-model="formData.leaderId"
                     placeholder="请选择"
                     popper-class="select-prop"
-                    >
+                  >
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
@@ -321,7 +321,10 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
-          <userDetail :formData="formData" :formDataDetail="formDataDetail"></userDetail>
+          <userDetail
+            :formData="formData"
+            :formDataDetail="formDataDetail"
+          ></userDetail>
           <!-- <el-form
             :model="formDataDetail"
             :rules="formDataRulesDetail"
@@ -659,7 +662,11 @@
             <el-button
               size="small"
               type="primary"
-              style="background-color: #EAEDF1; border: 1px solid #EAEDF1; color: #2D4D89;"
+              style="
+                background-color: #eaedf1;
+                border: 1px solid #eaedf1;
+                color: #2d4d89;
+              "
               @click="closeDialog"
               >取消</el-button
             >
@@ -674,8 +681,12 @@
       </el-tabs>
     </el-dialog>
 
-    
-    <el-dialog title="离司" width="40%" :visible.sync="showOut"  @close="closeDialogOut">
+    <el-dialog
+      title="离司"
+      width="40%"
+      :visible.sync="showOut"
+      @close="closeDialogOut"
+    >
       <div>
         <el-form>
           <el-form-item label="离职时间" prop="logoutTime">
@@ -686,8 +697,8 @@
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
-            </el-form-item>
-            <el-form-item label="离职表:" style="width: 50%">
+          </el-form-item>
+          <el-form-item label="离职表:" style="width: 50%">
             <el-upload
               class="avatar-uploader"
               action=""
@@ -707,7 +718,6 @@
         <el-button @click="closeDialogOut">取消</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 
@@ -717,7 +727,7 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
 import { validateSfz } from "../../../utils/validate.js";
-import userDetail from '@/components/UserDetail/index.vue'    // 详情信息
+import userDetail from "@/components/UserDetail/index.vue"; // 详情信息
 import mixa from "../mixin";
 const mixin = new mixa({
   treeTypeNum: 2, //树分类过滤参数
@@ -728,15 +738,15 @@ export default {
     tree,
     KtCommonTable,
     userDetail,
-    peopleImage
+    peopleImage,
   },
   mixins: [mixin],
   data() {
     return {
-      logoutTime: '', // 离司 离职时间
-      logoutImg: '',   // 离司 图片
-      logoutImgId: '',
-      lineId: '',
+      logoutTime: "", // 离司 离职时间
+      logoutImg: "", // 离司 图片
+      logoutImgId: "",
+      lineId: "",
       leaderOptions: [],
       searchLeaderOptions: {},
       activeName: "1",
@@ -817,6 +827,18 @@ export default {
           minWidth: 80,
           formatter: this.managementSourceFormatter,
         },
+        {
+          prop: "submitTime",
+          label: "提交时间",
+          type: "text",
+          minWidth: 100,
+        },
+        {
+          prop: "approveTime",
+          label: "审核时间",
+          type: "text",
+          minWidth: 100,
+        },
         {
           prop: "status",
           label: "状态",
@@ -839,7 +861,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       },
       //影像上传列表
       imagesIdList: [],
@@ -849,7 +871,6 @@ export default {
     this.searchLeaderFun();
   },
   methods: {
-    
     //上传影像
     httpRequest(options) {
       let file = options.file;
@@ -865,9 +886,9 @@ export default {
       const params = new FormData(); // 声明formData数据类型
       params.append("multipartFile", file);
       params.append("type", "personnel");
-      this.$api.letter.uploadFile(params).then(res => {
+      this.$api.letter.uploadFile(params).then((res) => {
         if (res.code == "200") {
-          this.logoutImgId = res.data.id
+          this.logoutImgId = res.data.id;
         }
       });
     },
@@ -884,38 +905,40 @@ export default {
       return isJPG && isLt2M;
     },
     handleSubOut() {
-      if (this.logoutTime == '') {
-        this.$message.error('请选择时间')
-        return
+      if (this.logoutTime == "") {
+        this.$message.error("请选择时间");
+        return;
       }
-      if (this.logoutImgId == '') {
-        this.$message.error('请上传离职表')
-        return
+      if (this.logoutImgId == "") {
+        this.$message.error("请上传离职表");
+        return;
       }
       let subData = {
-        esmUserImageVo: [{
-          imageId: this.logoutImgId,
-          type: 'LZ_01'
-        }],
-        sysUser: {id: this.lineId, logoutTime: this.logoutTime},
+        esmUserImageVo: [
+          {
+            imageId: this.logoutImgId,
+            type: "LZ_01",
+          },
+        ],
+        sysUser: { id: this.lineId, logoutTime: this.logoutTime },
         sysUserInfo: {},
-      }
+      };
       this.$api.user.departApply(subData).then((res) => {
         if (res.code == 200) {
-          this.$message.success(res.msg)
-          this.findPage()
-          this.closeDialogOut()
+          this.$message.success(res.msg);
+          this.findPage();
+          this.closeDialogOut();
         } else {
-          this.$message.error(res.msg)
+          this.$message.error(res.msg);
         }
-      })
+      });
     },
     closeDialogOut() {
-      this.showOut = false
+      this.showOut = false;
     },
     handleButton7(data) {
-      this.lineId = data.row.userId
-      this.showOut = true
+      this.lineId = data.row.userId;
+      this.showOut = true;
     },
     searchLeaderFun() {
       this.$api.user.findHxUserList().then((res) => {
@@ -1093,7 +1116,7 @@ export default {
         LD_00: "",
         YP_00: "",
         DX_00: "",
-        LZ_01: ""
+        LZ_01: "",
       };
       this.imagesIdList = [];
 
@@ -1375,16 +1398,16 @@ export default {
 >>> .el-tabs__header {
   margin-right: 50px !important;
 }
->>> .el-tabs__item:hover{
-  color: #2D4D89;
+>>> .el-tabs__item:hover {
+  color: #2d4d89;
 }
 >>> .el-tabs__item.is-active {
-  color: #FFF;
-  background: #2D4D89;
-  transition: all ease .5s;
+  color: #fff;
+  background: #2d4d89;
+  transition: all ease 0.5s;
 }
 >>> .el-tabs__active-bar {
-  background-color: #2D4D89;
+  background-color: #2d4d89;
 }
 >>> .el-tabs__item.is-top:nth-child(2) {
   padding-left: 20px !important;
@@ -1394,20 +1417,23 @@ export default {
 }
 
 .el-tabs {
-  >>> .el-input__inner:focus, >>> .el-select .el-input.is-focus .el-input__inner {
-    border-color: #2D4D89;
+  >>> .el-input__inner:focus,
+  >>> .el-select .el-input.is-focus .el-input__inner {
+    border-color: #2d4d89;
   }
-  .el-button--primary, .el-button--primary:focus {
-    background-color: #2D4D89;
-    border-color: #2D4D89;
+  .el-button--primary,
+  .el-button--primary:focus {
+    background-color: #2d4d89;
+    border-color: #2d4d89;
   }
 }
 .select-prop {
-  .el-select-dropdown__item.selected, .el-date-table td.available:hover {
-    color: #2D4D89;
+  .el-select-dropdown__item.selected,
+  .el-date-table td.available:hover {
+    color: #2d4d89;
   }
-  .el-date-table td.current:not(.disabled) span  {
-    background-color: #2D4D89;
+  .el-date-table td.current:not(.disabled) span {
+    background-color: #2d4d89;
   }
 }
 </style>