新增甲方单位、合作单位选择模块

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

@@ -58,7 +58,7 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 100MB
       # 设置总上传的文件大小
       max-request-size: 20MB
   # 服务模块

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-13 13:50:24
+ * @LastEditTime: 2024-06-18 15:19:08
 -->
 <template>
   <div class="main">
@@ -357,7 +357,7 @@
         <td>{{ budgetForm.businessRemark }}</td>
       </tr>
       <tr>
-        <td colspan="3" class="head">成本合计</td>
+        <td colspan="3" class="head">预算总额</td>
         <td colspan="5" class="head">{{ budgetForm.totalBudget }}</td>
       </tr>
       <tr v-if="contract.contractId">

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-18 11:15:07
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-18 19:11:39
 -->
 <template>
   <div class="app-container">
@@ -31,12 +31,12 @@
                   :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="甲方单位" prop="partyAId">
-                <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;"
-                  clearable>
+                <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
                   <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
                     :disabled="taskName != '合同拟稿'">
                   </el-option>
                 </el-select>
+                <el-button type="primary" @click="partyAOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
               </el-form-item>
               <el-form-item label="合同编码" prop="contractCode">
                 <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
@@ -431,6 +431,9 @@
     <el-dialog title="选择投标项目" :visible.sync="tbOpen" width="70%" append-to-body>
       <choose-tender @choose="confirmTender"></choose-tender>
     </el-dialog>
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
+      <choose-party-a @confirm="confirmPartyA"></choose-party-a>
+    </el-dialog>
   </div>
 </template>
 
@@ -455,13 +458,15 @@ import ChooseTender from '../components/chooseTender.vue';
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
+import ChoosePartyA from '../components/choosePartyA.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
     ChooseProject,
     ChooseTender,
