Merge remote-tracking branch 'origin/master'

client/src/views/OaSystem/attendanceCenter/dep.vue

@@ -41,6 +41,9 @@
           >
             <Icon icon="ep:upload" /> 导入
           </el-button>
+          <!-- <el-button v-if="porps.deptsName == '公司'" plain @click="dialogVisible = true">
+            免考勤人员设置
+          </el-button> -->
           <el-button type="success" style="background-color: #05ce9e" v-if="false">
             <img src="@/assets/imgs/OA/kq/kqqrIcon.png" class="mr-8px" alt="" />
             考勤确认</el-button
@@ -48,6 +51,17 @@
         </div>
       </div>
 
+      <!-- 免考勤人员设置 -->
+      <el-dialog v-model="dialogVisible" title="免考勤人员设置" width="500" align-center>
+        <UserOrgTree v-model="notAttendanceList" :multiple="true" placeholder="请选择免考勤人员" />
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="dialogVisible = false">关闭</el-button>
+            <el-button type="primary" @click="noAttendanceSet"> 确定 </el-button>
+          </div>
+        </template>
+      </el-dialog>
+
       <el-popover :width="50">
         <template #reference>
           <div class="depStateBox">
@@ -164,6 +178,7 @@ import ExportToExcel from '@/components/ExportToExcel/index.vue'
 import { getUserInfo } from '@/utils/tool'
 import AttendanceSheetImportForm from './components/attendanceSheetImportForm.vue'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
+import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
 
 const userInfo = getUserInfo()
 
