修改承接合同、分包合同的关联合同

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

@@ -88,4 +88,14 @@ public class CmcContractSubContractController extends BaseController
     {
         return success(cmcContractSubContractService.deleteCmcContractSubContractBySubContractIds(subContractIds));
     }
+
+    /**
+     * 删除cmc承接分包合同
+     */
+    @Log(title = "cmc承接分包合同", businessType = BusinessType.DELETE)
+    @DeleteMapping("/contractIds/{contractIds}")
+    public AjaxResult removeByContractIds(@PathVariable String[] contractIds)
+    {
+        return success(cmcContractSubContractService.deleteCmcContractSubContractByContractId(contractIds));
+    }
 }

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

@@ -50,7 +50,7 @@ public interface CmcContractSubContractMapper
      * @param contractId cmc承接分包合同主键
      * @return 结果
      */
-    public int deleteCmcContractSubContractByContractId(String contractId);
+    public int deleteCmcContractSubContractByContractId(String[] contractId);
 
     /**
      * 批量删除cmc承接分包合同

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

@@ -58,5 +58,5 @@ public interface ICmcContractSubContractService
      * @param contractId cmc承接分包合同主键
      * @return 结果
      */
-    public int deleteCmcContractSubContractByContractId(String contractId);
+    public int deleteCmcContractSubContractByContractId(String[] contractId);
 }

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

@@ -87,7 +87,7 @@ public class CmcContractSubContractServiceImpl implements ICmcContractSubContrac
      * @return 结果
      */
     @Override
-    public int deleteCmcContractSubContractByContractId(String contractId)
+    public int deleteCmcContractSubContractByContractId(String[] contractId)
     {
         return cmcContractSubContractMapper.deleteCmcContractSubContractByContractId(contractId);
     }

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

@@ -47,7 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteCmcContractSubContractByContractId" parameterType="String">
-        delete from cmc_contract_sub_contract where contract_id = #{contractId}
+        delete from cmc_contract_sub_contract where contract_id in
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
+        </foreach>
     </delete>
 
     <delete id="deleteCmcContractSubContractBySubContractIds" parameterType="String">

oa-ui/src/api/oa/contract/contractSubcontract.js

@@ -1,8 +1,8 @@
 /*
  * @Author: wrh
  * @Date: 2024-09-02 15:06:51
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-02 15:26:21
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-04 14:56:38
  */
 import request from '@/utils/request'
 
@@ -42,9 +42,19 @@ export function updateContractSubcontract(data) {
 }
 
 // 删除cmc承接分包合同
-export function delContractSubcontract(contractId) {
+export function delContractSubcontract(subcontractId) {
   return request({
-    url: '/oa/contractSubcontract/' + contractId,
+    url: '/oa/contractSubcontract/' + subcontractId,
+    method: 'delete'
+  })
+}
+
+// 删除cmc承接分包合同通过承接合同id
+export function delContractSubcontractByContractId(contractId) {
+  return request({
+    url: '/oa/contractSubcontract/contractIds/' + contractId,
     method: 'delete'
   })
 }
+
+

oa-ui/src/views/flowable/form/budget/components/chooseDevice.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-04 09:40:26
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-04 09:57:21
 -->
 <template>
   <div>
@@ -49,13 +49,9 @@
       <el-table-column label="规格型号" align="center" prop="series" />
       <el-table-column label="存放地址" align="center" prop="place" />
       <!-- <el-table-column label="单日成本" align="center" prop="dayCost" /> -->
-      <el-table-column label="检定证书" align="center" width="200" prop="document">
+      <el-table-column label="检定证书" align="center" width="200" prop="document" show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + scope.row.document}`" v-if="scope.row.document"
-            :underline="false" target="_blank">
-            <el-button type="warning" plain icon="el-icon-download" size="mini"></el-button>
-          </el-link>
-          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' +  scope.row.document}`)">
+          <el-link type="primary" :href="`${baseUrl}${'/profile/upload' + scope.row.document}`">
             {{ getFileName(scope.row.document) }}
           </el-link>
         </template>

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-03 16:08:11
+ * @LastEditTime: 2024-09-04 17:19:17
 -->
 <template>
   <div class="app-container">
