承接合同流程里增加可以选择分包合同，修改布局

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-09-02 11:31:23
+ * @LastEditTime: 2024-09-03 16:08:11
 -->
 <template>
   <div class="app-container">
@@ -11,78 +11,49 @@
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
-          <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-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 label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                    }}</el-descriptions-item>
-                  <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                    }}</el-descriptions-item>
-                  <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                    }}</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-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>
-                </el-select>
-                <el-button type="primary" @click="partyAOpen = true" size="mini"
-                  v-if="taskName == '合同拟稿'">选择单位</el-button>
-              </el-form-item>
-              <el-form-item label="合同编码" prop="contractCode">
-                <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
-                  :disabled="taskName != '合同拟稿'"></el-input>
-              </el-form-item>
-              <el-form-item label="合同编号" prop="contractNumber">
-                <el-input style="width:  100%;" v-model="form.contractNumber" placeholder="请输入合同编号"
-                  :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 != '合同拟稿'">
-                  <template slot="append">元</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
-                <el-input style="width:100%;" v-model="form.deposit" placeholder="请输入履约保证金"
-                  :disabled="taskName != '合同拟稿'">
-                  <template slot="append">元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12" :xs="24">
-              <el-alert v-show="taskName == '合同拟稿'" title="后签合同的项目，必须选择关联项目；先签合同的项目不选关联项目" type="error">
-              </el-alert>
-              <el-form-item label="关联项目：" prop="projectIds">
-                <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
-              </el-form-item>
-              <el-table v-loading="projectloading" :data="chooseProjectList">
-                <el-table-column label="序号" type="index" width="50px"></el-table-column>
-                <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
-                <el-table-column label="项目名称" align="center" prop="projectName"></el-table-column>
-                <el-table-column label="项目负责人" align="center" prop="projectLeaderUser.nickName"></el-table-column>
-                <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
-                <el-table-column label="操作" align="center">
-                  <template slot-scope="scope">
-                    <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </el-col>
-
-          </el-row>
+          <el-form-item label="投标项目名称：" prop="tenderId">
+            <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 label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
+                }}</el-descriptions-item>
+              <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
+                }}</el-descriptions-item>
+              <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
+                }}</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-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>
+            </el-select>
+            <el-button type="primary" @click="partyAOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
+          </el-form-item>
+          <el-form-item label="合同编码" prop="contractCode">
+            <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
+              :disabled="taskName != '合同拟稿'"></el-input>
+          </el-form-item>
+          <el-form-item label="合同编号" prop="contractNumber">
+            <el-input style="width:  100%;" v-model="form.contractNumber" placeholder="请输入合同编号"
+              :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 != '合同拟稿'">
+              <template slot="append">元</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item style="text-align: left;" label="履约保证金" prop="deposit">
+            <el-input style="width:100%;" v-model="form.deposit" placeholder="请输入履约保证金" :disabled="taskName != '合同拟稿'">
+              <template slot="append">元</template>
+            </el-input>
+          </el-form-item>
           <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']"
@@ -98,6 +69,39 @@
               </el-link>
             </div>
           </el-form-item>
+          <el-row>
+            <el-form-item label="关联项目" prop="projectIds">
+              <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
+              <el-table v-loading="projectloading" border :data="chooseProjectList">
+                <el-table-column label="序号" type="index" width="50px"></el-table-column>
+                <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
+                <el-table-column label="项目名称" align="center" prop="projectName"></el-table-column>
+                <el-table-column label="项目负责人" align="center" prop="projectLeaderUser.nickName"></el-table-column>
+                <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
+                <el-table-column label="操作" align="center">
+                  <template slot-scope="scope">
+                    <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-row>
+          <el-form-item label="关联分包合同">
+            <el-button type="primary" size="mini" @click="subOpen = true" icon="el-icon-plus" v-if="taskName == '合同拟稿'">新增分包合同</el-button>
+            <el-table v-loading="subloading" border :data="connectSubContractList">
+              <el-table-column type="index" label="序号" width="55" align="center" />
+              <el-table-column label="合同名称" align="center" prop="subContractName" />
+              <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
+              <el-table-column label="分包合同金额" align="center" prop="subAmount" width="120" />
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" icon="el-icon-view" @click="clickSubFn(scope.row)">查看</el-button>
+                  <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"  v-if="taskName == '合同拟稿'"
+                    @click="handleDeleteSub(scope.$index, scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
           <!-- 表1：合同计划工作量 -->
           <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"></work-table>
 
