合同拟稿

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContract.java

@@ -26,8 +26,8 @@ public class CmcContract extends BaseEntity
     @Excel(name = "合同编号")
     private String contractNumber;
 
-    /** 项目组 */
-    private String[] projectIds;
+    /** 投标项目 */
+    private String tenderId;
 
     /** 合同金额 */
     @Excel(name = "合同金额")
@@ -87,14 +87,14 @@ public class CmcContract extends BaseEntity
     {
         return contractNumber;
     }
-    public void setProjectIds(String[] projectIds)
+    public void setTenderId(String tenderId)
     {
-        this.projectIds = projectIds;
+        this.tenderId = tenderId;
     }
 
-    public String[] getProjectIds()
+    public String getTenderId()
     {
-        return projectIds;
+        return tenderId;
     }
 
     public void setAmount(BigDecimal amount)

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

@@ -7,6 +7,7 @@
     <resultMap type="CmcContract" id="CmcContractResult">
         <result property="contractId"    column="contract_id"    />
         <result property="contractNumber"    column="contract_number"    />
+        <result property="tenderId"    column="tender_id"    />
         <result property="amount"    column="amount"    />
         <result property="deposit"    column="deposit"    />
         <result property="contractDocument"    column="contract_document"    />
@@ -26,14 +27,16 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_number, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark,
-               c.sign_scan, c.comment_type from cmc_contract
-        left join sys_user as u on u.user_id = ca.drafter
+        select c.contract_id, c.contract_number, c.tender_id, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark,
+               c.sign_scan, c.comment_type from cmc_contract as c
+        left join sys_user as u on u.user_id = c.drafter
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">
         <include refid="selectCmcContractVo"/>
         <where>
+            <if test="contractId != null  and contractId != ''"> and c.contract_id like concat('%', #{contractId}, '%')</if>
+            <if test="tenderId != null  and tenderId != ''"> and c.tender_id = #{tenderId}</if>
             <if test="contractNumber != null  and contractNumber != ''"> and c.contract_number = #{contractNumber}</if>
             <if test="amount != null "> and c.amount = #{amount}</if>
             <if test="deposit != null "> and c.deposit = #{deposit}</if>
@@ -45,6 +48,7 @@
             <if test="signScan != null  and signScan != ''"> and c.sign_scan = #{signScan}</if>
             <if test="commentType != null  and commentType != ''"> and c.comment_type = #{commentType}</if>
         </where>
+        order by contract_id desc
     </select>
 
     <select id="selectCmcContractByContractId" parameterType="String" resultMap="CmcContractResult">
@@ -56,6 +60,7 @@
         insert into cmc_contract
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="contractId != null">contract_id,</if>
+            <if test="tenderId != null">tender_id,</if>
             <if test="contractNumber != null">contract_number,</if>
             <if test="amount != null">amount,</if>
             <if test="deposit != null">deposit,</if>
@@ -70,6 +75,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
+            <if test="tenderId != null">#{tenderId},</if>
             <if test="contractNumber != null">#{contractNumber},</if>
             <if test="amount != null">#{amount},</if>
             <if test="deposit != null">#{deposit},</if>
@@ -87,6 +93,7 @@
     <update id="updateCmcContract" parameterType="CmcContract">
         update cmc_contract
         <trim prefix="SET" suffixOverrides=",">
+            <if test="tenderId != null">tender_id = #{tenderId},</if>
             <if test="contractNumber != null">contract_number = #{contractNumber},</if>
             <if test="amount != null">amount = #{amount},</if>
             <if test="deposit != null">deposit = #{deposit},</if>

oa-back/sql/sql.sql

@@ -3055,6 +3055,7 @@ drop table if exists `cmc_contract`;
 create table `cmc_contract`  (
   `contract_id` 			char(10)  		not null 	 comment '合同id（ht2024w002）',
   `contract_number` 		varchar(30)  	default null comment '合同编号',
+  `tender_id` 				char(8)  		default null comment '投标项目id',
   `amount` 					decimal(10, 2) 	default null comment '合同金额',
   `deposit` 				decimal(10, 2) 	default null comment '履约保证金',
   `contract_document` 		varchar(255)  	default null comment '合同文件',

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

@@ -2,16 +2,50 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="合同编号" prop="contractNumber">
-            <el-input v-model="form.contractNumber" placeholder="请输入合同编号" />
-          </el-form-item>
-          <el-form-item label="合同金额" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入合同金额" />
-          </el-form-item>
-          <el-form-item label="履约保证金" prop="deposit">
-            <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="项目名称：" prop="tenderName">
+            <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" :value="item.tenderId">
+              </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">{{ chooseTender.projectName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
+              }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseTender.partyA
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
+              }}</el-descriptions-item>
+            </el-descriptions>
           </el-form-item>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="合同编码" prop="contractId">
