修改合同、项目数据列表界面可点击按钮发起流程；

新增合同在合同拟稿时候的保存按钮。

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

@@ -79,13 +79,6 @@ public class CmcContractController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcContract cmcContract)
     {
-        if (!cmcContract.getPartyAId().matches("-?\\d+(\\.\\d+)?")) {
-            CmcPartyA cmcPartyA = new CmcPartyA();
-            cmcPartyA.setPartyAId(String.valueOf(cmcPartyAService.selectCmcPartyAList(new CmcPartyA()).size() + 1));
-            cmcPartyA.setPartyAName(cmcContract.getPartyAId());
-            cmcPartyAService.insertCmcPartyA(cmcPartyA);
-            cmcContract.setPartyAId(cmcPartyA.getPartyAId());
-        }
         return toAjax(cmcContractService.insertCmcContract(cmcContract));
     }
 

oa-back/ruoyi-admin/src/main/resources/application-druid.yml

@@ -9,6 +9,7 @@ spring:
                 url: jdbc:mysql://localhost:3306/cmc_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
                 password: 123456
+#                password: cmcroot
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

oa-back/ruoyi-admin/src/main/resources/application.yml

@@ -18,6 +18,7 @@ cmc:
 server:
   # 服务器的HTTP端口，默认为8080
   port: 8080
+#  port: 8086
   servlet:
     # 应用的访问路径
     context-path: /
@@ -60,7 +61,7 @@ spring:
       # 单个文件大小
       max-file-size: 100MB
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 200MB
   # 服务模块
   devtools:
     restart:

oa-ui/src/components/Editor/index.vue

