承接合同可直接项目流转，项目台账标签页可来回切换

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectContractController.java

@@ -94,4 +94,13 @@ public class CmcProjectContractController extends BaseController
     {
         return success(cmcProjectContractService.deleteCmcProjectContractByContractIds(contractIds));
     }
+    /**
+     * 删除cmc项目合同
+     */
+    @Log(title = "cmc项目合同", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delete/{projectIds}")
+    public AjaxResult removeByProjectIds(@PathVariable String[] projectIds)
+    {
+        return success(cmcProjectContractService.deleteCmcProjectContractByProjectIds(projectIds));
+    }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectContractMapper.java

@@ -58,4 +58,13 @@ public interface CmcProjectContractMapper
      * @return 结果
      */
     public int deleteCmcProjectContractByContractIds(String[] contractIds);
+
+    /**
+     * 批量删除cmc项目合同
+     *
+     * @param projectIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectContractService.java

@@ -51,6 +51,14 @@ public interface ICmcProjectContractService
      */
     public int deleteCmcProjectContractByContractIds(String[] contractIds);
 
+    /**
+     * 批量删除cmc项目合同
+     *
+     * @param projectIds 需要删除的cmc项目合同主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds);
+
     /**
      * 删除cmc项目合同信息
      * 

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectContractServiceImpl.java

@@ -79,6 +79,18 @@ public class CmcProjectContractServiceImpl implements ICmcProjectContractService
         return cmcProjectContractMapper.deleteCmcProjectContractByContractIds(contractIds);
     }
 
+    /**
+     * 批量删除cmc项目合同
+     *
+     * @param projectIds 需要删除的cmc项目合同主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectContractByProjectIds(String[] projectIds)
+    {
+        return cmcProjectContractMapper.deleteCmcProjectContractByProjectIds(projectIds);
+    }
+
     /**
      * 删除cmc项目合同信息
      * 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectContractMapper.xml

@@ -56,4 +56,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{contractId}
         </foreach>
     </delete>
+    <delete id="deleteCmcProjectContractByProjectIds" parameterType="String">
+        delete from cmc_project_contract where project_id in
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
 </mapper>

oa-ui/src/router/index.js

@@ -2,19 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 09:56:16
- */
-/*
- * @Author: ysh
- * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-05-22 13:51:01
- */
-/*
- * @Author: ysh
- * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-15 14:18:00
+ * @LastEditTime: 2024-10-09 15:45:22
  */
 import Vue from 'vue'
 import Router from 'vue-router'
@@ -324,17 +312,30 @@ export const constantRoutes = [
       }
     ]
   },
+  // {
+  //   path: '/project/info',
+  //   component: Layout,
+  //   hidden: true,
+  //   children: [
+  //     {
+  //       path: '',
+  //       component: () => import('@/views/oa/project/info'),
+  //       name: 'projectInfo',
+  //       meta: { title: '项目详情', icon: '' }
+
+  //     }
+  //   ]
+  // },
   {
-    path: '/project/info',
+    path: '',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '',
+        path: 'projectInfo/info/:id',
         component: () => import('@/views/oa/project/info'),
         name: 'projectInfo',
         meta: { title: '项目详情', icon: '' }
-
       }
     ]
   },

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-27 11:41:27
+ * @LastEditTime: 2024-10-09 13:52:58
  */
 import request from '@/utils/request'
 
@@ -46,6 +46,7 @@ const apiEndpoints = [
     apiUrl: [
       '/oa/project/:id',
       '/oa/projectWork/:id',
+      '/oa/projectContract/delete/:id'
     ]
   },
   {

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-08 09:28:41
+ * @LastEditTime: 2024-10-09 14:19:38
 -->
 <template>
   <div class="app-container">
@@ -10,6 +10,9 @@
       <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
+        <div style="text-align:right;">
+          <el-button type="warning" size="mini" @click="gotoProjectRegister()" icon="el-icon-plus">项目登记、安排生产</el-button>
+        </div>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
           <el-form-item label="投标项目名称：" prop="tenderId">
             <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
@@ -280,6 +283,8 @@
               </tr>
             </table>
           </el-form-item>
+          <el-form-item label="">
+          </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="分管审批意见" prop="managerComment">
             <el-input v-model="form.managerComment" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入审批意见"
@@ -397,7 +402,7 @@ import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, get
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listContractSubcontract, delContractSubcontract, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
 import flow from '@/views/flowable/task/todo/detail/flow'
-import { flowXmlAndNode } from "@/api/flowable/definition";
+import { definitionStart,flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
 import ChooseTender from '../components/chooseTender.vue';
 import { listPartyA } from "@/api/oa/partyA/partyA";
@@ -409,6 +414,9 @@ import paymentTable from './components/paymentTable.vue';
 import projectInfo from '@/views/oa/project/info'
 import ChooseSubcontract from '@/views/flowable/form/components/chooseSubcontract.vue';
 import subContract from '@/views/flowable/form/business/subContract.vue';
+import { listDefinition } from "@/api/flowable/definition";
+import { Snowflake } from '@/utils/snowFlake.js'
+import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -1012,31 +1020,11 @@ export default {
         }
       });
     },