-    FileItem
+    FileItem,
+    ChoosePartyA
   },
   props: {
     taskName: {
@@ -514,6 +519,7 @@ export default {
       // 是否显示弹出层
       open: false,
       tbOpen: false,
+      partyAOpen:false,
       // 表单参数
       form: {
         amount: 0,
@@ -765,6 +771,7 @@ export default {
         pageSize: 99999999
       }).then(response => {
         this.partyAList = response.rows;
+        console.log(this.partyAList)
       })
     },
     // 查询项目列表
@@ -1151,6 +1158,15 @@ export default {
       this.isSelect = true
       this.form.partyAId = val.partyAId
     },
+    confirmPartyA(val){
+      this.partyAOpen = false
+      if(val && val.length > 1 ){
+        return this.$message.error('请选择一个甲方单位')
+      }
+      if (val) {
+        this.$set(this.form,'partyAId',val[0].partyAId)
+      }
+    },
     calculatePaymentAmount(payment) {
       let amount = (payment.paymentPercentage / 100) * this.form.amount
       this.$set(payment, 'paymentAmount', Number(amount))

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-12 17:22:33
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-18 18:41:01
 -->
 <template>
   <div class="app-container">
@@ -13,12 +13,6 @@
           <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-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-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>
@@ -59,19 +53,21 @@
             </el-col>
             <el-col :span="8" :xs="24">
               <el-form-item label="分包合同金额(元)" prop="subAmount" label-width="160px">
-                <el-input v-model="form.subAmount" placeholder="请输入分包合同金额" :disabled="taskName != '合同拟稿'" />
+                <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" filterable placeholder="请选择" style="width: 100%;"
-                  :disabled="taskName != '合同拟稿'" clearable @change="handleSelectPartner">
+                <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
+                  style="width: 84%;" disabled clearable>
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
                 </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">
@@ -83,21 +79,21 @@
 
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
-          <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="formTotal == 0"
-              :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
-            </FileUpload>
-            <div v-if="formTotal == 1">
-              <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="contractDocument">
+                <FileUpload v-if="formTotal == 0" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
+                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                  @input="getContractPath">
+                </FileUpload>
+                <div v-if="formTotal == 1">
+                  <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">
@@ -418,6 +414,9 @@
     <el-dialog title="选择项目" :visible.sync="open" width="70%" append-to-body>
       <project-choose @chooseProject="confirmProject"></project-choose>
     </el-dialog>
+    <el-dialog title="选择合作单位" :visible.sync="partnerOpen" width="70%" append-to-body>
+      <choose-partner @confirm="confirmPartners"></choose-partner>
+    </el-dialog>
   </div>
 </template>
 
@@ -441,12 +440,14 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import projectChoose from '../components/chooseProject.vue';
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
+import ChoosePartner from '../components/choosePartner.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
     projectChoose,
-    FileItem
+    FileItem,
+    ChoosePartner
   },
   props: {
     taskName: {
@@ -493,6 +494,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      partnerOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -645,6 +647,7 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          this.form.partnerId = this.form.partnerId ? this.form.partnerId.split(',') : null;
           if (this.form.commentType == '0') {
             this.commentOpen = false;
             this.meetingOpen = false;
@@ -759,45 +762,6 @@ export default {
         this.deptList = res.data
       })
     },
-    // 选择单位
-    handleSelectPartner(val) {
-      getPartner(val).then(response => {
-        this.$set(this.form, 'contactPerson', response.data.contactPerson);
-        this.$set(this.form, 'telephone', response.data.telephone);
-      })
-    },
-    // 选择项目
-    handleSelectProject(val) {
-      if (val != "" && val != undefined && val != null) {
-        getProject(val).then(res => {
-          this.chooseProject = res.data;
-          this.isSelect = true;
-          listProjectContract({ projectId: this.chooseProject.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 = {};
-          })
-        })
-      } else {
-        this.isSelect = false
-      }
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -888,25 +852,6 @@ export default {
         }
       })
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        subContractId: null,
-        contractId: null,
-        subContractName: null,
-        subAmount: null,
-        partnerId: null,
-        contactPerson: null,
-        drafter: null,
-        draftTime: null,
-        remark: null,
-        signDate: null,
-        signRemark: null,
-        signScan: null,
-        commentType: null
-      };
-      this.resetForm("form");
-    },
     validateDocument(doc) {
       // 这里添加你的验证逻辑  
       // 例如，检查tenderId是否为空或者是否符合其他规则  
@@ -926,6 +871,12 @@ export default {
       }
       this.$refs["form"].validate(valid => {
         if (valid) {
+          const handleComplete = (taskForm) => {
+            complete(taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack');
+            })
+          };
           if (this.formTotal != 0) {
             updateSubContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -935,10 +886,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '分管审核') {
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                handleComplete(this.taskForm);
               }
               else if (this.taskName == '线上会审') {
                 for (let comment of this.commentList) {
@@ -947,10 +895,7 @@ export default {
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
+                  handleComplete(this.taskForm);
                 })
               }
               else if (this.taskName == '会议评审') {
@@ -962,32 +907,29 @@ export default {
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
+                  handleComplete(this.taskForm);
                 })
               }
               else if (this.taskName == '合同签订') {
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                handleComplete(this.taskForm);
               }
             })
           } else {
             this.form.subContractId = this.taskForm.formId;
+            if (this.form.partnerId)
+              this.form.partnerId = this.form.partnerId.join(',')
             addSubContract(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
+            const subContractId = this.form.subContractId;
             for (let work of this.workList) {
-              work.contractId = this.form.subContractId
+              work.contractId = subContractId;
               addContractWork(work);
             }
             for (let payment of this.paymentList) {
-              payment.contractId = this.form.subContractId
+              payment.contractId = subContractId;
               addContractPayment(payment);
             }
             const params = { taskId: this.taskForm.taskId };
@@ -997,10 +939,7 @@ export default {
                   let userId = res.data.userId;
                   this.$set(this.taskForm.variables, "approval", userId);
                   this.$set(this.taskForm.variables, "commentType", '0');
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
+                  handleComplete(this.taskForm);
                 })
               }
               else if (this.commentOpen == true && this.meetingOpen == false) {
@@ -1012,10 +951,7 @@ export default {
                 }
                 this.$set(this.taskForm.variables, "approvalList", approvalList);
                 this.$set(this.taskForm.variables, "commentType", '2');
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                handleComplete(this.taskForm);
               }
               else if (this.commentOpen == false && this.meetingOpen == true) {
                 this.meetingForm.contractId = this.form.subContractId;
@@ -1025,10 +961,7 @@ export default {
                 addContractMeeting(formData);
                 this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
                 this.$set(this.taskForm.variables, "commentType", '1');
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                handleComplete(this.taskForm);
               }
             })
           }
