完善调岗审批，新增招聘审批

oa-ui/src/views/flowable/form/components/conditionDisplay.vue

@@ -65,6 +65,8 @@
       v-else-if="taskForm.procDefName == '职称评审'"></titles-form>
     <transfer-form :key="'titles' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
       v-else-if="taskForm.procDefName == '调岗审批'"></transfer-form>
+    <recruit-form :key="'titles' + taskForm.taskId" :taskForm="taskForm" :taskName="''" :isFlow="true"
+      v-else-if="taskForm.procDefName == '招聘审批'"></recruit-form>
   </div>
 </template>
 
@@ -101,6 +103,7 @@ import StudyForm from "@/views/flowable/form//oa/studyForm.vue";
 import BudgetAdjust from '@/views/flowable/form/budget/adjust/budgetAdjust.vue';
 import TitlesForm from '@/views/flowable/form/oa/titlesForm.vue';
 import TransferForm from '@/views/flowable/form/oa/transferForm.vue';
+import recruitForm from '@/views/flowable/form/oa/recruitForm.vue';
 export default {
   props: {
     passingParam: {
@@ -143,7 +146,8 @@ export default {
     StudyForm,
     BudgetAdjust,
     TitlesForm,
-    TransferForm
+    TransferForm,
+    recruitForm
   },
   data() {
     return {

oa-ui/src/views/flowable/form/components/detailDisplay.vue

@@ -60,6 +60,8 @@
       @goBack="goBack"></titles-form>
     <transfer-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '调岗审批'"
       @goBack="goBack"></transfer-form>
+    <recruit-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '招聘审批'"
+      @goBack="goBack"></recruit-form>
   </div>
 </template>
 
@@ -96,6 +98,7 @@ import StudyForm from "@/views/flowable/form/oa/studyForm.vue";
 import AdjustIndex from '@/views/flowable/form/budget/adjust/adjustIndex.vue';
 import TitlesForm from '@/views/flowable/form/oa/titlesForm.vue';
 import TransferForm from '@/views/flowable/form/oa/transferForm.vue';
+import recruitForm from '@/views/flowable/form/oa/recruitForm.vue';
 export default {
   components: {
     ScTable,
@@ -129,7 +132,8 @@ export default {
     StudyForm,
     AdjustIndex,
     TitlesForm,
-    TransferForm
+    TransferForm,
+    recruitForm
   },
   props: {
     taskForm: {

oa-ui/src/views/flowable/form/components/print/recruitPrint.vue

@@ -0,0 +1,171 @@
+<template>
+  <div>
+    <div id="printRecruit">
+      <div class="text-center title">招聘申请表</div>
+      <table border="1">
+        <tr>
+          <td :colspan="2" class="fontbold">申请人</td>
+          <td :colspan="2">{{ getUserName(form.applier) }}</td>
+          <td :colspan="2" class="fontbold">申请部门</td>
+          <td :colspan="3">{{  getDeptName(form.applyDept) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ form.project.projectNumber ? form.project.projectNumber : '无' }}</td>
+          <td :colspan="2" class="fontbold">项目名称</td>
+          <td :colspan="3">{{ form.project.projectName ? form.project.projectName:'无' }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">岗位名称</td>
+          <td :colspan="4">{{ form.postName }}</td>
+          <td :colspan="2" class="fontbold">招聘人数</td>
+          <td :colspan="1">{{ form.postNumber }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">岗位职责</td>
+          <td :colspan="7" style="white-space: pre-wrap;"><div  class="minHeight">{{ form.duty }}</div></td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">任职资格</td>
+          <td :colspan="7" style="white-space: pre-wrap;"><div class="minHeight">{{ form.qualification }}</div></td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">薪资待遇</td>
+          <td :colspan="7" style="white-space: pre-wrap;"><div  class="minHeight">{{ form.wage }}</div></td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">部门意见</td>
+          <td :colspan="3"><div class="minHeight">{{ form.deptComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.deptUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.deptTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">分管审批意见</td>
+          <td :colspan="3"><div class="minHeight">{{ form.managerComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.managerTime }}</td>
+        </tr>
+         <tr>
+          <td :colspan="2" class="fontbold">总经理审批意见</td>
+          <td :colspan="3"><div class="minHeight">{{ form.zjlComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.zjlUserId) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.zjlTime }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      settleSum: {},
+      deptSettleList: [],
+      deductionsList: [],
+      actualSumSettle: '',
+      print: {
+        id: 'printRecruit',
+        popTitle: '招聘申请表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+  table-layout: fixed; 
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+    word-wrap: break-word;
+    word-break: break-all;
+    overflow-wrap: break-word;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 150px;
+  text-align: center;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+}
+
+.minHeight{
+  min-height: 100px;
+}
+</style>

oa-ui/src/views/flowable/form/components/print/transferPrint.vue

@@ -0,0 +1,199 @@
+<template>
+  <div>
+    <div id="printTransfer">
+      <div class="text-center title">调岗申请表</div>
+      <table border="1">
+        <tr>
+          <td :colspan="1" class="fontbold">申请人</td>
+          <td :colspan="8">{{ getUserName(form.applier) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">调岗前所在部门</td>
+          <td :colspan="3">{{  getDeptName(form.beforeDeptId) }}</td>
+          <td :colspan="2" class="fontbold">拟调整岗位</td>
+          <td :colspan="2">{{ getPostById(form.beforePostId) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">调岗后所在部门</td>
+          <td :colspan="3">{{ getDeptName(form.afterDeptId) }}</td>
+          <td :colspan="2" class="fontbold">调岗后岗位</td>
+          <td :colspan="2">{{ getPostById(form.afterPostId) }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">调岗前所在部门意见</td>
+          <td :colspan="4"><div class="minHeight">{{ form.beforeDeptComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.beforeDeptLeader) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.beforeDeptTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">调岗后所在部门意见</td>
+          <td :colspan="4"><div class="minHeight">{{ form.afterDeptComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.afterDeptLeader) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.afterDeptTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">综合事务部意见</td>
+          <td :colspan="4"><div class="minHeight">{{ form.zhComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{
+            getUserName(form.zhUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.zhTime }}</td>
+        </tr>
+        <tr>
+          <td :colspan="1" class="fontbold">分管审批意见</td>
+          <td :colspan="4"><div class="minHeight">{{ form.managerComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.managerTime }}</td>
+        </tr>
+         <tr>
+          <td :colspan="1" class="fontbold">总经理审批意见</td>
+          <td :colspan="4"><div class="minHeight">{{ form.zjlComment }}</div></td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">
+            签名：<span class="auditor">{{ getUserName(form.zjlUserId) }}</span>
+          </td>
+          <td :colspan="2" style="text-align:left;width:240px;">日期：{{ form.zjlTime }}</td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getUser } from "@/api/system/user";
+export default {
+  props: {
+    form: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      settleSum: {},
+      deptSettleList: [],
+      deductionsList: [],
+      actualSumSettle: '',
+      postList: [],
+      print: {
+        id: 'printTransfer',
+        popTitle: '调岗申请表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods:{
+    getList() {
+        getUser(this.$store.state.user.id).then(response => {
+        this.postList = response.posts;
+      });
+    },
+    getPostById(val) {
+      let postname = [];
+      const postIds = val.split(",");
+      postIds.map(id => {
+        // 将字符ID转为数字进行比较
+        const numericId = Number(id);
+        const post = this.postList.find(post => post.postId == numericId);
+        if (post) {
+          postname.push(post.postName);
+        }
+      });
+
+      const displayText = postname.join("、");
+      return displayText;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+  table-layout: fixed; 
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+    word-wrap: break-word;
+    word-break: break-all;
+    overflow-wrap: break-word;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  min-width: 150px;
+  text-align: center;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+}
+
+.minHeight{
+  min-height: 100px;
+}
+</style>

oa-ui/src/views/flowable/form/oa/recruitForm.vue

@@ -0,0 +1,481 @@
+<!--
+ * @Author: ysh
+ * @Date: 2025-08-18 10:59:25
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-08-19 16:33:56
+-->
+<template>
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="isFlow ? 18 : 24" :xs="24">
+        <h2 style="text-align: center;">招聘申请表</h2>
+        <div class="mt20 mb20" v-if="showAlter">
+          <el-alert title="任务被退回，请修改后重新提交" type="error" :closable="false">
+            <return-comment :taskForm="taskForm" @isReturn="isReturn"></return-comment>
+          </el-alert>
+        </div>
+        <el-form :model="form" :rules="formRules" ref="form" label-width="175px" :disabled="taskName == ''"
+          class="mt20">
+          <el-divider></el-divider>
+            <!-- 申请部门 -->
+            <el-row :gutter="20" >
+                <el-col :md="7" :span="24">
+                    <el-form-item label="申请人：" prop="applier" >
+                        <span>{{ getUserName(form.applier) }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="7" :span="24">
+                    <el-form-item label="申请部门：" prop="dept.deptName" >
+                        <span>{{ form.dept ? form.dept.deptName : '' }}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="7" :span="24">
+                    <el-form-item label="申请时间" prop="applyDate">
+                        <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" disabled>
+                    </el-date-picker>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <!-- 项目 -->
+            <el-form-item label="项目招聘：" prop="isProject">
+                <el-switch v-model="isProject"  :disabled="taskName != '招聘申请'"></el-switch>
+              </el-form-item>
+            <el-form-item label="项目编号：" prop="projectId" v-if= this.isProject>
+                <el-button type="primary" size="mini" @click="openProject = true"
+                  v-if="taskName == '招聘申请'">选择项目</el-button>
+                <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+                  <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+                    }}</el-descriptions-item>
+                  <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+                    }}</el-descriptions-item>
+                  <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
+                    chooseProject.projectLeaderUser.nickName : ''
+                    }}</el-descriptions-item>
+                  <el-descriptions-item label="承担部门" label-class-name="my-label">
+                    <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
+                  </el-descriptions-item>
+                  <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+                    }}</el-descriptions-item>
+                </el-descriptions>
+              </el-form-item>
+            <!-- 需求岗位名称和人数 -->
+            <el-row :gutter="20" >
+                <el-col :md="12" :span="24">
+                  <el-form-item label="需求岗位名称：" prop="postName">
+                    <el-input type="textarea" :rows="1" placeholder="请输入需求岗位名称" v-model="form.postName"
+                      :disabled="taskName != '招聘申请'">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :md="12" :span="24">
+                  <el-form-item label="招聘人数：" prop="postNumber">
+                    <el-input-number v-model="form.postNumber" :min="1" :disabled="taskName != '招聘申请'"></el-input-number>
+                  </el-form-item>
+                </el-col>
+            </el-row>
+
+            <!-- 岗位职责 -->
+            <el-form-item label="岗位职责：" prop="duty" label-width="140px">
+                <el-input type="textarea" v-model="form.duty" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '招聘申请'"></el-input>
+            </el-form-item>
+            <!-- 任职资格 -->
+            <el-form-item label="任职资格：" prop="qualification" label-width="140px">
+                <el-input type="textarea" v-model="form.qualification" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '招聘申请'"></el-input>
+            </el-form-item>
+            <!-- 薪资待遇 -->
+            <el-form-item label="薪资待遇：" prop="wage" label-width="140px">
+                <el-input type="textarea" v-model="form.wage" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '招聘申请'"></el-input>
+            </el-form-item>
+
+            <el-divider></el-divider>
+
+          <!-- 部门（项目）负责人意见 -->
+            <el-form-item label="部门意见：" prop="deptComment" label-width="130px">
+                <el-input type="textarea" v-model="form.deptComment" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '部门审批'"></el-input>
+                <auditor-row ref="deptRef" :isCurrent="taskName == '部门审批'"
+                :signature="form.deptUserId ? form.deptUserId : null" :signTime="form.deptTime"></auditor-row>
+            </el-form-item>
+            <!-- 分管审核意见： -->
+            <el-form-item label="分管审批意见：" prop="managerComment" label-width="130px">
+                <el-input type="textarea" v-model="form.managerComment" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '分管审批'"></el-input>
+                <auditor-row ref="fgRef" :isCurrent="taskName == '分管审批'"
+                :signature="form.managerUserId ? form.managerUserId : null" :signTime="form.managerTime"></auditor-row>
+            </el-form-item>
+            <!-- 总经理审批意见： -->
+            <el-form-item label="总经理审批意见：" prop="zjlComment" label-width="130px">
+                <el-input type="textarea" v-model="form.zjlComment" :autosize="{ minRows: 4 }"
+                :disabled="taskName != '总经理审批'"></el-input>
+                <auditor-row ref="zjlRef" :isCurrent="taskName == '总经理审批'"
+                :signature="form.zjlUserId ? form.zjlUserId : null" :signTime="form.zjlTime"></auditor-row>
+            </el-form-item>
+        </el-form>
+
+        <!-- 操作按钮 -->
+        <div style="text-align: center;" v-if="taskName" class="mt30">
+          <el-button type="warning" @click="saveDraft">保存</el-button>
+          <el-button type="danger" @click="returnOpen = true" v-if="taskName != '调岗申请'">退回</el-button>
+          <el-button type="primary" @click="submitForm">{{ taskName != '总经理审批' ? '提交下一个流程' : '批准' }}</el-button>
+        </div>
+      </el-col>
+      <el-col :span="6" :xs="24" v-if="isFlow">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <el-dialog title="退回" :visible.sync="returnOpen" width="40%" append-to-body>
+      <return-btn :taskForm="taskForm" :comment="commentByRole()" @goBack="$emit('goBack')" @saves=""
+        @cancel="returnOpen = false"></return-btn>
+    </el-dialog>
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import flow from '@/views/flowable/task/todo/detail/flow';
+import { getProject } from "@/api/oa/project/project";
+import { flowXmlAndNode } from "@/api/flowable/definition";
+import { listRecruit, getRecruit, delRecruit, addRecruit, updateRecruit } from "@/api/oa/recruit/recruit";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
+import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post';
+import AuditorRow from '@/views/flowable/form/components/auditorRow.vue';
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+export default {
+  components: {
+    flow,
+    ReturnComment,
+    ReturnBtn,
+    AuditorRow,
+    projectChoose
+  },
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    },
+    isFlow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  watch: {
+    isProject(newVal, oldVal) {
+      if (newVal === false) {
+        this.form.projectId = ''; 
+        this.isSelect = false;
+      }
+    }
+  },
+  created() {
+    if (this.isFlow)
+      flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+        this.flowData = res.data;
+      })
+    // 初始化表单数据
+    this.initFormData()
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      flowData: {},
+      isEdit: false,
+      form: {
+        dept: {
+          deptName: '',
+        },
+      },
+      rules: {},
+      returnOpen: false,
+      showAlter: true,
+      openProject:false,
+      isSelect:false,
+      isProject: false,
+    }
+  },
+  computed: {
+    // 动态生成验证规则
+    formRules() {
+      if (this.taskName == '') {
+        return {}; // 当taskName为空时，不进行验证
+     }else if(this.taskName == '招聘申请'){
+        return {
+          postName: [
+            { required: true, message: '请输入需求岗位名称', trigger: 'blur' }
+          ],
+          postNumber: [
+            { required: true, message: '请选择招聘人数', trigger: 'change' }
+          ],
+          duty: [
+            { required: true, message: '请输入岗位职责', trigger: 'blur' }
+          ],
+          qualification: [
+            { required: true, message: '请输入任职资格', trigger: 'blur' }
+          ],
+          wage: [
+            { required: true, message: '请输入薪资待遇', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='部门审批'){
+        return{
+          deptComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='分管审批'){
+        return{
+          managerComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='总经理审批'){
+        return{
+          zjlComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}
+    }
+  },
+  methods: {
+    // 初始化表单数据
+    initFormData() {
+      getRecruit(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.form = res.data;
+          this.isEdit = true;
+          if (this.form.projectId) {
+            getProject(this.form.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true;
+              this.isProject = true;
+            })
+          }
+        } else {
+          this.form.applier = this.$store.state.user.id;
+          this.form.applyDate = this.parseTime(new Date(), '{y}-{m}-{d}');
+          this.form.applyDept = this.$store.getters.deptId;
+          this.form.dept.deptName = this.$store.getters.deptName;
+        }
+      })
+    },
+    // 保存
+    async saveDraft() {
+      if (this.taskName == '') {
+        this.$message.info('当前为只读模式，无法保存')
+        return;
+      }
+      if (this.taskName == '部门审批') {
+        this.form.deptUserId = this.$refs.deptRef.localSignatureUserId;
+        this.form.deptTime = this.$refs.deptRef.loaclSignTime;
+      } else if (this.taskName == '分管审批') {
+        this.form.managerUserId = this.$refs.fgRef.localSignatureUserId;
+        this.form.managerTime = this.$refs.fgRef.loaclSignTime;
+      } else if (this.taskName == '总经理审批') {
+        this.form.zjlUserId = this.$refs.zjlRef.localSignatureUserId;
+        this.form.zjlTime = this.$refs.zjlRef.loaclSignTime;
+      }
+
+      if (this.isEdit) {
+        await updateRecruit(this.form);
+      } else {
+        this.form.recruitId = this.taskForm.formId;
+        await addRecruit(this.form);
+        this.isEdit = true;
+      }
+      this.$message.success('保存成功')
+    },
+    // 提交表单
+    submitForm() {
+      if (this.taskName == '') {
+        this.$message.info('当前为只读模式，无法提交')
+        return;
+      }
+
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let msg = '确认提交招聘申请表？';
+          if (this.taskName == '总经理审批') {
+            msg = '最后一个节点，提交将无法修改，是否确认提交？';
+          }
+          this.$confirm(msg, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.submitFlow()
+          }).catch(() => {
+            this.$message.info('已取消提交')
+          })
+        } else {
+          this.$message.error('请完善表单信息')
+          return false
+        }
+      })
+    },
+    async submitFlow() {
+      await this.saveDraft();
+
+      if (this.taskName == '招聘申请') {  
+        const res = await getUsersDeptLeaderByDept({ deptId: this.$store.getters.deptId });
+        this.$set(this.taskForm.variables, "approval", res.data.userId);
+      }  else if (this.taskName == '部门审批') {
+        let managerList = []
+        let result = await getUsersManageLeaderByDept({ deptId: this.form.applyDept });
+        result.data.forEach(element => {managerList.push(element.userId)});
+        this.$set(this.taskForm.variables, "approvalList", managerList);
+      } else if (this.taskName == '分管审批') {
+        const res = await getUserByPost({ postName: "总经理" });
+        this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+      }
+
+      await getNextFlowNode({ taskId: this.taskForm.taskId });
+      const response = await complete(this.taskForm);
+      this.$modal.msgSuccess(response.msg);
+      this.$emit('goBack');
+    },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.$set(this.form, 'projectId', val[0].projectId);
+      }
+      this.openProject = false;
+    },
+    isReturn(val) {
+      this.showAlter = val;
+    },
+    commentByRole() {
+      if (this.taskName == '部门审批') {
+        return this.form.deptComment
+      } else if (this.taskName == '分管审批') {
+        return this.form.managerComment
+      } else if (this.taskName == '总经理审批') {
+        return this.form.zjlComment
+      } 
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+.process-steps {
+  margin: 20px 0;
+  padding: 20px;
+  background: #f8f9fa;
+  border-radius: 8px;
+}
+
+.current-step-info {
+  margin: 20px 0;
+
+  .step-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 8px;
+
+    i {
+      color: #409eff;
+      margin-right: 8px;
+      font-size: 16px;
+    }
+
+    .step-title {
+      font-weight: bold;
+      color: #303133;
+      font-size: 16px;
+    }
+  }
+
+  .step-description {
+    color: #606266;
+    font-size: 14px;
+    line-height: 1.5;
+  }
+}
+
+.form-section {
+  margin-bottom: 30px;
+  padding: 20px;
+  border: 1px solid #e4e7ed;
+  border-radius: 8px;
+  background: #fff;
+
+  .section-title {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    padding-bottom: 10px;
+    border-bottom: 2px solid #409eff;
+
+    i {
+      color: #409eff;
+      margin-right: 8px;
+      font-size: 18px;
+    }
+
+    svg {
+      color: #409eff;
+      margin-right: 8px;
+      font-size: 18px;
+    }
+
+    span {
+      font-size: 16px;
+      font-weight: bold;
+      color: #303133;
+    }
+  }
+}
+
+.sign {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding-right: 80px;
+  line-height: 30px;
+  /* 如果需要垂直居中 */
+}
+
+.mt20 {
+  margin-top: 20px;
+}
+
+.mt30 {
+  margin-top: 30px;
+}
+
+.mb20 {
+  margin-bottom: 20px;
+}
+
+.ml20 {
+  margin-left: 20px;
+}
+
+.mr20 {
+  margin-right: 20px;
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>

oa-ui/src/views/flowable/form/oa/transferForm.vue

@@ -16,11 +16,12 @@
         </div>
         <el-form :model="form" :rules="formRules" ref="form" label-width="175px" :disabled="taskName == ''"
           class="mt20">
+          <el-divider></el-divider>
             <!-- 申请人 -->
             <el-row :gutter="20" >
                 <el-col :md="12" :span="24">
                     <el-form-item label="申请人：" prop="applier" >
-                        <span class="auditor">{{ getUserName(form.applier) }}</span>
+                        <span>{{ getUserName(form.applier) }}</span>
                     </el-form-item>
                 </el-col>
                 <el-col :md="12" :span="24">
@@ -36,11 +37,11 @@
             <el-row :gutter="20" >
                 <el-col :md="12" :span="24">
                     <el-form-item label="调整前所在部门：" prop="beforeDeptId" :disabled="taskName != '调岗申请'">
-                    {{ getDept(form) }}
+                    {{ getDeptName(form.beforeDeptId) }}
                     </el-form-item>
                 </el-col>
                 <el-col :md="12" :span="24">
-                    <el-form-item label="调整前所在岗位：" prop="postList" >
+                    <el-form-item label="拟调整岗位：" prop="postList" >
                     <el-select v-model="postList.beforePostList" placeholder="请选择岗位" style="width:100%;" multiple :disabled="taskName != '调岗申请'" @change="$forceUpdate()">
                         <el-option v-for="item in beforepostOptions" :key="item.postId" :label="item.postName" :value="item.postId">
                         </el-option>
@@ -60,7 +61,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :md="12" :span="24">
-                    <el-form-item label="调整后所在岗位：" prop="postList">
+                    <el-form-item label="调整后岗位：" prop="postList">
                     <el-select v-model="postList.afterPostList" placeholder="请选择岗位" style="width:100%;" multiple :disabled="taskName != '调岗申请'" @change="$forceUpdate()">
                         <el-option v-for="item in allpostOptions" :key="item.postId" :label="item.postName" :value="item.postId">
                         </el-option>
@@ -72,35 +73,35 @@
             <el-divider></el-divider>
 
           <!-- 调整前所在部门意见 -->
-            <el-form-item label="调整前所在部门意见" prop="beforeDeptComment" label-width="140px">
+            <el-form-item label="调整前所在部门意见：" prop="beforeDeptComment" label-width="160px">
                 <el-input type="textarea" v-model="form.beforeDeptComment" :autosize="{ minRows: 4 }"
                 :disabled="taskName != '调前部门审批'"></el-input>
                 <auditor-row ref="beforeRef" :isCurrent="taskName == '调前部门审批'"
                 :signature="form.beforeDeptLeader ? form.beforeDeptLeader : null" :signTime="form.beforeDeptTime"></auditor-row>
             </el-form-item>
             <!-- 调整后所在部门意见 -->
-            <el-form-item label="调整后所在部门意见" prop="afterDeptComment" label-width="140px">
+            <el-form-item label="调整后所在部门意见：" prop="afterDeptComment" label-width="160px">
                 <el-input type="textarea" v-model="form.afterDeptComment" :autosize="{ minRows: 4 }"
                 :disabled="taskName != '调后部门审批'"></el-input>
                 <auditor-row ref="afterRef" :isCurrent="taskName == '调后部门审批'"
                 :signature="form.afterDeptLeader ? form.afterDeptLeader : null" :signTime="form.afterDeptTime"></auditor-row>
             </el-form-item>
             <!-- 综合事务部意见： -->
-            <el-form-item label="综合事务部意见：" prop="zhComment" label-width="130px">
+            <el-form-item label="综合事务部意见：" prop="zhComment" label-width="160px">
                 <el-input type="textarea" v-model="form.zhComment" :autosize="{ minRows: 4 }"
                 :disabled="taskName != '综合事务部审批'"></el-input>
                 <auditor-row ref="zhRef" :isCurrent="taskName == '综合事务部审批'"
                 :signature="form.zhUserId ? form.zhUserId : null" :signTime="form.zhTime"></auditor-row>
             </el-form-item>
             <!-- 分管审核意见： -->
-            <el-form-item label="分管审核意见：" prop="managerComment" label-width="130px">
+            <el-form-item label="分管审核意见：" prop="managerComment" label-width="160px">
                 <el-input type="textarea" v-model="form.managerComment" :autosize="{ minRows: 4 }"
                 :disabled="taskName != '分管审批'"></el-input>
                 <auditor-row ref="fgRef" :isCurrent="taskName == '分管审批'"
                 :signature="form.managerUserId ? form.managerUserId : null" :signTime="form.managerTime"></auditor-row>
             </el-form-item>
             <!-- 总经理审批意见： -->
-            <el-form-item label="总经理审批意见：" prop="zjlComment" label-width="130px">
+            <el-form-item label="总经理意见：" prop="zjlComment" label-width="160px">
                 <el-input type="textarea" v-model="form.zjlComment" :autosize="{ minRows: 4 }"
                 :disabled="taskName != '总经理审批'"></el-input>
                 <auditor-row ref="zjlRef" :isCurrent="taskName == '总经理审批'"
@@ -110,7 +111,6 @@
 
         <!-- 操作按钮 -->
         <div style="text-align: center;" v-if="taskName" class="mt30">
-          <el-button type="warning" @click="saveDraft">保存</el-button>
           <el-button type="danger" @click="returnOpen = true" v-if="taskName != '调岗申请'">退回</el-button>
           <el-button type="primary" @click="submitForm">{{ taskName != '总经理审批' ? '提交下一个流程' : '批准' }}</el-button>
         </div>
@@ -141,7 +141,7 @@ import { allocatedUserList } from "@/api/system/role";
 import ReturnComment from "@/views/flowable/form/components/flowBtn/returnComment.vue";
 import ReturnBtn from "@/views/flowable/form/components/flowBtn/returnBtn.vue";
 import { getUser, updateUser } from "@/api/system/user";
-import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost,delPost } from '@/api/system/post';
+import { getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post';
 import AuditorRow from '@/views/flowable/form/components/auditorRow.vue';
 export default {
   components: {
@@ -189,6 +189,9 @@ export default {
         afterPostList: [],
       },
       form: {
+        dept: {
+          deptName: '',
+        },
         transferId: null,
         applier: null,
         applyDate: null,
@@ -222,19 +225,43 @@ export default {
     formRules() {
       if (this.taskName == '') {
         return {}; // 当taskName为空时，不进行验证
-      }
-
-      return {
-        beforePostList: [
-          { required: true, message: '请选择调整前岗位', trigger: 'change', type: 'array'  }
-        ],
-        afterDeptId: [
-          { required: true, message: '请选择调整后部门', trigger: 'change' }
-        ],
-        afterPostList: [
-          { required: true, message: '请选择调整后岗位', trigger: 'change', type: 'array' }
-        ]
-      };
+     }else if(this.taskName == '调岗申请'){
+        return {
+          beforePostList: [
+            { required: true, message: '请选择调整前岗位', trigger: 'change', type: 'array'  }
+          ],
+          afterDeptId: [
+            { required: true, message: '请选择调整后部门', trigger: 'change' }
+          ],
+          afterPostList: [
+            { required: true, message: '请选择调整后岗位', trigger: 'change', type: 'array' }
+          ]
+     }}else if(this.taskName=='调前部门审批'){
+        return{
+          beforeDeptComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur'}
+          ]
+     }}else if(this.taskName=='调后部门审批'){
+        return{
+          afterDeptComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='综合事务部审批'){
+        return{
+          zhComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='分管审批'){
+        return{
+          managerComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}else if(this.taskName=='总经理审批'){
+        return{
+          zjlComment: [
+            { required: true, message: '请填写审批意见', trigger: 'blur' }
+          ]
+     }}
     }
   },
   methods: {
@@ -251,6 +278,8 @@ export default {
         } else {
           this.form.applier = this.$store.state.user.id;
           this.form.applyDate = this.parseTime(new Date(), '{y}-{m}-{d}');
+          this.form.dept.deptName = this.$store.getters.deptName;
+          this.form.beforeDeptId=this.$store.getters.deptId;
         }
       })
     },
@@ -319,7 +348,7 @@ export default {
     },
     async submitFlow() {
       await this.saveDraft();
-
+      
       if (this.taskName == '调岗申请') {  
         const res = await getUsersDeptLeaderByDept({ deptId: this.form.beforeDeptId });
         this.$set(this.taskForm.variables, "approval", res.data.userId);
@@ -330,8 +359,10 @@ export default {
         const res = await getUsersDeptLeaderByDept({ deptId: 104 });
         this.$set(this.taskForm.variables, "approval", res.data.userId);
       } else if (this.taskName == '综合事务部审批') {
-        let res = await getUsersManageLeaderByDept({ deptId: this.form.afterDeptId });
-        this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+        let managerList = []
+        let result = await getUsersManageLeaderByDept({ deptId: this.form.afterDeptId });
+        result.data.forEach(element => {managerList.push(element.userId)});
+        this.$set(this.taskForm.variables, "approvalList", managerList);
       } else if (this.taskName == '分管审批') {
         const res = await getUserByPost({ postName: "总经理" });
         this.$set(this.taskForm.variables, "approval", res.data[0].userId);
@@ -360,29 +391,11 @@ export default {
         });
       }else{
         getUser(this.$store.state.user.id).then(response => {
-          console.log(this.$store.state.user.id);
-          console.log(response);
           this.allpostOptions = response.posts;
           this.beforepostOptions = response.posts;
         });
       }
     },
-    //获取部门
-    getDept(val){
-      if(this.taskName=="调岗申请"){
-        for (let p of this.$store.state.user.deptList) {
-        if (p.deptId == this.$store.state.user.deptId) {
-          this.form.beforeDeptId = p.deptId;
-          return p.deptName;
-        }}
-      }else{
-        for (let p of this.$store.state.user.deptList) {
-        if (p.deptId == val.beforeDeptId) {
-          return p.deptName;
-        }
-      }
-      }
-    },
     //转换岗位id格式
     postIdConvert(val){
       // 处理空值
@@ -405,6 +418,7 @@ export default {
     async updateUserDeptAndPost(){
       const userinfo = await getUser(Number(this.form.applier));
       userinfo.data.deptId = this.form.afterDeptId;
+      userinfo.data.roleIds = userinfo.roleIds;
       userinfo.data.postIds = this.form.afterPostId.split(',').map(item => Number(item.trim())).filter(num => !isNaN(num));
       updateUser(userinfo.data).then(response => {
        this.$modal.msgSuccess("修改成功");

oa-ui/src/views/oa/recruit/index.vue

@@ -2,148 +2,26 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="申请人" prop="applier">
-        <el-input
-          v-model="queryParams.applier"
-          placeholder="请输入申请人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.applier" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="申请部门" prop="applyDept">
-        <el-input
-          v-model="queryParams.applyDept"
-          placeholder="请输入申请部门"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目id" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="岗位名称" prop="postName">
-        <el-input
-          v-model="queryParams.postName"
-          placeholder="请输入岗位名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="岗位人数" prop="postNumber">
-        <el-input
-          v-model="queryParams.postNumber"
-          placeholder="请输入岗位人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="岗位职责" prop="duty">
-        <el-input
-          v-model="queryParams.duty"
-          placeholder="请输入岗位职责"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任职资格" prop="qualification">
-        <el-input
-          v-model="queryParams.qualification"
-          placeholder="请输入任职资格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="薪酬待遇" prop="wage">
-        <el-input
-          v-model="queryParams.wage"
-          placeholder="请输入薪酬待遇"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门意见" prop="deptComment">
-        <el-input
-          v-model="queryParams.deptComment"
-          placeholder="请输入部门意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门负责人" prop="deptLeader">
-        <el-input
-          v-model="queryParams.deptLeader"
-          placeholder="请输入部门负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门审批时间" prop="deptTime">
-        <el-date-picker clearable
-          v-model="queryParams.deptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管领导意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管领导意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管领导" prop="managerLeader">
-        <el-input
-          v-model="queryParams.managerLeader"
-          placeholder="请输入分管领导"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管领导审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管领导审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理" prop="zjlLeader">
-        <el-input
-          v-model="queryParams.zjlLeader"
-          placeholder="请输入总经理"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
+        <el-select v-model="queryParams.applyDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -152,38 +30,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:recruit:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:recruit:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:recruit:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -199,36 +45,26 @@
 
     <el-table v-loading="loading" :data="recruitList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="招聘申请id" align="center" prop="recruitId" />
-      <el-table-column label="申请人" align="center" prop="applier" />
-      <el-table-column label="申请部门" align="center" prop="applyDept" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="申请人" align="center" prop="applier" >
+         <template slot-scope="scope">
+          {{ getUserName(scope.row.applier) }}
         </template>
       </el-table-column>
-      <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位人数" align="center" prop="postNumber" />
-      <el-table-column label="岗位职责" align="center" prop="duty" />
-      <el-table-column label="任职资格" align="center" prop="qualification" />
-      <el-table-column label="薪酬待遇" align="center" prop="wage" />
-      <el-table-column label="部门意见" align="center" prop="deptComment" />
-      <el-table-column label="部门负责人" align="center" prop="deptLeader" />
-      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+      <el-table-column label="申请部门" align="center" prop="applyDept" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+          {{ getDeptName(scope.row.applyDept) }}
         </template>
       </el-table-column>
-      <el-table-column label="分管领导意见" align="center" prop="managerComment" />
-      <el-table-column label="分管领导" align="center" prop="managerLeader" />
-      <el-table-column label="分管领导审批时间" align="center" prop="managerTime" width="180">
+      <el-table-column label="项目id" align="center" prop="project.projectNumber" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="岗位名称" align="center" prop="postName" />
+      <el-table-column label="岗位人数" align="center" prop="postNumber" />
+      <el-table-column label="薪酬待遇" align="center" prop="wage" />
       <el-table-column label="总经理意见" align="center" prop="zjlComment" />
-      <el-table-column label="总经理" align="center" prop="zjlLeader" />
       <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
@@ -236,20 +72,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:recruit:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:recruit:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -263,95 +86,19 @@
     />
 
     <!-- 添加或修改cmc招聘申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请人" prop="applier">
-          <el-input v-model="form.applier" placeholder="请输入申请人" />
-        </el-form-item>
-        <el-form-item label="申请部门" prop="applyDept">
-          <el-input v-model="form.applyDept" placeholder="请输入申请部门" />
-        </el-form-item>
-        <el-form-item label="项目id" prop="projectId">
-          <el-input v-model="form.projectId" placeholder="请输入项目id" />
-        </el-form-item>
-        <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable
-            v-model="form.applyDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择申请日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="岗位名称" prop="postName">
-          <el-input v-model="form.postName" placeholder="请输入岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位人数" prop="postNumber">
-          <el-input v-model="form.postNumber" placeholder="请输入岗位人数" />
-        </el-form-item>
-        <el-form-item label="岗位职责" prop="duty">
-          <el-input v-model="form.duty" placeholder="请输入岗位职责" />
-        </el-form-item>
-        <el-form-item label="任职资格" prop="qualification">
-          <el-input v-model="form.qualification" placeholder="请输入任职资格" />
-        </el-form-item>
-        <el-form-item label="薪酬待遇" prop="wage">
-          <el-input v-model="form.wage" placeholder="请输入薪酬待遇" />
-        </el-form-item>
-        <el-form-item label="部门意见" prop="deptComment">
-          <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
-        </el-form-item>
-        <el-form-item label="部门负责人" prop="deptLeader">
-          <el-input v-model="form.deptLeader" placeholder="请输入部门负责人" />
-        </el-form-item>
-        <el-form-item label="部门审批时间" prop="deptTime">
-          <el-date-picker clearable
-            v-model="form.deptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管领导意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管领导意见" />
-        </el-form-item>
-        <el-form-item label="分管领导" prop="managerLeader">
-          <el-input v-model="form.managerLeader" placeholder="请输入分管领导" />
-        </el-form-item>
-        <el-form-item label="分管领导审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择分管领导审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理意见" />
-        </el-form-item>
-        <el-form-item label="总经理" prop="zjlLeader">
-          <el-input v-model="form.zjlLeader" placeholder="请输入总经理" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
+      <recruit-tab :taskForm="taskForm"></recruit-tab>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listRecruit, getRecruit, delRecruit, addRecruit, updateRecruit } from "@/api/oa/recruit/recruit";
+import { listProject } from '@/api/oa/project/project';
+import RecruitTab from './recruitTab.vue'
 
 export default {
+  components: { RecruitTab },
   name: "Recruit",
   data() {
     return {
@@ -400,7 +147,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {
+        formId: ''
+      },
+      projectList: []
     };
   },
   created() {
@@ -462,51 +213,21 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc招聘申请";
+    goBack() {
+      this.$emit('goBack')
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const recruitId = row.recruitId || this.ids
-      getRecruit(recruitId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc招聘申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.recruitId != null) {
-            updateRecruit(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRecruit(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
+    remoteMethod(val) {
+      listProject({
+        pageNum: 1,
+        pageSize: 20,
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const recruitIds = row.recruitId || this.ids;
-      this.$modal.confirm('是否确认删除cmc招聘申请编号为"' + recruitIds + '"的数据项？').then(function() {
-        return delRecruit(recruitIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+    handleView(row){
+      this.taskForm.formId = row.recruitId;
+      this.open = true;
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/recruit/recruitTab.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-button type="success" @click="openPrint = true">打印</el-button>
+    <h3 class="text-center"><b>{{ '招聘申请表' }}</b></h3>
+    <el-form ref="recruitForm" :model="form" :rules="rules" label-width="125px" disabled>
+        <el-row>
+            <el-col :span="6" :xs="24">
+                <el-form-item label="申请人" prop="applier" >
+                    {{ getUserName(form.applier) }}
+                </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+        <el-form-item label="申请部门" prop="applyDept" >
+            {{ getDeptName(form.applyDept) }}
+        </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row v-show="isProject">
+            <el-col :span="6" :xs="24">
+            <el-form-item label="项目编号：" prop="project.projectNumber">
+                {{ form.project.projectNumber }}
+            </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+            <el-form-item label="项目名称：" prop="project.projectName">
+                {{ form.project.projectName }}
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="6" :xs="24">
+            <el-form-item label="岗位名称：" prop="postName">
+                {{ form.postName }}
+            </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+            <el-form-item label="招聘人数：" prop="postNumber">
+                {{ form.postNumber }}
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item label="岗位职责：" prop="duty">
+            <el-input v-model="form.duty" placeholder="请输入分管审批意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-form-item label="任职资格：" prop="qualification">
+            <el-input v-model="form.qualification" placeholder="请输入分管审批意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-form-item label="薪资待遇：" prop="wage">
+            <el-input v-model="form.wage" placeholder="请输入分管审批意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-form-item label="部门意见：" prop="deptComment">
+            <el-input v-model="form.deptComment" placeholder="请输入部门意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.deptUserId ? form.deptUser.nickName : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.deptTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+         <el-form-item label="分管审批意见：" prop="managerComment">
+            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.managerUserId ? form.managerUser.nickName : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.managerTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item label="总经理审批意见：" prop="zjlComment">
+            <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" type="textarea" 
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.zjlUserId ? form.zjlUser.nickName : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.zjlTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+    </el-form>
+    <el-dialog title="招聘申请表格预览" :visible.sync="openPrint" width="65%" append-to-body>
+      <recruit-print :form="form" @cancel="openPrint = false"></recruit-print>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRecruit, getRecruit, delRecruit, addRecruit, updateRecruit } from "@/api/oa/recruit/recruit";
+import { listUser } from '@/api/system/user';
+import { getProject } from "@/api/oa/project/project";
+import RecruitPrint from '../../flowable/form/components/print/recruitPrint.vue';
+export default {
+  components: { RecruitPrint },
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+    projectNumber() {
+      return this.$store.state.projectProcess.projectNumber;
+    },
+    projectName() {
+      return this.$store.state.projectProcess.projectName;
+    },
+  },
+  watch: {
+    projectNumber(newval) {
+      this.$set(this.form, "projectNumber", newval);
+    },
+    projectName(newval) {
+      this.$set(this.form, "projectName", newval);
+    },
+    'taskForm.formId'() {
+      this.loading = true;
+      this.initForm();
+    }
+
+  },
+  data() {
+    return {
+      isEmpty: true,
+      form: {},
+      rules: {},
+      userList: [],
+      loading: false,
+      isProject: false,
+      openPrint: false,
+    }
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    /** 查询cmc招聘列表 */
+    initForm() {
+      getRecruit(this.taskForm.formId).then((res) => {
+        if (res.data) {
+            this.isEmpty = false;
+            this.form = res.data;
+            if (res.data) {
+              if(res.data.projectId!=''){
+                  this.isProject = true;
+              }else{
+                this.isProject = false;
+              }
+              this.loading = false
+            }
+        }})
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>

oa-ui/src/views/oa/transfer/index.vue

@@ -1,173 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="申请人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入申请人id"
+      <el-form-item label="申请人" prop="userId">
+        <el-select
+          v-model="queryParams.applier"
+          filterable
           clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="申请日期" prop="applyDate">
-        <el-date-picker clearable
-          v-model="queryParams.applyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="调整前所在部门id" prop="beforeDeptId">
-        <el-input
-          v-model="queryParams.beforeDeptId"
-          placeholder="请输入调整前所在部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整前岗位id" prop="beforePostId">
-        <el-input
-          v-model="queryParams.beforePostId"
-          placeholder="请输入调整前岗位id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整后所在部门id" prop="afterDeptId">
-        <el-input
-          v-model="queryParams.afterDeptId"
-          placeholder="请输入调整后所在部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整后岗位id" prop="afterPostId">
-        <el-input
-          v-model="queryParams.afterPostId"
-          placeholder="请输入调整后岗位id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整前所在部门意见" prop="beforeDeptComment">
-        <el-input
-          v-model="queryParams.beforeDeptComment"
-          placeholder="请输入调整前所在部门意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整前所在部门负责人" prop="beforeDeptLeader">
-        <el-input
-          v-model="queryParams.beforeDeptLeader"
-          placeholder="请输入调整前所在部门负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整前所在部门审批时间" prop="beforeDeptTime">
-        <el-date-picker clearable
-          v-model="queryParams.beforeDeptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择调整前所在部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="调整后所在部门意见" prop="afterDeptComment">
-        <el-input
-          v-model="queryParams.afterDeptComment"
-          placeholder="请输入调整后所在部门意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="调整后所在部门审批时间" prop="afterDeptTime">
-        <el-date-picker clearable
-          v-model="queryParams.afterDeptTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择调整后所在部门审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="调整后所在部门负责人" prop="afterDeptLeader">
-        <el-input
-          v-model="queryParams.afterDeptLeader"
-          placeholder="请输入调整后所在部门负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="综合事务部意见" prop="zhComment">
-        <el-input
-          v-model="queryParams.zhComment"
-          placeholder="请输入综合事务部意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="综合事务部审批时间" prop="zhTime">
-        <el-date-picker clearable
-          v-model="queryParams.zhTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择综合事务部审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="综合事务部负责人" prop="zhUserId">
-        <el-input
-          v-model="queryParams.zhUserId"
-          placeholder="请输入综合事务部负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管领导意见" prop="managerComment">
-        <el-input
-          v-model="queryParams.managerComment"
-          placeholder="请输入分管领导意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分管领导审批时间" prop="managerTime">
-        <el-date-picker clearable
-          v-model="queryParams.managerTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择分管领导审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="分管领导" prop="managerUserId">
-        <el-input
-          v-model="queryParams.managerUserId"
-          placeholder="请输入分管领导"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理意见" prop="zjlComment">
-        <el-input
-          v-model="queryParams.zjlComment"
-          placeholder="请输入总经理意见"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总经理审批时间" prop="zjlTime">
-        <el-date-picker clearable
-          v-model="queryParams.zjlTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择总经理审批时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="总经理" prop="zjlUserId">
-        <el-input
-          v-model="queryParams.zjlUserId"
-          placeholder="请输入总经理"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery">
+          <el-option
+            v-for="item in $store.state.user.userList"
+            :key="item.userId"
+            :label="item.nickName"
+            :value="item.userId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -176,38 +22,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:transfer:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:transfer:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:transfer:remove']"
-        >删除</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -222,69 +36,44 @@
     </el-row>
 
     <el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="调岗id" align="center" prop="transferId" />
-      <el-table-column label="申请人id" align="center" prop="userId" />
-      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="申请人" align="center" prop="userId">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ getUserName(scope.row.applier) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调整前所在部门id" align="center" prop="beforeDeptId" />
-      <el-table-column label="调整前岗位id" align="center" prop="beforePostId" />
-      <el-table-column label="调整后所在部门id" align="center" prop="afterDeptId" />
-      <el-table-column label="调整后岗位id" align="center" prop="afterPostId" />
-      <el-table-column label="调整前所在部门意见" align="center" prop="beforeDeptComment" />
-      <el-table-column label="调整前所在部门负责人" align="center" prop="beforeDeptLeader" />
-      <el-table-column label="调整前所在部门审批时间" align="center" prop="beforeDeptTime" width="180">
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        
+      </el-table-column>
+      <el-table-column label="调整前所在部门" align="center" prop="beforeDeptId" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beforeDeptTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ getDeptName(scope.row.beforeDeptId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调整后所在部门意见" align="center" prop="afterDeptComment" />
-      <el-table-column label="调整后所在部门审批时间" align="center" prop="afterDeptTime" width="180">
+      <el-table-column label="拟调整岗位" align="center" prop="beforePostId" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.afterDeptTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ getPostById(scope.row.beforePostId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调整后所在部门负责人" align="center" prop="afterDeptLeader" />
-      <el-table-column label="综合事务部意见" align="center" prop="zhComment" />
-      <el-table-column label="综合事务部审批时间" align="center" prop="zhTime" width="180">
+      <el-table-column label="调整后所在部门" align="center" prop="afterDeptId" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.zhTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ getDeptName(scope.row.afterDeptId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="综合事务部负责人" align="center" prop="zhUserId" />
-      <el-table-column label="分管领导意见" align="center" prop="managerComment" />
-      <el-table-column label="分管领导审批时间" align="center" prop="managerTime" width="180">
+      <el-table-column label="调整后岗位" align="center" prop="afterPostId" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ getPostById(scope.row.afterPostId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分管领导" align="center" prop="managerUserId" />
       <el-table-column label="总经理意见" align="center" prop="zjlComment" />
       <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总经理" align="center" prop="zjlUserId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:transfer:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:transfer:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -297,115 +86,19 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改cmc调岗申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请人id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入申请人id" />
-        </el-form-item>
-        <el-form-item label="申请日期" prop="applyDate">
-          <el-date-picker clearable
-            v-model="form.applyDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择申请日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="调整前所在部门id" prop="beforeDeptId">
-          <el-input v-model="form.beforeDeptId" placeholder="请输入调整前所在部门id" />
-        </el-form-item>
-        <el-form-item label="调整前岗位id" prop="beforePostId">
-          <el-input v-model="form.beforePostId" placeholder="请输入调整前岗位id" />
-        </el-form-item>
-        <el-form-item label="调整后所在部门id" prop="afterDeptId">
-          <el-input v-model="form.afterDeptId" placeholder="请输入调整后所在部门id" />
-        </el-form-item>
-        <el-form-item label="调整后岗位id" prop="afterPostId">
-          <el-input v-model="form.afterPostId" placeholder="请输入调整后岗位id" />
-        </el-form-item>
-        <el-form-item label="调整前所在部门意见" prop="beforeDeptComment">
-          <el-input v-model="form.beforeDeptComment" placeholder="请输入调整前所在部门意见" />
-        </el-form-item>
-        <el-form-item label="调整前所在部门负责人" prop="beforeDeptLeader">
-          <el-input v-model="form.beforeDeptLeader" placeholder="请输入调整前所在部门负责人" />
-        </el-form-item>
-        <el-form-item label="调整前所在部门审批时间" prop="beforeDeptTime">
-          <el-date-picker clearable
-            v-model="form.beforeDeptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择调整前所在部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="调整后所在部门意见" prop="afterDeptComment">
-          <el-input v-model="form.afterDeptComment" placeholder="请输入调整后所在部门意见" />
-        </el-form-item>
-        <el-form-item label="调整后所在部门审批时间" prop="afterDeptTime">
-          <el-date-picker clearable
-            v-model="form.afterDeptTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择调整后所在部门审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="调整后所在部门负责人" prop="afterDeptLeader">
-          <el-input v-model="form.afterDeptLeader" placeholder="请输入调整后所在部门负责人" />
-        </el-form-item>
-        <el-form-item label="综合事务部意见" prop="zhComment">
-          <el-input v-model="form.zhComment" placeholder="请输入综合事务部意见" />
-        </el-form-item>
-        <el-form-item label="综合事务部审批时间" prop="zhTime">
-          <el-date-picker clearable
-            v-model="form.zhTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择综合事务部审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="综合事务部负责人" prop="zhUserId">
-          <el-input v-model="form.zhUserId" placeholder="请输入综合事务部负责人" />
-        </el-form-item>
-        <el-form-item label="分管领导意见" prop="managerComment">
-          <el-input v-model="form.managerComment" placeholder="请输入分管领导意见" />
-        </el-form-item>
-        <el-form-item label="分管领导审批时间" prop="managerTime">
-          <el-date-picker clearable
-            v-model="form.managerTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择分管领导审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="分管领导" prop="managerUserId">
-          <el-input v-model="form.managerUserId" placeholder="请输入分管领导" />
-        </el-form-item>
-        <el-form-item label="总经理意见" prop="zjlComment">
-          <el-input v-model="form.zjlComment" placeholder="请输入总经理意见" />
-        </el-form-item>
-        <el-form-item label="总经理审批时间" prop="zjlTime">
-          <el-date-picker clearable
-            v-model="form.zjlTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理" prop="zjlUserId">
-          <el-input v-model="form.zjlUserId" placeholder="请输入总经理" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body>
+      <transfer-tab :taskForm="taskForm"></transfer-tab>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/oa/transfer/transfer";
+import { getUser } from "@/api/system/user";
+import TransferTab from './transferTab.vue'
 
 export default {
+  components: { TransferTab },
   name: "Transfer",
   data() {
     return {
@@ -427,11 +120,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //所有岗位
+      postList: [],
+      //所有部门
+      deptList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: null,
+        applier: null,
         applyDate: null,
         beforeDeptId: null,
         beforePostId: null,
@@ -457,7 +154,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {
+        formId: ''
+      },
     };
   },
   created() {
@@ -472,6 +172,10 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      getUser(this.$store.state.user.id).then(response => {
+        this.postList = response.posts;
+      });
+      this.deptList = this.$store.state.user.deptList
     },
     // 取消按钮
     cancel() {
@@ -506,6 +210,31 @@ export default {
       };
       this.resetForm("form");
     },
+    getPostById(val) {
+      let postname = [];
+      const postIds = val.split(",");
+      postIds.map(id => {
+        // 将字符ID转为数字进行比较
+        const numericId = Number(id);
+        const post = this.postList.find(post => post.postId == numericId);
+        if (post) {
+          postname.push(post.postName);
+        }
+      });
+
+      const displayText = postname.join("、");
+      return displayText;
+    },
+    getDeptById(val) {
+      const dept = this.deptList.find(dept => dept.deptId == val);
+      if (dept) {
+        return dept.deptName;
+      }
+    },
+    handleView(row){
+      this.taskForm.formId = row.transferId;
+      this.open = true;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -522,52 +251,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc调岗申请";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const transferId = row.transferId || this.ids
-      getTransfer(transferId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc调岗申请";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.transferId != null) {
-            updateTransfer(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTransfer(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const transferIds = row.transferId || this.ids;
-      this.$modal.confirm('是否确认删除cmc调岗申请编号为"' + transferIds + '"的数据项？').then(function() {
-        return delTransfer(transferIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/transfer/export', {

oa-ui/src/views/oa/transfer/transferTab.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-button type="success" @click="openPrint = true">打印</el-button>
+    <h3 class="text-center"><b>{{ '调岗申请表' }}</b></h3>
+    <el-form ref="transferForm" :model="form" :rules="rules" label-width="125px" disabled>
+        <el-form-item label="申请人" prop="applier" >
+            {{ getUserName(form.applier) }}
+        </el-form-item>
+        <el-row>
+        <el-col :span="6" :xs="24">
+            <el-form-item label="调岗前所在部门" prop="beforeDeptId" >
+                {{ getDeptName(form.beforeDeptId) }}
+            </el-form-item>
+        </el-col>
+        <el-col :span="6" :xs="24">
+            <el-form-item label="拟调整岗位" prop="beforePostId" >
+                {{ getPostById(form.beforePostId) }}
+            </el-form-item>
+        </el-col>
+        </el-row>
+        <el-row>
+        <el-col :span="6" :xs="24">
+            <el-form-item label="调岗后所在部门" prop="beforeDeptId" >
+                {{ getDeptName(form.afterDeptId) }}
+            </el-form-item>
+        </el-col>
+        <el-col :span="6" :xs="24">
+            <el-form-item label="调岗后岗位" prop="beforePostId" >
+                {{ getPostById(form.afterPostId) }}
+            </el-form-item>
+        </el-col>
+        </el-row>
+        <el-form-item label="调岗前所在部门意见：" prop="beforeDeptComment">
+            <el-input v-model="form.beforeDeptComment" placeholder="请输入调岗前所在部门意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.beforeDeptLeader ? getUserName(form.beforeDeptLeader) : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.beforeDeptTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item label="调岗后所在部门意见：" prop="afterDeptComment">
+            <el-input v-model="form.afterDeptComment" placeholder="请输入调岗后所在部门意见：" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.afterDeptLeader ? getUserName(form.afterDeptLeader) : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.afterDeptTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item label="综合事务部意见：" prop="zhComment">
+            <el-input v-model="form.zhComment" placeholder="请输入综合事务部意见：" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.zhUserId ? getUserName(form.zhUserId) : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.zhTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+         <el-form-item label="分管审批意见：" prop="managerComment">
+            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" type="textarea"
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.managerUserId ? form.managerUser.nickName : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.managerTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item label="总经理审批意见：" prop="zjlComment">
+            <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" type="textarea" 
+            :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名" prop="deptUserId">
+                <span class="auditor"> {{ form.zjlUserId ? form.zjlUser.nickName : '' }}
+                </span>
+            </el-form-item>
+            </el-col>
+            <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+                <span> {{ parseTime(form.zjlTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+            </el-col>
+        </el-row>
+    </el-form>
+    <el-dialog title="调岗申请表格预览" :visible.sync="openPrint" width="65%" append-to-body>
+       <transfer-print :form="form" @cancel="openPrint = false"></transfer-print>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/oa/transfer/transfer";
+import { getUser } from '@/api/system/user';
+import { getProject } from "@/api/oa/project/project";
+import transferPrint from '../../flowable/form/components/print/transferPrint.vue';
+export default {
+  components: { transferPrint },
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  computed: {
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      isEmpty: true,
+      form: {},
+      rules: {},
+      postList: [],
+      loading: false,
+      openPrint: false,
+    }
+  },
+  mounted() {
+    this.initForm();
+  },
+  methods: {
+    /** 查询cmc招聘列表 */
+    initForm() {
+      Promise.all([
+        getTransfer(this.taskForm.formId),
+        getUser(this.$store.state.user.id)
+      ]).then(([transferRes, userRes]) => {
+        if (transferRes.data) {
+          this.isEmpty = false;
+          this.form = transferRes.data;
+        }
+        this.postList = userRes.posts || [];
+        this.loading = false;
+      }).catch(error => {
+        console.error('初始化数据失败:', error);
+        this.loading = false;
+      });
+    },
+    getPostById(val) {
+      if (!val) {
+        return '暂无岗位信息';
+      }
+      let postname = [];
+      const postIds = val.split(",");
+      postIds.map(id => {
+        // 将字符ID转为数字进行比较
+        const numericId = Number(id);
+        const post = this.postList.find(post => post.postId == numericId);
+        if (post) {
+          postname.push(post.postName);
+        }
+      });
+
+      const displayText = postname.join("、");
+      return displayText;
+    },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+</style>