-    // updateContractData() {
-    //   this.workList = this.$refs.workTableRef.workList;
-    //   this.paymentList = this.$refs.paymentRef.paymentList;
-    //   updateContract(this.form).then(response => {
-    //     this.$modal.msgSuccess("修改成功");
-    //     this.open = false;
-    //     delContractWork(this.form.contractId).then(res => {
-    //       for (let work of this.workList) {
-    //         work.contractId = this.form.contractId
-    //         addContractWork(work);
-    //       }
-    //     })
-    //     delContractPayment(this.form.contractId).then(res => {
-    //       for (let payment of this.paymentList) {
-    //         payment.contractId = this.form.contractId
-    //         addContractPayment(payment);
-    //       }
-    //     })
-    //   });
-    // },
     updateContractData() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
       updateContract(this.form).then(response => {
-        this.$modal.msgSuccess("修改成功");
+        this.$modal.msgSuccess("保存成功");
         this.open = false;
         // 删除合同的工作和支付信息，并等待两个操作完成
         Promise.all([
@@ -1044,19 +1032,19 @@ export default {
           delContractPayment(this.form.contractId)
         ]).then(([workRes, paymentRes]) => {
           // 添加工作信息
-          const workPromises = this.workList.map(work => {
+          const workPromises = this.workList.map(async work => {
             work.contractId = this.form.contractId;
-            return addContractWork(work);
+            return await addContractWork(work);
           });
           // 添加支付信息
-          const paymentPromises = this.paymentList.map(payment => {
+          const paymentPromises = this.paymentList.map(async payment => {
             payment.contractId = this.form.contractId;
-            return addContractPayment(payment);
+            return await addContractPayment(payment);
           });
           // 等待所有添加操作完成
           return Promise.all([...workPromises, ...paymentPromises]);
         }).then(() => {
-          this.$modal.msgSuccess("计划工作量和回款计划添加成功");
+          // this.$modal.msgSuccess("计划工作量和回款计划添加成功");
         }).catch(error => {
           this.$modal.msgError("操作失败: " + error.message);
         });
@@ -1201,6 +1189,80 @@ export default {
       delContractSubcontract(row.subContractId)
       this.connectSubContractList.splice(index, 1)
     },
+    // 跳转项目流转，并结束流程
+    async gotoProjectRegister() {
+      let response = await listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: "项目流转",
+        category: "project",
+      })
+      if (response.data.total == 1) {
+        let obj = response.data.records[0]
+        this.$confirm("是否发起项目流转？若页面未跳转，请刷新页面", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.handleStartProcess(obj)
+        })
+      }
+    },
+    handleStartProcess(row) {
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data;
+        const variables = {};
+        const formData = {};
+        formData.disabled = true;
+        formData.formBtns = false;
+        formData.formId = formId
+        if (row.id) {
+          variables.variables = formData;
+          let routePath = this.getRoutePath(row);
+          this.$emit('goBack');
+          this.$cache.local.set('contractId',`${this.taskForm.formId}`)
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            let procInstanceId = res.data;
+            todoList({
+              pageNum: 1,
+              pageSize: 99999999, processInsId: procInstanceId
+            }).then(toDoRes => {
+              let records = toDoRes.data.records;
+              if (records.length == 1) {
+                records = records[0]
+              }
+              this.$router.push({
+                path: routePath,
+                query: {
+                  procInsId: records.procInsId,
+                  executionId: records.executionId,
+                  deployId: records.deployId,
+                  taskId: records.taskId,
+                  taskName: records.taskName,
+                  startUser: records.startUserName + '-' + records.startDeptName,
+                  formId: formData.formId,
+                  procDefName: records.procDefName,
+                }
+              })
+            })
+          })
+        }
+      })
+    },
+    getRoutePath(row) {
+      let path;
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.name) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
+      }
+      return path
+    },
   }
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-18 17:38:50
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-18 11:16:02
+ * @LastEditTime: 2024-10-09 11:31:52
 -->
 <template>
   <div>
