项目台账加入流程进度、流程图

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1393,14 +1393,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      */
     @Override
     public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
-        List<FlowVarInst> flowVarInst =  flowVarInstMapper.selectProcInstByVar(formId);
-        List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
-        AjaxResult result = flowXmlAndNode(flowVarInst.get(0).getProcInstId(), flowProcDefList.get(0).getDeploymentId());
-        if (result.isSuccess()) {
-            result.put("procInsId", flowVarInst.get(0).getProcInstId());
-            result.put("deployId", flowProcDefList.get(0).getDeploymentId());
+        try {
+            List<FlowVarInst> flowVarInst = flowVarInstMapper.selectProcInstByVar(formId);
+            List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
+            AjaxResult result = flowXmlAndNode(flowVarInst.get(0).getProcInstId(), flowProcDefList.get(0).getDeploymentId());
+            if (result.isSuccess()) {
+                result.put("procInsId", flowVarInst.get(0).getProcInstId());
+                result.put("deployId", flowProcDefList.get(0).getDeploymentId());
+            }
+            return result;
+        }
+        catch (Exception e) {
+            return AjaxResult.error("无流程历史记录");
         }
-        return result;
     }
 
     /**

oa-ui/src/views/oa/project/info.vue

@@ -3,6 +3,8 @@
     <div class="header">
       <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
       <h1>{{ '【' + project.projectNumber + '】' + project.projectName }}</h1>
+      <el-button icon="el-icon-search" type="primary" class="records" @click="clickRecords">流转记录</el-button>
+      <el-button icon="el-icon-connection" type="success" class="flow" @click="clickProcess">流程图</el-button>
     </div>
     <el-divider></el-divider>
 
@@ -486,6 +488,16 @@
         <el-button @click="deptOpen = false">取消</el-button>
       </div>
     </el-dialog>
+    <el-drawer title="流程图" :visible.sync="drawerOpen" direction="rtl">
+      <div class="app-container">
+        <flow :flowData="flowData" />
+      </div>
+    </el-drawer>
+    <el-drawer title="办理进度" :visible.sync="recordOpen" direction="rtl">
+      <div class="app-container">
+        <row-detail :rows="clickRow"></row-detail>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -498,7 +510,7 @@ import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
-import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listContract, getContract } from "@/api/oa/contract/contract";
 import { listDevice } from "@/api/oa/device/device";
 import { listCar } from '@/api/oa/car/car';
 import budgetInfo from '@/views/flowable/form/budget/budgetInfo.vue';
@@ -510,9 +522,13 @@ import BorrowData from '@/views/flowable/form/inProgress/borrowData.vue';
 import BudgetTab from '@/views/flowable/form/projectProcess/budgetTab.vue';
 import achiData from "@/views/flowable/form/inProgress/achiData.vue";
 import choosePeople from '@/views/flowable/form/budget/components/choosePeople.vue'
-import { listProjectChange, getProjectChange, delProjectChange, addProjectChange, updateProjectChange } from "@/api/oa/project/projectChange";
+import { listProjectChange } from "@/api/oa/project/projectChange";
+import { flowXmlAndNodeByFormId } from "@/api/flowable/definition";
+import flow from '@/views/flowable/task/todo/detail/flow'
+import RowDetail from '@/views/flowable/task/myProcess/send/rowDetail.vue';
+
 export default {
-  components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople },
+  components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople, flow, RowDetail },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -526,7 +542,7 @@ export default {
       this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
       this.getProjectChangeList(projectId);
-    }else{
+    } else {
       this.goBack();
     }
   },
@@ -560,6 +576,13 @@ export default {
       participates: [],
       undertakingDept: [],
       projectChangeList: [],
+      drawerOpen: false,
+      flowData: {},
+      recordOpen: false,
+      clickRow: {
+        procInsId:'',
+        deployId:''
+      }
     }
   },
   methods: {
@@ -714,6 +737,22 @@ export default {
           this.$router.go(0);
         })
       })
+    },
+    async clickProcess() {
+      if (this.$route.query.projectId) {
+        let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+        this.flowData = resData.data;
+        this.drawerOpen = true;
+        let resData2 = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+        this.flowData = resData2.data;
+        this.drawerOpen = true;
+      }
+    },
+    async clickRecords() {
+      let resData = await flowXmlAndNodeByFormId({ formId: this.$route.query.projectId, name: '项目流转' })
+      let { procInsId, deployId } = resData
+      this.clickRow = { procInsId, deployId }
+      this.recordOpen = true;
     }
   },
 }
@@ -731,6 +770,18 @@ export default {
     left: 12px;
     top: -10px;
   }
+
+  .records {
+    position: absolute;
+    right: 120px;
+    top: -10px;
+  }
+
+  .flow {
+    position: absolute;
+    right: 12px;
+    top: -10px;
+  }
 }
 
 .content {

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

@@ -111,18 +111,16 @@
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
             </template>
           </el-table-column>
-          <!-- <el-table-column label="执业证书" align="center" key="certificates" prop="certificates" v-if="columns[7].visible"
-            :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              {{ formatCrtificates(dict.type.sys_user_certificates, scope.row.certificates) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="入职年月" align="center" key="entryDate" prop="entryDate" v-if="columns[8].visible"
-            :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.entryDate, '{y}-{m}') }}</span>
-            </template>
-          </el-table-column> -->
+          <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
+            v-if="columns[10].visible" />
+          <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
+          <el-table-column label="学历" align="center" key="degree" prop="degree" :formatter="formatterDegree"
+            v-if="columns[12].visible" />
+          <el-table-column label="籍贯" align="center" key="nativePlace" prop="native_place" v-if="columns[13].visible" />
+          <el-table-column label="政治面貌" align="center" key="politicalAffiliation" :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation"
+            v-if="columns[14].visible" />
+          <el-table-column label="民族" align="center" key="ethnic" prop="ethnic"  v-if="columns[15].visible" />
+
           <el-table-column label="合同签订" align="center" key="contractSign" prop="contractSign" v-if="columns[7].visible"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -145,6 +143,7 @@
               <el-tag type="success" v-if="scope.row.status == 0">在职</el-tag>
               <el-tag type="danger" v-if="scope.row.status == 1">离职</el-tag>
               <el-tag type="warning" v-if="scope.row.status == 2">退休</el-tag>
+              <el-tag type="primary" v-if="scope.row.status == 3">试用</el-tag>
               <!-- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
               @change="handleStatusChange(scope.row)"></el-switch> -->
             </template>
@@ -430,6 +429,12 @@ export default {
         { key: 7, label: `合同签订`, visible: true },
         { key: 8, label: `合同期满`, visible: true },
         { key: 9, label: `状态`, visible: true },
+        { key: 10, label: `毕业院校`, visible: false },
+        { key: 11, label: `专业`, visible: false },
+        { key: 12, label: `学历`, visible: false },
+        { key: 13, label: `籍贯`, visible: false },
+        { key: 14, label: `政治面貌`, visible: false },
+        { key: 15, label: `民族`, visible: false },
       ],
       // 表单校验
       rules: {
@@ -784,6 +789,14 @@ export default {
       let bSalaryLevel = parseInt(b.salaryLevel, 10) || 0; // 同上  
       // 返回salaryLevel的差值  
       return aSalaryLevel - bSalaryLevel;
+    },
+    formatterDegree(row) {
+      let v = this.selectDictLabel(this.dict.type.sys_user_degree,row.degree)
+      return v
+    },
+    formatterPoliticalAffiliation(row){
+      let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
+      return v
     }
   }
 };