修改分包合同评审

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

@@ -16,7 +16,7 @@
       accept=".doc,.docx,.xls,.xlsx,.pdf"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
@@ -90,6 +90,10 @@ export default {
     filePathName:{
       type: String,
       default: '',
+    },
+    disabled:{
+      type: Boolean,
+      default:false,
     }
   },
   created(){

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-05-13 18:58:07
+ * @LastEditTime: 2024-05-14 17:46:47
 -->
 <template>
   <div class="app-container">
@@ -10,11 +10,12 @@
       <el-col :span="18" :xs="24">
         <h2 class="text-center">承接合同评审表</h2>
         <el-divider></el-divider>
-        <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true"
+                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <!-- <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
                   :disabled="taskName != '合同拟稿'" clearable>
                   <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName"
@@ -64,14 +65,14 @@
             </el-col>
 
             <el-col :span="12" :xs="24">
-              <el-form-item label="关联项目编号：" prop="projectIds">
+              <el-form-item label="关联项目：" prop="projectIds">
                 <!-- <el-select v-model="projectContractForm.projectIds" multiple filterable placeholder="请选择"
                   @change="handleSelectProject" :disabled="taskName != '合同拟稿'" clearable>
                   <el-option v-for="item in projectList" :key="item.value"
                     :label="item.projectNumber + item.projectName" :value="item.projectId">
                   </el-option>
                 </el-select> -->
-                <el-button type="primary" size="mini" @click="open = true">选择项目</el-button>
+                <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
               </el-form-item>
               <el-table v-loading="loading" :data="chooseProjectList">
                 <el-table-column label="项目编号" align="center" prop="projectNumber"></el-table-column>
@@ -83,16 +84,17 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="form.tenderId == null" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
-            <div v-if="form.tenderId != null">
+            <div v-if="taskName != '合同拟稿'">
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
                 tag="ul">
                 <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
                   <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false"
                     target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;"> {{
-      getFileName(form.contractDocument) }} </span>
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.contractDocument) }}
+                    </span>
                   </el-link>
                 </li>
               </transition-group>
@@ -102,7 +104,7 @@
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width: 50px;">序号</td>
                 <td>工作内容</td>
                 <td>等级或比例尺</td>
                 <td>单位</td>
@@ -119,10 +121,16 @@
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="work.scale" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <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-input v-model="work.unit" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <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>
@@ -148,7 +156,7 @@
           <el-form-item label="合同回款计划：">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width: 50px;">序号</td>
                 <td>回款条件</td>
                 <td>回款比例（%）</td>
                 <td>回款金额（元）</td>
@@ -188,7 +196,7 @@
               :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -217,9 +225,9 @@
                 <td>会审部门</td>
                 <td>会审人</td>
                 <td>会审意见</td>
-                <td>会审附件</td>
+                <td style="width: 200px;">会审附件</td>
                 <td style="width: 90px;">签名</td>
-                <td>日期</td>
+                <td style="width: 100px;">日期</td>
               </tr>
               <tr v-for="(comment, index) in commentList" :key="index">
                 <td>
@@ -241,14 +249,33 @@
                 </td>
                 <td>
                   <el-input v-model="comment.comment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }"
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input>
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
-                <td style="text-align:left;">
-                  <FileUpload :limit="1" :filePathName="'合同文件'"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input=""></FileUpload>
+                <td style="text-align:left;" @click="clickFile(comment)">
+                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'合同文件'"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
+                  </FileUpload>
+
                   <!-- <el-input v-model="comment.document" clearable
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input> -->
-
+                  <div v-if="comment.document != ''">
+                    <transition-group class="upload-file-list el-upload-list el-upload-list--text"
+                      name="el-fade-in-linear" tag="ul">
+                      <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                        <el-link :href="`${baseUrl}${'/profile/upload' + comment.document}`" :underline="false"
+                          target="_blank">
+                          <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                            {{ getFileName(comment.document) }}
+                          </span>
+                        </el-link>
+                        <div class="ele-upload-list__item-content-action" v-if="comment.userId == userId">
+                          <el-link :underline="false" @click="handleFileDelete(comment, 'document')"
+                            type="danger">删除</el-link>
+                        </div>
+                      </li>
+                    </transition-group>
+                  </div>
                 </td>
                 <td>
                   <span class="auditor"> {{ comment.commentUser ? comment.commentUser.nickName : '' }} </span>