+                <el-input v-model="form.contractId" :disabled="true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="合同编号" prop="contractNumber">
+                <el-input v-model="form.contractNumber" placeholder="请输入合同编号"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="合同金额" prop="amount">
+                <el-input v-model="form.amount" placeholder="请输入合同金额" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="履约保证金" prop="deposit">
+                <el-input v-model="form.deposit" placeholder="请输入履约保证金" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
             <el-input v-model="form.contractDocument" placeholder="请输入合同文件" />
           </el-form-item>
@@ -63,7 +97,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import { getContractWork } from "@/api/oa/contract/contractWork";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
-import { listProject, getProject } from "@/api/oa/project/project";
+import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -125,8 +159,8 @@ export default {
       rules: {
       },
       workList: [],
-      projectList: [],
-      chooseProject: {},
+      tenderList: [],
+      chooseTender: {},
       isSelect: false,
       formTotal: 0,
       flowData: {},
@@ -137,6 +171,7 @@ export default {
       this.drafter = this.$store.getters.name;
       this.draftTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    this.getTenderList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -158,6 +193,12 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          if (data.tenderId) {
+            getTender(data.tenderId).then(response => {
+              this.chooseTender = response.data;
+              this.isSelect = true
+            })
+          }
         }
       })
     },
@@ -171,21 +212,22 @@ export default {
       });
     },
     // 查询项目列表
-    getProjectList() {
+    getTenderList() {
       this.loading = true
-      listProject({
+      listTender({
         pageNum: 1,
         pageSize: 99999999
       }).then(response => {
-        this.projectList = response.rows;
+        this.tenderList = response.rows;
       })
     },
     // 选择项目
-    handleSelectProject(val) {
+    handleSelectTender(val) {
       if (val != "" && val != undefined && val != null) {
-        getProject(val).then(res => {
-          this.chooseProject = res.data;
-          this.isSelect = true
+        getTender(val).then(res => {
+          this.chooseTender = res.data;
+          this.isSelect = true;
+          this.getContractId(this.chooseTender)
         })
       } else {
         this.isSelect = false
@@ -204,6 +246,43 @@ export default {
       }
       return true;
     },
+    getProjectSource(chooseTender) {
+      let partyAList = ['中国电建集团成都勘测设计研究院勘测设计分公司', '成勘院 水环境与城建工程分公司'];
+      return partyAList.indexOf(chooseTender.partyA) != -1 ? '院内' : '院外';
+    },
+    getContractId(chooseTender) {
+      let contractId = '';
+      if (chooseTender) {
+        if (this.getProjectSource(chooseTender) == '院内') {
+          listContract({ contractId: 'C' }).then(res => {
+            if (res.total == 0)
+              contractId = 'HT' + new Date().getFullYear() + 'C' + '001';
+            else
+              contractId = 'HT' + new Date().getFullYear() + 'C' + this.fillZero(Number(res.rows[0].contractId.substring(7, 10)) + 1);
+            this.$set(this.form, 'contractId', contractId);
+          })
+        }
+        else {
+          listContract({ contractId: 'W' }).then(res => {
+            if (res.total == 0)
+              contractId = 'HT' + new Date().getFullYear() + 'W' + '001';
+            else
+              contractId = 'HT' + new Date().getFullYear() + 'W' + this.fillZero(Number(res.rows[0].contractId.substring(7, 10)) + 1);
+            this.$set(this.form, 'contractId', contractId);
+          })
+        }
+      }
+    },
+    fillZero(number) {
+      let fullNumber = '';
+      if (number < 10)
+        fullNumber = '00' + number;
+      else if (number >= 10 & number < 100)
+        fullNumber = '0' + number;
+      else
+        fullNumber = number;
+      return fullNumber;
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -303,7 +382,7 @@ export default {
       }, `contract_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
 
 <style>