修改承接合同、分包合同的修改事件

oa-ui/src/views/flowable/form/business/components/paymentTable.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-29 15:21:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-30 17:23:40
+ * @LastEditTime: 2024-09-02 10:09:25
 -->
 <template>
   <div style="width:100%">
@@ -103,6 +103,15 @@ export default {
       listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.contractId }).then(res => {
         if (res.rows.length > 0)
           this.paymentList = res.rows;
+        else {
+          this.paymentList = [{
+            paymentCondition: "",
+            paymentPercentage: "",
+            paymentAmount: "",
+            paymentTime: undefined,
+            remark: "",
+          }]
+        }
       });
     },
     deletPaymentItem(index) {

oa-ui/src/views/flowable/form/business/components/workTable.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-08-29 15:21:42
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-29 16:01:51
+ * @LastEditTime: 2024-09-02 14:12:47
 -->
 <template>
   <div style="width:100%">
@@ -16,7 +16,7 @@
         <td style="width:150px">等级或比例尺</td>
         <td style="width:100px">单位</td>
         <td style="width:100px">工作量</td>
-        <td>要求完成时间</td>
+        <td style="width:150px">要求完成时间</td>
         <td>备注</td>
       </tr>
       <tr v-for="(work, index) in workList" :key="index">
@@ -39,11 +39,11 @@
           </el-select>
         </td>
         <td>
-          <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable
+          <el-input-number :controls="false" style="width:100%;" v-model="work.workload" clearable
             :disabled="taskName != '合同拟稿'"></el-input-number>
         </td>
         <td>
-          <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+          <el-date-picker style="width: 100%" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
             placeholder="选择日期" :disabled="taskName != '合同拟稿'">
           </el-date-picker>
         </td>
@@ -104,6 +104,16 @@ export default {
       listContractWork({ pageNum: 1, pageSize: 100, contractId: this.contractId }).then(res => {
         if (res.rows.length > 0)
           this.workList = res.rows;
+        else{
+          this.workList = [{
+        content: "",
+        scale: "",
+        unit: "",
+        workload: "",
+        deadline: undefined,
+        remark: "",
+      }]
+        }
       });
     },
     deletWorkItem(index) {

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-08-30 14:37:25
+ * @LastEditTime: 2024-09-02 11:31:23
 -->
 <template>
   <div class="app-container">
@@ -168,7 +168,7 @@
                 </td>
                 <td @click="clickFile(comment)">
                   <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
-                    :filePathName="'承接合同/线上会审意见'"
+                    :filePathName="'承接合同/线上会审意见'" :isShowTip="false"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setCommentDocument">
                   </FileUpload>

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-08-28 15:51:59
+ * @LastEditTime: 2024-09-02 11:24:50
 -->
 <template>
   <div class="app-container">
@@ -10,20 +10,6 @@
       <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
-          <el-divider></el-divider>
-          <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-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" 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>
-          </el-form-item>
-
           <el-divider></el-divider>
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
@@ -43,7 +29,7 @@
             <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>
+                  :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>
@@ -83,112 +69,33 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <table border="1" style="width:100%">
-            <tr>
-              <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表1：合同计划工作量</strong></td>
-            </tr>
-            <tr>
-              <td style="width: 50px;">序号</td>
-              <td style="min-width:250px">工作内容</td>
-              <td style="width:150px">等级或比例尺</td>
-              <td style="width:100px">单位</td>
-              <td style="width:100px">工作量</td>
-              <td>要求完成时间</td>
-              <td>备注</td>
-            </tr>
-            <tr v-for="(work, index) in workList" :key="index">
-              <td>
-                {{ index + 1 }}
-              </td>
-              <td>
-                <el-input v-model="work.content" type="textarea" clearable :autosize="{ minRows: 4 }"
-                  :disabled="taskName != '合同拟稿'"></el-input>
-              </td>
-              <td>
-                <el-select v-model="work.scale" placeholder="请选择" clearable :disabled="taskName != '合同拟稿'">
-                  <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 :disabled="taskName != '合同拟稿'">
-                  <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 :disabled="taskName != '合同拟稿'"></el-input>
-              </td>
-              <td>
-                <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
-                  placeholder="选择日期" :disabled="taskName != '合同拟稿'">
-                </el-date-picker>
-              </td>
-              <td>
-                <el-input v-model="work.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
-                  :disabled="taskName != '合同拟稿'"></el-input>
-              </td>
-              <td v-show="taskName == '合同拟稿'">
-                <div class="delete-btn" @click="deletWorkItem(index)">
-                  <i class="el-icon-circle-close"></i>
-                </div>
-              </td>
-            </tr>
-          </table>
-          <el-button icon="el-icon-plus" size="mini" @click="addWorkList()" type="primary" plain
-            :disabled="taskName != '合同拟稿'"></el-button>
+          <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-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>
+          </el-form-item>
+
+          <el-divider></el-divider>
+          <!-- 表1：合同计划工作量 -->
+          <work-table ref="workTableRef" :contractId="taskForm.formId" :taskName="taskName"></work-table>
 
           <p class="mb20 mt20"></p>
 
           <!-- 表2：合同回款计划  -->
-          <table border="1" style="width:100%">
-            <tr>
-              <td :colspan="8" style="background-color: #f8f8f9;line-height:40px"><strong>表2：合同回款计划</strong></td>
-            </tr>
-            <tr>
-              <td style="width: 50px;">序号</td>
-              <td style="min-width:350px">回款条件</td>
-              <td>回款比例（%）</td>
-              <td>回款金额（元）</td>
-              <td>预计时间</td>
-              <td>备注</td>
-            </tr>
-            <tr v-for="(payment, index) in paymentList" :key="index">
-              <td>
-                {{ index + 1 }}
-              </td>
-              <td>
-                <el-input v-model="payment.paymentCondition" type="textarea" clearable
-                  :autosize="{ minRows: 4 }" :disabled="taskName != '合同拟稿'"></el-input>
-              </td>
-              <td>
-                <el-input-number :controls="false" style="width:100%" v-model="payment.paymentPercentage" clearable
-                  @change="calculatePaymentAmount(payment)" :disabled="taskName != '合同拟稿'"></el-input-number>
-              </td>
-              <td>
-                <el-input-number :controls="false" style="width:100%" v-model="payment.paymentAmount" 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>
-              </td>
-              <td>
-                <el-input v-model="payment.remark" type="textarea" clearable :autosize="{ minRows: 4 }"
-                  :disabled="taskName != '合同拟稿'"></el-input>
-              </td>
-              <td v-show="taskName == '合同拟稿'">
-                <div class="delete-btn" @click="deletPaymentItem(index)">
-                  <i class="el-icon-circle-close"></i>
-                </div>
-              </td>
-            </tr>
-          </table>
-          <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
-            :disabled="taskName != '合同拟稿'"></el-button>
+          <payment-table ref="paymentRef" :contractId="taskForm.formId" :amount="form.subAmount"
+            :taskName="taskName"></payment-table>
+
           <el-form-item label="合同备注" prop="remark">
-            <el-input type="textarea" v-model="form.remark" :autosize="{ minRows: 4 }" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input type="textarea" v-model="form.remark" :autosize="{ minRows: 4 }" placeholder="请输入合同备注"
+              :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="11">
@@ -247,7 +154,7 @@
                 <!-- 线上会审附件 -->
                 <td @click="clickFile(comment)">
                   <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
-                    :filePathName="'分包合同/线上会审意见'"
+                    :filePathName="'分包合同/线上会审意见'" :isShowTip="false"
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setCommentDocument">
                   </FileUpload>
@@ -461,13 +368,17 @@ import projectChoose from '../components/chooseProject.vue';
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
 import ChoosePartner from '../components/choosePartner.vue';
+import workTable from './components/workTable.vue';
+import paymentTable from './components/paymentTable.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
     projectChoose,
     FileItem,
-    ChoosePartner
+    ChoosePartner,
+    workTable,
+    paymentTable
   },
   props: {
     taskName: {
@@ -568,21 +479,8 @@ export default {
       deptList: [],
       userList: [],
       users: undefined,
-      workList: [{
-        content: "",
-        scale: "",
-        unit: "",
-        workload: "",
-        deadline: undefined,
-        remark: "",
-      }],
-      paymentList: [{
-        paymentCondition: "",
-        paymentPercentage: "",
-        paymentAmount: "",
-        paymentTime: undefined,
-        remark: "",
-      }],
+      workList: [],
+      paymentList: [],
       placeList: [{ id: '0', name: '301会议室' }, { id: '1', name: '216会议室' }],
       commentList: [
         {
@@ -711,14 +609,6 @@ export default {
               })
             }
           })
-          listContractWork({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
-              this.workList = res.rows;
-          });
-          listContractPayment({ pageNum: 1, pageSize: 100, contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
-              this.paymentList = res.rows;
-          });
           listContractComment({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows && res.rows.length != 0) {
               this.commentList = res.rows;
@@ -837,25 +727,6 @@ export default {
       }
       return true;
     },
-    addWorkList() {
-      this.workList.push({
-        content: "",
-        scale: "",
-        unit: "",
-        workload: "",
-        deadline: undefined,
-        remark: "",
-      });
-    },
-    addPaymentList() {
-      this.paymentList.push({
-        paymentCondition: "",
-        paymentPercentage: "",
-        paymentAmount: "",
-        paymentTime: undefined,
-        remark: "",
-      });
-    },
     addCommentList() {
       this.commentList.push({
         deptId: "",
@@ -865,24 +736,6 @@ export default {
         commentTime: undefined,
       });
     },
-    deletWorkItem(index) {
-      let arr = this.workList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
-    deletPaymentItem(index) {
-      let arr = this.paymentList;
-      if (arr.length == 1) {
-        return;
-      }
-      if (index >= 0 && index < arr.length) {
-        arr.splice(index, 1);
-      }
-    },
     deletCommentItem(index) {
       let arr = this.commentList;
       if (arr.length == 1) {
@@ -930,6 +783,8 @@ export default {
     },
     // 保存信息
     saves() {
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
       if (this.formTotal != 0) {
         if (this.form.partnerId)
           this.form.partnerId = this.form.partnerId.join(',')
@@ -968,6 +823,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
       // let isProjectValid = this.validateManual(this.chooseProjectList);
       let isDocValid = this.validateDocument(this.form.contractDocument)
       if (!isDocValid) {
@@ -1099,6 +956,8 @@ export default {
       }
     },
     updateChooseProjectList() {
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
       const subContractId = this.taskForm.formId
       delProjectSubcontract(subContractId).then(() => {
         this.chooseProjectList.forEach(item => {
@@ -1258,10 +1117,6 @@ export default {
       }
       return true;
     },
-    calculatePaymentAmount(payment) {
-      let amount = (payment.paymentPercentage / 100) * this.form.subAmount
-      this.$set(payment, 'paymentAmount', Number(amount).toFixed(2))
-    },
   }
 };
 </script>

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

@@ -37,7 +37,7 @@
       </el-pagination>
     </div>
     <div>
-      已选项目：<el-tag>{{ choosePContract.tender.projectName }}</el-tag>
+      已选合同：<el-tag>{{ choosePContract.tender.projectName }}</el-tag>
     </div>
     <div style="text-align: center;margin-top: 20px;">
       <el-button type="primary" @click="confirmChoose">确认选择</el-button>

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

@@ -0,0 +1,128 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-form-item label="合同名称" prop="subContractName">
+        <el-input v-model="queryParams.subContractName" placeholder="请输入合同名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="承接单位" prop="partnerId">
+        <el-select v-model="queryParams.partnerId" clearable filterable remote reserve-keyword placeholder="请输入承接单位"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;" @change="handleQuery">
+          <el-option v-for="partner in partnerList" :key="partner.partnerId" :label="partner.partnerName"
+            :value="partner.partnerId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table ref="chooseRef" v-loading="loading" border :data="subContractList" :row-key="getRowKeys"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
+      <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>
+    <div style="text-align: right;" class="mt20 mr20">
+      <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"
+        :page-size="queryParams.pageSize" layout="total, prev, pager, next" :total="total">
+      </el-pagination>
+    </div>
+    <el-divider></el-divider>
+    <div>
+      已选合同：
+      <el-tag v-for="item in chooseList" style="margin: 5px;" :key="item.subContractId">
+        {{ item.subContractName }}
+      </el-tag>
+    </div>
+    <div style="text-align: center;margin-top: 20px;">
+      <el-button type="primary" @click="confirmChoose">确认选择</el-button>
+      <el-button @click="clearChoose">清空选择</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import { listPartner } from "@/api/oa/partner/partner";
+export default {
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        contractId: null,
+        subContractName: null,
+        subAmount: null,
+        partnerId: null,
+        contactPerson: null,
+        drafter: null,
+        draftTime: null,
+        signDate: null,
+        signRemark: null,
+        signScan: null,
+        commentType: null
+      },
+      subContractList: [],
+      chooseList: [],
+      partnerList: [],
+    }
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc分包合同评审列表 */
+    getList() {
+      this.loading = true;
+      listSubContract(this.queryParams).then(response => {
+        this.subContractList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    remoteMethod(val) {
+      listPartner({
+        pageNum: 1,
+        pageSize: 20,
+        partnerName: val
+      }).then(res => {
+        this.partnerList = res.rows;
+      })
+    },
+    handleSelectionChange(val) {
+      this.chooseList = val
+    },
+    setCommentType(commentType) {
+      if (commentType == '2') {
+        return '线上评审'
+      } else if (commentType == '0') {
+        return '无须评审'
+      } else {
+        return '会议评审'
+      }
+    },
+    getRowKeys(row) {
+      return row.subContractId;
+    },
+    confirmChoose() {
+      this.$emit('choose', this.chooseList)
+    },
+    clearChoose() {
+      this.$refs.chooseRef.clearSelection();
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -3,7 +3,8 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-form-item label="投标项目名称" prop="tenderId">
         <el-button type="primary" size="mini" @click="tbOpen = true">选择投标项目</el-button>
-        <el-button type="danger" size="mini" @click="form.tenderId = null" v-if="form.tenderId != null">删除投标项目</el-button>
+        <el-button type="danger" size="mini" @click="form.tenderId = null"
+          v-if="form.tenderId != null">删除投标项目</el-button>
         <el-descriptions border v-if="form.tenderId" style="margin-top: 10px;" :column="1">
           <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">
             {{ chooseTender.projectName }}
@@ -61,7 +62,7 @@
       </el-form-item>
       <el-form-item label="关联项目：" prop="projectIds">
         <el-button type="primary" size="mini" @click="open = true" icon="el-icon-plus">新增关联项目</el-button>
-        <el-table v-loading="projectloading" :data="connectProjectList">
+        <el-table v-loading="projectloading" border :data="connectProjectList">
           <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>
@@ -71,13 +72,26 @@
             <template slot-scope="scope">
               <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
               <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"
-                @click="handleDelete(scope.$index,scope.row)">删除</el-button>
+                @click="handleDelete(scope.$index, scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-form-item>
       <el-form-item label="关联分包合同：">
-
+        <el-button type="primary" size="mini" @click="subOpen = true" icon="el-icon-plus">新增分包合同</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"
+                @click="handleDeleteSub(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
       </el-form-item>
       <!-- 表1：工作量计划-->
       <work-table ref="workTableRef" :contractId="form.contractId" :taskName="'合同拟稿'"></work-table>
@@ -91,8 +105,8 @@
         <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注" />
       </el-form-item>
 
-
       <el-divider></el-divider>
+
       <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>
@@ -161,6 +175,9 @@
     <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="60%" append-to-body>
       <choose-tender @choose="confirmTender"></choose-tender>
     </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="partyAOpen" title="选择甲方单位" :size="'40%'" append-to-body>
       <div class="app-container">
         <choose-party-a @confirm="confirmPartyA"></choose-party-a>
@@ -169,6 +186,9 @@
     <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="taskForm" :taskName="''" :formDisabled="true" :flowDisabled="false"></sub-contract>
+    </el-drawer>
   </div>
 
 </template>
@@ -178,7 +198,9 @@ import { listContractWork, addContractWork, delContractWork } from "@/api/oa/con
 import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
 import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
+import { listContractSubcontract, delContractSubcontract, addContractSubcontract } from "@/api/oa/contract/contractSubcontract"
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import chooseProject from "@/views/flowable/form/components/chooseProject.vue";
@@ -187,8 +209,10 @@ import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 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 ChooseSubcontract from '@/views/flowable/form/components/chooseSubcontract.vue';
+import SubContract from '@/views/flowable/form/business/subContract.vue';
 export default {
-  components: { chooseProject, chooseTender, ChoosePartyA, WorkTable, paymentTable, projectInfo },
+  components: { chooseProject, chooseTender, ChoosePartyA, WorkTable, paymentTable, projectInfo, ChooseSubcontract, SubContract },
   props: {
     form: {
       type: Object
@@ -201,6 +225,8 @@ export default {
       tbOpen: false,
       partyAOpen: false,
       drawerOpen: false,
+      subInfoOpen: false,
+      subOpen: false,
       commentList: [],
       workList: [],
       paymentList: [],
@@ -215,10 +241,16 @@ export default {
         ],
       },
       projectloading: false,
+      subloading: false,
       connectProjectList: [],
+      connectSubContractList: [],
+      deleteSubList: [],
       projectContractForm: {
         projectIds: [],
       },
+      taskForm: {
+        formId: ''
+      }
     }
   },
   watch: {
@@ -235,23 +267,34 @@ export default {
       const contractId = this.form.contractId;
       this.chooseTender = this.form.tender;
       const tenderId = this.form.tenderId;
+      this.connectProjectList = [];
+      this.connectSubContractList = [];
+      this.deleteSubList = [];
+      this.projectloading = true;
+      this.subloading = true;
       listContractComment({ pageNum: 1, pageSize: 100, contractId: contractId }).then(res => {
         if (res.rows && res.rows.length != 0) {
           this.commentList = res.rows;
         }
       })
-      listProjectContract({ contractId: contractId }).then(res => {
+      listProjectContract({ contractId: contractId }).then(async res => {
         if (res.rows) {
           let list = []
           for (let row of res.rows) {
-            getProject(row.projectId).then(response => {
-              list.push(response.data)
-            })
+            let response = await getProject(row.projectId)
+            list.push(response.data)
           }
           this.connectProjectList = list;
           this.projectloading = false;
         }
       })
+      listContractSubcontract({ contractId: contractId }).then(async res => {
+        for (let r of res.rows) {
+          let obj = await getSubContract(r.subContractId)
+          this.connectSubContractList.push(obj.data)
+        }
+        this.subloading = false;
+      })
     },
     /** 提交按钮 */
     submitForm() {
@@ -263,6 +306,7 @@ export default {
             }
             this.updateContractData();
             this.updateRelatedProject();
+            this.updateRelatedSub();
             this.$emit('cancel')
           }
         }
@@ -321,6 +365,12 @@ export default {
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
+    confirmSubContract(val) {
+      this.subOpen = false
+      for (let v of val) {
+        this.connectSubContractList.push(v)
+      }
+    },
     getContractPath(val) {
       let arr = val.split('/upload')
       this.form.contractDocument = arr[1]
@@ -355,6 +405,20 @@ export default {
         }
       })
     },
+    updateRelatedSub() {
+      let subIds = this.deleteSubList.map(item => item.subContractId);
+      console.log(subIds);
+      delContractSubcontract(subIds).then(() => {
+        this.connectSubContractList.forEach(item => {
+          item.contractId = this.form.contractId;
+          let obj = {
+            contractId: this.form.contractId,
+            subContractId: item.subContractId
+          }
+          addContractSubcontract(obj)
+        })
+      })
+    },
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
       this.drawerOpen = true;
@@ -362,7 +426,15 @@ export default {
     handleDelete(index, row) {
       this.connectProjectList.splice(index, 1)
       this.projectContractForm.projectIds.splice(row.contractId)
-    }
+    },
+    clickSubFn(row) {
+      this.taskForm.formId = row.subContractId
+      this.subInfoOpen = true
+    },
+    handleDeleteSub(index, row) {
+      this.deleteSubList.push(row)
+      this.connectSubContractList.splice(index, 1)
+    },
   },
 }
 </script>

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

@@ -0,0 +1,401 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-form-item label="合同名称" prop="subContractName">
+        <el-input style="width: 100%;" v-model="form.subContractName" placeholder="请输入合同名称"></el-input>
+      </el-form-item>
+      <el-form-item label="承接单位" prop="partnerId">
+        <el-select style="width:84%;" v-model="form.partnerId" multiple filterable placeholder="请选择" 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">选择单位</el-button>
+      </el-form-item>
+      <el-form-item label="联系人" prop="contactPerson">
+        <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="telephone">
+        <el-input v-model="form.telephone" placeholder="请输入联系电话" />
+      </el-form-item>
+      <el-form-item label="分包合同金额" prop="subAmount">
+        <el-input-number :controls="false" v-model="form.subAmount" placeholder="请输入分包合同金额" />(元)
+      </el-form-item>
+      <el-form-item label="合同文件" prop="contractDocument">
+        <FileUpload ref="contractFile" :limit="1" :filePathName="'承接合同/合同文件'" :isModify="true" :isShowTip="false"
+          :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getContractPath">
+        </FileUpload>
+        <div>
+          <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" icon="el-icon-plus">新增关联项目</el-button>
+        <el-table :data="connectProjectList" border v-if="connectProjectList.length != 0">
+          <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">
+            <template slot-scope="scope">
+              <el-button type="text" icon="el-icon-view" @click="clickProjectFn(scope.row)">查看</el-button>
+              <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"
+                @click="handleDelete(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>
+
+      <p class="mb20 mt20"></p>
+      <!-- 表2：回款计划 -->
+      <payment-table ref="paymentRef" :contractId="form.subContractId" :amount="form.subAmount"
+        :taskName="'合同拟稿'"></payment-table>
+
+      <el-form-item label="合同备注" prop="remark">
+        <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注" />
+      </el-form-item>
+
+
+      <el-divider></el-divider>
+      <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>
+      </el-form-item>
+      <el-form-item label="分管审批日期" prop="managerTime">
+        <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="请选择分管审批日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理审批日期" prop="gmTime">
+        <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择总经理审批日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="签订日期" prop="signDate">
+        <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="评审方式">
+        <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
+          {{ getCommentType(form.commentType) }}</el-tag>
+      </el-form-item>
+      <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
+        <table border="1" style="width:100%;">
+          <tr>
+            <td style="width: 50px;">序号</td>
+            <td>会审部门</td>
+            <td>会审人</td>
+            <td>会审意见</td>
+            <td style="width: 200px;">会审附件</td>
+            <td style="width: 100px;">日期</td>
+          </tr>
+          <tr v-for="(comment, index) in commentList" :key="index">
+            <td>
+              {{ index + 1 }}
+            </td>
+            <td>
+              {{ getDeptName(comment.deptId) }}
+            </td>
+            <td>
+              {{ getUserName(comment.userId) }}
+            </td>
+            <td>
+              {{ comment.comment }}
+            </td>
+            <td>
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
+                {{ getFileName(comment.document) }}
+              </el-link>
+            </td>
+            <td>
+              <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
+                placeholder="选择日期"></el-date-picker>
+            </td>
+          </tr>
+        </table>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer text-center">
+      <el-button type="primary" @click="submitForm">修 改</el-button>
+      <el-button @click="$emit('cancel')">取 消</el-button>
+    </div>
+
+    <el-dialog title="选择项目" :visible.sync="open" width="60%" append-to-body>
+      <choose-project @chooseProject="confirmProject"></choose-project>
+    </el-dialog>
+    <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="70%" append-to-body>
+      <choose-partner @confirm="confirmPartners"></choose-partner>
+    </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>
+      </div>
+    </el-drawer>
+    <el-drawer :visible.sync="drawerOpen" title="" :size="'70%'" append-to-body>
+      <projectInfo :needReturn="false"></projectInfo>
+    </el-drawer>
+  </div>
+
+</template>
+
+<script>
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
+import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
+import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
+import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
+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 { listPartner, getPartner } from "@/api/oa/partner/partner";
+import { listProject, getProject } from "@/api/oa/project/project";
+import { listPartyA } from "@/api/oa/partyA/partyA";
+import chooseProject from "@/views/flowable/form/components/chooseProject.vue";
+import chooseTender from "@/views/flowable/form/components/chooseTender.vue";
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
+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';
+export default {
+  components: {
+    chooseProject, chooseTender, ChoosePartyA, WorkTable, paymentTable, projectInfo,
+    ChoosePartner
+  },
+  props: {
+    form: {
+      type: Object
+    },
+  },
+  data() {
+    return {
+      baseUrl: process.env.VUE_APP_BASE_API,
+      open: false,
+      tbOpen: false,
+      partyAOpen: false,
+      drawerOpen: false,
+      partnerOpen: false,
+      commentList: [],
+      workList: [],
+      paymentList: [],
+      partyAList: [],
+      partnerList: [],
+      chooseTender: {},
+      rules: {
+        subContractName: [
+          { required: true, message: '请输入合同名称', trigger: 'blur' },
+        ],
+        subAmount: [
+          { required: true, message: '请输入合同金额', trigger: 'blur' },
+        ],
+      },
+      projectloading: false,
+      connectProjectList: [],
+      projectContractForm: {
+        projectIds: [],
+      },
+    }
+  },
+  watch: {
+    'form.contractId'() {
+      this.init();
+    }
+  },
+  created() {
+    this.getPartyAList();
+    this.init();
+  },
+  methods: {
+    init() {
+      this.getPartnerList();
+      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;
+          }
+        })
+    },
+    // 查询承接单位列表
+    getPartnerList() {
+      listPartner({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partnerList = response.rows;
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.subContractId != null) {
+            for (let comment of this.commentList) {
+              updateContractComment(comment);
+            }
+            if (this.form.partnerId)
+              this.form.partnerId = this.form.partnerId.join(',')
+            this.updateSubContractFn()
+            this.$emit('cancel')
+          }
+        }
+      });
+    },
+    // 查询业主单位列表
+    getPartyAList() {
+      listPartyA({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.partyAList = response.rows;
+      })
+    },
+    getCommentType(row) {
+      let name = '';
+      if (row == '0') {
+        name = '无须评审'
+      } else if (row == '1') {
+        name = '会议评审'
+      } else {
+        name = '线上评审'
+      }
+      return name
+    },
+    getProjectSource(chooseTender) {
+      const TARGET_COMPANY = '中国电建集团成都勘测设计研究院有限公司';
+      if (!chooseTender || !chooseTender.partyA || !chooseTender.partyA.partyAName) {
+        return '';
+      }
+      return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
+    },
+    confirmProject(val) {
+      this.open = false
+      for (let v of val) {
+        this.projectContractForm.projectIds.push(v.projectId);
+        this.connectProjectList.push(v)
+      }
+    },
+    // 确定合作单位
+    confirmPartners(val) {
+      this.partnerOpen = false
+      if (val) {
+        let ids = []
+        let contactPerson = []
+        let telephone = []
+        val.map(item => {
+          ids.push(item.partnerId)
+          if (item.contactPerson)
+            contactPerson.push(item.contactPerson)
+          if (item.telephone)
+            telephone.push(item.telephone)
+        })
+        this.$set(this.form, 'contactPerson', contactPerson.join(','));
+        this.$set(this.form, 'telephone', telephone.join(','));
+        this.form.partnerId = ids
+      }
+    },
+    confirmPartyA(val) {
+      this.partyAOpen = false
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个甲方单位')
+      }
+      if (val) {
+        this.getPartyAList();
+        this.$set(this.form, 'partyAId', val[0].partyAId)
+      }
+    },
+    getContractPath(val) {
+      let arr = val.split('/upload')
+      this.form.contractDocument = arr[1]
+      if (val == "") {
+        this.form.contractDocument = ""
+      }
+    },
+    updateSubContractFn() {
+      const subContractId = this.form.subContractId
+      this.workList = this.$refs.workTableRef.workList;
+      this.paymentList = this.$refs.paymentRef.paymentList;
+      updateSubContract(this.form).then(() => {
+        this.$modal.msgSuccess("修改成功");
+        delProjectSubcontract(subContractId).then(() => {
+          this.connectProjectList.forEach(item => {
+            addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
+          })
+        })
+        delContractWork(subContractId).then(() => {
+          for (let work of this.workList) {
+            work.contractId = subContractId;
+            addContractWork(work);
+          }
+        })
+        delContractPayment(subContractId).then(() => {
+          for (let payment of this.paymentList) {
+            payment.contractId = subContractId;
+            addContractPayment(payment);
+          }
+        })
+      })
+
+    },
+    updateRelatedProject() {
+      delProjectContract(this.form.contractId).then(() => {
+        for (let projectId of this.projectContractForm.projectIds) {
+          addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+        }
+      })
+    },
+    clickProjectFn(row) {
+      this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
+      this.drawerOpen = true;
+    },
+    handleDelete(index, row) {
+      this.connectProjectList.splice(index, 1)
+      this.projectContractForm.projectIds.splice(row.contractId)
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+
+::v-deep .el-descriptions-item__label.is-bordered-label {
+  color: #5a5757;
+  background: rgba($color: #a9adb3, $alpha: 0.1);
+  width: 150px;
+  min-width: 150px;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+  border: 1px solid #cdd0d3;
+}
+</style>

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-08-28 17:30:44
+ * @LastEditTime: 2024-09-02 15:11:08
 -->
 <!--
  * @Author: ysh
@@ -356,16 +356,6 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const contractIds = row.contractId || this.ids;
-      this.$modal.confirm('是否确认删除cmc合同评审编号为"' + contractIds + '"的数据项？').then(function () {
-        return delContract(contractIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/contract/export', {

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-21 18:52:00
+ * @LastEditors: 
+ * @LastEditTime: 2024-09-02 15:20:37
+-->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
@@ -97,74 +103,8 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc分包合同评审对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="合同名称" prop="subContractName">
-          {{ form.subContractName }}
-        </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>
-        </el-form-item>
-        <el-form-item label="分管审批日期" prop="managerTime">
-          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择分管审批日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="总经理审批日期" prop="gmTime">
-          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
-            placeholder="请选择总经理审批日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="签订日期" prop="signDate">
-          <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="评审方式">
-          <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
-            {{ setCommentType(form.commentType) }}</el-tag>
-        </el-form-item>
-        <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
-          <table border="1" style="width:100%;">
-            <tr>
-              <td style="width: 50px;">序号</td>
-              <td>会审部门</td>
-              <td>会审人</td>
-              <td>会审意见</td>
-              <td style="width: 200px;">会审附件</td>
-              <td style="width: 100px;">日期</td>
-            </tr>
-            <tr v-for="(comment, index) in commentList" :key="index">
-              <td>
-                {{ index + 1 }}
-              </td>
-              <td>
-                {{ getDeptName(comment.deptId) }}
-              </td>
-              <td>
-                {{ getUserName(comment.userId) }}
-              </td>
-              <td>
-                {{ comment.comment }}
-              </td>
-              <td>
-                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
-                  {{ getFileName(comment.document) }}
-                </el-link>
-              </td>
-              <td>
-                <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
-                  placeholder="选择日期"></el-date-picker>
-              </td>
-            </tr>
-          </table>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+      <sub-edit :form="form" @cancel="cancel()"></sub-edit>
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="openInfo" append-to-body width="70%">
@@ -182,9 +122,10 @@ import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { listContractComment, addContractComment, updateContractComment, delContractComment } from "@/api/oa/contract/contractComment";
+import SubEdit from './components/subEdit.vue';
 
 export default {
-  components: { subContract },
+  components: { subContract, SubEdit },
   name: "SubContract",
   data() {
     return {
@@ -229,6 +170,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        
       },
       taskForm: {
         formId: ''
@@ -268,7 +210,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      this.reset();
+      this.getList()
     },
     // 表单重置
     reset() {
@@ -309,7 +251,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增分包合同评审_日期";
+      this.title = "新增分包合同评审";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -318,7 +260,7 @@ export default {
       getSubContract(subContractId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改分包合同评审_日期";
+        this.title = "修改分包合同评审";
         listContractComment({ pageNum: 1, pageSize: 100, contractId: subContractId }).then(res => {
           if (res.rows && res.rows.length != 0) {
             this.commentList = res.rows;
@@ -420,16 +362,6 @@ export default {
       }
       return path
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const subContractIds = row.subContractId || this.ids;
-      this.$modal.confirm('是否确认删除cmc分包合同评审编号为"' + subContractIds + '"的数据项？').then(function () {
-        return delSubContract(subContractIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('oa/subContract/export', {

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

@@ -503,12 +503,12 @@
       <project-print :project="project" :workList="workList" :projectComment="projectComment"
         @cancel="printOpen = false"></project-print>
     </el-dialog>
-    <el-drawer title="流程图" :visible.sync="drawerOpen" direction="rtl">
+    <el-drawer title="流程图" :visible.sync="drawerOpen" direction="rtl" append-to-body>
       <div class="app-container">
         <flow :flowData="flowData" />
       </div>
     </el-drawer>
-    <el-drawer title="办理进度" :visible.sync="recordOpen" direction="rtl">
+    <el-drawer title="办理进度" :visible.sync="recordOpen" direction="rtl" append-to-body>
       <div class="app-container">
         <row-detail :rows="clickRow"></row-detail>
       </div>