@@ -119,7 +123,6 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
-                <!-- <span> {{ form.draftTime ? form.draftTime : draftTime }} </span> -->
                 <el-date-picker v-model="form.draftTime" :disabled="taskName != '合同拟稿'" type="date"
                   value-format="yyyy-MM-dd" placeholder="选择日期">
                 </el-date-picker>
@@ -364,9 +367,15 @@
     <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="60%" append-to-body>
       <choose-party-a @confirm="confirmPartyA"></choose-party-a>
     </el-dialog>
+    <el-dialog :visible.sync="subOpen" title="选择分包合同" :size="'70%'" append-to-body>
+      <choose-subcontract @choose="confirmSubContract"></choose-subcontract>
+    </el-dialog>
     <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
+    <el-drawer :visible.sync="subInfoOpen" title="" :size="'55%'" append-to-body>
+      <sub-contract :taskForm="subContractId" :taskName="''" :formDisabled="true" :flowDisabled="false"></sub-contract>
+    </el-drawer>
   </div>
 </template>
 
@@ -384,6 +393,8 @@ import { listProjectContract, addProjectContract, delProjectContract } from "@/a
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post.js'
+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 ChooseProject from '../components/chooseProject.vue';
@@ -395,6 +406,8 @@ import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 import workTable from './components/workTable.vue';
 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';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -404,7 +417,7 @@ export default {
     FileItem,
     ChoosePartyA,
     workTable,
-    paymentTable,projectInfo
+    paymentTable, projectInfo,ChooseSubcontract,SubContract
   },
   props: {
     taskName: {
@@ -454,10 +467,12 @@ export default {
       // 遮罩层
       loading: true,
       projectloading: true,
+      subloading:true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      subOpen:false,
       tbOpen: false,
       partyAOpen: false,
       // 表单参数
@@ -476,7 +491,9 @@ export default {
       meetingOpen: false,
       commentOpen: false,
       drawerOpen: false,
+      subInfoOpen:false,
       chooseProjectList: [],
+      connectSubContractList:[],
       partyAList: [],
       projectList: [],
       deptList: [],
@@ -521,6 +538,9 @@ export default {
       formTotal: 0,
       flowData: {},
       clickTd: {},
+      subContractId:{
+        formId:''
+      }
     };
   },
   created() {
@@ -576,6 +596,7 @@ export default {
     },
     initForm() {
       getContract(this.taskForm.formId).then(res => {
+        this.getContractSubcontractList()
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
@@ -679,6 +700,20 @@ export default {
         }
       })
     },
+    // 获取关联分包合同
+    getContractSubcontractList() {
+      this.subloading = true;
+      const contractId = this.taskForm.formId;
+      listContractSubcontract({ contractId: contractId }).then(async res => {
+        let list = []
+        for (let r of res.rows) {
+          let obj = await getSubContract(r.subContractId)
+          list.push(obj.data)
+        }
+        this.connectSubContractList = list
+        this.subloading = false;
+      })
+    },
     // 查询业主单位列表
     getPartyAList() {
       this.loading = true
@@ -1094,6 +1129,22 @@ export default {
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
+    async confirmSubContract(val){
+      let isSame = this.haveSameIds(val, this.connectSubContractList, 'subContractId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有的分包合同')
+        return
+      }
+      this.subOpen = false
+      for (let v of val) {
+        this.connectSubContractList.push(v)
+        await addContractSubcontract({ contractId: this.taskForm.formId, subContractId: v.subContractId })
+      }
+      this.getContractSubcontractList()
+    },
+    haveSameIds(arr1, arr2, key) {
+      return arr1.some(obj1 => arr2.some(obj2 => obj1[key] === obj2[key]))
+    },
     reviewWord(url) {
       this.$router.push({
         path: '/preview',
@@ -1105,7 +1156,15 @@ export default {
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
-    }
+    },
+    clickSubFn(row) {
+      this.subContractId.formId = row.subContractId
+      this.subInfoOpen = true
+    },
+    handleDeleteSub(index, row) {
+      delContractSubcontract(row.subContractId)
+      this.connectSubContractList.splice(index, 1)
+    },
   }
 }
 </script>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-02 15:11:08
+ * @LastEditTime: 2024-09-03 16:01:56
 -->
 <!--
  * @Author: ysh
@@ -104,7 +104,7 @@
       <contract-edit :form="form" @cancel="open = false"></contract-edit>
     </el-dialog>
     <!-- 查看详情 -->
-    <el-dialog :title="title" :visible.sync="openInfo" width="70%" append-to-body>
+    <el-dialog :title="title" :visible.sync="openInfo" width="60%" append-to-body>
       <contract-form :taskForm="taskForm" :taskName="''" :flowDisabled="false"></contract-form>
     </el-dialog>
   </div>