@@ -124,22 +124,26 @@ export default {
     };
   },
   created() {
+    this.firstGetList();
     this.getList();
   },
   watch: {
     projectSource() {
+      this.firstGetList();
       this.getList();
     }
   },
   methods: {
-    /** 查询cmc业主单位列表 */
-    getList() {
-      this.loading = true;
+    firstGetList() {
       if (this.projectSource == '0') {
-        this.queryParams.partyAName = '中国电建集团成都勘测设计研究院有限公司'
+        this.$set(this.queryParams, 'partyAName', '中国电建集团成都勘测设计研究院有限公司')
       } else if (this.projectSource == '1') {
-        this.queryParams.partyAName = null
+        this.$set(this.queryParams, 'partyAName', null)
       }
+    },
+    /** 查询cmc业主单位列表 */
+    getList() {
+      this.loading = true;
       listPartyA(this.queryParams).then(response => {
         this.partyAList = response.rows;
         this.total = response.total;

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-29 11:47:57
+ * @LastEditTime: 2024-10-09 14:29:14
 -->
 <template>
   <div class="project-wrapper">
@@ -129,6 +129,7 @@ import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/projec
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { listPartyA } from "@/api/oa/partyA/partyA";
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
 import chooseContract from '../components/chooseContract.vue';
 import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 import ArrangeProject from './arrangeProject.vue';
@@ -176,7 +177,8 @@ export default {
         registerTime: undefined,
         projectRegistrant: "",
         projectLevel: "0",
-        taskDocument: ''
+        taskDocument: '',
+        undertakingDept: ''
       },
       chooseContractInfo: {
         contractCode: '',
@@ -225,6 +227,10 @@ export default {
     this.getPartyAList();
     this.getDeptList();
     this.getContractDataList();
+    if (this.$cache.local.get('contractId')) {
+      const contractId = this.$cache.local.get('contractId')
+      this.afterJumpByContract(contractId)
+    }
     // this.getList();
   },
   mounted() {
@@ -299,21 +305,43 @@ export default {
     getContractDataList() {
       listProjectContract({ projectId: this.taskForm.formId }).then(res => {
         if (res.rows) {
-          for (let row of res.rows) {
-            getContract(row.contractId).then(res => {
+          // 创建一个数组来存储所有的 getContract 请求
+          const contractPromises = res.rows.map(row => getContract(row.contractId));
+          // 使用 Promise.all 来处理所有的请求
+          Promise.all(contractPromises).then(contractResponses => {
+            contractResponses.forEach(res => {
               if (res.data) {
-                if (this.chooseContractInfo.contractCode != '') {
-                  this.chooseContractInfo.contractCode = this.chooseContractInfo.contractCode + '、' + res.data.contractCode;
-                } else {
-                  this.chooseContractInfo.contractCode = res.data.contractCode;
-                }
-                if (this.chooseContractInfo.contractNumber != '') {
-                  this.chooseContractInfo.contractNumber = this.chooseContractInfo.contractNumber + '、' + res.data.contractNumber;
-                } else {
-                  this.chooseContractInfo.contractNumber = res.data.contractNumber;
-                }
+                // 合并合同信息
+                this.chooseContractInfo.contractCode += this.chooseContractInfo.contractCode ? '、' : '' + res.data.contractCode;
+                this.chooseContractInfo.contractNumber += this.chooseContractInfo.contractNumber ? '、' : '' + res.data.contractNumber;
               }
-            })
+            });
+          }).catch(err => {
+            console.error('获取合同失败:', err);
+            // 可以在这里处理错误，比如设置一个错误状态
+          });
+        }
+      }).catch(err => {
+        console.error('获取项目合同失败:', err);
+        // 可以在这里处理错误，比如设置一个错误状态
+      });
+    },
+    // 从承接合同跳转过来的
+    afterJumpByContract(contractId) {
+      getContract(contractId).then(res => {
+        if (res.data) {
+          this.chooseContractInfo = res.data;
+          this.$set(this.addForm, 'partyAId', res.data.partyAId);
+          this.$set(this.addForm, 'projectName', res.data.contractName);
+          if (res.data.partyA) {
+            let partyAName = res.data.partyA.partyAName;
+            if (partyAName.indexOf('中国电建集团成都勘测设计研究院') != -1) {
+              this.$set(this.addForm, 'projectSource', '0');
+              this.changeProjectSource('0');
+            } else {
+              this.$set(this.addForm, 'projectSource', '1');
+              this.changeProjectSource('1');
+            }
           }
         }
       })
@@ -355,6 +383,9 @@ export default {
         await updateProject(this.addForm)
         this.$modal.msgSuccess("保存成功")
       }
+      if (this.$cache.local.get('contractId')) {
+        this.$cache.local.remove('contractId')
+      }
     },
     async confirmAddForm() {
       let leaderData = await getUsersDeptLeaderByDept({ deptId: 109 })
@@ -400,7 +431,9 @@ export default {
           dom.scrollIntoView({ behavior: 'smooth' });
         }
       })
-
+      if (this.$cache.local.get('contractId')) {
+        this.$cache.local.remove('contractId')
+      }
     },
     confirmPartyA(val) {
       this.partyAOpen = false

oa-ui/src/views/flowable/form/projectProcess/planWorkload.vue

@@ -55,6 +55,7 @@
 <script>
 import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
 import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   props: {
@@ -78,6 +79,10 @@ export default {
   },
   created() {
     this.getList();
+    if (this.$cache.local.get('contractId')) {
+      const contractId = this.$cache.local.get('contractId')
+      this.getContractWorkList(contractId)
+    }
   },
   methods: {
     getList() {
@@ -87,6 +92,22 @@ export default {
         }
       })
     },
+    getContractWorkList(contractId) {
+      listContractWork({ pageNum: 1, pageSize: 100, contractId }).then(res => {
+        if (res.rows.length > 0)
+          this.workList = res.rows;
+        else {
+          this.workList = [{
+            content: "",
+            scale: "",
+            unit: "",
+            workload: "",
+            deadline: undefined,
+            remark: "",
+          }]
+        }
+      });
+    },
     addWorkList() {
       this.workList.push({
         content: "",
@@ -121,6 +142,7 @@ table {
   /*设置背景颜色*/
   /* background-color: #bfa; */
 }
+
 .delete-btn {
   color: #F56C6C;
   cursor: pointer;

oa-ui/src/views/oa/contract/components/edit.vue

@@ -424,7 +424,7 @@ export default {
           // 等待所有添加操作完成
           return Promise.all([...workPromises, ...paymentPromises]);
         }).then(() => {
-          this.$modal.msgSuccess("计划工作量和回款计划添加成功");
+          // this.$modal.msgSuccess("计划工作量和回款计划添加成功");
         }).catch(error => {
           this.$modal.msgError("操作失败: " + error.message);
         });

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-23 16:15:25
+ * @LastEditTime: 2024-10-09 16:25:24
 -->
 <template>
   <div class="project-wrapper">
@@ -364,10 +364,12 @@ export default {
     },
     handleView(row) {
       let id = row.projectId
-      this.$router.push({
-        path: '/project/info',
-        query: { projectId: id }
-      })
+      this.$router.push(
+        {
+          name: 'projectInfo',
+          params: { id },
+          query: { projectId: id, projectName: row.projectName }
+        });
     },
     handleUpdate(row) {
       this.addForm = row;
@@ -463,13 +465,14 @@ export default {
     formatStatus(row) {
       if (!row) {
         row = 0
+        return 'exception'
       }
       if (row <= 20) {
         return 'exception'
       } else if (row > 20 && row <= 50) {
         return 'warning'
       } else if (row > 50 && row <= 80) {
-        return ''
+        return null
       } else {
         return 'success'
       }

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

@@ -573,6 +573,17 @@ export default {
       default: true
     }
   },
+  beforeCreate() {
+    // 可有可无，在面包屑中展示
+    this.$route.meta.title = this.$route.query.projectName
+    // 找到当前tab并修改当前tab显示的标题
+    let currentView = this.$store.getters.visitedViews[this.$store.getters.visitedViews.findIndex(
+      (item) => item.path === this.$route.path
+    )]
+    if (currentView != null) {
+      currentView.title = this.$route.query.projectName
+    }
+  },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -637,7 +648,6 @@ export default {
   methods: {
     scrollToAnchor(anchor) {
       const element = this.$refs[anchor];
-      console.log(element.offsetTop);
       if (element) {
         window.scrollTo({
           behavior: 'smooth',