@@ -1039,28 +972,82 @@ export default {
       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: this.form.projectId }).then(response => {
+        return;
+      }
+
+      if (val.length === 1) {
+        this.chooseProject = val[0];
+        this.isSelect = true;
+        this.form.projectId = val[0].projectId;
+
+        this.fetchContracts(this.form.projectId)
+          .then(contractData => {
+            this.processContractData(contractData);
+          })
+          .catch(error => {
+            console.error('获取合同列表时出错:', error);
+            this.$message.error('获取合同列表时出错');
+          });
+      }
+    },
+    // 确定合作单位
+    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
+      }
+    },
+    // 获取合同详情
+    fetchContracts(projectId) {
+      return new Promise((resolve, reject) => {
+        listProjectContract({ projectId: 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('、');
+            const contractIds = response.rows.map(row => row.contractId);
+            Promise.all(contractIds.map(contractId => getContract(contractId)))
+              .then(contractData => {
+                resolve(contractData);
+              })
+              .catch(error => {
+                reject(error);
               });
-            }
+          } else {
+            resolve([]); // 如果没有合同，返回一个空数组  
           }
-          else
-            this.chooseContract = {};
-        })
-      }
+        }).catch(error => {
+          reject(error);
+        });
+      });
+    },
+    // 处理合同编码、合同编号的格式
+    processContractData(contractData) {
+      this.chooseContract = {
+        amount: [],
+        contractCode: [],
+        contractNumber: []
+      };
+      contractData.forEach(contract => {
+        if (contract.data) {
+          this.chooseContract.amount.push(contract.data.amount);
+          this.chooseContract.contractCode.push(contract.data.contractCode);
+          this.chooseContract.contractNumber.push(contract.data.contractNumber);
+        }
+      });
+
+      this.amount = this.chooseContract.amount.join('、');
+      this.contractCode = this.chooseContract.contractCode.join('、');
+      this.contractNumber = this.chooseContract.contractNumber.join('、');
     },
     getFileName(name) {
       if (name) {

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

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="单位名称" prop="partnerName">
+        <el-input v-model="queryParams.partnerName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="资质等级" prop="qualification">
+        <el-input v-model="queryParams.qualification" placeholder="请输入资质等级" clearable
+          @keyup.enter.native="handleQuery" />
+      </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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:partner:add']">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-table ref="partner" v-loading="loading" :data="partnerList" :row-key="getRowKeys"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="单位名称" align="center" prop="partnerName" width="200px" />
+      <el-table-column label="联系人" align="center" prop="contactPerson" />
+      <el-table-column label="联系电话" align="center" prop="telephone" />
+      <el-table-column label="资质等级" align="center" prop="qualification" />
+      <el-table-column label="内业规模" align="center" prop="inWorker" />
+      <el-table-column label="外业规模" align="center" prop="outWorker" />
+      <el-table-column label="擅长业务方向" align="center" prop="strength" />
+      <el-table-column label="履约能力评价" align="center" prop="fulfill" />
+    </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <div>
+      已选单位：<el-tag v-for="item in partners" style="margin: 5px;" :key="item.partnerId">{{ item.partnerName }}</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>
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+        <el-row>
+          <el-col :span="12" :gutter="20">
+            <el-form-item label="单位名称" prop="partnerName">
+              <el-input v-model="form.partnerName" placeholder="请输入单位名称" />
+            </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-col>
+          <el-col :span="12">
+            <el-form-item label="资质等级" prop="qualification">
+              <el-input v-model="form.qualification" placeholder="请输入资质等级" />
+            </el-form-item>
+            <el-form-item label="内业规模" prop="inWorker">
+              <el-input v-model="form.inWorker" placeholder="请输入内业规模" />
+            </el-form-item>
+            <el-form-item label="外业规模" prop="outWorker">
+              <el-input v-model="form.outWorker" placeholder="请输入外业规模" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="主要技术装备" prop="equipment" label-width="120px">
+          <el-input v-model="form.equipment" placeholder="请输入主要技术装备" />
+        </el-form-item>
+        <el-form-item label="擅长业务方向" prop="strength" label-width="120px">
+          <el-input v-model="form.strength" placeholder="请输入擅长业务方向" />
+        </el-form-item>
+        <el-form-item label="履约能力评价" prop="fulfill" label-width="120px">
+          <el-input v-model="form.fulfill" placeholder="请输入履约能力评价" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark" label-width="120px">
+          <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 10 }"
+            placeholder="请输入备注说明" />
+        </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>
+  </div>
+</template>
+
+<script>
+import { listPartner, getPartner, delPartner, addPartner, updatePartner } from "@/api/oa/partner/partner";
+
+export default {
+  name: "Partner",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc合作单位表格数据
+      partnerList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        partnerName: null,
+        contactPerson: null,
+        telephone: null,
+        qualification: null,
+        inWorker: null,
+        outWorker: null,
+        equipment: null,
+        strength: null,
+        fulfill: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        partnerName: [
+          { required: true, message: '请输入单位名称', trigger: 'blur' },
+        ]
+      },
+      partners: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc合作单位列表 */
+    getList() {
+      this.loading = true;
+      listPartner(this.queryParams).then(response => {
+        this.partnerList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        partnerId: null,
+        partnerName: null,
+        contactPerson: null,
+        telephone: null,
+        qualification: null,
+        inWorker: null,
+        outWorker: null,
+        equipment: null,
+        strength: null,
+        fulfill: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加合作单位";
+    },
+    handleView(row) {
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.partnerId != null) {
+            updatePartner(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPartner(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    getRowKeys(row) {
+      return row.partnerName;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.partners = selection
+    },
+    // 清空选择
+    clearChoose() {
+      this.$refs.partner.clearSelection();
+    },
+    confirmChoose() {
+      this.$emit('confirm', this.partners)
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,199 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-06-18 17:38:50
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-18 19:00:46
+-->
+<template>
+  <div>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="单位名称" prop="partyAName">
+        <el-input v-model="queryParams.partyAName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery" />
+      </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-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table ref="partyA" v-loading="loading" :data="partyAList" :row-key="getRowKeys"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="partyAId" />
+      <el-table-column label="单位名称" align="center" prop="partyAName" width="300px" />
+      <el-table-column label="联系人" align="center" prop="aPerson" />
+      <el-table-column label="联系电话" align="center" prop="aPhone" />
+      <el-table-column label="备注说明" align="center" prop="remark" />
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    <div>
+      已选单位：<el-tag v-for="item in choosePartyA" style="margin: 5px;" :key="item.partyAId">{{ item.partyAName }}</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>
+    <!-- 添加或修改cmc业主单位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="单位名称" prop="partyAName">
+          <el-input v-model="form.partyAName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="联系人" prop="aPerson">
+          <el-input v-model="form.aPerson" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="aPhone">
+          <el-input v-model="form.aPhone" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="备注说明" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注说明" />
+        </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>
+  </div>
+</template>
+
+
+<script>
+import { listPartyA, getPartyA, delPartyA, addPartyA, updatePartyA } from "@/api/oa/partyA/partyA";
+
+export default {
+  name: "PartyA",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc业主单位表格数据
+      partyAList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        partyAName: null,
+        aPerson: null,
+        aPhone: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        partyAName: [
+          { required: true, message: '请输入单位名称', trigger: 'blur' },
+        ]
+      },
+      choosePartyA: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc业主单位列表 */
+    getList() {
+      this.loading = true;
+      listPartyA(this.queryParams).then(response => {
+        this.partyAList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        partyAId: null,
+        partyAName: null,
+        aPerson: null,
+        aPhone: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加甲方单位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const partyAId = row.partyAId || this.ids
+      getPartyA(partyAId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改甲方单位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.partyAId != null) {
+            updatePartyA(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPartyA(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    getRowKeys(row) {
+      return row.partyAId;
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.choosePartyA = selection
+    },
+    // 清空选择
+    clearChoose() {
+      this.$refs.partyA.clearSelection();
+    },
+    confirmChoose() {
+      this.$emit('confirm', this.choosePartyA)
+    },
+  }
+};
+</script>
+<style lang="scss" scoped></style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-14 15:37:51
+ * @LastEditTime: 2024-06-18 14:52:40
 -->
 <template>
   <div class="project-wrapper">
@@ -108,8 +108,11 @@
           </el-link>
         </div>
       </el-form-item>
+      <el-form-item label="资料提交要求：" prop="projectRequest">
+        <el-input v-model="addForm.projectRequest" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+      </el-form-item>
       <el-form-item label="备注：" prop="remark">
-        <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
+        <el-input v-model="addForm.remark" type="textarea" :autosize="{ minRows: 4, maxRows: 10}"></el-input>
       </el-form-item>
       <el-row>
         <el-col :span="6" :xs="24" :offset="12">

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

@@ -1,8 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目id" prop="projectId">
-        <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="项目编号" prop="projectId">
+        <el-select v-model="queryParams.projectId" clearable filterable remote reserve-keyword placeholder="请输入项目编号"
+          :remote-method="remoteMethod" :loading="loading" style="width: 400px;">
+          <el-option v-for="project in projectList" :key="project.projectId"
+            :label="project.projectNumber + '-' + project.projectName" :value="project.projectId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="编制人" prop="compiler">
+        <el-select v-model="queryParams.compiler" filterable clearable>
+          <el-option :key="item.userId" v-for="item of $store.state.user.userList" :label="item.nickName"
+            :value="item.userId"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -10,7 +21,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['oa:budget:add']">新增</el-button>
@@ -28,12 +39,19 @@
           v-hasPermi="['oa:budget:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="budgetList" @selection-change="handleSelectionChange">
-      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column label="项目编号" align="center" prop="project.projectNumber" />
+      <el-table-column label="项目名称" align="center" prop="project.projectName" />
       <el-table-column label="固定成本" align="center" prop="fixCost" />
-      <el-table-column label="直接成本" align="center" prop="directExpense" />
+      <el-table-column label="直接成本" align="center" prop="settleExpense" />
+      <el-table-column label="其他成本" align="center" prop="directExpense">
+        <template slot-scope="scope">
+          {{ (Number(scope.row.directExpense) - Number(scope.row.settleExpense)).toFixed(2) }}
+        </template>
+      </el-table-column>
       <el-table-column label="预算总额" align="center" prop="totalBudget" />
       <el-table-column label="编制人" align="center" prop="compiler">
         <template slot-scope="scope">
@@ -47,10 +65,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+            v-hasPermi="['oa:budget:view']">查看</el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['oa:budget:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:budget:remove']">删除</el-button>
+            v-hasPermi="['oa:budget:remove']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -127,14 +147,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
+      <budget-info :taskForm="taskForm" :taskName="''"></budget-info>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api/oa/budget/budget";
-
+import { listProject } from '@/api/oa/project/project';
+import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
 export default {
   name: "Budget",
+  components: { budgetInfo, },
   data() {
     return {
       // 遮罩层
@@ -155,6 +181,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      infoOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -184,7 +211,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {},
+      projectList: []
     };
   },
   created() {
@@ -200,6 +229,16 @@ export default {
         this.loading = false;
       });
     },
+    remoteMethod(val) {
+      console.log(val);
+      listProject({
+        pageNum: 1,
+        pageSize: 20, 
+        projectNumber: val
+      }).then(res => {
+        this.projectList = res.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -255,6 +294,10 @@ export default {
       this.open = true;
       this.title = "添加cmc预算管理";
     },
+    handleView(row) {
+      this.taskForm.formId = row.projectId;
+      this.infoOpen = true;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-18 10:40:58
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-18 17:34:15
 -->
 <template>
   <div class="app-container">
@@ -60,7 +60,7 @@
     <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
-      <el-table-column label="合同名称" align="center" prop="contractName" />
+      <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
       <el-table-column label="合同编码" align="center" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
       <el-table-column label="合同金额" align="center" prop="amount" />

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

@@ -210,7 +210,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc合作单位";
+      this.title = "添加合作单位";
     },
     handleView(row){
 
@@ -222,7 +222,7 @@ export default {
       getPartner(partnerId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc合作单位";
+        this.title = "修改合作单位";
       });
     },
     /** 提交按钮 */