@@ -389,6 +404,14 @@ const init = () => {
 onMounted(() => {
   init()
 })
+
+/** 免考勤人员设置 */
+const dialogVisible = ref(false)
+const notAttendanceList = ref([])
+const noAttendanceSet = () => {
+  dialogVisible.value = false
+  // console.log('notAttendanceList', notAttendanceList.value)
+}
 </script>
 <style lang="scss" scoped>
 .attendanceCenterDep {

client/src/views/OaSystem/personnelManagement/ygdaPage/SchoolTable.vue

@@ -45,10 +45,11 @@
         <span v-else>{{ scope.row.xl }}</span>
       </template>
     </el-table-column>
-    <el-table-column prop="filePath" label="附件地址">
+    <el-table-column prop="filePath" label="附件">
       <template #default="scope">
-        <el-input v-model="scope.row.filePath" v-if="scope.row.isEdit" />
-        <span v-else>{{ scope.row.filePath }}</span>
+        <!-- <el-input v-model="scope.row.filePath" v-if="scope.row.isEdit" /> -->
+        <!-- <span v-else>{{ scope.row.filePath }}</span> -->
+        <UploadImg :modelValue="scope.row.filePath" height="55px" />
       </template>
     </el-table-column>
     <el-table-column fixed="right" label="操作" width="140">
@@ -91,6 +92,9 @@
 /**
  * @description 学习经历
  */
+
+import { UploadImg } from '@/components/UploadFile'
+
 interface ITable {
   id?: string
   userId?: string
@@ -143,6 +147,7 @@ const onSaveItem = (index: number) => {
     delete item.isEdit
     return item
   })
+  // console.log('changeData', changeData)
   $emit('onSave', changeData)
 }
 

zjugis-business/src/main/java/com/zjugis/business/flow/interview/event/InterviewEvent.java

@@ -100,6 +100,7 @@ public class InterviewEvent extends BaseController {
                 InterviewDO entity = interviewService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
+                entity.setReport("0");
                 interviewService.update(entity);
                 return ok("true");
             } else {

zjugis-business/src/main/java/com/zjugis/business/flow/interview/service/InterviewServiceImpl.java

@@ -204,7 +204,8 @@ public class InterviewServiceImpl implements InterviewService {
             dto.setUserId(interviewDO.getUserId());
         }
         staffApi.createStaff(dto).getCheckedData();
-//        interviewDAO.deleteById(interviewDO);
+        interviewDO.setReport("1");
+        interviewDAO.updateById(interviewDO);
         return "新增成功";
     }
 

zjugis-business/src/main/resources/templates/Interview/index.ftl

@@ -32,7 +32,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                         <tr>
 
                             <td class="th">
-                                <div class="form-label">员工名称：</div>
+                                <div class="form-label">姓名：</div>
                             </td>
                             <td>
                                 <div class="z-form-control">
@@ -48,18 +48,23 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
 
                             <td class="th">
-                                <div class="form-label">面试时间：</div>
+                                <div class="form-label">面试官：</div>
                             </td>
                             <td>
                                 <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$mssj">
-                                            <input type="text" value="${(formEntity.mssj?date)!}">
+                                    <div class="form-group">
+                                        <div class="form-item">
+                                            <div class="z-comp-input" name="createReqVO$msgxm">
+                                                <input type="text" value="${formEntity.msgxm!}">
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </td>
 
+
+
+
                         </tr>
 
                         <tr>
@@ -81,13 +86,13 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
 
                             <td class="th">
-                                <div class="form-label">身份证号：</div>
+                                <div class="form-label">面试时间：</div>
                             </td>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-input" name="createReqVO$sfzh">
-                                            <input type="text" value="${formEntity.sfzh!}">
+                                        <div class="z-comp-date" name="createReqVO$mssj">
+                                            <input type="text" value="${(formEntity.mssj?date)!}">
                                         </div>
                                     </div>
                                 </div>
@@ -98,22 +103,21 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
                         <tr>
                             <td class="th">
-                                <div class="form-label">应聘岗位：</div>
+                                <div class="form-label">手机号：</div>
                             </td>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$ypgw"
-                                             data='${post_type!}' value="${formEntity.ypgw!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
+                                        <div class="z-comp-input" name="createReqVO$mobile">
+                                            <input type="text" value="${formEntity.mobile!}">
                                         </div>
                                     </div>
                                 </div>
                             </td>
 
 
+
+
                             <td class="th">
                                 <div class="form-label">应聘部门：</div>
                             </td>
@@ -134,13 +138,13 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
                         <tr>
                             <td class="th">
-                                <div class="form-label">手机号：</div>
+                                <div class="form-label">身份证号：</div>
                             </td>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-input" name="createReqVO$mobile">
-                                            <input type="text" value="${formEntity.mobile!}">
+                                        <div class="z-comp-input" name="createReqVO$sfzh">
+                                            <input type="text" value="${formEntity.sfzh!}">
                                         </div>
                                     </div>
                                 </div>
@@ -148,11 +152,18 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
 
                             <td class="th">
-                                <div class="form-label"></div>
+                                <div class="form-label">应聘岗位：</div>
                             </td>
                             <td>
                                 <div class="form-group">
-
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$ypgw"
+                                             data='${post_type!}' value="${formEntity.ypgw!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </td>
 
@@ -398,24 +409,6 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                 <div class="jbxx-box jbxx-box-flex">
                     <table class="jbxx-table-info">
 
-                        <tr>
-                            <td class="th">
-                                <div class="form-label">面试官：</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="z-comp-selecttree" name="msg">
-                                        <input type="hidden" name="createReqVO$msgid"
-                                               value="${formEntity.msgid!}">
-                                        <input type="hidden" name="createReqVO$msgxm" value="${formEntity.msgid!}">
-                                        <div class="z-inputselect-bar">
-                                            <span>${formEntity.msgxm!}</span><i></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
 
                         <tr>
                             <td class="th">
@@ -442,8 +435,7 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
                                 <div class="form-group">
                                     <div class="form-item">
                                         <div class="z-comp-textarea" name="createReqVO$xmnl">
-                                            <textarea
-                                                    placeholder="承担角色 / 所做项目的类型或大小 / 数据导入工具使用等">${formEntity.xmnl!}</textarea>
+                                            <textarea placeholder="承担角色 / 所做项目的类型或大小 / 数据导入工具使用等">${formEntity.xmnl!}</textarea>
                                         </div>
                                     </div>
                                 </div>

zjugis-business/src/main/resources/templates/Interview/js/index.js

@@ -1,7 +1,7 @@
 (function () {
     window.onload = function (ex) {
 
-        initStaff();
+        // initStaff();
         initData();
         initDept();//所有部门列表查询
         backPerson();//离职员工重新入职直接返回已有数据

zjugis-business/src/main/resources/templates/Resign/js/index.js

@@ -326,6 +326,8 @@
                     detailReadonly(i)
                     $("#addDataUnfinished").css("display", "none");
                     $("#addDataFinished").css("display", "none");
+                    $("#editBtnF_" + i).css("display", "none");
+                    $("#delBtnF_" + i).css("display", "none");
                 }
 
 
@@ -443,6 +445,8 @@
                     })
                 } else {
                     detailReadonlyU(i)
+                    $("#editBtnU_" + i).css("display", "none");
+                    $("#delBtnU_" + i).css("display", "none");
                 }