@@ -302,7 +329,9 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5">
-                  <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input>
+                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
+                  <!-- <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input> -->
                 </td>
               </tr>
               <tr>
@@ -326,7 +355,8 @@
             </table>
           </el-form-item>
           <el-form-item label="分管审批意见" prop="remark">
-            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" :disabled="taskName != '分管审核'" />
+            <el-input v-model="form.managerComment" type="textarea" placeholder="请输入审批意见"
+              :disabled="taskName != '分管审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -347,15 +377,33 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
-            <el-input v-model="form.signRemark" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
+            <el-input v-model="form.signRemark" type="textarea" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
-            <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" />
+            <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
+            <FileUpload v-if="form.signScan == null || form.signScan == ''" ref="contractFile" :limit="1"
+              :filePathName="'合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+            </FileUpload>
+            <div v-if="form.signScan != null && form.signScan != ''">
+              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
+                tag="ul">
+                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
+                  <el-link :href="`${baseUrl}${'/profile/upload' + form.signScan}`" :underline="false" target="_blank">
+                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
+                      {{ getFileName(form.signScan) }}
+                    </span>
+                  </el-link>
+                  <div class="ele-upload-list__item-content-action" v-if="taskName != ''">
+                    <el-link :underline="false" @click="handleFileDelete(form, 'signScan')" type="danger">删除</el-link>
+                  </div>
+                </li>
+              </transition-group>
+            </div>
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="formDisabled">提 交</el-button>
+          <!-- <el-button @click="cancel">取 消</el-button> -->
         </div>
       </el-col>` `
       <el-col :span="6" :xs="24">
@@ -369,7 +417,7 @@
     </el-row>
 
     <el-dialog title="选择项目" :visible.sync="open" width="70%" append-to-body>
-      <choose-project @chooseProject="confirmProject" :chooseList="chooseProjectList"></choose-project>
+      <choose-project @chooseProject="confirmProject"></choose-project>
     </el-dialog>
     <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="70%" append-to-body>
       <choose-tender @choose="confirmTender"></choose-tender>
@@ -395,7 +443,9 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
 import ChooseTender from '../components/chooseTender.vue';
+import { mapGetters } from "vuex";
 export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
     ChooseProject,
@@ -409,8 +459,15 @@ export default {
     taskForm: {
       type: Object,
       required: true
+    },
+    formDisabled: {
+      type: Boolean,
+      default: false
     }
   },