@@ -407,7 +407,7 @@ 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';
+import subContract from '@/views/flowable/form/business/subContract.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -417,7 +417,7 @@ export default {
     FileItem,
     ChoosePartyA,
     workTable,
-    paymentTable, projectInfo,ChooseSubcontract,SubContract
+    paymentTable, projectInfo,ChooseSubcontract,subContract
   },
   props: {
     taskName: {
@@ -888,21 +888,22 @@ export default {
         this.updateRelatedProject();
       } else {
         this.form.contractId = this.taskForm.formId;
-        addContract(this.form).then(response => {
+        addContract(this.form).then(async response => {
           if (response.code == 200) {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
             for (let work of this.workList) {
               work.contractId = this.form.contractId
-              addContractWork(work);
+              await addContractWork(work);
             }
             for (let payment of this.paymentList) {
               payment.contractId = this.form.contractId
-              addContractPayment(payment);
+              await addContractPayment(payment);
             }
             for (let projectId of this.projectContractForm.projectIds) {
-              addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+              await addProjectContract({ projectId: projectId, contractId: this.form.contractId });
             }
+            this.initForm();
           } else {
             this.$message.error("新增失败，请确认合同编码是否唯一");
           }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-02 11:24:50
+ * @LastEditTime: 2024-09-04 17:29:54
 -->
 <template>
   <div class="app-container">
@@ -11,78 +11,75 @@
         <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
-          <el-row :gutter="20">
-            <el-col :span="16" :xs="24">
-              <el-form-item label="分包合同名称" prop="subContractName">
-                <el-input type="textarea" :rows="3" v-model="form.subContractName" placeholder="请输入分包合同名称"
-                  :disabled="taskName != '合同拟稿'" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="分包合同金额(元)" prop="subAmount" label-width="160px">
-                <el-input-number :controls="false" v-model="form.subAmount" placeholder="请输入分包合同金额"
-                  :disabled="taskName != '合同拟稿'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <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="taskName == '合同拟稿' ? { width: '84%' } : { width: '100%' }" disabled clearable>
-                  <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
-                    :value="item.partnerId">
-                  </el-option>
-                </el-select>
-                <el-button type="primary" @click="partnerOpen = true" size="mini"
-                  v-if="taskName == '合同拟稿'">选择单位</el-button>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="联系人" prop="contactPerson">
-                <el-input v-model="form.contactPerson" placeholder="请输入联系人" :disabled="taskName != '合同拟稿'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="16" :xs="24">
-              <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">
-                </FileUpload>
-                <div v-if="form.contractDocument">
-                  <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
-                    {{ getFileName(form.contractDocument) }}
-                  </el-link>
-                  <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`"
-                    :underline="false" target="_blank">
-                    <span class="el-icon-download">下载文件</span>
-                  </el-link>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="联系电话" prop="telephone">
-                <el-input v-model="form.telephone" placeholder="请输入联系电话" :disabled="taskName != '合同拟稿'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-form-item label="分包合同名称" prop="subContractName">
+            <el-input type="textarea" :rows="3" v-model="form.subContractName" placeholder="请输入分包合同名称"
+              :disabled="taskName != '合同拟稿'" />
+          </el-form-item>
+          <el-form-item label="分包合同金额" prop="subAmount">
+            <el-input-number :controls="false" v-model="form.subAmount" placeholder="请输入分包合同金额"
+              :disabled="taskName != '合同拟稿'" />(元)
+          </el-form-item>
+          <el-form-item label="承接单位" prop="partnerId">
+            <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
+              :style="taskName == '合同拟稿' ? { width: '84%' } : { width: '100%' }" disabled clearable>
+              <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
+                :value="item.partnerId">
+              </el-option>
+            </el-select>
+            <el-button type="primary" @click="partnerOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
+          </el-form-item>
+          <el-form-item label="联系人" prop="contactPerson">
+            <el-input v-model="form.contactPerson" placeholder="请输入联系人" :disabled="taskName != '合同拟稿'" />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="telephone">
+            <el-input v-model="form.telephone" placeholder="请输入联系电话" :disabled="taskName != '合同拟稿'" />
+          </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']"
+              @input="getContractPath">
+            </FileUpload>
+            <div v-if="form.contractDocument">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
+                {{ getFileName(form.contractDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-form-item>
           <el-form-item label="关联项目" prop="projectId">
             <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
-            <el-table :data="chooseProjectList" border v-if="isSelect">
+            <el-table :data="chooseProjectList" border>
               <el-table-column type="index" width="50" label="序号" />
               <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
               <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
               <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
               <el-table-column label="承担部门" align="center" prop="undertakingDeptName"></el-table-column>
-              <!-- <el-table-column label="主合同编码" align="center" key="contractCode" prop="contractCode" />
-              <el-table-column label="主合同编号" align="center" key="contractNumber" prop="contractNumber" />
-              <el-table-column label="主合同金额" align="center" key="amount" prop="amount" /> -->
+              <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-form-item label="关联主合同：">
+            <el-button type="primary" size="mini" @click="contractOpen = true" icon="el-icon-plus"
+              v-if="taskName == '合同拟稿'">新增关联主合同</el-button>
+            <el-table v-loading="contractloading" :data="connectContractList" border>
+              <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
+              <el-table-column label="合同金额" align="center" prop="amount" />
+              <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
+              <el-table-column label="合同编码" align="center" prop="contractCode" />
+              <el-table-column label="合同编号" align="center" prop="contractNumber" />
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button type="text" icon="el-icon-view" @click="clickContractFn(scope.row)">查看</el-button>
+                </template>
+              </el-table-column>
             </el-table>
           </el-form-item>
-
           <el-divider></el-divider>
           <!-- 表1：合同计划工作量 -->
           <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"></work-table>
@@ -343,6 +340,12 @@
     <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="70%" append-to-body>
       <choose-partner @confirm="confirmPartners"></choose-partner>
     </el-dialog>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+      <projectInfo :needReturn="false"></projectInfo>
+    </el-drawer>
+    <el-drawer :visible.sync="formOpen" title="" :size="'55%'" append-to-body>
+      <contract-form :taskForm="contractId" :taskName="''" :formDisabled="true" :flowDisabled="false"></contract-form>
+    </el-drawer>
   </div>
 </template>
 
@@ -359,6 +362,7 @@ import { getContractMeeting, addContractMeeting, updateContractMeeting, delContr
 import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { getContract } from "@/api/oa/contract/contract";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import { listContractSubcontract, delContractSubcontract, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
 import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
@@ -370,6 +374,8 @@ import { mapGetters } from "vuex";
 import ChoosePartner from '../components/choosePartner.vue';
 import workTable from './components/workTable.vue';
 import paymentTable from './components/paymentTable.vue';
+import contractForm from '@/views/flowable/form/business/contractForm.vue';
+import projectInfo from '@/views/oa/project/info'
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -378,7 +384,9 @@ export default {
     FileItem,
     ChoosePartner,
     workTable,
-    paymentTable
+    paymentTable,
+    contractForm,
+    projectInfo,
   },
   props: {
     taskName: {
@@ -515,7 +523,15 @@ export default {
       isSelect: false,
       formTotal: 0,
       flowData: {},
-      clickTd: {}
+      clickTd: {},
+      contractOpen: false,
+      connectContractList: [],
+      contractloading: true,
+      formOpen: false,
+      contractId: {
+        formId: ''
+      },
+      drawerOpen: false,
     };
   },
   created() {
@@ -576,6 +592,7 @@ export default {
     },
     initForm() {
       getSubContract(this.taskForm.formId).then(res => {
+        this.getContractSubcontractList();
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.drafter = this.$store.getters.userId;
@@ -689,6 +706,20 @@ export default {
         this.loading = false;
       });
     },
+    // 获取关联承接合同
+    getContractSubcontractList() {
+      this.contractloading = true;
+      const subContractId = this.taskForm.formId;
+      listContractSubcontract({ subContractId: subContractId }).then(async res => {
+        let list = []
+        for (let r of res.rows) {
+          let obj = await getContract(r.contractId)
+          list.push(obj.data)
+        }
+        this.connectContractList = list
+        this.contractloading = false;
+      })
+    },
     // 查询承接单位列表
     getPartnerList() {
       this.loading = true
@@ -786,7 +817,8 @@ export default {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
       if (this.formTotal != 0) {
-        if (this.form.partnerId)
+        console.log(this.form.partnerId);
+        if (this.form.partnerId && this.form.partnerId instanceof Array)
           this.form.partnerId = this.form.partnerId.join(',')
         updateSubContract(this.form).then(response => {
           this.$modal.msgSuccess("修改成功");
@@ -796,12 +828,13 @@ export default {
         });
       } else {
         this.form.subContractId = this.taskForm.formId;
-        if (this.form.partnerId)
+        if (this.form.partnerId && this.form.partnerId.length)
           this.form.partnerId = this.form.partnerId.join(',')
         addSubContract(this.form).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
+          this.initForm();
         });
         const subContractId = this.form.subContractId;
         this.chooseProjectList.forEach(item => {
@@ -1117,6 +1150,14 @@ export default {
       }
       return true;
     },
+    clickContractFn(row) {
+      this.formOpen = true;
+      this.contractId.formId = row.contractId
+    },
+    clickProjectFn(row) {
+      this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
+      this.drawerOpen = true;
+    },
   }
 };
 </script>

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

@@ -0,0 +1,130 @@
+<template>
+  <div style="width:100%">
+    <table border="1" style="width:100%">
+      <tr class="title">
+        <td :colspan="8">项目实际完成工作量</td>
+      </tr>
+      <tr>
+        <td>序号</td>
+        <td style="width: 180px">工作内容</td>
+        <td>等级或比例尺</td>
+        <td>单位</td>
+        <td>工作量</td>
+        <td style="width: 100px">要求完成时间</td>
+        <td>备注</td>
+        <td>操作</td>
+      </tr>
+      <tr v-for="work, index in workList">
+        <td>{{ index + 1 }}</td>
+        <td>
+          <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+        </td>
+        <td>
+          <el-select v-model="work.scale" placeholder="请选择" clearable>
+            <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+              :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="work.unit" placeholder="请选择" clearable>
+            <el-option v-for="dict in dict.type.cmc_unit" :key="dict.value" :label="dict.label" :value="dict.label" />
+          </el-select>
+        </td>
+        <td>
+          <el-input v-model="work.workload" clearable></el-input>
+        </td>
+        <td>
+          <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+            placeholder="选择日期">
+          </el-date-picker>
+        </td>
+        <td>
+          <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
+        </td>
+        <td>
+          <el-button type="text" style="color:#F56C6C" size="mini" @click="deletWorkItem(index)">删除行</el-button>
+        </td>
+      </tr>
+    </table>
+    <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addWorkList"></el-button>
+
+  </div>
+</template>
+
+<script>
+import { listProjectWorkload, getProjectWorkload, addProjectWorkload, updateProjectWorkload, delProjectWorkload } from '@/api/oa/project/projectWorkload'
+export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
+  props: {
+    projectId: {
+      type: String,
+      require: true
+    }
+  },
+  data() {
+    return {
+      workList: [{
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      },]
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    getList() {
+      let queryParams = {
+        pageNum: 1,
+        pageSize: 100,
+        projectId: this.projectId
+      }
+      listProjectWorkload(queryParams).then(res => {
+
+      })
+    },
+    addWorkList() {
+      this.workList.push({
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+.title {
+  background-color: #f5f7fa;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-22 11:12:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 09:09:03
+ * @LastEditTime: 2024-09-04 11:20:46
 -->
 <template>
   <div>
@@ -22,14 +22,12 @@
       </el-form>
     </el-row>
     <el-table ref="choosePContract" v-loading="loading" :data="contractList" highlight-current-row
-      @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
-      <el-table-column label="投标项目名称" align="center" key="tender.projectName" prop="tender.projectName"
-        min-width="150px" />
+      @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose" @row-click="selectRow">
+      <el-table-column label="序号" align="center" type="index" width="55" />
+      <el-table-column label="合同名称" align="center" key="contractName" prop="contractName" min-width="100px" />
       <el-table-column label="合同编码" align="center" key="contractCode" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" min-width="100px" />
       <el-table-column label="合同金额" align="center" prop="amount" min-width="100px" />
-      <el-table-column label="拟稿人" align="center" prop="draftUser.nickName" min-width="100px" />
-      <el-table-column label="合同备注" align="center" prop="remark" min-width="250px" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">
       <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
@@ -37,7 +35,7 @@
       </el-pagination>
     </div>
     <div>
-      已选合同：<el-tag>{{ choosePContract.tender.projectName }}</el-tag>
+      已选合同：<el-tag>{{ choosePContract.contractName }}</el-tag>
     </div>
     <div style="text-align: center;margin-top: 20px;">
       <el-button type="primary" @click="confirmChoose">确认选择</el-button>
@@ -89,6 +87,9 @@ export default {
     getRowKeys(row) {
       return row.contractId;
     },
+    selectRow(row){
+      this.choosePContract = row
+    },
     confirmChoose() {
       this.$emit('choose', this.choosePContract)
     },

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
- * @Date: 2024-04-15 09:35:41
+ * @Date: 2024-06-21 18:51:54
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 14:39:00
+ * @LastEditTime: 2024-09-04 17:06:39
 -->
 <template>
   <div>
@@ -41,7 +41,7 @@
           </el-tooltip>
         </el-form-item>
         <el-form-item label="使用设备：">
-          <el-tooltip class="item" effect="dark" content="直接获取设备申请中的设备,若无车辆,则需要先提交项目的设备申请" placement="top-end">
+          <el-tooltip class="item" effect="dark" content="直接获取设备申请中的设备,若无设备,则需要先提交项目的设备申请" placement="top-end">
             <el-select v-model="form.devices" multiple disabled style="width:90%">
               <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
         + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
@@ -64,7 +64,7 @@
           </el-col>
         </el-row>
         <el-form-item label="项目进度：">
-          <table border="1">
+          <table border="1" style="width:100%">
             <tr>
               <td style="width: 80px">序号</td>
               <td>截至日期</td>
@@ -95,7 +95,10 @@
           </table>
           <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
         </el-form-item>
+        <el-divider></el-divider>
+        <actual-work :projectId="taskForm.formId"></actual-work>
       </el-form>
+        <el-divider></el-divider>
       <div class="headers">
         项目借款
         <div class="line"></div>
@@ -150,13 +153,15 @@ import ChoosePeople from '../budget/components/choosePeople.vue';
 import ChooseCar from '../budget/components/chooseCar.vue';
 import ChooseDevice from "../budget/components/chooseDevice.vue";
 import AchiData from '../inProgress/achiData.vue';
+import actualWork from '@/views/flowable/form/components/actualWork.vue';
 export default {
   components: {
     borrowData,
     SettleData,
     ChoosePeople,
     ChooseCar,
-    AchiData
+    AchiData,
+    actualWork
   },
   computed: {
     ...mapGetters(["name", "userId"]),
@@ -438,6 +443,10 @@ table {
   }
 }
 
+.title {
+  background-color: #f5f7fa;
+}
+
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }

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

@@ -36,7 +36,7 @@
       </el-form-item>
       <el-form-item label="关联项目：" prop="projectId">
         <el-button type="primary" size="mini" @click="open = true" icon="el-icon-plus">新增关联项目</el-button>
-        <el-table :data="connectProjectList" border v-if="connectProjectList.length != 0">
+        <el-table :data="connectProjectList" border>
           <el-table-column type="index" width="50" label="序号" />
           <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
           <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
@@ -51,6 +51,23 @@
           </el-table-column>
         </el-table>
       </el-form-item>
+      <el-form-item label="关联主合同：">
+        <el-button type="primary" size="mini" @click="contractOpen = true" icon="el-icon-plus">新增关联主合同</el-button>
+        <el-table v-loading="contractloading" :data="connectContractList" border>
+          <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
+          <el-table-column label="合同金额" align="center" prop="amount" />
+          <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
+          <el-table-column label="合同编码" align="center" prop="contractCode" />
+          <el-table-column label="合同编号" align="center" prop="contractNumber" />
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" icon="el-icon-view" @click="clickContractFn(scope.row)">查看</el-button>
+              <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"
+                @click="handleDeleteContract(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
       <!-- 表1：工作量计划-->
       <work-table ref="workTableRef" :contractId="form.subContractId" :taskName="'合同拟稿'"></work-table>
 
@@ -133,6 +150,9 @@
     <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="70%" append-to-body>
       <choose-partner @confirm="confirmPartners"></choose-partner>
     </el-dialog>
+    <el-dialog title="选择承接合同" :visible.sync="contractOpen" width="70%" append-to-body>
+      <choose-contract @choose="confirmContract"></choose-contract>
+    </el-dialog>
     <el-drawer :visible.sync="partyAOpen" title="选择甲方单位" :size="'40%'" append-to-body>
       <div class="app-container">
         <choose-party-a @confirm="confirmPartyA"></choose-party-a>
@@ -141,6 +161,9 @@
     <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
       <projectInfo :needReturn="false"></projectInfo>
     </el-drawer>
+    <el-drawer :visible.sync="formOpen" title="" :size="'60%'" append-to-body>
+      <contract-form :taskForm="taskForm" :taskName="''" :formDisabled="true" :flowDisabled="false"></contract-form>
+    </el-drawer>
   </div>
 
 </template>
@@ -153,6 +176,7 @@ import { listContract, getContract, delContract, addContract, updateContract } f
 import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
+import { listContractSubcontract, delContractSubcontractByContractId, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
 import { listPartner, getPartner } from "@/api/oa/partner/partner";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listPartyA } from "@/api/oa/partyA/partyA";
@@ -163,10 +187,14 @@ import WorkTable from '@/views/flowable/form/business/components/workTable.vue';
 import paymentTable from '@/views/flowable/form/business/components/paymentTable.vue';
 import projectInfo from '@/views/oa/project/info'
 import ChoosePartner from '@/views/flowable/form/components/choosePartner.vue';
+import ChooseContract from '@/views/flowable/form/components/chooseContract.vue';
+import ContractForm from '@/views/flowable/form/business/contractForm.vue';
 export default {
   components: {
     chooseProject, chooseTender, ChoosePartyA, WorkTable, paymentTable, projectInfo,
-    ChoosePartner
+    ChoosePartner,
+    ChooseContract,
+    ContractForm,
   },
   props: {
     form: {
@@ -200,11 +228,20 @@ export default {
       projectContractForm: {
         projectIds: [],
       },
+      contractOpen: false,
+      connectContractList: [],
+      contractloading: true,
+      formOpen: false,
+      taskForm: {
+        formId: ''
+      }
     }
   },
   watch: {
     'form.contractId'() {
-      this.init();
+      // this.init();
+      this.getContractSubcontractList();
+      this.getProjectSubcontractList();
     }
   },
   created() {
@@ -214,23 +251,48 @@ export default {
   methods: {
     init() {
       this.getPartnerList();
+      this.getContractSubcontractList();
+      this.form.partnerId = this.form.partnerId ? this.form.partnerId.split(',') : null;
+      this.getContractCommentList();
+      this.getProjectSubcontractList();
+    },
+    getContractCommentList(){
       const subContractId = this.form.subContractId;
-      this.form.partnerId = this.form.partnerId ? this.form.partnerId.split(',') : null
-      Promise.all([listContractComment({ pageNum: 1, pageSize: 100, contractId: subContractId }), listProjectSubcontract({ subContractId: subContractId })])
-        .then(([res1, res2]) => {
-          if (res1.rows && res1.rows.length != 0) {
-            this.commentList = res1.rows;
-          }
-          if (res2.rows) {
-            let list = []
-            for (let row of res2.rows) {
-              getProject(row.projectId).then(response => {
-                list.push(response.data)
-              })
-            }
-            this.connectProjectList = list;
+      listContractComment({ pageNum: 1, pageSize: 100, contractId: subContractId }).then(res => {
+        if (res.rows && res.rows.length != 0) {
+          this.commentList = res.rows;
+        }
+      })
+    },
+    getProjectSubcontractList() {
+      const subContractId = this.form.subContractId;
+      listProjectSubcontract({ subContractId: subContractId }).then(res => {
+        if (res.rows) {
+          let list = []
+          for (let row of res.rows) {
+            getProject(row.projectId).then(response => {
+              list.push(response.data)
+            })
           }
-        })
+          this.connectProjectList = list;
+        }
+      })
+    },
+    // 获取关联承接合同
+    getContractSubcontractList() {
+      this.contractloading = true;
+      const subContractId = this.form.subContractId;
+      if(!subContractId) return
+      listContractSubcontract({ subContractId: subContractId }).then(async res => {
+        let list = []
+        for (let r of res.rows) {
+          let obj = await getContract(r.contractId)
+          list.push(obj.data)
+        }
+        console.log(res,subContractId);
+        this.connectContractList = list
+        this.contractloading = false;
+      })
     },
     // 查询承接单位列表
     getPartnerList() {
@@ -249,6 +311,7 @@ export default {
             for (let comment of this.commentList) {
               updateContractComment(comment);
             }
+            debugger
             if (this.form.partnerId)
               this.form.partnerId = this.form.partnerId.join(',')
             this.updateSubContractFn()
@@ -285,6 +348,11 @@ export default {
       return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
     },
     confirmProject(val) {
+      let isSame = this.haveSameIds(val, this.connectProjectList, 'projectId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有项目')
+        return
+      }
       this.open = false
       for (let v of val) {
         this.projectContractForm.projectIds.push(v.projectId);
@@ -310,6 +378,20 @@ export default {
         this.form.partnerId = ids
       }
     },
+    async confirmContract(val) {
+      let isSame = this.haveSameIds([val], this.connectContractList, 'contractId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有的合同');
+        return
+      }
+      this.contractOpen = false;
+      this.connectContractList.push(val)
+      await addContractSubcontract({ contractId: val.contractId, subContractId: this.form.subContractId })
+
+    },
+    haveSameIds(arr1, arr2, key) {
+      return arr1.some(obj1 => arr2.some(obj2 => obj1[key] === obj2[key]))
+    },
     confirmPartyA(val) {
       this.partyAOpen = false
       if (val && val.length > 1) {
@@ -367,6 +449,14 @@ export default {
     handleDelete(index, row) {
       this.connectProjectList.splice(index, 1)
       this.projectContractForm.projectIds.splice(row.contractId)
+    },
+    clickContractFn(row) {
+      this.formOpen = true;
+      this.taskForm.formId = row.contractId
+    },
+    handleDeleteContract(index, row) {
+      this.connectContractList.splice(index, 1)
+      delContractSubcontractByContractId(row.contractId)
     }
   },
 }

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:52:00
- * @LastEditors: 
- * @LastEditTime: 2024-09-02 15:20:37
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-04 15:47:18
 -->
 <template>
   <div class="app-container">
@@ -107,7 +107,7 @@
       <sub-edit :form="form" @cancel="cancel()"></sub-edit>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="70%">
+    <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="60%">
       <sub-contract :taskForm="taskForm" :taskName="''" :flowDisabled="false"></sub-contract>
     </el-dialog>
   </div>