@@ -186,7 +186,6 @@ export default {
   },
   methods: {
     init() {
-      debugger
       const editor = this.$refs.editor;
       this.Quill = new Quill(editor, this.options);
       var Size = Quill.import("formats/size");
@@ -285,7 +284,6 @@ export default {
       return true;
     },
     handleUploadSuccess(res, file) {
-      debugger
       // 如果上传成功
       if (res.code == 200) {
         // 获取富文本组件实例

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-07-09 17:42:01
+ * @LastEditTime: 2024-07-24 16:09:37
 -->
 <template>
   <div class="app-container">
@@ -14,26 +14,27 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true"
+                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="3" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">{{ chooseTender.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="合同名称" prop="contractName">
-                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName" placeholder="请输入合同名称"
-                  :disabled="taskName != '合同拟稿'"></el-input>
+                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName"
+                  placeholder="请输入合同名称" :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="甲方单位" prop="partyAId">
                 <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
-                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
-                    :disabled="taskName != '合同拟稿'">
+                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName"
+                    :value="item.partyAId" :disabled="taskName != '合同拟稿'">
                   </el-option>
                 </el-select>
                 <el-button type="primary" @click="partyAOpen = true" size="mini"
@@ -48,7 +49,8 @@
                   :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="合同金额" prop="amount">
-                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'">
+                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额"
+                  :disabled="taskName != '合同拟稿'">
                   <template slot="append">元</template>
                 </el-input>
               </el-form-item>
@@ -77,7 +79,8 @@
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
             <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
+              :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
+              @input="getContractPath">
             </FileUpload>
             <div v-if="form.contractDocument && taskName != '合同拟稿'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -134,8 +137,8 @@
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="text" style="color:#F56C6C" size="mini" circle @click="deletWorkItem(index)"
+                    :disabled="taskName != '合同拟稿'">删除行</el-button>
                 </td>
               </tr>
             </table>
@@ -169,8 +172,8 @@
                     clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -392,8 +395,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -403,8 +406,8 @@
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
             <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''"
-              ref="contractFile" :limit="1" :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-              @input="getSignScanPath">
+              ref="contractFile" :limit="1" :filePathName="'承接合同文件'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan && taskName != '合同签订'">
               <!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
@@ -433,6 +436,7 @@
           </el-form-item>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
+          <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>` `
@@ -698,11 +702,11 @@ export default {
               this.isSelect = true
             })
           }
-          listContractWork({ contractId: this.taskForm.formId }).then(res => {
+          listContractWork({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.workList = res.rows;
           });
-          listContractPayment({ contractId: this.taskForm.formId }).then(res => {
+          listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.paymentList = res.rows;
           });
@@ -978,7 +982,7 @@ export default {
     validateTenderId(tenderId) {
       // 这里添加你的验证逻辑  
       // 例如，检查tenderId是否为空或者是否符合其他规则  
-      if (!tenderId || tenderId.trim() === '') {
+      if (!tenderId) {
         this.$message.error('请选择一个有效的投标项目');
         return false;
       }
@@ -993,6 +997,34 @@ export default {
       }
       return true;
     },
+    // 保存信息
+    saves() {
+      if (this.formTotal != 0) {
+        this.updateContractData();
+        this.updateRelatedProject();
+      } else {
+        this.form.contractId = this.taskForm.formId;
+        addContract(this.form).then(response => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("新增成功");
+            this.open = false;
+            for (let work of this.workList) {
+              work.contractId = this.form.contractId
+              addContractWork(work);
+            }
+            for (let payment of this.paymentList) {
+              payment.contractId = this.form.contractId
+              addContractPayment(payment);
+            }
+            for (let projectId of this.projectContractForm.projectIds) {
+              addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+            }
+          } else {
+            this.$message.error("新增失败，请确认合同编码是否唯一");
+          }
+        });
+      }
+    },
     /** 提交按钮 */
     submitForm() {
       this.isTenderIdValid = this.validateTenderId(this.form.tenderId);
@@ -1091,12 +1123,14 @@ export default {
               }
             });
           }
+        } else {
+          this.$message.error('请完善必填项')
         }
       });
     },
     updateContractData() {
       updateContract(this.form).then(response => {
-        this.$modal.msgSuccess("数据添加成功");
+        this.$modal.msgSuccess("修改成功");
         this.open = false;
         delContractWork(this.form.contractId).then(res => {
           for (let work of this.workList) {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-12 17:03:07
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-24 15:56:52
 -->
 <template>
   <div class="app-container">
@@ -55,8 +55,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择" style="width: 84%;"
-                  disabled clearable>
+                <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
+                  style="width: 84%;" disabled clearable>
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -75,10 +75,11 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="合同文件" prop="contractDocument">
-                <FileUpload v-if="formTotal == 0" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
+                <FileUpload v-if="taskName == '合同拟稿'" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
+                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
+                  @input="getContractPath">
                 </FileUpload>
-                <div v-if="taskName != '合同拟稿' && form.contractDocument">
+                <div v-if="form.contractDocument">
                   <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
                     {{ getFileName(form.contractDocument) }}
                   </el-link>
@@ -174,8 +175,8 @@
                     :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -325,7 +326,8 @@
                 <td colspan="5" style="text-align:left;">
                   <FileUpload v-if="meetingForm.document == null || meetingForm.document == ''" ref="contractFile"
                     :limit="1" :filePathName="'分包合同/会议评审意见'" :disabled="taskName != '会议评审'"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getMeetingPath"></FileUpload>
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getMeetingPath">
+                  </FileUpload>
                   <div v-if="meetingForm.document != null && meetingForm.document != ''">
                     <file-item :document="meetingForm.document"></file-item>
                   </div>
@@ -389,8 +391,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -398,7 +400,8 @@
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
             <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''" :limit="1"
-              :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getSignScanPath">
+              :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
+              @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan && taskName != '合同签订'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.signScan}`)">
@@ -412,6 +415,7 @@
           </el-form-item>
         </el-form>
         <div style="text-align: center;" v-if="flowDisabled">
+          <el-button type="warning" @click="saves()" :disabled="formDisabled" v-if="taskName == '合同拟稿'">保 存</el-button>
           <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
         </div>
       </el-col>
@@ -706,11 +710,11 @@ export default {
               })
             }
           })
-          listContractWork({ contractId: this.taskForm.formId }).then(res => {
+          listContractWork({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.workList = res.rows;
           });
-          listContractPayment({ contractId: this.taskForm.formId }).then(res => {
+          listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.paymentList = res.rows;
           });
@@ -923,6 +927,44 @@ export default {
       }
       return true;
     },
+    // 保存信息
+    saves() {
+      if (this.formTotal != 0) {
+        if (this.form.partnerId)
+          this.form.partnerId = this.form.partnerId.join(',')
+        updateSubContract(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.open = false;
+          this.getList();
+          this.updateChooseProjectList()
+        });
+      } else {
+        this.form.subContractId = this.taskForm.formId;
+        if (this.form.partnerId)
+          this.form.partnerId = this.form.partnerId.join(',')
+        addSubContract(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+        const subContractId = this.form.subContractId;
+        this.chooseProjectList.forEach(item => {
+          addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
+        })
+        for (let work of this.workList) {
+          work.contractId = subContractId;
+          addContractWork(work);
+        }
+        for (let payment of this.paymentList) {
+          payment.contractId = subContractId;
+          addContractPayment(payment);
+        }
+        const params = { taskId: this.taskForm.taskId };
+        getNextFlowNode(params).then(res => {
+          this.contractDraftSubmit(handleComplete)
+        })
+      }
+    },
     /** 提交按钮 */
     submitForm() {
       let isProjectValid = this.validateManual(this.chooseProjectList);

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

@@ -441,7 +441,6 @@ export default {
         });
       } else if (this.taskName == '安排设备') {
         getUsersManageLeader({ userId: this.form.applier }).then(res => {
-          debugger
           let userId = [];
           res.data.forEach(user => {
             userId.push(user.userId)

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

@@ -301,7 +301,6 @@ export default {
       // 获取下一个流程节点
       this.$refs['projectAdd'].validate((vaild) => {
         if (vaild) {
-          console.log(vaild);
           const params = { taskId: this.taskForm.taskId };
           getNextFlowNode(params).then(res => {
             complete(this.taskForm).then(response => {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-10 17:51:06
+ * @LastEditTime: 2024-07-24 11:04:44
 -->
 <template>
   <div class="app-container">
@@ -32,7 +32,8 @@
         <el-col :span="12" :xs="24">
           <el-form-item label="项目负责人：" prop="projectLeader">
             <el-select v-model="form.projectLeader" placeholder="请选择项目负责人" size="large" disabled>
-              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
+              <el-option v-for="item in $store.state.user.userList" :key="item.userId" :label="item.nickName"
+                :value="item.userId" />
             </el-select>
             <!-- <el-tag effect="plain" type="warning" style="margin-right: 10px;"
               v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
@@ -258,17 +259,23 @@ export default {
         if (resData.data) {
           approvalId = resData.data[0].userId;
         }
-        const params = { taskId: this.taskForm.taskId };
-        // 获取下一个流程节点
-        getNextFlowNode(params).then(res => {
-          this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-          this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
-          this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
-          this.$set(this.taskForm.variables, "approval", approvalId);
-          complete(this.taskForm).then(response => {
-            this.$modal.msgSuccess(response.msg);
-            this.$emit('goBack');
-          });
+        this.$refs['arrangeForm'].validate((vaild) => {
+          if (vaild) {
+            const params = { taskId: this.taskForm.taskId };
+            // 获取下一个流程节点
+            getNextFlowNode(params).then(res => {
+              this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+              this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
+              this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
+              this.$set(this.taskForm.variables, "approval", approvalId);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack');
+              });
+            })
+          }else{
+            this.$message.error('请完善必填项')
+          }
         })
       })
 

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-04 13:06:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-24 10:21:34
 -->
 <template>
   <div class="app-container">

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-23 17:11:21
+ * @LastEditTime: 2024-07-24 15:01:08
 -->
 <template>
   <div class="app-container">
@@ -54,10 +54,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:contract:remove']">删除</el-button>
       </el-col> -->
-      <!-- <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleRegister"
-          v-hasPermi="['oa:contract:add']">登记合同</el-button>
-      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleRegister"
+          v-hasPermi="['oa:contract:add']">登记承接合同</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:contract:export']">导出</el-button>
@@ -322,8 +322,23 @@ export default {
       });
     },
     // 登记合同
-    handleRegister(row) {
-      // this.handleStartProcess(row)
+    async handleRegister() {
+      let response = await listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: "承接合同评审",
+        category: "business",
+      })
+      if (response.data.total == 1) {
+        let obj = response.data.records[0]
+        this.$confirm("是否发起承接合同评审流程？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.handleStartProcess(obj)
+        }).catch(() => { });
+      }
     },
     handleStartProcess(row) {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();

oa-ui/src/views/oa/contract/subContract.vue

@@ -27,6 +27,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-plus" size="mini" @click="handleRegister"
+          v-hasPermi="['oa:contract:add']">登记分包合同</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:subContract:export']">导出</el-button>
@@ -112,7 +116,8 @@
           <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
         </el-form-item>
         <el-form-item label="拟稿日期" prop="draftTime">
-          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择拟稿日期">
+          <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择拟稿日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="合同备注" prop="remark">
@@ -145,6 +150,10 @@
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listPartner } from "@/api/oa/partner/partner";
 import subContract from '../../flowable/form/business/subContract.vue';
+import { listDefinition } from "@/api/flowable/definition";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { Snowflake } from '@/utils/snowFlake.js'
 
 export default {
   components: { subContract },
@@ -214,7 +223,7 @@ export default {
     remoteMethod(val) {
       listPartner({
         pageNum: 1,
-        pageSize: 20, 
+        pageSize: 20,
         partnerName: val
       }).then(res => {
         this.partnerList = res.rows;
@@ -282,6 +291,65 @@ export default {
         this.title = "修改cmc分包合同评审";
       });
     },
+    async handleRegister() {
+      let response = await listDefinition({
+        pageNum: 1,
+        pageSize: 9999,
+        name: "分包合同评审",
+        category: "business",
+      })
+      if (response.data.total == 1) {
+        let obj = response.data.records[0]
+        this.$confirm("是否发起分包合同评审流程？", '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.handleStartProcess(obj)
+        }).catch(() => { });
+      }
+    },
+    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);
+          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
+                }
+              })
+            })
+          })
+        }
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -302,6 +370,18 @@ export default {
         }
       });
     },
+    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
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const subContractIds = row.subContractId || this.ids;

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-07-18 13:54:18
+ * @LastEditTime: 2024-07-24 16:28:58
 -->
 <template>
   <div class="project-wrapper">
@@ -72,10 +72,10 @@
     <el-card style="margin-top: 20px;">
       <div slot="header" class="card-header">
         <div style="font-weight: bold;font-size: 20px;">项目列表</div>
-        <!-- <div>
-          <el-button style="float: right;margin-right: 10px;" type="warning" size="mini" icon="el-icon-plus"
-            @click="handleAdd">新增项目</el-button>
-        </div> -->
+        <div>
+          <el-button style="float: right;margin-right: 10px;" type="success" size="mini" icon="el-icon-plus"
+            @click="handleRegister">登记项目</el-button>
+        </div>
       </div>
       <el-table v-loading="loading" :data="projectList" style="margin-top: 30px;">
         <el-table-column type="index" width="50">
@@ -93,9 +93,10 @@
               :percentage="scope.row.percentage" text-color="#fff"></el-progress>
           </template>
         </el-table-column>
-        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px"/>
+        <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
-        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" width="120px" />
+        <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
+          width="120px" />
         <el-table-column label="项目级别" align="center" key="projectLevel" prop="projectLevel" width="120px">
           <template slot-scope="scope">
             <el-tag :type="scope.row.projectLevel ? (scope.row.projectLevel === '0' ? 'info' : 'danger') : 'info'"
@@ -104,7 +105,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px"/>
+        <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px" />
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
@@ -246,6 +247,10 @@ import { listDept } from '@/api/system/dept';
 import { listUser, getUser } from '@/api/system/user';
 import { mapGetters } from 'vuex';
 import { checkPermi } from '@/utils/permission';
+import { listDefinition } from "@/api/flowable/definition";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { Snowflake } from '@/utils/snowFlake.js'
 
 export default {
   computed: {
@@ -455,7 +460,78 @@ export default {
       } else {
         return 'success'
       }
-    }
+    },
+    async handleRegister() {
+      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)
+        }).catch(() => { });
+      }
+    },
+    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);
+          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/oa/project/info.vue

@@ -160,7 +160,7 @@
                 <svg-icon slot="prefix" icon-class="dept" />
                 承担部门
               </template>
-              <div style="display: flex;" class="ml20">
+              <div style="display: flex;" class="ml20" v-if="project.undertakingDept">
                 <div>{{ getDeptNames(project.undertakingDept) }}</div>
                 <div>
                   <el-button class="ml20" type="success" plain size="mini" icon="el-icon-refresh"
@@ -183,7 +183,7 @@
                 <svg-icon slot="prefix" icon-class="user" />
                 项目负责人
               </template>
-              <div style="display: flex;" class="ml20">
+              <div style="display: flex;" class="ml20" v-if="project.projectLeader">
                 <div>{{ project.projectLeaderUser ? project.projectLeaderUser.nickName : "" }}</div>
                 <div>
                   <el-button class="ml20" type="success" plain size="mini" icon="el-icon-refresh"
@@ -517,7 +517,7 @@ export default {
     this.getUserList();
     this.getDeviceList();
     this.getCarList();
-    if (this.$route.query) {
+    if (this.$route.query.projectId) {
       this.taskForm.formId = this.$route.query.projectId;
       let projectId = this.$route.query.projectId;
       this.getProjectInfo(projectId);
@@ -526,6 +526,8 @@ export default {
       this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
       this.getProjectChangeList(projectId);
+    }else{
+      this.goBack();
     }
   },
   data() {
@@ -659,23 +661,6 @@ export default {
         }
       })
     },
-    getUserName(userId) {
-      if (userId) {
-        let arr = this.userList.filter(item => item.userId == userId)
-        if (arr.length == 1) {
-          let name = arr[0].nickName
-          return name
-        }
-
-      }
-    },
-    getUserListName(userIdArr) {
-      if (userIdArr) {
-        for (let user of userIdArr) {
-
-        }
-      }
-    },
     getFileName(name) {
       if (name != null) {
         let arr = name.split('/')