+  computed: {
+    ...mapGetters(["userId"]),
+  },
   name: "Contract",
   data() {
     return {
@@ -533,6 +590,7 @@ export default {
       isSelect: false,
       formTotal: 0,
       flowData: {},
+      clickTd: {},
     };
   },
   created() {
@@ -752,6 +810,16 @@ export default {
         arr.splice(index, 1);
       }
     },
+    setCommentDocument(val) {
+      let arr = val.split('/upload');
+      this.clickTd.document = arr[1];
+    },
+    handleFileDelete(key, val) {
+      key[val] = ''
+    },
+    clickFile(val) {
+      this.clickTd = val
+    },
     deletCommentItem(index) {
       let arr = this.commentList;
       if (arr.length == 1) {
@@ -937,12 +1005,25 @@ export default {
       if (val == "") {
         this.form.contractDocument = ""
       }
+    },
+    getSignScanPath(val) {
+      let arr = val.split('/upload')
+      this.form.signScan = arr[1]
+      if (val == "") {
+        this.form.signScan = ""
+      }
+    },
+    getMeetingPath(val){
+      
     },
     getFileName(name) {
-      let arr = name.split('/')
-      return arr[arr.length - 1];
+      if (name) {
+        let arr = name.split('/')
+        return arr[arr.length - 1];
+      }
+
     },
-    confirmProject(val) {
+    confirmProject(val) { 
       this.open = false
       for (let v of val) {
         this.projectContractForm.projectIds.push(v.projectId);
@@ -974,4 +1055,26 @@ table {
     padding: 5px;
   }
 }
+
+.upload-file-uploader {
+  margin-bottom: 5px;
+}
+
+.upload-file-list .el-upload-list__item {
+  border: 1px solid #e4e7ed;
+  line-height: 2;
+  margin-bottom: 10px;
+  position: relative;
+}
+
+.upload-file-list .ele-upload-list__item-content {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  color: inherit;
+}
+
+.ele-upload-list__item-content-action .el-link {
+  margin-right: 10px;
+}
 </style>

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

@@ -6,24 +6,25 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="130px">
           <el-divider></el-divider>
           <el-form-item label="项目编号：" prop="projectId">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+            <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
+            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '合同拟稿'" clearable>
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber + item.projectName"
                 :value="item.projectId">
               </el-option>
-            </el-select>
+            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
-              <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+              <el-descriptions-item label="项目编号" label-class-name="my-label">
+                {{ chooseProject.projectNumber }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-row :gutter="20">
@@ -51,7 +52,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">
-              <el-form-item label="分包合同金额" prop="subAmount">
+              <el-form-item label="分包合同金额(元)" prop="subAmount" label-width="160px">
                 <el-input v-model="form.subAmount" placeholder="请输入分包合同金额" :disabled="taskName != '合同拟稿'" />
               </el-form-item>
             </el-col>
@@ -59,7 +60,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select v-model="form.partnerId" filterable placeholder="请选择" :disabled="taskName != '合同拟稿'" clearable>
+                <el-select v-model="form.partnerId" filterable placeholder="请选择" :disabled="taskName != '合同拟稿'"
+                  clearable>
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -76,7 +78,7 @@
           <el-form-item label="合同计划工作量：">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width:50px;">序号</td>
                 <td>工作内容</td>
                 <td>等级或比例尺</td>
                 <td>单位</td>
@@ -93,10 +95,16 @@
                     :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="work.scale" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <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-input v-model="work.unit" clearable :disabled="taskName != '合同拟稿'"></el-input>
+                  <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>
@@ -122,7 +130,7 @@
           <el-form-item label="合同付款计划：">
             <table border="1">
               <tr>
-                <td>序号</td>
+                <td style="width:50px;">序号</td>
                 <td>付款条件</td>
                 <td>付款比例（%）</td>
                 <td>付款金额（元）</td>
@@ -144,8 +152,8 @@
                   <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -272,7 +280,9 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5">
-                  <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input>
+                  <!-- <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input> -->
+                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'合同文件'"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
                 </td>
               </tr>
               <tr>
@@ -312,8 +322,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -324,8 +334,7 @@
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -337,6 +346,10 @@
         </el-card>
       </el-col>
     </el-row>
+
+    <el-dialog title="选择项目" :visible.sync="open" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
@@ -357,9 +370,12 @@ import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } fr
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
+import projectChoose from '../components/chooseProject.vue';
 export default {
+  dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
-    flow
+    flow,
+    projectChoose
   },
   props: {
     taskName: {
@@ -574,15 +590,15 @@ export default {
               })
             })
           }
-          listContractWork({contractId: this.taskForm.formId}).then(res => {
+          listContractWork({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.workList = res.rows;
           });
-          listContractPayment({contractId: this.taskForm.formId}).then(res => {
+          listContractPayment({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.paymentList = res.rows;
           });
-          listContractComment({contractId: this.taskForm.formId}).then(res => {
+          listContractComment({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.commentList = res.rows;
             for (let comment of this.commentList) {
@@ -795,42 +811,12 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.subContractId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc分包合同评审";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const subContractId = row.subContractId || this.ids
-      getSubContract(subContractId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc分包合同评审";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
+          debugger
           if (this.formTotal != 0) {
             updateSubContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -839,6 +825,7 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
+          debugger
               if (this.taskName == '分管审核') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
@@ -859,6 +846,7 @@ export default {
                 })
               }
               else if (this.taskName == '会议评审') {
+                debugger
                 this.meetingForm.contractId = this.form.subContractId;
                 let formData = new FormData();
                 let jsonForm = JSON.stringify(this.meetingForm);
@@ -940,27 +928,43 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    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(() => { });
+    confirmProject(val) {
+      this.open = false
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.form.projectId = val[0].projectId
+        listProjectContract({ projectId: val.projectId }).then(response => {
+          if (response.rows) {
+            for (let row of response.rows) {
+              getContract(row.contractId).then(r => {
+                this.chooseContract.amount.push(r.data.amount);
+                this.chooseContract.contractCode.push(r.data.contractCode);
+                this.chooseContract.contractNumber.push(r.data.contractNumber);
+                this.amount = this.chooseContract.amount.join('、');
+                this.contractCode = this.chooseContract.contractCode.join('、');
+                this.contractNumber = this.chooseContract.contractNumber.join('、');
+              });
+            }
+          }
+          else
+            this.chooseContract = {};
+        })
+      }
+    },
+    getMeetingPath(val) {
+
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/subContract/export', {
-        ...this.queryParams
-      }, `subContract_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 table {
   /*居中*/
   margin: 0 auto;

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

@@ -53,10 +53,7 @@ import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/
 import { listUser, getUser } from '@/api/system/user'
 export default {
   props: {
-    chooseList: {
-      type: Array,
-      default: []
-    }
+    
   },
   data() {
     return {
@@ -78,7 +75,6 @@ export default {
   created() {
     this.getList();
     this.getUserList();
-    this.chooseProject = this.chooseList;
   },
   methods: {
     // 查询项目列表

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-23 17:08:16
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-10 16:29:22
+ * @LastEditTime: 2024-05-14 13:45:45
 -->
 <template>
   <div>
@@ -18,6 +18,7 @@
     <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
     <settle-form :taskForm="taskForm" :taskName="''" :disabled="true" v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
     <budget-info :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"></budget-info>
+    <contract-form :taskForm="taskForm" :taskName="''" :formDisabled="true" v-else-if="taskForm.procDefName == '承接合同评审'"></contract-form>
   </div>
 </template>
 
@@ -34,6 +35,7 @@ import TechnicalForm from '@/views/flowable/form/technicalForm.vue';
 import SafeForm from '@/views/flowable/form/safeForm.vue';
 import SettleForm from '@/views/flowable/form/settleForm.vue';
 import BudgetInfo from '../budget/budgetInfo.vue';
+import ContractForm from '../business/contractForm.vue';
 export default {
   props: {
     passingParam: {
@@ -57,7 +59,8 @@ export default {
     TechnicalForm,
     SafeForm,
     SettleForm,
-    BudgetInfo
+    BudgetInfo,
+    ContractForm
   },
   data() {
     return {
@@ -71,6 +74,7 @@ export default {
   },
   methods: {
     init(val) {
+      console.log(val);
       this.taskForm = val
       this.taskName = val.taskName
       this.procDefName = val.procDefName

oa-ui/src/views/flowable/task/finished/detail/index.vue

@@ -15,7 +15,7 @@
           </el-col>
         </el-tab-pane> -->
         <el-tab-pane label="表单信息" name="1">
-          <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
+          <!-- <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
           <jy-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
           <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
           <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
@@ -29,7 +29,8 @@
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="variablesData" />
             </div>
-          </el-col>
+          </el-col> -->
+          <conditionDisplay :passingParam="taskForm"></conditionDisplay>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
@@ -98,7 +99,7 @@ import CarForm from '@/views/flowable/form/oa/carForm.vue';
 import projectProcess from '@/views/flowable/form/projectProcess/index'
 import TechnicalForm from '../../../form/technicalForm.vue';
 import SafeForm from '../../../form/safeForm.vue';
-
+import conditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue'
 export default {
   name: "Record",
   components: {
@@ -113,7 +114,8 @@ export default {
     CarForm,
     projectProcess,
     TechnicalForm,
-    SafeForm
+    SafeForm,
+    conditionDisplay
   },
   props: {},
   data() {
@@ -151,7 +153,8 @@ export default {
       variablesData: {}, // 流程变量数据
       variableOpen: false, // 是否加载流程变量数据
       // 表单信息
-      tableForm: {}
+      tableForm: {},
+      passingParam: {},
     };
   },
   created() {
@@ -160,6 +163,7 @@ export default {
     this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
     this.taskForm.formId = this.$route.query.formId;
     this.taskForm.procDefName = this.$route.query.procDefName;
+    this.taskForm.taskName = ''
     // 回显流程记录
     // 流程任务重获取变量表单
     if (this.taskForm.taskId) {